3 files changed, 5 insertions, 39 deletions
diff --git a/railties/lib/rails/commands/dev_cache.rb b/railties/lib/rails/commands/dev_cache.rb
deleted file mode 100644
index ec96e8f630..0000000000
--- a/railties/lib/rails/commands/dev_cache.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'rails/command'
-
-module Rails
-  module Commands
-    # This is a wrapper around the Rails dev:cache command
-    class DevCache < Command
-      set_banner :dev_cache, 'Toggle development mode caching on/off'
-      def dev_cache
-        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'
-      end
-    end
-  end
-end
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index babb197ba1..5844e9037c 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -59,8 +59,8 @@ elsif File.exist?(code_or_file)
   Kernel.load code_or_file
 else
   begin
-    eval(code_or_file, binding, __FILE__, __LINE__) 
-  rescue SyntaxError,NameError => err
+    eval(code_or_file, binding, __FILE__, __LINE__)
+  rescue SyntaxError, NameError
     $stderr.puts "Please specify a valid ruby command or the path of a script to run."
     $stderr.puts "Run '#{$0} -h' for help."
     exit 1
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 27cbaf360a..4e5bf34773 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -2,6 +2,7 @@ require 'fileutils'
 require 'optparse'
 require 'action_dispatch'
 require 'rails'
+require 'rails/dev_caching'
 
 module Rails
   class Server < ::Rack::Server
@@ -100,12 +101,8 @@ module Rails
     private
 
       def setup_dev_caching
-        return unless options[:environment] == "development"
-
-        if options[:caching] == false
-          delete_cache_file
-        elsif options[:caching]
-          create_cache_file
+        if options[:environment] == "development"
+          Rails::DevCaching.enable_by_argument(options[:caching])
         end
       end
 
@@ -114,16 +111,6 @@ module Rails
         puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
         puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
         puts "=> Run `rails server -h` for more startup options"
-
-        puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
-      end
-
-      def create_cache_file
-        FileUtils.touch("tmp/caching-dev.txt")
-      end
-
-      def delete_cache_file
-        FileUtils.rm("tmp/caching-dev.txt") if File.exist?("tmp/caching-dev.txt")
       end
 
       def create_tmp_directories