Merge pull request #9138 from amparo-luna/no_rc

Add --no-rc option to skip the loading of railsrc file

2 files changed, 12 insertions, 6 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index c6ffe30ad3..0a9c4a4984 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Add --no-rc option to skip the loading of railsrc file during the generation of a new app.
+    
+    *Amparo Luna*
+
 *   Fixes database.yml when creating a new rails application with '.'
     Fix #8304
 
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index 2d9708e5b5..b4c7356159 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -9,12 +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.insert(1, *extra_args)
+  unless ARGV.delete("--no-rc")
+    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.insert(1, *extra_args)
+    end
   end
 end