6 files changed, 22 insertions, 6 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 992519ee92..160ea0f600 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.2.0 (unreleased)*
 
+* Default options to `rails new` can be set in ~/.railsrc [Guillermo Iguaran]
+
 * Added destroy alias to Rails engines. [Guillermo Iguaran]
 
 * Added destroy alias for Rails command line. This allows the following: `rails d model post`. [Andrey Ognevsky]
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index 1cf23a8b92..60d1aed73a 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -9,6 +9,14 @@ if ARGV.first != "new"
   ARGV[0] = "--help"
 else
   ARGV.shift
+  railsrc = File.join(File.expand_path("~"), ".railsrc")
+  if File.exist?(railsrc)
+    extra_args_string = File.open(railsrc).read
+    extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten
+    puts "Using #{extra_args.join(" ")} from #{railsrc}"
+    ARGV << extra_args
+    ARGV.flatten!
+  end
 end
 
 require 'rubygems' if ARGV.include?("--dev")
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 5af5d3b856..b26839644e 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -90,7 +90,7 @@ module Rails
           append_file "Gemfile", "\ngroup #{name} do\n", :force => true
 
           @in_group = true
-          instance_eval &block
+          instance_eval(&block)
           @in_group = false
 
           append_file "Gemfile", "end\n", :force => true
diff --git a/railties/lib/rails/generators/rails/app/USAGE b/railties/lib/rails/generators/rails/app/USAGE
index 9e7a78d132..691095f33f 100644
--- a/railties/lib/rails/generators/rails/app/USAGE
+++ b/railties/lib/rails/generators/rails/app/USAGE
@@ -2,6 +2,12 @@ Description:
     The 'rails new' command creates a new Rails application with a default
     directory structure and configuration at the path you specify.
 
+    You can specify extra command-line arguments to be used every time
+    'rails new' runs in the .railsrc configuration file in your home directory.
+
+    Note that the arguments specified in the .railsrc file don't affect the
+    defaults values shown above in this help message.
+
 Example:
     rails new ~/Code/Ruby/weblog
 
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 68f566274d..8d0d8cacac 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -24,7 +24,7 @@ if defined?(MiniTest)
   end
 end
 
-if defined?(ActiveRecord)
+if defined?(ActiveRecord::Base)
   require 'active_record/test_case'
 
   class ActiveSupport::TestCase
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 448982f9de..97ad47ac14 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -306,7 +306,7 @@ module ApplicationTests
       require "#{app_path}/config/environment"
       require "mail"
 
-      ActionMailer::Base
+      _ = ActionMailer::Base
 
       assert_equal [::MyMailInterceptor], ::Mail.send(:class_variable_get, "@@delivery_interceptors")
     end
@@ -319,7 +319,7 @@ module ApplicationTests
       require "#{app_path}/config/environment"
       require "mail"
 
-      ActionMailer::Base
+      _ = ActionMailer::Base
 
       assert_equal [::MyMailInterceptor, ::MyOtherMailInterceptor], ::Mail.send(:class_variable_get, "@@delivery_interceptors")
     end
@@ -332,7 +332,7 @@ module ApplicationTests
       require "#{app_path}/config/environment"
       require "mail"
 
-      ActionMailer::Base
+      _ = ActionMailer::Base
 
       assert_equal [::MyMailObserver], ::Mail.send(:class_variable_get, "@@delivery_notification_observers")
     end
@@ -345,7 +345,7 @@ module ApplicationTests
       require "#{app_path}/config/environment"
       require "mail"
 
-      ActionMailer::Base
+      _ = ActionMailer::Base
 
       assert_equal [::MyMailObserver, ::MyOtherMailObserver], ::Mail.send(:class_variable_get, "@@delivery_notification_observers")
     end