ruby-debug 0.10.4 → 0.10.5.rc1

data/cli/ruby-debug/processor.rb

@@ -12,6 +12,10 @@ module Debugger
     attr_reader   :processor
     attr_reader   :commands
 
+    # optional argument passed passed in callback. For catchpoints it is
+    # the catch object. For breakpoints it is the breakpoint object.
+    attr_reader   :event_arg
+
     # Format _msg_ with gdb-style annotation header.
     def afmt(msg, newline="\n")
       "\032\032#{msg}#{newline}"
@@ -147,6 +151,7 @@ module Debugger
     # This is a callback routine when the debugged program hits a 
     # breakpoint event. For example ruby-debug-base calls this.
     def at_breakpoint(context, breakpoint)
+      @event_arg = breakpoint
       aprint 'stopped' if Debugger.annotate.to_i > 2
       n = Debugger.breakpoints.index(breakpoint) + 1
       file = CommandProcessor.canonic_file(breakpoint.source)
@@ -161,6 +166,7 @@ module Debugger
     # This is a callback routine when the debugged program hits a 
     # catchpoint. For example ruby-debug-base calls this.
     def at_catchpoint(context, excpt)
+      @event_arg = excpt
       aprint 'stopped' if Debugger.annotate.to_i > 2
       file = CommandProcessor.canonic_file(context.frame_file(0))
       line = context.frame_line(0)
@@ -180,12 +186,12 @@ module Debugger
       return if defined?(Debugger::RDEBUG_FILE) && 
         Debugger::RDEBUG_FILE == file # Don't trace ourself
       @last_file = CommandProcessor.canonic_file(file)
-      file = CommandProcessor.canonic_file(file)
-      unless file == @last_file and @last_line == line and 
+      canonic_file = CommandProcessor.canonic_file(file)
+      unless canonic_file == @last_file and @last_line == line and 
           Command.settings[:tracing_plus]
         print "Tracing(%d):%s:%s %s",
-        context.thnum, file, line, Debugger.line_at(file, line)
-        @last_file = file
+        context.thnum, canonic_file, line, Debugger.line_at(file, line)
+        @last_file = canonic_file
         @last_line = line
       end
       always_run(context, file, line, 2)

data/doc/rdebug.1

@@ -1,4 +1,4 @@
-.\" $Id: rdebug.1 516 2007-12-31 05:55:24Z rockyb $
+.\" $Id$
 .TH rdebug 1 
 .SH NAME
 rdebug \- Fast Ruby debugger

data/rdbg.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #!/usr/bin/env ruby
-# $Id: rdbg.rb 756 2008-03-13 02:15:04Z rockyb $
+# $Id$
 
 # Use this to run rdebug without installing it.  We assume that the
 # library directories are stored at the same level the directory

data/test/base/base.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
-require 'test/unit'
+require File.expand_path("../../helper", __FILE__)
 
 # Some tests of Debugger module in C extension ruby_debug 
 class TestRubyDebug < Test::Unit::TestCase
-  $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'ext')
-  require 'ruby_debug'
-  $:.shift
+  def test_version
+    assert(defined?(Debugger::VERSION))
+  end
 
   # test current_context
   def test_current_context
@@ -26,6 +26,7 @@ class TestRubyDebug < Test::Unit::TestCase
     assert_equal(1, Debugger.current_context.stack_size)
     assert_equal(TestRubyDebug, Debugger.current_context.frame_class)
     assert_equal(false, Debugger.current_context.dead?, 'Not dead yet!')
+  ensure
     Debugger.stop
     assert_equal(false, Debugger.started?, 
                  'Debugger should no longer be started.')
@@ -47,6 +48,7 @@ class TestRubyDebug < Test::Unit::TestCase
                  'There should only be one context.')
     assert_equal(Array, a.class, 
                  'Context should be an array.')
+  ensure
     Debugger.stop
     assert_equal(false, Debugger.started?, 
                  'debugger should no longer be started.')
@@ -68,6 +70,7 @@ class TestRubyDebug < Test::Unit::TestCase
     Debugger.remove_breakpoint(1)
     assert_equal(0, Debugger.breakpoints.size,
                  'There should no longer be any breakpoints set.')
+  ensure
     Debugger.stop
   end
 end

data/test/base/binding.rb

@@ -1,18 +1,8 @@
 #!/usr/bin/env ruby
-
-require 'test/unit'
+require File.expand_path("../../helper", __FILE__)
 
 # Test binding_n command
 class TestBinding < Test::Unit::TestCase
-
-  SRC_DIR = File.expand_path(File.dirname(__FILE__)) unless 
-    defined?(SRC_DIR)
-  %w(ext lib).each do |dir|
-    $:.unshift File.join(SRC_DIR, '..', '..', dir)
-  end
-  require File.join(SRC_DIR, '..', '..', 'lib', 'ruby-debug-base')
-  $:.shift; $:.shift
-
   def test_basic
     def inside_fn
       s = 'some other string'
@@ -24,8 +14,9 @@ class TestBinding < Test::Unit::TestCase
     Debugger.start
     b = Kernel::binding_n(0)
     y = eval('s', b)
-    assert_equal(y, s)
+    assert_equal(s, y)
     inside_fn
+  ensure
     Debugger.stop
   end
 end

data/test/base/catchpoint.rb

@@ -1,15 +1,9 @@
 #!/usr/bin/env ruby
-require 'test/unit'
+require File.expand_path("../../helper", __FILE__)
 
 # Test catchpoint in C ruby_debug extension.
   
 class TestRubyDebugCatchpoint < Test::Unit::TestCase
-
-  $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'ext')
-  require 'ruby_debug'
-  $:.shift
-
-  # test current_context
   def test_catchpoints
     assert_raise(RuntimeError) {Debugger.catchpoints}
     Debugger.start_
@@ -19,8 +13,7 @@ class TestRubyDebugCatchpoint < Test::Unit::TestCase
     Debugger.add_catchpoint('RuntimeError')
     assert_equal(['RuntimeError', 'ZeroDivisionError'], 
                  Debugger.catchpoints.keys.sort)
+  ensure
     Debugger.stop
   end
-
 end
-

data/test/base/load.rb

@@ -1,22 +1,14 @@
 #!/usr/bin/env ruby
-require 'test/unit'
+require File.expand_path("../../helper", __FILE__)
 
 # Test of Debugger.debug_load in C extension ruby_debug.so
 class TestDebugLoad < Test::Unit::TestCase
-
-  @@src_dir = File.dirname(__FILE__)
-  $:.unshift File.join(@@src_dir, '..', '..', 'ext')
-  require 'ruby_debug'
-  $:.shift
-  
-  class  << self
+  class << self
     def at_line(file, line)
       @@at_line = [File.basename(file), line]
     end
   end
 
-  Debugger::PROG_SCRIPT = File.join(@@src_dir, '..', 'gcd.rb')
-
   class Debugger::Context
     def at_line(file, line)
       TestDebugLoad::at_line(file, line)
@@ -24,17 +16,29 @@ class TestDebugLoad < Test::Unit::TestCase
   end
 
   def test_debug_load
+    src_dir = File.dirname(__FILE__)
+    prog_script = File.join(src_dir, '..', 'example', 'gcd.rb')
+
     # Without stopping
-    bt = Debugger.debug_load(Debugger::PROG_SCRIPT, false)
+    bt = Debugger.debug_load(prog_script, false)
     assert_equal(nil, bt)
+    assert(Debugger.started?)
+    Debugger.stop
+
     # With stopping
-    bt = Debugger.debug_load(Debugger::PROG_SCRIPT, true)
+    bt = Debugger.debug_load(prog_script, true)
     assert_equal(nil, bt)
     assert_equal(['gcd.rb', 4], @@at_line)
+    assert(Debugger.started?)
+    Debugger.stop
 
     # Test that we get a proper backtrace on a script that raises 'abc'
-    prog_script = File.join(@@src_dir, '..', 'raise.rb')
+    prog_script = File.join(src_dir, '..', 'example', 'raise.rb')
     bt = Debugger.debug_load(prog_script, false)
-    assert_equal(bt.to_s, 'abc')
+    assert_equal('abc', bt.to_s)
+    assert(Debugger.started?)
+    Debugger.stop
+  ensure
+    Debugger.stop if Debugger.started?
   end
 end

data/test/base/reload_bug.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-require 'test/unit'
+require File.expand_path("../../helper", __FILE__)
+
 class TestReloadBug < Test::Unit::TestCase
   def test_reload_bug
-    top_srcdir = File.join(File.dirname(__FILE__), '..', '..')
     assert_equal({}, Debugger::source_reload)
   end
 end

data/test/cli/commands/catchpoint_test.rb

@@ -1,18 +1,7 @@
 #!/usr/bin/env ruby
-
-require 'test/unit'
+require File.expand_path("../../../helper", __FILE__)
 
 class TestCatchCommand < Test::Unit::TestCase
-  
-  base_dir = File.expand_path(File.join(File.dirname(__FILE__), 
-                                        '..', '..', '..'))
-  
-  %w(ext lib cli).each do |dir|
-    $: <<  File.join(base_dir, dir)
-  end
-  
-  require File.join(base_dir, 'cli', 'ruby-debug')
-  
   class MockState
     attr_accessor :message 
     def context; end
@@ -32,5 +21,4 @@ class TestCatchCommand < Test::Unit::TestCase
     end
     assert_equal(nil, state.message)
   end
-
 end

data/test/cli/commands/unit/regexp.rb

@@ -1,12 +1,7 @@
-require 'test/unit'
-
+#!/usr/bin/env ruby
+require File.expand_path("../../../../helper", __FILE__)
 
 class TestCommandREs < Test::Unit::TestCase
-  base_dir=File.expand_path(File.join(File.dirname(__FILE__), 
-                                      '..', '..', '..', '..',
-                                      'cli', 'ruby-debug'))
-  require File.join(base_dir, 'command')
-  require File.join(base_dir, 'commands', 'frame')
   include Debugger
  
   def test_quit
@@ -39,4 +34,3 @@ class TestCommandREs < Test::Unit::TestCase
     assert_equal(nil, c.regexp.match('dow'))
   end
 end
-

data/test/data/annotate.cmd

@@ -3,7 +3,7 @@
 # ********************************************************
 set debuggertesting on
 set callstyle last
-set force off
+set different off
 set annotate 3
 # Get into gcd
 step 2
@@ -21,7 +21,7 @@ b 12
 display 1+2
 # undisplay should trigger display annotation
 undisplay 1
-step
+step+
 # Test error annotations
 up 10
 frame 100

data/test/data/annotate.right

@@ -7,8 +7,8 @@ def gcd(a, b)
 Currently testing the debugger is on.
 # set callstyle last
 Frame call-display style is last.
-# set force off
-force-stepping is off.
+# set different off
+different-line stepping is off.
 # set annotate 3
 Annotation level is 3
 # # Get into gcd
@@ -71,7 +71,7 @@ Num Enb What
 # undisplay 1
 display
 
-# step
+# step+
 display
 
 starting
@@ -83,7 +83,7 @@ Num Enb What
 display
 
 stack
---> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:6
+--> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:10
     #1 at line gcd.rb:18
 
 variables
@@ -91,8 +91,8 @@ a = 3
 b = 5
 self = main
 
-source gcd.rb:6
-if a > b
+source gcd.rb:10
+return nil if a <= 0
 # # Test error annotations
 # up 10
 error-begin
@@ -101,7 +101,7 @@ Adjusting would put us beyond the oldest (initial) frame.
 display
 
 stack
---> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:6
+--> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:10
     #1 at line gcd.rb:18
 
 variables
@@ -116,7 +116,7 @@ Adjusting would put us beyond the oldest (initial) frame.
 display
 
 stack
---> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:6
+--> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:10
     #1 at line gcd.rb:18
 
 variables

data/test/data/at-exit.cmd

@@ -0,0 +1,4 @@
+set debuggertesting on
+break 2
+c
+c

data/test/data/at-exit.right

@@ -0,0 +1,12 @@
+at-exit.rb:1
+at_exit do
+# set debuggertesting on
+Currently testing the debugger is on.
+# break 2
+Breakpoint 1 file at-exit.rb, line 2
+# c
+Breakpoint 1 at at-exit.rb:2
+at-exit.rb:2
+puts "Hello world!"
+# c
+Hello world!

data/test/data/break_bad.cmd

@@ -5,14 +5,12 @@
 set debuggertesting on
 set callstyle last
 set autoeval off
+set basename on
 # There aren't 100 lines in gcd.rb.
 break 100
-break gcd.rb:100
-# Line one isn't a valid stopping point.
-# It is a comment.
-break gcd.rb:1
+break example/gcd.rb:100
 # This line is okay
-break gcd.rb:4
+break example/gcd.rb:4
 # No class Foo.
 break Foo.bar
 q

data/test/data/break_bad.right

@@ -10,17 +10,15 @@ Currently testing the debugger is on.
 Frame call-display style is last.
 # set autoeval off
 autoeval is off.
+# set basename on
+basename is on.
 # # There aren't 100 lines in gcd.rb.
 # break 100
 *** There are only 18 lines in file "gcd.rb".
-# break gcd.rb:100
+# break example/gcd.rb:100
 *** There are only 18 lines in file "gcd.rb".
-# # Line one isn't a valid stopping point.
-# # It is a comment.
-# break gcd.rb:1
-*** Line 1 is not a stopping point in file "gcd.rb".
 # # This line is okay
-# break gcd.rb:4
+# break example/gcd.rb:4
 Breakpoint 1 file gcd.rb, line 4
 # # No class Foo.
 # break Foo.bar

data/test/data/break_tracelines.cmd

@@ -0,0 +1,9 @@
+set debuggertesting on
+set callstyle last
+set autoeval off
+set basename on
+# Line one isn't a valid stopping point.
+# It is a comment.
+break example/gcd.rb:1
+break 11
+q

data/test/data/break_tracelines.right

@@ -0,0 +1,17 @@
+gcd.rb:4
+def gcd(a, b)
+# set debuggertesting on
+Currently testing the debugger is on.
+# set callstyle last
+Frame call-display style is last.
+# set autoeval off
+autoeval is off.
+# set basename on
+basename is on.
+# # Line one isn't a valid stopping point.
+# # It is a comment.
+# break example/gcd.rb:1
+*** Line 1 is not a stopping point in file "gcd.rb".
+# break 11
+*** Line 11 is not a stopping point in file "gcd.rb".
+# q

data/test/data/breakpoints-basename.cmd

@@ -0,0 +1,2 @@
+break example/b/example.rb:1
+c