aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-31 16:40:07 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-31 16:40:07 -0800
commitb0d4a205713154a4cd3c065e8bdb42431f63dd74 (patch)
treec3f256093d33daca1e89d094a9ffc5d04f7229b7 /railties/lib
parent83eccde1e2aeb925a670899d862572e960a76329 (diff)
parenta1e1af9b2170c83d0f913f0cea2be0aec05a30fd (diff)
downloadrails-b0d4a205713154a4cd3c065e8bdb42431f63dd74.tar.gz
rails-b0d4a205713154a4cd3c065e8bdb42431f63dd74.tar.bz2
rails-b0d4a205713154a4cd3c065e8bdb42431f63dd74.zip
Merge pull request #9138 from amparo-luna/no_rc
Add --no-rc option to skip the loading of railsrc file
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/commands/application.rb14
1 files changed, 8 insertions, 6 deletions
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