From 19ca0952bbdcf744f12d2bedb267dff20618e149 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 30 Oct 2013 16:37:33 -0700 Subject: there is no reason for ARGV[0] to be nil --- .../lib/rails/generators/rails/app/app_generator.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index b6dbb11a34..718be02f30 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -362,15 +362,17 @@ module Rails end end + def read_rc_file(railsrc) + return [] unless File.exists?(railsrc) + extra_args_string = File.read(railsrc) + extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten + puts "Using #{extra_args.join(" ")} from #{railsrc}" + extra_args + end + def insert_railsrc_into_argv!(argv, railsrc) - if File.exist?(railsrc) - extra_args_string = File.read(railsrc) - extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten - puts "Using #{extra_args.join(" ")} from #{railsrc}" - [argv.first] + extra_args + argv.drop(1) - else - argv - end + extra_args = read_rc_file railsrc + argv.take(1) + extra_args + argv.drop(1) end end end -- cgit v1.2.3