lib/provisional/project.rb in vigetlabs-provisional-2.0.3 vs lib/provisional/project.rb in vigetlabs-provisional-2.1.0

@@ -1,39 +1,48 @@
 require 'active_support'
 require 'uri'
+require 'yaml'
 
 module Provisional
   class Project
     attr_reader :options
     
     def initialize(options)
-      @options = options
+      @options = HashWithIndifferentAccess.new
+      if options[:config]
+        begin
+          @options = @options.merge(YAML.load_file(options[:config]))
+        rescue
+          raise ArgumentError, "could not be loaded or parsed: #{options[:config]}"
+        end
+      end
+      @options = @options.merge(options.reject{|k,v| v.nil?})
 
-      unless is_valid_url?(@options[:template])
-        if File.exist?(File.expand_path(@options[:template]))
-          @options[:template_path] = File.expand_path(@options[:template])
+      @options[:scm] ||= 'git'
+      @options[:template] ||= 'viget'
+
+      unless is_valid_url?(@options['template'])
+        if File.exist?(File.expand_path(@options['template']))
+          @options['template_path'] = File.expand_path(@options['template'])
         else
-          @options[:template_path] = File.expand_path(File.join(File.dirname(__FILE__),'templates',"#{@options[:template]}.rb"))
+          @options['template_path'] = File.expand_path(File.join(File.dirname(__FILE__),'templates',"#{@options['template']}.rb"))
         end
-        raise ArgumentError, "is not valid: #{@options[:template]}" unless File.exist?(@options[:template_path])
+        raise ArgumentError, "is not valid: #{@options['template']}" unless File.exist?(@options['template_path'])
       else
-        @options[:template_path] = @options[:template]
+        @options['template_path'] = @options['template']
       end
 
-      raise ArgumentError, "must be specified" unless @options[:name]
-      raise ArgumentError, "already exists: #{@options[:name]}" if File.exist?(@options[:name])
-      raise ArgumentError, "already exists: #{@options[:name]}.repo" if @options[:scm] == 'svn' && File.exist?("#{@options[:name]}.repo")
+      raise ArgumentError, "name must be specified" unless @options['name']
+      raise ArgumentError, "already exists: #{@options['name']}" if File.exist?(@options['name'])
+      raise ArgumentError, "already exists: #{@options['name']}.repo" if @options['scm'] == 'svn' && File.exist?("#{@options['name']}.repo")
 
       begin
-        require "provisional/scm/#{@options[:scm]}"
+        require "provisional/scm/#{@options['scm']}"
       rescue MissingSourceFile
-        raise ArgumentError, "is not supported: #{@options[:scm]}"
+        raise ArgumentError, "is not supported: #{@options['scm']}"
       end
 
-      raise ArgumentError, "must be specified" if @options[:rails].to_s.empty?
-      raise ArgumentError, "is not valid: #{@options[:rails]}" unless File.exist?(@options[:rails]) && File.executable?(@options[:rails])
-
-      scm_class = "Provisional::SCM::#{@options[:scm].classify}".constantize
+      scm_class = "Provisional::SCM::#{@options['scm'].classify}".constantize
       scm = scm_class.new(@options)
       scm.init
       scm.generate_rails
       scm.checkin
     end