1 files changed, 19 insertions, 17 deletions
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index e669315934..904b9d9ad6 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -3,7 +3,7 @@ namespace :rails do
   task update: [ "update:configs", "update:bin" ]
 
   desc "Applies the template supplied by LOCATION=(/path/to/template) or URL"
-  task :template do
+  task template: :environment do
     template = ENV["LOCATION"]
     raise "No LOCATION value given. Please set LOCATION either as path to a file or a URL" if template.blank?
     template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://}
@@ -32,35 +32,37 @@ namespace :rails do
           FileUtils.cp_r src_name, dst_name
         end
       end
-     end
+    end
   end
 
   namespace :update do
-    def invoke_from_app_generator(method)
-      app_generator.send(method)
-    end
+    class RailsUpdate
+      def self.invoke_from_app_generator(method)
+        app_generator.send(method)
+      end
 
-    def app_generator
-      @app_generator ||= begin
-        require 'rails/generators'
-        require 'rails/generators/rails/app/app_generator'
-        gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
-                                                             destination_root: Rails.root
-        File.exist?(Rails.root.join("config", "application.rb")) ?
-          gen.send(:app_const) : gen.send(:valid_const?)
-        gen
+      def self.app_generator
+        @app_generator ||= begin
+          require 'rails/generators'
+          require 'rails/generators/rails/app/app_generator'
+          gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
+            destination_root: Rails.root
+          File.exist?(Rails.root.join("config", "application.rb")) ?
+            gen.send(:app_const) : gen.send(:valid_const?)
+          gen
+        end
       end
     end
 
     # desc "Update config/boot.rb from your current rails install"
     task :configs do
-      invoke_from_app_generator :create_boot_file
-      invoke_from_app_generator :create_config_files
+      RailsUpdate.invoke_from_app_generator :create_boot_file
+      RailsUpdate.invoke_from_app_generator :update_config_files
     end
 
     # desc "Adds new executables to the application bin/ directory"
     task :bin do
-      invoke_from_app_generator :create_bin_files
+      RailsUpdate.invoke_from_app_generator :create_bin_files
     end
   end
 end