installer.rb in spree_cmd-1.1.0.rc2

- old
+ new

@@ -10,12 +10,11 @@
                                :desc => 'Answer yes to all prompts'
 
     class_option :skip_install_data, :type => :boolean, :default => false,
                  :desc => 'Skip running migrations and loading seed and sample data'
 
-    class_option :version, :type => :string, :default => 'current',
-                 :desc => 'Spree Version to use (current, edge, local)'
+    class_option :version, :type => :string, :desc => 'Spree Version to use'
 
     class_option :edge, :type => :boolean
 
     class_option :path, :type => :string, :desc => 'Spree gem path'
     class_option :git, :type => :string, :desc => 'Spree gem git url'
@@ -40,10 +39,12 @@
       elsif options[:git]
         @spree_gem_options[:git] = options[:git]
         @spree_gem_options[:ref] = options[:ref] if options[:ref]
         @spree_gem_options[:branch] = options[:branch] if options[:branch]
         @spree_gem_options[:tag] = options[:tag] if options[:tag]
+      elsif options[:version]
+        @spree_gem_options[:version] = options[:version]
       end
     end
 
     def ask_questions
       @install_default_gateways = ask_with_default('Would you like to install the default gateways?')
@@ -104,13 +105,14 @@
       end
     end
 
     private
 
-      def gem(name, options={})
+      def gem(name, gem_options={})
         say_status :gemfile, name
         parts = ["'#{name}'"]
-        options.each { |key, value| parts << ":#{key} => '#{value}'" }
+        parts << ["'#{gem_options.delete(:version)}'"] if gem_options[:version]
+        gem_options.each { |key, value| parts << ":#{key} => '#{value}'" }
         append_file 'Gemfile', "gem #{parts.join(', ')}\n", :verbose => false
       end
 
       def ask_with_default(message, default = 'yes')
         return true if options[:auto_accept]