ruby-debug 0.10.3 → 0.10.4

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

@@ -4,10 +4,13 @@ module Debugger
   class HelpCommand < Command
     self.allow_in_control = true
 
+    # An input line is matched against this regular expression. If we have
+    # a match, run this command.
     def regexp
       /^\s* h(?:elp)? (?:\s+(.+))? $/x
     end
 
+    # The code that implements this command.
     def execute
       if @match[1]
         args = @match[1].split
@@ -41,10 +44,12 @@ module Debugger
     end
 
     class << self
+      # The command name listed via 'help'
       def help_command
         'help'
       end
 
+      # Returns a String given the help description of this command
       def help(cmd)
         %{
           h[elp]\t\tprint this help

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

@@ -91,7 +91,7 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
     end
     
     def execute
-      if @match[1].empty?
+      if !@match[1] || @match[1].empty?
         errmsg "\"info\" must be followed by the name of an info command:\n"
         print "List of info subcommands:\n\n"
         for subcmd in Subcommands do
@@ -142,12 +142,15 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
         end
         print "Num Enb What\n"
         brkpts.each do |b|
+          fname = Command.settings[:basename] ? 
+             File.basename(b.source) : b.source
+            
           if b.expr.nil?
             print "%3d %s   at %s:%s\n", 
-            b.id, (b.enabled? ? 'y' : 'n'), b.source, b.pos
+            b.id, (b.enabled? ? 'y' : 'n'), fname, b.pos
           else
             print "%3d %s   at %s:%s if %s\n", 
-            b.id, (b.enabled? ? 'y' : 'n'), b.source, b.pos, b.expr
+            b.id, (b.enabled? ? 'y' : 'n'), fname, b.pos, b.expr
           end
           hits = b.hit_count
           if hits > 0

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

@@ -2,20 +2,78 @@ require 'irb'
 
 module IRB # :nodoc:
   module ExtendCommand # :nodoc:
-    class Continue # :nodoc:
-      def self.execute(conf)
-        throw :IRB_EXIT, :cont
+
+    # FIXME: should we read these out of a directory to 
+    #        make this more user-customizable? 
+    # A base command class that resume execution
+    class DebuggerResumeCommand
+      def self.execute(conf, *opts)
+        name = 
+          if self.name =~ /IRB::ExtendCommand::(\S+)/
+            $1.downcase
+          else
+            'unknown'
+          end
+        $rdebug_args = opts
+        $rdebug_command = 
+          if $rdebug_irb_statements 
+            $rdebug_irb_statements
+          else
+            ([name] + opts).join(' ')
+          end
+
+        throw :IRB_EXIT, name.to_sym
+      end
+    end
+
+    class Continue < DebuggerResumeCommand ; end
+    class Next     < DebuggerResumeCommand ; end
+    class Quit     < DebuggerResumeCommand ; end
+    class Step     < DebuggerResumeCommand ; end
+
+    # Issues a comamnd to the debugger without continuing
+    # execution. 
+    class Dbgr
+      def self.execute(conf, *opts)
+        command = 
+          if opts.size == 1 && opts[0].is_a?(String)
+            args = opts[0]
+          else
+            opts.join(' ')
+          end
+        if $rdebug_state && $rdebug_state.processor
+          processor = $rdebug_state.processor
+          processor.one_cmd($rdebug_state.processor.commands, 
+                            $rdebug_state.context,
+                            command)
+        end
       end
     end
+
+  end
+  if defined?(ExtendCommandBundle)
+    [['cont', :Continue],
+     ['dbgr', :Dbgr],
+     ['n',    :Next],
+     ['step', :Step],
+     ['q',    :Quit]].each do |command, sym|
+      ExtendCommandBundle.def_extend_command command, sym
+    end
   end
-  ExtendCommandBundle.def_extend_command "cont", :Continue
   
   def self.start_session(binding)
     unless @__initialized
-      args = ARGV
-      ARGV.replace(ARGV.dup)
+      args = ARGV.dup
+      ARGV.replace([])
       IRB.setup(nil)
       ARGV.replace(args)
+
+      # If the user has a IRB profile, run that now.
+      if ENV['RDEBUG_IRB']
+        ENV['IRBRC'] = ENV['RDEBUG_IRB']
+        @CONF[:RC_NAME_GENERATOR]=nil
+        IRB.run_config
+      end
       @__initialized = true
     end
     
@@ -32,6 +90,18 @@ module IRB # :nodoc:
   end
 end
 
+# Monkeypatch to save the current IRB statement to be run and make the instruction sequence
+# "filename" unique. Possibly not needed.
+class IRB::Context
+  def evaluate(line, line_no)
+    $rdebug_irb_statements = line
+    @line_no = line_no
+    set_last_value(@workspace.evaluate(self, line, irb_path, line_no))
+#    @workspace.evaluate("_ = IRB.conf[:MAIN_CONTEXT]._")
+#    @_ = @workspace.evaluate(line, irb_path, line_no)
+  end
+end
+
 module Debugger
 
   # Implements debugger "irb" command.
@@ -45,7 +115,9 @@ module Debugger
     end
 
     def regexp
-      /^irb$/
+      /^\s* irb
+        (?:\s+(-d))?
+        \s*$/x
     end
     
     def execute
@@ -55,13 +127,30 @@ module Debugger
       end
 
       save_trap = trap("SIGINT") do
-        throw :IRB_EXIT, :cont if $debug_in_irb
+        throw :IRB_EXIT, :cont if $rdebug_in_irb
       end
 
-      $debug_in_irb = true
+      # add_debugging = @match.is_a?(Array) && '-d' == @match[1]
+      $rdebug_state = @state
+      $rdebug_in_irb = true
       cont = IRB.start_session(get_binding)
-      if cont == :cont
+      case cont
+      when :cont
+        @state.proceed 
+      when :step
+        force = Command.settings[:force_stepping]
+        @state.context.step(1, force)
         @state.proceed 
+      when :next
+        force = Command.settings[:force_stepping]
+        @state.context.step_over(1, @state.frame_pos, force)
+        @state.proceed 
+      when :quit
+        # FIXME: DRY with code from file/command quit.
+        if confirm("Really quit? (y/n) ") 
+          @state.interface.finalize
+          exit! # exit -> exit!: No graceful way to stop threads...
+        end
       else
         file = @state.context.frame_file(0)
         line = @state.context.frame_line(0)
@@ -70,7 +159,8 @@ module Debugger
       end
 
     ensure
-      $debug_in_irb = false
+      $rdebug_in_irb = nil
+      $rdebug_state = nil
       trap("SIGINT", save_trap) if save_trap
     end
     
@@ -81,7 +171,20 @@ module Debugger
 
       def help(cmd)
         %{
-          irb\tstarts an Interactive Ruby (IRB) session.
+          irb [-d]\tstarts an Interactive Ruby (IRB) session.
+
+If -d is added you can get access to debugger state via the global variable
+$rdebug_state. 
+
+irb is extended with methods "cont", "n", "step" and "q" which run the
+corresponding debugger commands. In contrast to the real debugger
+commands these commands do not allow command arguments.
+
+However to run any arbitrary rdebug command which does not involve
+execution of the debugged program (like the above "step" "cont", etc.)
+use method "dbgr" and give an array of string parameters. For example:
+
+dbgr ['list', '10']   # same as "list 10" inside debugger
         }
       end
     end

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

@@ -0,0 +1,50 @@
+module Debugger
+
+  # Implements debugger "kill" command
+  class KillCommand < Command
+    self.allow_in_control = true
+
+    def regexp
+      / ^\s*
+         (?:kill) \s*
+         (?:\s+(\S+))?\s*
+         $
+      /ix
+    end
+
+    def execute
+      if @match[1] 
+        signame = @match[1]
+        unless Signal.list.member?(signame)
+          errmsg("signal name #{signame} is not a signal I know about\n")
+          return false
+        end
+        if 'KILL' == signame
+            @state.interface.finalize
+        end
+      else
+        if not confirm("Really kill? (y/n) ")
+          return
+        else 
+          signame = 'KILL'
+        end
+      end
+      Process.kill(signame, Process.pid)
+    end
+
+    class << self
+      def help_command
+        %w[kill]
+      end
+
+      def help(cmd)
+        %{
+          kill [SIGNAL]
+
+          Send [signal] to Process.pid
+Equivalent of Process.kill(Process.pid)
+         }
+     end
+    end
+  end
+end

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

@@ -69,12 +69,12 @@ module Debugger
     # If we can show from B to E then we return B, otherwise we return the
     # previous line @state.previous_line.
     def display_list(b, e, file, current)
-      print "[%d, %d] in %s\n", b, e, file
       lines = LineCache::getlines(file, 
                                   Command.settings[:reload_source_on_change])
       if lines
-        return @state.previous_line if b >= lines.size
+        b = lines.size - (e - b) if b >= lines.size
         e = lines.size if lines.size < e
+        print "[%d, %d] in %s\n", b, e, file
         [b, 1].max.upto(e) do |n|
           if n > 0 && lines[n-1]
             if n == current
@@ -88,7 +88,7 @@ module Debugger
         errmsg "No sourcefile available for %s\n", file
         return @state.previous_line
       end
-      return e == lines.size ? @state.previous_line : b
+      return b
     end
   end
 end

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

@@ -4,14 +4,17 @@ module Debugger
   class QuitCommand < Command
     self.allow_in_control = true
 
+    # An input line is matched against this regular expression. If we have
+    # a match, run this command.
     def regexp
       / ^\s*
          (?:q(?:uit)?|exit) \s*
-         (\s+unconditionally)? \s*
+         (!|\s+unconditionally)? \s*
          $
       /ix
     end
 
+    # The code that implements this command.
     def execute
       if @match[1] or confirm("Really quit? (y/n) ") 
         @state.interface.finalize
@@ -20,19 +23,22 @@ module Debugger
     end
 
     class << self
+      # The command name listed via 'help'
       def help_command
         %w[quit exit]
       end
 
+      # Returns a String given the help description of this command
       def help(cmd)
         %{
-          q[uit] [unconditionally]\texit from debugger. 
-          exit\talias to quit
+          q[uit] [!|unconditionally]\texit from debugger. 
+          exit[!]\talias to quit
 
           Normally we prompt before exiting. However if the parameter
-          "unconditionally" is given, we stop without asking further questions.
-        }
-      end
+          "unconditionally" or is given or suffixed with !, we stop
+          without asking further questions.  
+         }
+     end
     end
   end
 end

data/cli/ruby-debug/commands/raise.RB

@@ -0,0 +1,41 @@
+module Debugger
+  class RaiseCommand < Command # :nodoc:
+    self.allow_in_control = false
+
+    def regexp
+      /^\s* raise
+           (?:\s+ (\S+))? \s* $/ix
+    end
+
+    def execute
+      excn = @match[1]
+      exception = 
+        if not excn
+          # No args given.
+          RuntimeError
+        else
+          unless debug_eval("#{excn}.is_a?(Class)", binding)
+            errmsg "#{excn} is not known to be a Class\n"
+            return
+          end
+          debug_eval(excn, binding)
+        end
+      @state.exception = exception
+      @state.proceed
+    end
+
+    class << self
+      def help_command
+        'raise'
+      end
+
+      def help(cmd)
+        %{
+           raise EXCEPTION
+
+          Raise an exception in the debugged program."
+        }
+      end
+    end
+  end
+end

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

@@ -38,37 +38,34 @@ module Debugger
         style = Command.settings[:callstyle]
         return "Frame call-display style is #{style}."
       when /^commands(:?\s+(\d+))?$/
-        if @state.interface.readline_support?
-          s = '';
-          args = @match[1].split
-          if args[1]
-            first_line = args[1].to_i - 4
-            last_line  = first_line + 10 - 1
-            if first_line > Readline::HISTORY.length
-              first_line = last_line = Readline::HISTORY.length
-            elsif first_line <= 0
-              first_line = 1
-            end
-            if last_line > Readline::HISTORY.length
-              last_line = Readline::HISTORY.length
-            end
-            i = first_line
-            commands = Readline::HISTORY.to_a[first_line..last_line]
-          else
-            if Readline::HISTORY.length > 10
-              commands = Readline::HISTORY.to_a[-10..-1]
-              i = Readline::HISTORY.length - 10
-            else
-              commands = Readline::HISTORY.to_a
-              i = 1
-            end
+        return 'No readline support.' unless @state.interface.readline_support?
+        s = '';
+        args = @match[1].split
+        if args[1]
+          first_line = args[1].to_i - 4
+          last_line  = first_line + 10 - 1
+          if first_line > Readline::HISTORY.length
+            first_line = last_line = Readline::HISTORY.length
+          elsif first_line <= 0
+            first_line = 1
           end
-          commands.each do |cmd|
-            s += ("%5d  %s\n" % [i, cmd])
-            i += 1
+          if last_line > Readline::HISTORY.length
+            last_line = Readline::HISTORY.length
           end
+          i = first_line
+          commands = Readline::HISTORY.to_a[first_line..last_line]
         else
-          s='No readline suport'
+          if Readline::HISTORY.length > 10
+            commands = Readline::HISTORY.to_a[-10..-1]
+            i = Readline::HISTORY.length - 10
+          else
+            commands = Readline::HISTORY.to_a
+            i = 1
+          end
+        end
+        commands.each do |cmd|
+          s += ("%5d  %s\n" % [i, cmd])
+          i += 1
         end
         return s
       when /^debuggertesting$/
@@ -81,6 +78,7 @@ module Debugger
         on_off = Command.settings[:full_path]
         return "Displaying frame's full file names is #{show_onoff(on_off)}."
       when /^history(:?\s+(filename|save|size))?$/
+        return 'No readline support.' unless @state.interface.readline_support?
         args = @match[1].split
         interface = @state.interface
         if args[1]