2 files changed, 3 insertions, 29 deletions
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index 2ff29418c6..678697f09b 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -1,30 +1,3 @@
-require 'rails/version'
-
-if ['--version', '-v'].include?(ARGV.first)
-  puts "Rails #{Rails::VERSION::STRING}"
-  exit(0)
-end
-
-if ARGV.first != "new"
-  ARGV[0] = "--help"
-else
-  ARGV.shift
-  unless ARGV.delete("--no-rc")
-    customrc = ARGV.index{ |x| x.include?("--rc=") }
-    railsrc = if customrc
-                File.expand_path(ARGV.delete_at(customrc).gsub(/--rc=/, ""))
-              else
-                File.join(File.expand_path("~"), '.railsrc')
-              end
-    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.insert(1, *extra_args)
-    end
-  end
-end
-
 require 'rails/generators'
 require 'rails/generators/rails/app/app_generator'
 
@@ -40,4 +13,5 @@ module Rails
   end
 end
 
+Rails::Generators::AppPreparer.new(ARGV).prepare!
 Rails::Generators::AppGenerator.start
diff --git a/railties/lib/rails/commands/commands_tasks.rb b/railties/lib/rails/commands/commands_tasks.rb
index bb25d6419b..11524c4ef5 100644
--- a/railties/lib/rails/commands/commands_tasks.rb
+++ b/railties/lib/rails/commands/commands_tasks.rb
@@ -100,7 +100,7 @@ EOT
     end
 
     def version
-      ARGV.unshift '--version'
+      argv.unshift '--version'
       require_command!("application")
     end
 
@@ -117,7 +117,7 @@ EOT
       end
 
       def shift_argv!
-        ARGV.shift if ARGV.first && ARGV.first[0] != '-'
+        argv.shift if argv.first && argv.first[0] != '-'
       end
 
       def require_command!(command)