Merge remote branch 'mainstream/master'

2 files changed, 9 insertions, 3 deletions

diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb
index 92e0d37436..1e1acc1141 100644
--- a/railties/lib/generators/rails/app/app_generator.rb
+++ b/railties/lib/generators/rails/app/app_generator.rb
@@ -178,7 +178,8 @@ module Rails::Generators
     end
 
     def bundle_if_dev_or_edge
-      run "bundle install" if dev_or_edge?
+      bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle')
+      run "#{bundle_command} install" if dev_or_edge?
     end
 
     protected
@@ -220,6 +221,8 @@ module Rails::Generators
           raise Error, "Invalid application name #{app_name}. Please give a name which does not start with numbers."
         elsif RESERVED_NAMES.include?(app_name)
           raise Error, "Invalid application name #{app_name}. Please give a name which does not match one of the reserved rails words."
+        elsif Object.const_defined?(app_const_base)
+          raise Error, "Invalid application name #{app_name}, constant #{app_const_base} is already in use. Please choose another application name."
         end
       end
 
diff --git a/railties/lib/generators/rails/app/templates/script/rails b/railties/lib/generators/rails/app/templates/script/rails
index 199fe1a6d3..b01d1ee183 100644
--- a/railties/lib/generators/rails/app/templates/script/rails
+++ b/railties/lib/generators/rails/app/templates/script/rails
@@ -1,5 +1,8 @@
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENV_PATH = File.expand_path('../../config/environment',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+ENV_PATH  = File.expand_path('../../config/environment',  __FILE__)
+BOOT_PATH = File.expand_path('../../config/boot',  __FILE__)
+APP_PATH  = File.expand_path('../../config/application',  __FILE__)
+
+require BOOT_PATH
 require 'rails/commands'