mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Keep debugger support only for rubies < 2.0.0
This commit is contained in:
parent
75e0ee861f
commit
7901ae13a1
6 changed files with 31 additions and 12 deletions
|
@ -1,5 +1,5 @@
|
|||
require 'active_support/core_ext/kernel/agnostics'
|
||||
require 'active_support/core_ext/kernel/concern'
|
||||
require 'active_support/core_ext/kernel/debugger'
|
||||
require 'active_support/core_ext/kernel/debugger' if RUBY_VERSION < '2.0.0'
|
||||
require 'active_support/core_ext/kernel/reporting'
|
||||
require 'active_support/core_ext/kernel/singleton_class'
|
||||
|
|
|
@ -137,4 +137,4 @@ class KernelDebuggerTest < ActiveSupport::TestCase
|
|||
ensure
|
||||
Object.send(:remove_const, :Rails)
|
||||
end
|
||||
end
|
||||
end if RUBY_VERSION < '2.0.0'
|
||||
|
|
|
@ -18,7 +18,14 @@ 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", 'Enable the debugger.') { |v| options[:debugger] = v }
|
||||
opt.on("--debugger", 'Enable 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
|
||||
|
||||
|
@ -71,10 +78,13 @@ module Rails
|
|||
|
||||
def debugger?
|
||||
options[:debugger]
|
||||
end
|
||||
end if RUBY_VERSION < '2.0.0'
|
||||
|
||||
def start
|
||||
require_debugger if debugger?
|
||||
if RUBY_VERSION < '2.0.0'
|
||||
require_debugger if debugger?
|
||||
end
|
||||
|
||||
set_environment! if environment?
|
||||
|
||||
if sandbox?
|
||||
|
@ -96,6 +106,6 @@ module Rails
|
|||
rescue LoadError
|
||||
puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle it and try again."
|
||||
exit(1)
|
||||
end
|
||||
end if RUBY_VERSION < '2.0.0'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -18,7 +18,14 @@ module Rails
|
|||
opts.on("-c", "--config=file", String,
|
||||
"Use custom rackup configuration file") { |v| options[:config] = v }
|
||||
opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:daemonize] = true }
|
||||
opts.on("-u", "--debugger", "Enable the debugger") { options[:debugger] = true }
|
||||
opts.on("-u", "--debugger", "Enable 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 }
|
||||
|
@ -75,7 +82,9 @@ module Rails
|
|||
|
||||
def middleware
|
||||
middlewares = []
|
||||
middlewares << [Rails::Rack::Debugger] if options[:debugger]
|
||||
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.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
module Rails
|
||||
module Rack
|
||||
autoload :Debugger, "rails/rack/debugger"
|
||||
autoload :Debugger, "rails/rack/debugger" if RUBY_VERSION < '2.0.0'
|
||||
autoload :Logger, "rails/rack/logger"
|
||||
autoload :LogTailer, "rails/rack/log_tailer"
|
||||
end
|
||||
|
|
|
@ -22,11 +22,11 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
|
|||
def test_debugger_option
|
||||
console = Rails::Console.new(app, parse_arguments(["--debugger"]))
|
||||
assert console.debugger?
|
||||
end
|
||||
end if RUBY_VERSION < '2.0.0'
|
||||
|
||||
def test_no_options
|
||||
console = Rails::Console.new(app, parse_arguments([]))
|
||||
assert !console.debugger?
|
||||
assert !console.debugger? if RUBY_VERSION < '2.0.0'
|
||||
assert !console.sandbox?
|
||||
end
|
||||
|
||||
|
@ -41,7 +41,7 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
|
|||
rails_console.expects(:require_debugger).returns(nil)
|
||||
|
||||
silence_stream(STDOUT) { rails_console.start }
|
||||
end
|
||||
end if RUBY_VERSION < '2.0.0'
|
||||
|
||||
def test_start_with_sandbox
|
||||
app.expects(:sandbox=).with(true)
|
||||
|
|
Loading…
Reference in a new issue