ruby-debug 0.10.1 → 0.10.2

data/Rakefile

@@ -20,7 +20,7 @@ COMMON_FILES = FileList[
   'Rakefile',
 ]                        
 
-CLI_TEST_FILE_LIST = 'test/test-*.rb'
+CLI_TEST_FILE_LIST = FileList['test/test-*.rb', 'test/cli/**/*_test.rb']
 CLI_FILES = COMMON_FILES + FileList[
   "cli/**/*",
   'ChangeLog',
@@ -30,7 +30,7 @@ CLI_FILES = COMMON_FILES + FileList[
   'test/**/data/*.right',
   'test/**/*.rb',
   'rdbg.rb',
-   CLI_TEST_FILE_LIST,                                    
+   CLI_TEST_FILE_LIST
 ]
 
 BASE_TEST_FILE_LIST = %w(
@@ -48,16 +48,16 @@ BASE_FILES = COMMON_FILES + FileList[
 ]
 
 desc "Test everything."
-test_task = task :test => [:lib, :test_base] do 
+task :test => :test_base do 
   Rake::TestTask.new(:test) do |t|
     t.libs << ['./ext', './lib', './cli']
-    t.pattern = CLI_TEST_FILE_LIST
+    t.test_files = CLI_TEST_FILE_LIST
     t.verbose = true
   end
 end
 
 desc "Test ruby-debug-base."
-test_task = task :test_base => :lib do 
+task :test_base => :lib do 
   Rake::TestTask.new(:test_base) do |t|
     t.libs << ['./ext', './lib']
     t.test_files = FileList[BASE_TEST_FILE_LIST]
@@ -198,7 +198,7 @@ task :publish do
   # Get ruby-debug path.
   ruby_debug_path = File.expand_path(File.dirname(__FILE__))
 
-  publisher = Rake::SshDirPublisher.new("kent@rubyforge.org",
+  Rake::SshDirPublisher.new("kent@rubyforge.org",
         "/var/www/gforge-projects/ruby-debug", ruby_debug_path)
 end
 

data/bin/rdebug

@@ -38,9 +38,13 @@ def debug_program(options)
          else
            Debugger::PROG_SCRIPT
          end
-    $0[0..-1] = d0
+    if $0.frozen?
+      $0 = d0
+    else
+      $0[0..-1] = d0
+    end
   end
-  bt = Debugger.debug_load(Debugger::PROG_SCRIPT, options.stop)
+  bt = Debugger.debug_load(Debugger::PROG_SCRIPT, options.stop, false)
   if bt
     if options.post_mortem
       Debugger.handle_post_mortem(bt)
@@ -281,7 +285,7 @@ else
     end
     debug_program(options)
   else
-    # activate debugger
+    # Set up trace hook for debugger
     Debugger.start
     # start control thread
     Debugger.start_control(options.host, options.cport) if options.control

data/cli/ruby-debug.rb

@@ -138,10 +138,10 @@ module Debugger
     #
     # Runs a script file
     #
-    def run_script(file, out = handler.interface)
+    def run_script(file, out = handler.interface, verbose=false)
       interface = ScriptInterface.new(File.expand_path(file), out)
       processor = ControlCommandProcessor.new(interface)
-      processor.process_commands
+      processor.process_commands(verbose)
     end
   end
 end

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

@@ -1,5 +1,7 @@
 module Debugger
-  class AddBreakpoint < Command # :nodoc:
+
+  # Implements debugger "break" command.
+  class AddBreakpoint < Command
     self.allow_in_control = true
     
     def regexp
@@ -60,19 +62,16 @@ module Debugger
       
       if line =~ /^\d+$/
         line = line.to_i
-        unless LineCache.cache(brkpt_filename, 
-                                Command.settings[:reload_source_on_change])
-          errmsg("No source file named %s\n", file) 
-          return
-        end
-        last_line = LineCache.size(brkpt_filename)
-        if line > last_line
-          errmsg("There are only %d lines in file \"%s\".\n", last_line, file) 
-          return
-        end
-        unless LineCache.trace_line_numbers(brkpt_filename).member?(line)
-          errmsg("Line %d is not a stopping point in file \"%s\".\n", line, file) 
-          return
+        if LineCache.cache(brkpt_filename, Command.settings[:reload_source_on_change])
+          last_line = LineCache.size(brkpt_filename)
+          if line > last_line
+            errmsg("There are only %d lines in file \"%s\".\n", last_line, file) 
+            return
+          end
+          unless LineCache.trace_line_numbers(brkpt_filename).member?(line)
+            errmsg("Line %d is not a stopping point in file \"%s\".\n", line, file) 
+            return
+          end
         end
         unless @state.context
           errmsg "We are not in a state we can add breakpoints.\n"
@@ -106,7 +105,8 @@ module Debugger
     end
   end
 
-  class DeleteBreakpointCommand < Command # :nodoc:
+  # Implements debugger "delete" command.
+  class DeleteBreakpointCommand < Command
     self.allow_in_control = true
 
     def regexp

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

@@ -3,14 +3,21 @@ module Debugger
     self.allow_in_control = true
 
     def regexp
-      /^\s* cat(?:ch)? (?:\s+(.+))? $/x
+      /^\s* cat(?:ch)? 
+           (?:\s+ (\S+))? 
+           (?:\s+ (off))? \s* $/ix
     end
 
     def execute
-      if excn = @match[1]
-        if excn == 'off'
-          Debugger.catchpoint = nil
-          print "Clear catchpoint.\n"
+      excn = @match[1] 
+      if not excn
+        # No args given.
+        info_catch
+      elsif not @match[2]
+        # One arg given.
+        if 'off' == excn
+          Debugger.catchpoints.clear if 
+            confirm("Delete all catchpoints? (y or n) ")
         else
           binding = @state.context ? get_binding : TOPLEVEL_BINDING
           unless debug_eval("#{excn}.is_a?(Class)", binding)
@@ -19,8 +26,13 @@ module Debugger
           Debugger.add_catchpoint(excn)
           print "Catch exception %s.\n", excn
         end
+      elsif @match[2] != 'off'
+        errmsg "Off expected. Got %s\n", @match[2]
+      elsif Debugger.catchpoints.member?(excn)
+        Debugger.catchpoints.delete(excn)
+        print "Catch for exception %s removed.\n", excn
       else
-        info_catch
+        errmsg "Catch for exception %s not found.\n", excn
       end
     end
 

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

@@ -1,18 +1,24 @@
 module Debugger
+
   # Implements debugger "continue" command.
   class ContinueCommand < Command
-    self.allow_in_post_mortem = false
-    self.need_context         = true
+    self.allow_in_post_mortem = true
+    self.need_context         = false
     def regexp
       /^\s* c(?:ont(?:inue)?)? (?:\s+(.*))? $/x
     end
 
     def execute
       if @match[1] && !@state.context.dead?
-        file = File.expand_path(@state.file)
-        line = get_int(@match[1], "Continue", 0, nil, 0)
-        return unless line
-        @state.context.set_breakpoint(file, line)
+        filename = File.expand_path(@state.file)
+        line_number = get_int(@match[1], "Continue", 0, nil, 0)
+        return unless line_number
+        unless LineCache.trace_line_numbers(filename).member?(line_number)
+          errmsg("Line %d is not a stopping point in file \"%s\".\n", 
+                 line_number, filename) 
+          return
+        end
+        @state.context.set_breakpoint(filename, line_number)
       end
       @state.proceed
     end

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

@@ -5,15 +5,15 @@ module Debugger
         print "No frame selected.\n"
         return 
       end
-      if Debugger.catchpoints.empty?
-        print "No exceptions set to be caught.\n"
-      else
+      if Debugger.catchpoints and not Debugger.catchpoints.empty?
         # FIXME: show whether Exception is valid or not
         # print "Exception: is_a?(Class)\n"
         Debugger.catchpoints.each do |exception, hits|
           # print "#{exception}: #{exception.is_a?(Class)}\n"
            print "#{exception}\n"
         end
+      else
+        print "No exceptions set to be caught.\n"
       end
     end
   end

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

@@ -34,8 +34,8 @@ end
 
 module Debugger
 
-  # Implements debugger "help" command.
-  class IRBCommand < Command # :nodoc:
+  # Implements debugger "irb" command.
+  class IRBCommand < Command
 
     register_setting_get(:autoirb) do 
       IRBCommand.always_run

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

@@ -72,8 +72,8 @@ module Debugger
       print "[%d, %d] in %s\n", b, e, file
       lines = LineCache::getlines(file, 
                                   Command.settings[:reload_source_on_change])
-      return @state.previous_line if b >= lines.size
       if lines
+        return @state.previous_line if b >= lines.size
         e = lines.size if lines.size < e
         [b, 1].max.upto(e) do |n|
           if n > 0 && lines[n-1]

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

@@ -1,5 +1,46 @@
 module Debugger
-  class MethodCommand < Command # :nodoc:
+
+  begin
+    require 'methodsig'
+    have_methodsig = true
+  rescue LoadError
+    have_methodsig = false
+  end
+
+  # Implements the debugger 'method sig' command.
+  class MethodSigCommand < Command
+    def regexp
+      /^\s*m(?:ethod)?\s+sig(?:nature)?\s+(\S+)\s*$/
+    end
+
+    def execute
+      obj = debug_eval('method(:%s)' % @match[1])
+      if obj.is_a?(Method)
+        begin
+          print "%s\n", obj.signature.to_s
+        rescue
+          errmsg("Can't get signature for '#{@match[1]}'\n")
+        end
+      else
+        errmsg("Can't make method out of '#{@match[1]}'\n")
+      end
+    end
+
+    class << self
+      def help_command
+        'method'
+      end
+
+      def help(cmd)
+        %{
+          m[ethod] sig[nature] <obj>\tshow the signature of a method
+        }
+      end
+    end
+  end if have_methodsig
+
+  # Implements the debugger 'method' command.
+  class MethodCommand < Command
     def regexp
       /^\s*m(?:ethod)?\s+((iv)|(i(:?nstance\s+)?)\s+)?/
     end
@@ -33,10 +74,11 @@ module Debugger
       def help(cmd)
         %{
           m[ethod] i[nstance] <obj>\tshow methods of object
-          m[ethod] iv <obj>\tshow instance variables of object
+          m[ethod] iv <obj>\t\tshow instance variables of object
           m[ethod] <class|module>\t\tshow instance methods of class or module
         }
       end
     end
   end
+
 end

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

@@ -20,7 +20,12 @@ module Debugger
       Debugger.breakpoints.each do |b|
         file.puts "break #{b.source}:#{b.pos}#{" if #{b.expr}" if b.expr}"
       end
-      file.puts "catch #{Debugger.catchpoint}" if Debugger.catchpoint
+    end
+
+    def save_catchpoints(file)
+      Debugger.catchpoints.keys.each do |c|
+        file.puts "catch #{c}" 
+      end
     end
     
     def save_displays(file)
@@ -44,7 +49,9 @@ module Debugger
     end
     
     def regexp
-      /^\s*sa(?:ve)?(?:\s+(.+))?$/
+      /^\s* sa(?:ve)?
+        (?:\s+(.+))? 
+        \s*$/ix
     end
     
     def execute
@@ -54,6 +61,7 @@ module Debugger
         file = open(@match[1], 'w')
       end
       save_breakpoints(file)
+      save_catchpoints(file)
       # save_displays(file)
       save_settings(file)
       print "Saved to '#{file.path}'\n"
@@ -70,10 +78,12 @@ module Debugger
       
       def help(cmd)
         %{
-          save FILE\tsaves current debugger state to FILE as a script file.
-          This includes breakpoints, catchpoint, display expressions and some
-           settings.
-        }
+save [FILE]
+Saves current debugger state to FILE as a script file.
+This includes breakpoints, catchpoints, display expressions and some settings.
+If no filename is given, we will fabricate one.
+
+Use the 'source' command in another debug session to restore them.}
       end
     end
   end

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

@@ -110,15 +110,18 @@ set history size -- Set the size of the command history"],
               when /^basename$/
                 Command.settings[:basename] = set_on
               when /^callstyle$/
-                arg = args[0].downcase.to_sym
-                case arg
-                when :short, :last, :tracked
-                  Command.settings[:callstyle] = arg
-                  Debugger.track_frame_args = arg == :tracked ? true : false
-                else
-                  print "Invalid call style #{arg}. Should be one of: " +
-                    "'short', 'last', or 'tracked'.\n"
+                if args[0]
+                  arg = args[0].downcase.to_sym
+                  case arg
+                  when :short, :last, :tracked
+                    Command.settings[:callstyle] = arg
+                    Debugger.track_frame_args = arg == :tracked ? true : false
+                    print "%s\n" % show_setting(try_subcmd.name)
+                    return
+                  end
                 end
+                print "Invalid call style #{arg}. Should be one of: " +
+                  "'short', 'last', or 'tracked'.\n"
               when /^trace$/
                 Command.settings[:stack_trace_on_error] = set_on
               when /^fullpath$/

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

@@ -38,33 +38,37 @@ module Debugger
         style = Command.settings[:callstyle]
         return "Frame call-display style is #{style}."
       when /^commands(:?\s+(\d+))?$/
-        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
+        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
           end
-          if last_line > Readline::HISTORY.length
-            last_line = Readline::HISTORY.length
+          commands.each do |cmd|
+            s += ("%5d  %s\n" % [i, cmd])
+            i += 1
           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
-        end
-        commands.each do |cmd|
-          s += ("%5d  %s\n" % [i, cmd])
-          i += 1
+          s='No readline suport'
         end
         return s
       when /^debuggertesting$/