Also check if application is a valid constant in rake rails:update.

1 files changed, 11 insertions, 5 deletions

diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 65d3c48f2d..dbe2ac54ed 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -32,12 +32,18 @@ namespace :rails do
 
   namespace :update do
     def invoke_from_app_generator(method)
-      require 'rails/generators'
-      require 'generators/rails/app/app_generator'
+      app_generator.invoke(method)
+    end
 
-      generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true },
-                                                      :destination_root => Rails.root
-      generator.invoke(method)
+    def app_generator
+      @app_generator ||= begin
+        require 'rails/generators'
+        require 'generators/rails/app/app_generator'
+        gen = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true },
+                                                             :destination_root => Rails.root
+        gen.send(:valid_app_const?)
+        gen
+      end
     end
 
     desc "Update config/boot.rb from your current rails install"