From a1e1af9b2170c83d0f913f0cea2be0aec05a30fd Mon Sep 17 00:00:00 2001
From: Amparo Luna <amparo.m.luna@gmail.com>
Date: Thu, 31 Jan 2013 19:30:47 -0500
Subject: Add --no-rc option to skip the loading of railsrc file
---
railties/lib/rails/commands/application.rb | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'railties/lib/rails')
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
--
cgit v1.2.3