lib/spree_cmd/installer.rb in spree_cmd-2.0.13 vs lib/spree_cmd/installer.rb in spree_cmd-2.1.0

- old
+ new

@@ -60,19 +60,19 @@ end def ask_questions @install_default_gateways = ask_with_default('Would you like to install the default gateways? (Recommended)') @install_default_auth = ask_with_default('Would you like to install the default authentication system?') - + if @install_default_auth @user_class = "Spree::User" else @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 + end if options[:skip_install_data] @run_migrations = false @load_seed_data = false @load_sample_data = false @@ -92,15 +92,15 @@ inside @app_path do gem :spree, @spree_gem_options if @install_default_gateways - gem :spree_gateway, :git => "https://github.com/spree/spree_gateway.git", :branch => '2-0-stable' + gem :spree_gateway, :git => "https://github.com/spree/spree_gateway.git" end if @install_default_auth - gem :spree_auth_devise, :git => "https://github.com/spree/spree_auth_devise.git", :branch => '2-0-stable' + gem :spree_auth_devise, :git => "https://github.com/spree/spree_auth_devise.git" end run 'bundle install', :capture => true end end @@ -159,10 +159,10 @@ rails_cmd << " -d #{options[:database]}" if options[:database] run(rails_cmd) end def rails_project? - File.exists? File.join(@app_path, 'script', 'rails') + File.exists? File.join(@app_path, 'bin', 'rails') end def linux? /linux/i === RbConfig::CONFIG['host_os'] end