spree_cmd 1.2.0.rc1 → 1.2.0.rc2

data/lib/spree_cmd.rb

@@ -4,16 +4,17 @@ require 'thor/group'
 module SpreeCmd
   class Command
 
-    if ARGV.first == 'version'
-      puts Gem.loaded_specs['spree_cmd'].version
-    elsif ARGV.first == 'extension'
-      ARGV.shift
-      require 'spree_cmd/extension'
-      SpreeCmd::Extension.start
-    else
-      ARGV.shift
-      require 'spree_cmd/installer'
-      SpreeCmd::Installer.start
+    case ARGV.first
+      when 'version' || '-v' || '--version'
+        puts Gem.loaded_specs['spree_cmd'].version
+      when 'extension'
+        ARGV.shift
+        require 'spree_cmd/extension'
+        SpreeCmd::Extension.start
+      else
+        ARGV.shift
+        require 'spree_cmd/installer'
+        SpreeCmd::Installer.start
     end
   end
-end
+end

data/lib/spree_cmd/extension.rb

@@ -51,7 +51,7 @@ module SpreeCmd
       end
 
       def spree_version
-        '1.2.0.rc1'
+        '1.2.0.rc2'
       end
 
       def use_prefix(prefix)

data/lib/spree_cmd/installer.rb

@@ -1,4 +1,5 @@
 require 'rbconfig'
+require 'active_support/core_ext/string'
 
 module SpreeCmd
 
@@ -64,6 +65,12 @@ module SpreeCmd
     def ask_questions
       @install_default_gateways = ask_with_default('Would you like to install the default gateways?')
       @install_default_auth = ask_with_default('Would you like to install the default authentication system?')
+      unless @install_default_auth
+        @user_class = ask("What is the name of the class representing users within your application? [User]")
+        if @user_class.blank?
+          @user_class = "User"
+        end
+      end
 
       if options[:skip_install_data]
         @run_migrations = false
@@ -94,7 +101,7 @@ module SpreeCmd
         end
 
         if @install_default_auth
-          gem :spree_auth_devise, :git => "git://github.com/radar/spree_auth_devise"
+          gem :spree_auth_devise, :git => "git://github.com/spree/spree_auth_devise"
         end
 
         run 'bundle install', :capture => true
@@ -106,6 +113,7 @@ module SpreeCmd
       spree_options << "--migrate=#{@run_migrations}"
       spree_options << "--seed=#{@load_seed_data}"
       spree_options << "--sample=#{@load_sample_data}"
+      spree_options << "--user_class=#{@user_class}"
       spree_options << "--auto_accept" if options[:auto_accept]
 
       inside @app_path do
@@ -181,10 +189,16 @@ module SpreeCmd
       end
 
       def image_magick_installed?
+        cmd = 'identify -version'
+        if RUBY_PLATFORM =~ /mswin/ #windows
+          cmd += " >nul"
+        else
+          cmd += " >/dev/null"
+        end
         # true if command executed succesfully
         # false for non zero exit status
         # nil if command execution fails
-        system('identify -version')
+        system(cmd)
       end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cmd
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3038474117322682252
+      hash: 3532538520875852145
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: