From e31caff00eaef9237e5825a7e9ccdae80a6fecf0 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 29 Jun 2011 13:19:59 +0000
Subject: * lib/tracer.rb: Tracer.on only if required by -r command-line
 option.   and consider --disable-gems option. * test/test_tracer.rb: add
 tests for it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/tracer.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib/tracer.rb')

diff --git a/lib/tracer.rb b/lib/tracer.rb
index b1f08f3f68..4b2429508d 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -287,7 +287,12 @@ if $0 == __FILE__
   ARGV.shift
   Tracer.on
   require $0
-elsif caller.count {|bt| /\/rubygems\/custom_require.rb:/ !~ bt} <= 1
-  Tracer.on
+else
+  # call Tracer.on only if required by -r command-line option
+  count = caller.count {|bt| /\/rubygems\/custom_require.rb:/ !~ bt}
+  if (defined?(Gem) and count == 0) or
+     (!defined?(Gem) and count <= 1)
+    Tracer.on
+  end
 end
 # :startdoc:
-- 
cgit v1.2.3