Configuration changes

Pulled System.rb out to individual classes.

lib/systemreader.rb

@@ -1,18 +1,25 @@
-require_relative 'system.rb'
-require_relative 'objects/vulnerability'
+require_relative 'configuration.rb'
+require_relative 'network_manager.rb'
+require_relative 'service_manager.rb'
+require_relative 'base_manager.rb'
 require_relative 'helpers/vulnerability_processor'
+require_relative 'objects/base_box'
+require_relative 'objects/network'
+require_relative 'objects/service'
+require_relative 'objects/system'
+require_relative 'objects/vulnerability'
+
 class SystemReader
 	# initializes systems xml from BOXES_XML const
-	def initialize(systems_xml)
-		@systems_xml = systems_xml
+	def initialize()
 		@vulnerability_processor = VulnerabilityProcessor.new
 	end
 
 	# uses nokogiri to extract all system information from scenario.xml will add it to the system class after
 	# checking if the vulnerabilities / networks exist from system.rb
-	def systems
+	def parse_systems
 		systems = []
-		doc = Nokogiri::XML(File.read(@systems_xml))
+		doc = Nokogiri::XML(File.read(SCENARIO_XML))
 		doc.xpath("//systems/system").each do |system|
 			id = system["id"]
 			os = system["os"]
@@ -51,9 +58,9 @@ class SystemReader
 			new_vulns = @vulnerability_processor.process(vulns)
 			#puts new_vulns.inspect
 			
-			new_networks = NetworkManager.process(networks, Conf.networks)
+			new_networks = NetworkManager.process(networks, Configuration.networks)
 			# pass in the already selected set of vulnerabilities, and additional secure services to find
-			new_services = ServiceManager.process(services, Conf.services, new_vulns)
+			new_services = ServiceManager.process(services, Configuration.services, new_vulns)
 
 			s = System.new(id, os, basebox, url, new_vulns, new_networks, new_services)
 			if s.is_valid_base == false
@@ -64,4 +71,4 @@ class SystemReader
 		end
 		return systems
 	end
-end
+end