4 files changed, 33 insertions, 23 deletions
diff --git a/railties/lib/rails/tasks/dev.rake b/railties/lib/rails/tasks/dev.rake
index 4593100465..d2ceaacc0c 100644
--- a/railties/lib/rails/tasks/dev.rake
+++ b/railties/lib/rails/tasks/dev.rake
@@ -1,14 +1,8 @@
+require 'rails/dev_caching'
+
 namespace :dev do
   desc 'Toggle development mode caching on/off'
   task :cache do
-    if File.exist? 'tmp/caching-dev.txt'
-      File.delete 'tmp/caching-dev.txt'
-      puts 'Development mode is no longer being cached.'
-    else
-      FileUtils.touch 'tmp/caching-dev.txt'
-      puts 'Development mode is now being cached.'
-    end
-
-    FileUtils.touch 'tmp/restart.txt'
+    Rails::DevCaching.enable_by_file
   end
 end
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 7601836809..3e771167ee 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -1,4 +1,6 @@
-namespace :rails do
+require 'active_support/deprecation'
+
+namespace :app do
   desc "Update configs and some other initially generated files (or use just update:configs or update:bin)"
   task update: [ "update:configs", "update:bin" ]
 
@@ -24,12 +26,12 @@ namespace :rails do
 
       default_templates.each do |type, names|
         local_template_type_dir = File.join(project_templates, type)
-        FileUtils.mkdir_p local_template_type_dir
+        mkdir_p local_template_type_dir, verbose: false
 
         names.each do |name|
           dst_name = File.join(local_template_type_dir, name)
           src_name = File.join(generators_lib, type, name, "templates")
-          FileUtils.cp_r src_name, dst_name
+          cp_r src_name, dst_name, verbose: false
         end
       end
     end
@@ -45,8 +47,9 @@ namespace :rails do
         @app_generator ||= begin
           require 'rails/generators'
           require 'rails/generators/rails/app/app_generator'
-          gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true, api: !!Rails.application.config.api_only },
-            destination_root: Rails.root
+          gen = Rails::Generators::AppGenerator.new ["rails"],
+                                                    { api: !!Rails.application.config.api_only },
+                                                    destination_root: Rails.root
           File.exist?(Rails.root.join("config", "application.rb")) ?
             gen.send(:app_const) : gen.send(:valid_const?)
           gen
@@ -66,3 +69,15 @@ namespace :rails do
     end
   end
 end
+
+namespace :rails do
+  %i(update template templates:copy update:configs update:bin).each do |task_name|
+    task "#{task_name}" do
+      ActiveSupport::Deprecation.warn(<<-MSG.squish)
+        Running #{task_name} with the rails: namespace is deprecated in favor of app: namespace.
+        Run bin/rails app:#{task_name} instead.
+      MSG
+      Rake.application.invoke_task("app:#{task_name}")
+    end
+  end
+end
diff --git a/railties/lib/rails/tasks/restart.rake b/railties/lib/rails/tasks/restart.rake
index f36c86d81b..3f98cbe51f 100644
--- a/railties/lib/rails/tasks/restart.rake
+++ b/railties/lib/rails/tasks/restart.rake
@@ -1,5 +1,8 @@
-desc "Restart app by touching tmp/restart.txt"
+desc 'Restart app by touching tmp/restart.txt'
 task :restart do
-  FileUtils.mkdir_p('tmp')
-  FileUtils.touch('tmp/restart.txt')
+  verbose(false) do
+    mkdir_p 'tmp'
+    touch 'tmp/restart.txt'
+    rm_f 'tmp/pids/server.pid'
+  end
 end
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake
index 9162ef234a..c74a17a0ca 100644
--- a/railties/lib/rails/tasks/tmp.rake
+++ b/railties/lib/rails/tasks/tmp.rake
@@ -5,9 +5,7 @@ namespace :tmp do
   tmp_dirs = [ 'tmp/cache',
                'tmp/sockets',
                'tmp/pids',
-               'tmp/cache/assets/development',
-               'tmp/cache/assets/test',
-               'tmp/cache/assets/production' ]
+               'tmp/cache/assets' ]
 
   tmp_dirs.each { |d| directory d }
 
@@ -17,21 +15,21 @@ namespace :tmp do
   namespace :cache do
     # desc "Clears all files and directories in tmp/cache"
     task :clear do
-      FileUtils.rm_rf(Dir['tmp/cache/[^.]*'])
+      rm_rf Dir['tmp/cache/[^.]*'], verbose: false
     end
   end
 
   namespace :sockets do
     # desc "Clears all files in tmp/sockets"
     task :clear do
-      FileUtils.rm(Dir['tmp/sockets/[^.]*'])
+      rm Dir['tmp/sockets/[^.]*'], verbose: false
     end
   end
 
   namespace :pids do
     # desc "Clears all files in tmp/pids"
     task :clear do
-      FileUtils.rm(Dir['tmp/pids/[^.]*'])
+      rm Dir['tmp/pids/[^.]*'], verbose: false
     end
   end
 end