aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-12-10 18:38:27 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-12-10 18:38:27 +0000
commit9fe6d61b848a220a91a118daea0ceb02e5f4d3aa (patch)
tree937cee92ce1b59b3a7f54f08852dff1dddd31487
parent5ae593f10b31c5189605ea865b0f9bbfc8a9ef28 (diff)
downloadrails-9fe6d61b848a220a91a118daea0ceb02e5f4d3aa.tar.gz
rails-9fe6d61b848a220a91a118daea0ceb02e5f4d3aa.tar.bz2
rails-9fe6d61b848a220a91a118daea0ceb02e5f4d3aa.zip
Fix breakpointing by differenciating between gem and not
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@112 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/bin/breakpointing8
1 files changed, 7 insertions, 1 deletions
diff --git a/railties/bin/breakpointing b/railties/bin/breakpointing
index a7c601f872..a3e325fe04 100644
--- a/railties/bin/breakpointing
+++ b/railties/bin/breakpointing
@@ -1,3 +1,9 @@
#!/usr/local/bin/ruby
-require File.dirname(__FILE__) + '/../config/environment'
+begin
+ require 'rubygems'
+ require_gem 'rails'
+rescue LoadError
+ require File.dirname(__FILE__) + '/../vendor/railties/lib/breakpoint'
+end
+
require 'breakpoint_client'