drbrain	2012-11-29 17:22:04 +0900 (Thu, 29 Nov 2012)

  New Revision: 37988

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37988

  Log:
    * lib/tracer.rb:  Updated to match removal of custom_require from
      RubyGems.
    * test/test_tracer.rb:  ditto.  Improved failure message if the test
      fails

  Modified files:
    trunk/ChangeLog
    trunk/lib/tracer.rb
    trunk/test/test_tracer.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37987)
+++ ChangeLog	(revision 37988)
@@ -1,3 +1,10 @@
+Thu Nov 29 17:19:26 2012  Eric Hodel  <drbrain@s...>
+
+	* lib/tracer.rb:  Updated to match removal of custom_require from
+	  RubyGems.
+	* test/test_tracer.rb:  ditto.  Improved failure message if the test
+	  fails
+
 Thu Nov 29 17:15:00 2012  Zachary Scott  <zachary@z...>
 
 	* gc.c: Documentation for GC, GC::Profiler, ObjectSpace, and
Index: lib/tracer.rb
===================================================================
--- lib/tracer.rb	(revision 37987)
+++ lib/tracer.rb	(revision 37988)
@@ -289,7 +289,7 @@
   require $0
 else
   # call Tracer.on only if required by -r command-line option
-  count = caller.count {|bt| /\/rubygems\/custom_require.rb:/ !~ bt}
+  count = caller.count {|bt| %r%/rubygems/core_ext/kernel_require\.rb:% !~ bt}
   if (defined?(Gem) and count == 0) or
      (!defined?(Gem) and count <= 1)
     Tracer.on
Index: test/test_tracer.rb
===================================================================
--- test/test_tracer.rb	(revision 37987)
+++ test/test_tracer.rb	(revision 37988)
@@ -9,11 +9,11 @@
     assert_in_out_err(%w[-rtracer -e 1]) do |(*lines),|
       case lines.size
       when 2
-        assert_match(%r{rubygems/custom_require\.rb:\d+:Kernel:<:}, lines[0])
+        assert_match(%r{rubygems/core_ext/kernel_require\.rb:\d+:Kernel:<:}, lines[0])
       when 1
         # do nothing
       else
-        flunk "unexpected output from `ruby -rtracer -e 1`"
+        flunk "unexpected output from `ruby -rtracer -e 1`: #{lines.inspect}"
       end
       assert_equal "#0:-e:1::-: 1", lines.last
     end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/