2 files changed, 14 insertions, 19 deletions
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index 5844e9037c..f9c183ac86 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -2,6 +2,7 @@ require 'optparse'
 
 options = { environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup }
 code_or_file = nil
+command = 'bin/rails runner'
 
 if ARGV.first.nil?
   ARGV.push "-h"
@@ -34,7 +35,7 @@ ARGV.clone.options do |opts|
     opts.separator ""
     opts.separator "You can also use runner as a shebang line for your executables:"
     opts.separator "    -------------------------------------------------------------"
-    opts.separator "    #!/usr/bin/env #{File.expand_path($0)} runner"
+    opts.separator "    #!/usr/bin/env #{File.expand_path(command)}"
     opts.separator ""
     opts.separator "    Product.all.each { |p| p.price *= 2 ; p.save! }"
     opts.separator "    -------------------------------------------------------------"
@@ -52,7 +53,7 @@ Rails.application.require_environment!
 Rails.application.load_runner
 
 if code_or_file.nil?
-  $stderr.puts "Run '#{$0} -h' for help."
+  $stderr.puts "Run '#{command} -h' for help."
   exit 1
 elsif File.exist?(code_or_file)
   $0 = code_or_file
@@ -62,7 +63,7 @@ else
     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."
+    $stderr.puts "Run '#{command} -h' for help."
     exit 1
   end
 end
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index d7597a13e1..7418dff18b 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
@@ -92,20 +93,17 @@ module Rails
         DoNotReverseLookup: true,
         environment:        (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
         daemonize:          false,
-        caching:            false,
-        pid:                Options::DEFAULT_PID_PATH
+        caching:            nil,
+        pid:                Options::DEFAULT_PID_PATH,
+        restart_cmd:        restart_command
       })
     end
 
     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
 
@@ -116,14 +114,6 @@ module Rails
         puts "=> Run `rails server -h` for more startup options"
       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
         %w(cache pids sockets).each do |dir_to_make|
           FileUtils.mkdir_p(File.join(Rails.root, 'tmp', dir_to_make))
@@ -141,5 +131,9 @@ module Rails
           Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
         end
       end
+
+      def restart_command
+        "bin/rails server #{ARGV.join(' ')}"
+      end
   end
 end