ruby-debug 0.5.1 → 0.5.2

data/CHANGES

@@ -1,3 +1,8 @@
+0.5.2
+- Fixes interoperability problems with rspec.
+- Made 'exit' as an alias to 'quit'
+- Added 'restart' command. Patch from R. Bernstein.
+
 0.5.1
 - Bugfixes.
 

data/bin/rdebug

@@ -54,6 +54,12 @@ EOB
 end
 
 begin
+  Debugger::ARGV = ARGV.clone
+  rdebug_path = File.expand_path($0)
+  if RUBY_PLATFORM =~ /mswin/
+    rdebug_path += ".cmd" unless rdebug_path =~ /\.cmd$/i
+  end
+  Debugger::RDEBUG_SCRIPT = rdebug_path
   opts.parse! ARGV
 rescue StandardError => e
   puts opts
@@ -72,13 +78,14 @@ else
     exit(-1)
   end
 
+  Debugger::PROG_SCRIPT = ARGV.shift
   trap('INT') { Debugger.interrupt_last }
   Debugger.stop_on_connect = !options.nostop
   Debugger.wait_connection = options.wait
   load "#{ENV["HOME"]}/.rdebugrc" if File.exists?("#{ENV["HOME"]}/.rdebugrc")
   if options.server
     Debugger.start_remote(options.host, [options.port, options.cport], options.post_mortem)
-    Debugger.debug_load ARGV.shift
+    Debugger.debug_load Debugger::PROG_SCRIPT
   else
     Debugger.start
     if options.script
@@ -86,6 +93,6 @@ else
     end
     Debugger.post_mortem if options.post_mortem
     debugger 2
-    Debugger.debug_load ARGV.shift
+    Debugger.debug_load Debugger::PROG_SCRIPT
   end
 end

data/ext/ruby_debug.c

@@ -4,7 +4,7 @@
 #include <rubysig.h>
 #include <st.h>
 
-#define DEBUG_VERSION "0.5.1"
+#define DEBUG_VERSION "0.5.2"
 
 #define CTX_FL_MOVED        (1<<1)
 #define CTX_FL_SUSPEND      (1<<2)

data/lib/ruby-debug/command.rb

@@ -10,7 +10,7 @@ module Debugger
         :control => false, 
         :always_run => false,
         :unknown => false,
-        :context => false,
+        :need_context => false,
       }
       
       def inherited(klass)

data/lib/ruby-debug/commands/control.rb

@@ -3,7 +3,7 @@ module Debugger
     self.control = true
 
     def regexp
-      /^\s*q(?:uit)?\s*$/
+      /^\s*(?:q(?:uit)?|exit)\s*$/
     end
 
     def execute
@@ -15,21 +15,65 @@ module Debugger
 
     class << self
       def help_command
-        'quit'
+        %w[quit exit]
       end
 
       def help(cmd)
         %{
-          q[uit]\texit from debugger
+          q[uit]\texit from debugger, 
+          exit\talias to quit
         }
       end
     end
   end
   
+  class RestartCommand < Command # :nodoc:
+    self.control = true
+
+    def regexp
+      / ^\s*
+      (restart|R)
+      (\s+ \S+ .*)?
+      $
+      /x
+    end
+    
+    def execute
+      if not defined? Debugger::RDEBUG_SCRIPT or not defined? Debugger::ARGV
+        print "We are not in a context we can restart from.\n"
+        return
+      end
+      if @match[2]
+        args = Debugger::PROG_SCRIPT + " " + @match[2]
+      else
+        args = Debugger::ARGV.join(" ")
+      end
+
+      # An execv would be preferable to the "exec" below.
+      cmd = Debugger::RDEBUG_SCRIPT + " " + args
+      print "Re exec'ing:\n\t#{cmd}\n"
+      exec cmd
+    end
+
+    class << self
+      def help_command
+        'restart'
+      end
+
+      def help(cmd)
+        %{
+          restart|R [args] 
+          Restart the program. This is is a re-exec - all debugger state
+          is lost. If command arguments are passed those are used.
+        }
+      end
+    end
+  end
+
   class InterruptCommand < Command # :nodoc:
     self.event = false
     self.control = true
-    self.context = true
+    self.need_context = true
     
     def regexp
       /^\s*i(?:nterrupt)?\s*$/

data/lib/ruby-debug/commands/frame.rb

@@ -1,6 +1,7 @@
 module Debugger
   module FrameFunctions # :nodoc:
     def format_frame(frame, pos)
+      printf "\032\032" if ENV['EMACS']
       file, line, id = frame.file, frame.line, frame.id
       "#%d %s:%s%s\n" % [pos + 1, file, line, (id ? ":in `#{id.id2name}'" : "")]
     end

data/lib/ruby-debug/commands/stepping.rb

@@ -1,6 +1,6 @@
 module Debugger
   class NextCommand < Command # :nodoc:
-    self.context = true
+    self.need_context = true
     
     def regexp
       /^\s*n(?:ext)?(?:\s+(\d+))?$/
@@ -26,7 +26,7 @@ module Debugger
   end
 
   class StepCommand < Command # :nodoc:
-    self.context = true
+    self.need_context = true
     
     def regexp
       /^\s*s(?:tep)?(?:\s+(\d+))?$/
@@ -51,7 +51,7 @@ module Debugger
   end
 
   class FinishCommand < Command # :nodoc:
-    self.context = true
+    self.need_context = true
     
     def regexp
       /^\s*fin(?:ish)?$/

data/lib/ruby-debug/commands/threads.rb

@@ -47,7 +47,7 @@ module Debugger
 
   class ThreadSwitchCommand < Command # :nodoc:
     self.control = true
-    self.context = true
+    self.need_context = true
     
     include ThreadFunctions
 
@@ -85,7 +85,7 @@ module Debugger
 
   class ThreadStopCommand < Command # :nodoc:
     self.control = true
-    self.context = true
+    self.need_context = true
     
     include ThreadFunctions
 
@@ -122,7 +122,7 @@ module Debugger
   end
 
   class ThreadCurrentCommand < Command # :nodoc:
-    self.context = true
+    self.need_context = true
     
     include ThreadFunctions
 
@@ -149,7 +149,7 @@ module Debugger
 
   class ThreadResumeCommand < Command # :nodoc:
     self.control = true
-    self.context = true
+    self.need_context = true
     
     include ThreadFunctions
 

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

@@ -8,9 +8,9 @@ module Debugger
       if @match[2]
         Debugger.tracing = @match[1] == 'on'
       elsif @match[1]
-        @state.context.tracing = @match[1] == 'on'
+        Debugger.current_context.tracing = @match[1] == 'on'
       end
-      if Debugger.tracing || @state.context.tracing
+      if Debugger.tracing || Debugger.current_context.tracing
         print "Trace on.\n"
       else
         print "Trace off.\n"

data/lib/ruby-debug/processor.rb

@@ -107,7 +107,7 @@ module Debugger
           end
           
           if cmd = commands.find{ |c| c.match(input) }
-            if context.nil? && cmd.class.context
+            if context.nil? && cmd.class.need_context
               print "Command is unavailable\n"
             else
               cmd.execute

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
-date: 2006-12-20 21:01:48 -05:00
+  version: 0.5.2
+date: 2006-12-21 16:17:01 -05:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib