From 4e0694c603099a2f76de8ad0f65c4f446a44dc4f Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 30 Oct 2013 16:20:39 -0700 Subject: return argv from each method --- railties/lib/rails/generators/rails/app/app_generator.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 0377bfb4a3..6b59400f95 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -318,11 +318,10 @@ module Rails def prepare! handle_version_request!(@argv.first) - unless handle_invalid_command!(@argv.first, @argv) + handle_invalid_command!(@argv.first, @argv) do @argv.shift handle_rails_rc!(@argv) end - @argv end def self.default_rc_file @@ -340,8 +339,10 @@ module Rails end def handle_invalid_command!(argument, argv) - if argument != "new" - argv[0] = "--help" + if argument == "new" + yield + else + ['--help'] + argv.drop(1) end end @@ -349,6 +350,7 @@ module Rails unless argv.delete("--no-rc") insert_railsrc_into_argv!(argv, railsrc(argv)) end + argv end def railsrc(argv) -- cgit v1.2.3