Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge breakpoint/1.8.5 fix from [5380]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5381 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 6eb941ee6cb5cc0cfda1e3777779bc059c0f4079 1 parent 7e8dd03
Scott Barron authored
Showing with 15 additions and 1 deletion.
  1. +15 −1 railties/lib/breakpoint.rb
View
16 railties/lib/breakpoint.rb
@@ -16,7 +16,21 @@
# license please contact me.
require 'irb'
-require 'binding_of_caller'
+if RUBY_VERSION == '1.8.5'
+ begin
+ require 'rubygems'
+ require 'breakpoint185'
+ rescue LoadError
+ puts 'WARNING: breakpoints will not work with Ruby 1.8.5 without the call_stack gem.'
+ puts ' gem install call_stack or see http://eigenclass.org/hiki.rb?call_stack'
+ def Binding.of_caller(&block)
+ raise 'Breakpoint requires the call_stack gem with Ruby 1.8.5.'
+ return
+ end
+ end
+else
+ require 'binding_of_caller'
+end
require 'drb'
require 'drb/acl'
Please sign in to comment.
Something went wrong with that request. Please try again.