diff options
| author | Scott Barron <scott@elitists.net> | 2006-11-01 17:49:02 +0000 |
|---|---|---|
| committer | Scott Barron <scott@elitists.net> | 2006-11-01 17:49:02 +0000 |
| commit | c1c96d55d754e6de1572e35bc9bc68cc896655bf (patch) | |
| tree | 047c2483fe66e7f80facecc129cf3fffc55762f3 /railties/lib | |
| parent | c5dcec789e5513ef1cfd8ef468cd2a46cdaf01f5 (diff) | |
| download | rails-c1c96d55d754e6de1572e35bc9bc68cc896655bf.tar.gz rails-c1c96d55d754e6de1572e35bc9bc68cc896655bf.tar.bz2 rails-c1c96d55d754e6de1572e35bc9bc68cc896655bf.zip | |
If using Ruby 1.8.5, pull in call_stack so breakpointer works again.
If using Ruby 1.8.5 and call_stack is not installed, give warnings and
instructions.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5380 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/breakpoint.rb | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/railties/lib/breakpoint.rb b/railties/lib/breakpoint.rb index 60f7fdbbef..fc586bcadb 100644 --- a/railties/lib/breakpoint.rb +++ b/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'
|