lib/simple_provision/configuration.rb in simple_provision-0.99.5 vs lib/simple_provision/configuration.rb in simple_provision-0.99.6

@@ -4,17 +4,16 @@
   class Configuration
     MissingServerType = Class.new(StandardError)
     MissingServerConfiguration = Class.new(StandardError)
 
     attr_reader :options
+    attr_reader :profile
 
-    def initialize(command_line_options = {})
-      @command_line_options = command_line_options
+    def initialize(profile)
+      @profile = profile
 
       read_and_parse_server_options
-
-      raise MissingServerType, "Please specify a type of server you want to create using the --type option" unless options[:type]
     end
 
     private
 
     def default_options
@@ -27,23 +26,19 @@
 
     def server_options
       begin
         YAML.load(File.read(server_file))
       rescue Errno::ENOENT
-        raise MissingServerConfiguration, "Please create a configuration file './servers/#{type}.yml'"
+        raise MissingServerConfiguration, "Please create a configuration file './servers/#{profile}.yml'"
       end
     end
 
     def server_file
-      "servers/#{type}.yml"
+      "servers/#{profile}.yml"
     end
 
     def read_and_parse_server_options
-      options_string_hash = default_options.merge(server_options).merge(@command_line_options)
+      options_string_hash = default_options.merge(server_options)
       @options = Hash[options_string_hash.map{ |(k,v)| [k.to_sym, v] }]
-    end
-
-    def type
-      @command_line_options[:type]
     end
   end
 end