ruby-debug 0.10.1 → 0.10.2

data/cli/ruby-debug/commands/trace.rb

@@ -1,19 +1,42 @@
 module Debugger
   class TraceCommand < Command # :nodoc:
     def regexp
-      /^\s*tr(?:ace)?(?:\s+(on|off))?(?:\s+(all))?$/
+      /^\s* tr(?:ace)? (?: \s+ (\S+))         # on |off | var(iable)
+                       (?: \s+ (\S+))?        # (all | variable-name)?
+                       (?: \s+ (\S+))? \s*    # (stop | nostop)? 
+       $/ix
     end
 
     def execute
-      if @match[2]
-        Debugger.tracing = @match[1] == 'on'
-      elsif @match[1]
-        Debugger.current_context.tracing = @match[1] == 'on'
-      end
-      if Debugger.tracing || Debugger.current_context.tracing
-        print "Trace on.\n"
-      else
-        print "Trace off.\n"
+      if @match[1] =~ /on|off/
+        onoff = 'on' == @match[1] 
+        if @match[2]
+          Debugger.current_context.tracing = onoff
+          print "Tracing %s all threads.\n" % (onoff ? 'on' : 'off')
+        else
+          Debugger.tracing = onoff
+          print "Tracing %s on current thread.\n"  % (onoff ? 'on' : 'off')
+        end
+      elsif @match[1] =~ /var(?:iable)?/
+        varname=@match[2]
+        if debug_eval("defined?(#{varname})")
+          if @match[3] && @match[3] !~ /(:?no)?stop/
+            errmsg("expecting 'stop' or 'nostop'; got %s\n" % @match[3])
+          else
+            dbg_cmd = if @match[3] && (@match[3] !~ /nostop/) 
+                        'debugger' else '' end
+          end
+          eval("
+           trace_var(:#{varname}) do |val|
+              print \"traced variable #{varname} has value \#{val}\n\"
+              #{dbg_cmd}
+           end")
+        else
+          errmsg "#{varname} is not a global variable.\n"
+        end
+      else 
+        errmsg("expecting 'on', 'off', 'var' or 'variable'; got: %s\n" %
+               @match[1])
       end
     end
 
@@ -26,8 +49,9 @@ module Debugger
         %{
           tr[ace] (on|off)\tset trace mode of current thread
           tr[ace] (on|off) all\tset trace mode of all threads
+          tr[ace] var(iable) VARNAME [stop|nostop]\tset trace variable on VARNAME
         }
       end
     end
   end
-end
+end

data/cli/ruby-debug/commands/variables.rb

@@ -24,14 +24,15 @@ module Debugger
     end
   end
 
-  class VarClassVarCommand < Command # :nodoc:
+  # Implements the debugger 'var class' command.
+  class VarClassVarCommand < Command
     def regexp
       /^\s*v(?:ar)?\s+cl(?:ass)?/
     end
 
     def execute
       unless @state.context
-        print "can't get class variables here.\n"
+        errmsg "can't get class variables here.\n"
         return 
       end
       var_class_self
@@ -107,7 +108,7 @@ module Debugger
 
   class VarInstanceCommand < Command # :nodoc:
     def regexp
-      /^\s*v(?:ar)?\s+i(?:nstance)?\s*/
+      /^\s*v(?:ar)?\s+ins(?:tance)?\s*/
     end
 
     def execute
@@ -128,7 +129,8 @@ module Debugger
     end
   end
 
-  class VarLocalCommand < Command # :nodoc:
+  # Implements the debugger 'var local' command.
+  class VarLocalCommand < Command
     def regexp
       /^\s*v(?:ar)?\s+l(?:ocal)?\s*$/
     end
@@ -153,4 +155,45 @@ module Debugger
       end
     end
   end
+  
+    # Implements the debugger 'var inherit' command.
+  begin
+    require 'classtree'
+    have_classtree = true
+  rescue LoadError
+    have_classtree = false
+  end
+
+  class VarInheritCommand < Command
+    def regexp
+      /^\s*v(?:ar)?\s+ct\s*/
+    end
+
+    def execute
+      unless @state.context
+        errmsg "can't get object inheritance.\n"
+        return 
+      end
+      puts @match.post_match
+      obj = debug_eval("#{@match.post_match}.classtree")
+      if obj
+        print obj
+      else
+        errmsg "Trouble getting object #{@match.post_match}\n"
+      end
+    end
+
+    class << self
+      def help_command
+        'var'
+      end
+
+      def help(cmd)
+        %{
+          v[ar] ct\t\t\tshow class heirarchy of object
+        }
+      end
+    end
+  end if have_classtree
+
 end

data/cli/ruby-debug/interface.rb

@@ -1,5 +1,10 @@
 module Debugger  
   class Interface # :nodoc:
+    attr_writer :have_readline  # true if Readline is available
+
+    def initialize
+      @have_readline = false
+    end
 
     # Common routine for reporting debugger error messages.
     # Derived classed may want to override this to capture output.
@@ -38,6 +43,7 @@ module Debugger
     def initialize()
       super
       @command_queue = []
+      @have_readline = false
       @history_save = true
       # take gdb's default
       @history_length = ENV["HISTSIZE"] ? ENV["HISTSIZE"].to_i : 256  
@@ -77,10 +83,15 @@ module Debugger
       end
     end
     
+    def readline_support?(msg)
+      @have_readline
+    end
+
     private
     begin
       require 'readline'
       class << Debugger
+        @have_readline = true
         define_method(:save_history) do
           iface = self.handler.interface
           iface.histfile ||= File.join(ENV["HOME"]||ENV["HOMEPATH"]||".", 
@@ -114,7 +125,7 @@ module Debugger
     end
   end
 
-  class RemoteInterface # :nodoc:
+  class RemoteInterface < Interface # :nodoc:
     attr_accessor :command_queue
     attr_accessor :histfile
     attr_accessor :history_save
@@ -137,6 +148,15 @@ module Debugger
       @restart_file = nil
     end
     
+    def close
+      @socket.close
+    rescue Exception
+    end
+    
+    def confirm(prompt)
+      send_command "CONFIRM #{prompt}"
+    end
+
     def finalize
     end
     
@@ -144,19 +164,14 @@ module Debugger
       send_command "PROMPT #{prompt}"
     end
     
-    def confirm(prompt)
-      send_command "CONFIRM #{prompt}"
+    def readline_support?
+      false
     end
 
     def print(*args)
       @socket.printf(*args)
     end
     
-    def close
-      @socket.close
-    rescue Exception
-    end
-    
     private
     
     def send_command(msg)
@@ -172,6 +187,7 @@ module Debugger
     attr_accessor :histfile
     attr_accessor :history_save
     attr_accessor :history_length
+    attr_accessor :restart_file
     def initialize(file, out, verbose=false)
       super()
       @command_queue = []
@@ -197,6 +213,10 @@ module Debugger
       result.chomp!
     end
     
+    def readline_support?
+      false
+    end
+
     def confirm(prompt)
       'y'
     end

data/cli/ruby-debug/processor.rb

@@ -267,6 +267,7 @@ module Debugger
     def one_cmd(commands, context, input)
       if cmd = commands.find{ |c| c.match(input) }
         if context.dead? && cmd.class.need_context
+          p cmd
           print "Command is unavailable\n"
         else
           cmd.execute
@@ -276,7 +277,7 @@ module Debugger
         if unknown_cmd
             unknown_cmd.execute
         else
-          print "Unknown command\n"
+          errmsg "Unknown command: \"#{input}\".  Try \"help\".\n"
         end
       end
     end
@@ -393,7 +394,7 @@ module Debugger
       @debugger_context_was_dead = true # Assume we haven't started.
     end
     
-    def process_commands
+    def process_commands(verbose=false)
       control_cmds = Command.commands.select do |cmd| 
         cmd.allow_in_control 
       end
@@ -409,11 +410,12 @@ module Debugger
       end
 
       while input = @interface.read_command(prompt(nil))
+        print "+#{input}" if verbose
         catch(:debug_error) do
           if cmd = commands.find{|c| c.match(input) }
             cmd.execute
           else
-            print "Unknown command\n"
+            errmsg "Unknown command\n"
           end
         end
       end
@@ -462,7 +464,7 @@ module Debugger
       end
 
       def file
-        print "No filename given.\n"
+        errmsg "No filename given.\n"
         throw :debug_error
       end
     end # State

data/test/bp_loop_issue.rb

@@ -0,0 +1,3 @@
+1.upto(2) {
+  sleep 0.01
+}

data/test/classes.rb

@@ -0,0 +1,11 @@
+class Mine
+  def initialize
+    @myvar = 'init'
+  end
+  def mymethod(a, b=5, &block)
+  end
+  def self.classmeth
+  end
+end
+me = Mine.new
+metoo = Mine(new)

data/test/cli/commands/catchpoint_test.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+
+BASE_DIR = 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 TestCatchCommand < Test::Unit::TestCase
+  
+  class MockState
+    attr_accessor :message 
+    def context; end
+    def confirm(msg); true end
+    def print(*args)
+      @message = *args
+    end
+  end
+  
+  # regression test for bug #20156
+  def test_catch_does_not_blow_up
+    state = MockState.new
+    catch_cmd = Debugger::CatchCommand.new(state)
+    assert(catch_cmd.match('catch off'))
+    catch(:debug_error) do
+      catch_cmd.execute
+    end
+    assert_equal(nil, state.message)
+  end
+
+end

data/test/data/break_loop_bug.cmd

@@ -0,0 +1,5 @@
+set debuggertesting on
+break 2
+cont
+cont
+cont

data/test/data/break_loop_bug.right

@@ -0,0 +1,15 @@
+bp_loop_issue.rb:1
+1.upto(2) {
+# set debuggertesting on
+Currently testing the debugger is on.
+# break 2
+Breakpoint 1 file ./bp_loop_issue.rb, line 2
+# cont
+Breakpoint 1 at bp_loop_issue.rb:2
+bp_loop_issue.rb:2
+sleep 0.01
+# cont
+Breakpoint 1 at bp_loop_issue.rb:2
+bp_loop_issue.rb:2
+sleep 0.01
+# cont

data/test/data/breakpoints.cmd

@@ -16,7 +16,7 @@ info break
 continue
 where
 info program
-c 10
+c 6
 info break
 break foo
 info break

data/test/data/breakpoints.right

@@ -41,18 +41,17 @@ return nil if a <= 0
     #1 at line gcd.rb:18
 # info program
 Program stopped. It stopped at a breakpoint.
-# c 10
-Breakpoint 3 at Object:gcd
-gcd.rb:4
-def gcd(a, b)
+# c 6
+Breakpoint 2 at gcd.rb:10
+gcd.rb:10
+return nil if a <= 0
 # info break
 Num Enb What
   1 y   at gcd.rb:6
 	breakpoint already hit 1 time
   2 y   at gcd.rb:10
-	breakpoint already hit 1 time
+	breakpoint already hit 2 times
   3 y   at Object:gcd
-	breakpoint already hit 1 time
 # break foo
 *** Invalid breakpoint location: foo.
 # info break
@@ -60,26 +59,23 @@ Num Enb What
   1 y   at gcd.rb:6
 	breakpoint already hit 1 time
   2 y   at gcd.rb:10
-	breakpoint already hit 1 time
+	breakpoint already hit 2 times
   3 y   at Object:gcd
-	breakpoint already hit 1 time
 # disable  1
 # info break
 Num Enb What
   1 n   at gcd.rb:6
 	breakpoint already hit 1 time
   2 y   at gcd.rb:10
-	breakpoint already hit 1 time
+	breakpoint already hit 2 times
   3 y   at Object:gcd
-	breakpoint already hit 1 time
 # delete 1
 # # We should see breakpoint 2 but not 1
 # info break
 Num Enb What
   2 y   at gcd.rb:10
-	breakpoint already hit 1 time
+	breakpoint already hit 2 times
   3 y   at Object:gcd
-	breakpoint already hit 1 time
 # # We should still be able to access 2
 # disable 2
 # disable bar

data/test/data/catch.cmd

@@ -0,0 +1,17 @@
+# ***************************************************
+# Test catch
+# ***************************************************
+set debuggertesting on
+set autoeval off
+set basename on
+info catch
+catch ZeroDivisionError off
+catch ZeroDivisionError off afdasdf
+catch ZeroDivisionError
+info catch
+catch ZeroDivisionError off
+info catch
+catch ZeroDivisionError
+c
+where
+quit