ruby-debug 0.10.1 → 0.10.2

data/test/data/catch.right

@@ -0,0 +1,37 @@
+pm.rb:3
+def zero_div
+# # ***************************************************
+# # Test catch
+# # ***************************************************
+# set debuggertesting on
+Currently testing the debugger is on.
+# set autoeval off
+autoeval is off.
+# set basename on
+basename is on.
+# info catch
+No exceptions set to be caught.
+# catch ZeroDivisionError off
+*** Catch for exception ZeroDivisionError not found.
+# catch ZeroDivisionError off afdasdf
+*** Unknown command: "catch ZeroDivisionError off afdasdf".  Try "help".
+# catch ZeroDivisionError
+Catch exception ZeroDivisionError.
+# info catch
+ZeroDivisionError
+# catch ZeroDivisionError off
+Catch for exception ZeroDivisionError removed.
+# info catch
+No exceptions set to be caught.
+# catch ZeroDivisionError
+Catch exception ZeroDivisionError.
+# c
+Catchpoint at pm.rb:5: `divided by 0' (ZeroDivisionError)
+	from ../rdbg.rb:23:in `runner'
+	from ../rdbg.rb:32
+pm.rb:5
+1/0
+# where
+--> #0 Object./ at line pm.rb:5
+    #1 at line pm.rb:8
+# quit

data/test/data/emacs_basic.right

@@ -42,9 +42,8 @@ return nil if a <= 0
 # info program
 Program stopped. It stopped at a breakpoint.
 # c 10
-Breakpoint 3 at Object:gcd
-gcd.rb:4
-def gcd(a, b)
+gcd.rb:10
+return nil if a <= 0
 # info break
 Num Enb What
   1 y   at gcd.rb:6
@@ -52,7 +51,6 @@ Num Enb What
   2 y   at gcd.rb:10
 	breakpoint already hit 1 time
   3 y   at Object:gcd
-	breakpoint already hit 1 time
 # break foo
 *** Invalid breakpoint location: foo.
 # info break
@@ -62,7 +60,6 @@ Num Enb What
   2 y   at gcd.rb:10
 	breakpoint already hit 1 time
   3 y   at Object:gcd
-	breakpoint already hit 1 time
 # disable  1
 # info break
 Num Enb What
@@ -71,7 +68,6 @@ Num Enb What
   2 y   at gcd.rb:10
 	breakpoint already hit 1 time
   3 y   at Object:gcd
-	breakpoint already hit 1 time
 # enable breakpoint 1
 # enable br 10
 Enable breakpoints argument '10' needs to at most 3.
@@ -82,7 +78,6 @@ Num Enb What
   2 y   at gcd.rb:10
 	breakpoint already hit 1 time
   3 y   at Object:gcd
-	breakpoint already hit 1 time
 # # We should still be able to access 2
 # disable 2
 # enable

data/test/data/frame.cmd

@@ -3,6 +3,9 @@
 # ***************************************************
 set debuggertesting on
 set callstyle last
+# Invalid line number in continue command
+continue 3
+# This time, for sure!
 continue 6
 where
 up

data/test/data/frame.right

@@ -7,6 +7,10 @@ def gcd(a, b)
 Currently testing the debugger is on.
 # set callstyle last
 Frame call-display style is last.
+# # Invalid line number in continue command
+# continue 3
+*** Line 3 is not a stopping point in file "gcd.rb".
+# # This time, for sure!
 # continue 6
 gcd.rb:6
 if a > b

data/test/data/method.cmd

@@ -0,0 +1,10 @@
+# ********************************************************
+# This tests the 'method' command
+# ********************************************************
+set debuggertesting on
+set autoeval off
+b 11
+c
+method Mine
+m iv me
+quit

data/test/data/method.right

@@ -0,0 +1,21 @@
+classes.rb:1
+class Mine
+# # ********************************************************
+# # This tests the 'method' command
+# # ********************************************************
+# set debuggertesting on
+Currently testing the debugger is on.
+# set autoeval off
+autoeval is off.
+# b 11
+Breakpoint 1 file ./classes.rb, line 11
+# c
+Breakpoint 1 at classes.rb:11
+classes.rb:11
+metoo = Mine(new)
+# method Mine
+mymethod
+
+# m iv me
+@myvar = "init"
+# quit

data/test/data/methodsig.cmd

@@ -0,0 +1,10 @@
+# ********************************************************
+# This tests the 'method' command
+# ********************************************************
+set debuggertesting on
+set autoeval off
+b 3
+c
+method sig initialize
+method sig mymethod
+quit

data/test/data/methodsig.right

@@ -0,0 +1,20 @@
+classes.rb:1
+class Mine
+# # ********************************************************
+# # This tests the 'method' command
+# # ********************************************************
+# set debuggertesting on
+Currently testing the debugger is on.
+# set autoeval off
+autoeval is off.
+# b 3
+Breakpoint 1 file ./classes.rb, line 3
+# c
+Breakpoint 1 at classes.rb:3
+classes.rb:3
+@myvar = 'init'
+# method sig initialize
+Mine#initialize()
+# method sig mymethod
+Mine#mymethod(a, b=5, &block)
+# quit

data/test/data/output.right

@@ -29,13 +29,3 @@ puts "two"
 # step
 starting
 two
-stopped
-stack
---> #0 debug_program at line tdebug.rb:53
-
-variables
-self = main
-
-source tdebug.rb:53
-if bt
-# quit

data/test/data/quit.right

@@ -1,9 +0,0 @@
-tdebug.rb:53
-if bt
-# # ***************************************************
-# # This tests the quit.
-# # ***************************************************
-# set debuggertesting on
-Currently testing the debugger is on.
-# # FIXME need to test --no-quit.
-# quit

data/test/data/raise.right

@@ -19,7 +19,7 @@ Catch exception 5.
 	./raise.rb:3
 	./tdebug.rb:52:in `debug_load'
 	./tdebug.rb:52:in `debug_program'
-	./tdebug.rb:243
+	./tdebug.rb:242
 	../rdbg.rb:23:in `load'
 	../rdbg.rb:23:in `runner'
 	../rdbg.rb:32

data/test/data/save.cmd

@@ -0,0 +1,33 @@
+# This tests the functioning of some set/show debugger commands
+set debuggertesting on
+### *******************************
+### ***   save/source commands  ***
+### *******************************
+########################################
+###   test args and baseneme...
+########################################
+set basename off
+set autoeval off
+# Should have nothing set
+info break
+info catch
+# Should save nothing
+save temp
+eval File.open("temp").readlines
+# Should read in nothing
+source temp
+info break
+# Now try saving something interesting
+break 10
+catch RuntimeError
+save temp
+eval File.open("temp").readlines
+# FIXME: The below is broken
+## Change parameters above
+## catch RuntimeError off
+## info catch
+##set listsize 55
+source temp
+##info break
+##info catch
+##show listsize

data/test/data/save.right

@@ -0,0 +1,59 @@
+gcd.rb:4
+def gcd(a, b)
+# # This tests the functioning of some set/show debugger commands
+# set debuggertesting on
+Currently testing the debugger is on.
+# ### *******************************
+# ### ***   save/source commands  ***
+# ### *******************************
+# ########################################
+# ###   test args and baseneme...
+# ########################################
+# set basename off
+basename is off.
+# set autoeval off
+autoeval is off.
+# # Should have nothing set
+# info break
+No breakpoints.
+# info catch
+No exceptions set to be caught.
+# # Should save nothing
+# save temp
+Saved to 'temp'
+# eval File.open("temp").readlines
+["set autoeval off\n", "set basename off\n", "set debuggertesting on\n", "set autolist off\n", "set autoirb off\n"]
+# # Should read in nothing
+# source temp
+autoeval is off.
+basename is off.
+Currently testing the debugger is on.
+autolist is off.
+autoirb is off.
+# info break
+No breakpoints.
+# # Now try saving something interesting
+# break 10
+Breakpoint 1 file ./gcd.rb, line 10
+# catch RuntimeError
+Catch exception RuntimeError.
+# save temp
+Saved to 'temp'
+# eval File.open("temp").readlines
+["break gcd.rb:10\n", "catch RuntimeError\n", "set autoeval off\n", "set basename on\n", "set debuggertesting on\n", "set autolist off\n", "set autoirb off\n"]
+# # FIXME: The below is broken
+# ## Change parameters above
+# ## catch RuntimeError off
+# ## info catch
+# ##set listsize 55
+# source temp
+Breakpoint 2 file gcd.rb, line 10
+Catch exception RuntimeError.
+autoeval is off.
+basename is on.
+Currently testing the debugger is on.
+autolist is off.
+autoirb is off.
+# ##info break
+# ##info catch
+# ##show listsize

data/test/data/setshow.cmd

@@ -41,3 +41,16 @@ set history save off
 show history save
 set history save 1
 show history save
+#### Test 'autoeval'...
+set autoeval on
+puts 'printed via autoeval'
+set autoeval off
+puts 'autoeval should not run this'
+#### Test 'callstyle'...
+set callstyle
+set callstyle short
+set callstyle last
+set callstyle tracked
+set callstyle foo
+
+

data/test/data/setshow.right

@@ -70,3 +70,28 @@ Saving of history save is off.
 Saving of history save is on.
 # show history save
 Saving of history save is on.
+# #### Test 'autoeval'...
+# set autoeval on
+autoeval is on.
+# puts 'printed via autoeval'
+printed via autoeval
+nil
+# set autoeval off
+autoeval is off.
+# puts 'autoeval should not run this'
+*** Unknown command: "puts 'autoeval should not run this'".  Try "help".
+# #### Test 'callstyle'...
+# set callstyle
+Invalid call style . Should be one of: 'short', 'last', or 'tracked'.
+Frame call-display style is last.
+# set callstyle short
+Frame call-display style is short.
+# set callstyle last
+Frame call-display style is last.
+# set callstyle tracked
+Frame call-display style is tracked.
+# set callstyle foo
+Invalid call style foo. Should be one of: 'short', 'last', or 'tracked'.
+Frame call-display style is tracked.
+# 
+# 

data/test/helper.rb

@@ -1,6 +1,7 @@
 # Some common routines used in testing.
 
 require 'fileutils'
+require 'yaml'
 # require 'diff/lcs'
 # require 'diff/lcs/hunk'
 
@@ -21,12 +22,13 @@ module TestHelper
     end
     
     ENV['RDEBUG'] = debug_pgm
+
     if old_code
       cmd = "/bin/sh #{File.join('..', 'runner.sh')} #{args} >#{outfile}"
     else
-      cmd = "../rdbg.rb #{args} >#{outfile}"
+      cmd = "#{"#{load_ruby} #{load_params} "}../rdbg.rb #{args} > #{outfile}"
     end
-    # puts cmd
+    # puts "'#{cmd}'"
     output = `#{cmd}`
     
     got_lines     = File.read(outfile).split(/\n/)
@@ -112,6 +114,26 @@ module TestHelper
   #   # Handle the last remaining hunk 
   #   output << oldhunk.diff(format) << '\n'
   # end
+  
+  # Loads key from the _config_._yaml_ file.
+  def config_load(key, may_be_nil=false, default_value='')
+    conf = File.join('config.private.yaml') # try private first
+    conf = File.join('config.yaml') unless File.exists?(conf)
+    value = YAML.load_file(conf)[key]
+    assert_not_nil(value, "#{key} is set in config.yaml") unless may_be_nil
+    value || default_value
+  end
+  module_function :config_load
 
+  def load_ruby
+    config_load('ruby', true)
+  end
+  module_function :load_ruby
+
+  def load_params
+    config_load('ruby_params', true)
+  end
+  module_function :load_params
+  
 end
 

data/test/tdebug.rb

@@ -49,7 +49,7 @@ def debug_program(options)
          end
     $0[0..-1] = d0
   end
-  bt = Debugger.debug_load(Debugger::PROG_SCRIPT, !options.nostop)
+  bt = Debugger.debug_load(Debugger::PROG_SCRIPT, !options.nostop, false)
   if bt
     if options.post_mortem
       Debugger.handle_post_mortem(bt)
@@ -188,9 +188,12 @@ trap('INT') { Debugger.interrupt_last }
 Debugger.wait_connection = false
 Debugger.keep_frame_binding = options.frame_bind
 
-# activate debugger
+# Add Debugger trace hook.
 Debugger.start
 
+# start control thread
+Debugger.start_control(options.host, options.cport) if options.control
+
 # activate post-mortem
 Debugger.post_mortem if options.post_mortem
 
@@ -210,10 +213,6 @@ if $?.exitstatus != 0 and RUBY_PLATFORM !~ /mswin/
   puts output
   exit $?.exitstatus 
 end
-# activate debugger
-Debugger.start
-# start control thread
-Debugger.start_control(options.host, options.cport) if options.control
 
 # load initrc script (e.g. .rdebugrc)
 Debugger.run_init_script(StringIO.new) unless options.nx