diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-23 06:48:05 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-23 06:48:05 -0700 |
| commit | a5fb1c61755f03a8c75b0a434fb2aca57502293b (patch) | |
| tree | 093d94f72e157c71baaf8a3e749f4e4c20781bfd /railties | |
| parent | 5c3f3f10babe01ec0b6ae04a8846b5598d107926 (diff) | |
| parent | 2514d65ca2b92f57b52e8027f6ab6fc8601df92f (diff) | |
| download | rails-a5fb1c61755f03a8c75b0a434fb2aca57502293b.tar.gz rails-a5fb1c61755f03a8c75b0a434fb2aca57502293b.tar.bz2 rails-a5fb1c61755f03a8c75b0a434fb2aca57502293b.zip | |
Merge pull request #1231 from joshk/ruby-debugger
Ruby debugger corrections
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/rack/debugger.rb | 7 | ||||
| -rw-r--r-- | railties/lib/rails/test_help.rb | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb index 06e23db5f1..831188eeee 100644 --- a/railties/lib/rails/rack/debugger.rb +++ b/railties/lib/rails/rack/debugger.rb @@ -1,5 +1,3 @@ -require 'active_support/core_ext/kernel/requires' - module Rails module Rack class Debugger @@ -8,11 +6,12 @@ module Rails ARGV.clear # clear ARGV so that rails server options aren't passed to IRB - require_library_or_gem 'ruby-debug' + require 'ruby-debug' + ::Debugger.start ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings) puts "=> Debugger enabled" - rescue Exception + rescue LoadError puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'" exit end diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 41485c8bac..68f566274d 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -3,7 +3,6 @@ abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production? require 'test/unit' -require 'active_support/core_ext/kernel/requires' require 'active_support/test_case' require 'action_controller/test_case' require 'action_dispatch/testing/integration' |