6 files changed, 3 insertions, 72 deletions
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 96ced3c2f9..35a815a34f 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -18,14 +18,6 @@ module Rails
           opt.on("-e", "--environment=name", String,
                   "Specifies the environment to run this console under (test/development/production).",
                   "Default: development") { |v| options[:environment] = v.strip }
-          opt.on("--debugger", 'Enables the debugger.') do |v|
-            if RUBY_VERSION < '2.0.0'
-              options[:debugger] = v
-            else
-              puts "=> Notice: debugger option is ignored since Ruby 2.0 and " \
-                   "it will be removed in future versions."
-            end
-          end
           opt.parse!(arguments)
         end
 
@@ -76,25 +68,7 @@ module Rails
       Rails.env = environment
     end
 
-    if RUBY_VERSION < '2.0.0'
-      def debugger?
-        options[:debugger]
-      end
-
-      def require_debugger
-        require 'debugger'
-        puts "=> Debugger enabled"
-      rescue LoadError
-        puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle it and try again."
-        exit(1)
-      end
-    end
-
     def start
-      if RUBY_VERSION < '2.0.0'
-        require_debugger if debugger?
-      end
-
       set_environment! if environment?
 
       if sandbox?
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 3f14910edf..bc8f1a8dea 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -28,14 +28,6 @@ module Rails
           opts.on("-c", "--config=file", String,
                   "Uses a custom rackup configuration.") { |v| options[:config] = v }
           opts.on("-d", "--daemon", "Runs server as a Daemon.") { options[:daemonize] = true }
-          opts.on("-u", "--debugger", "Enables the debugger.") do
-            if RUBY_VERSION < '2.0.0'
-              options[:debugger] = true
-            else
-              puts "=> Notice: debugger option is ignored since Ruby 2.0 and " \
-                   "it will be removed in future versions."
-            end
-          end
           opts.on("-e", "--environment=name", String,
                   "Specifies the environment to run this server under (test/development/production).",
                   "Default: development") { |v| options[:environment] = v }
@@ -86,9 +78,6 @@ module Rails
 
     def middleware
       middlewares = []
-      if RUBY_VERSION < '2.0.0'
-        middlewares << [Rails::Rack::Debugger] if options[:debugger]
-      end
       middlewares << [::Rack::ContentLength]
 
       # FIXME: add Rack::Lock in the case people are using webrick.
@@ -112,7 +101,6 @@ module Rails
         DoNotReverseLookup: true,
         environment:        (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
         daemonize:          false,
-        debugger:           false,
         pid:                File.expand_path("tmp/pids/server.pid"),
         config:             File.expand_path("config.ru")
       })
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index ecaec618dc..3659edcfcd 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -23,13 +23,8 @@ source 'https://rubygems.org'
 
 group :development, :test do
 <% if RUBY_ENGINE == 'ruby' -%>
-  <%- if RUBY_VERSION < '2.0.0' -%>
-  # Call 'debugger' anywhere in the code to stop execution and get a debugger console
-  gem 'debugger'
-  <%- else -%>
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
-  <%- end -%>
 
   # Access an IRB console on exception pages or by using <%%= console %> in views
   <%- if options.dev? || options.edge? -%>
diff --git a/railties/lib/rails/generators/rails/plugin/templates/Gemfile b/railties/lib/rails/generators/rails/plugin/templates/Gemfile
index 84cef9525e..f325455bac 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin/templates/Gemfile
@@ -39,11 +39,7 @@ end
 <% end -%>
 <% if RUBY_ENGINE == 'ruby' -%>
 # To use a debugger
-  <%- if RUBY_VERSION < '2.0.0' -%>
-# gem 'debugger', group: [:development, :test]
-  <%- else -%>
 # gem 'byebug', group: [:development, :test]
-  <%- end -%>
 <% end -%>
 
 <% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%>
diff --git a/railties/lib/rails/rack.rb b/railties/lib/rails/rack.rb
index f34bf2fd41..a4c4527a72 100644
--- a/railties/lib/rails/rack.rb
+++ b/railties/lib/rails/rack.rb
@@ -1,6 +1,5 @@
 module Rails
   module Rack
-    autoload :Debugger,      "rails/rack/debugger"   if RUBY_VERSION < '2.0.0'
-    autoload :Logger,        "rails/rack/logger"
+    autoload :Logger, "rails/rack/logger"
   end
 end
diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb
index f7b77bcb3b..1fde3db070 100644
--- a/railties/lib/rails/rack/debugger.rb
+++ b/railties/lib/rails/rack/debugger.rb
@@ -1,24 +1,3 @@
-module Rails
-  module Rack
-    class Debugger
-      def initialize(app)
-        @app = app
+require 'active_support/deprecation'
 
-        ARGV.clear # clear ARGV so that rails server options aren't passed to IRB
-
-        require 'debugger'
-
-        ::Debugger.start
-        ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
-        puts "=> Debugger enabled"
-      rescue LoadError
-        puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle it and try again."
-        exit(1)
-      end
-
-      def call(env)
-        @app.call(env)
-      end
-    end
-  end
-end
+ActiveSupport::Deprecation.warn("This file is deprecated and will be removed in Rails 5.1 with no replacement.")