5 files changed, 47 insertions, 4 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 8306233dcd..8b10144413 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   Created rake restart task. Restarts your Rails app by touching the 
+    `tmp/restart.txt`.
+
+    Fixes #18876.
+
+    *Hyonjee Joo*
+
 *   Set Rails console to use log formatter and log level as specified for the
     given environment.
 
diff --git a/railties/lib/rails/code_statistics.rb b/railties/lib/rails/code_statistics.rb
index 0bdf63943f..583d005d46 100644
--- a/railties/lib/rails/code_statistics.rb
+++ b/railties/lib/rails/code_statistics.rb
@@ -71,12 +71,12 @@ class CodeStatistics #:nodoc:
 
     def print_header
       print_splitter
-      puts "| Name                 | Lines |   LOC | Classes | Methods | M/C | LOC/M |"
+      puts "| Name                 |  Lines |   LOC  | Classes | Methods | M/C | LOC/M |"
       print_splitter
     end
 
     def print_splitter
-      puts "+----------------------+-------+-------+---------+---------+-----+-------+"
+      puts "+----------------------+--------+--------+---------+---------+-----+-------+"
     end
 
     def print_line(name, statistics)
@@ -84,8 +84,8 @@ class CodeStatistics #:nodoc:
       loc_over_m = (statistics.code_lines / statistics.methods) - 2 rescue loc_over_m = 0
 
       puts "| #{name.ljust(20)} " \
-           "| #{statistics.lines.to_s.rjust(5)} " \
-           "| #{statistics.code_lines.to_s.rjust(5)} " \
+           "| #{statistics.lines.to_s.rjust(6)} " \
+           "| #{statistics.code_lines.to_s.rjust(6)} " \
            "| #{statistics.classes.to_s.rjust(7)} " \
            "| #{statistics.methods.to_s.rjust(7)} " \
            "| #{m_over_c.to_s.rjust(3)} " \
diff --git a/railties/lib/rails/tasks.rb b/railties/lib/rails/tasks.rb
index 945fbdb3e2..a5e4d2935e 100644
--- a/railties/lib/rails/tasks.rb
+++ b/railties/lib/rails/tasks.rb
@@ -7,6 +7,7 @@ require 'rake'
   log
   middleware
   misc
+  restart
   routes
   statistics
   tmp
diff --git a/railties/lib/rails/tasks/restart.rake b/railties/lib/rails/tasks/restart.rake
new file mode 100644
index 0000000000..1af0302824
--- /dev/null
+++ b/railties/lib/rails/tasks/restart.rake
@@ -0,0 +1,4 @@
+desc "Restart app by touching tmp/restart.txt"
+task restart: :environment do
+  FileUtils.touch('tmp/restart.txt')
+end
diff --git a/railties/test/application/rake/restart_test.rb b/railties/test/application/rake/restart_test.rb
new file mode 100644
index 0000000000..35099913fb
--- /dev/null
+++ b/railties/test/application/rake/restart_test.rb
@@ -0,0 +1,31 @@
+require "isolation/abstract_unit"
+
+module ApplicationTests
+  module RakeTests
+    class RakeRestartTest < ActiveSupport::TestCase
+      include ActiveSupport::Testing::Isolation
+
+      def setup
+        build_app
+        boot_rails
+      end
+
+      def teardown
+        teardown_app
+      end
+      
+      test 'rake restart touches tmp/restart.txt' do
+        Dir.chdir(app_path) do
+          `rake restart`
+          assert File.exist?("tmp/restart.txt")
+          
+          prev_mtime = File.mtime("tmp/restart.txt")
+          sleep(1)
+          `rake restart`
+          curr_mtime = File.mtime("tmp/restart.txt")
+          assert_not_equal prev_mtime, curr_mtime
+        end
+      end
+    end
+  end
+end