ruby-debug 0.4.4 → 0.4.5

data/CHANGES

@@ -1,3 +1,9 @@
+0.4.5
+- Fixed debug_method when applied to setter.
+- Added reload command which can be used to reload source code in case it's been changed.
+- Added Debugger.reload_source_on_change option (true, by default) which controls whether ruby-debug should keep
+  track of the source files modification times and reload them if they've been changed.
+
 0.4.4
 - Renamed Context#set_suspend and Context#clear_suspend methods to Context#suspend and Context#resume respectively.
 - Context#resume method not only clears suspend flag, but also resumes the thread execution.

data/ext/ruby_debug.c

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

data/lib/ruby-debug/command.rb

@@ -22,7 +22,7 @@ module Debugger
       def load_commands
         dir = File.dirname(__FILE__)
         Dir[File.join(dir, 'commands', '*')].each do |file|
-          require file
+          require file if file =~ /\.rb$/
         end
       end
       

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

@@ -6,7 +6,7 @@ module Debugger
     end
     
     def regexp
-      /^\s*(p|e(?:val)?)(?:\s+(on|off)|\s+)/
+      /^\s*(p|e(?:val)?)(?:\s+(on|off)$|\s+)/
     end
 
     def execute

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

@@ -73,4 +73,41 @@ module Debugger
       end
     end
   end
+
+  class ReloadCommand < Command # :nodoc
+    self.control = true
+    
+    def regexp
+      /^\s*r(?:eload)?(?:\s*(on|off))?$/
+    end
+    
+    def execute
+      if @match[1]
+        Debugger.reload_source_on_change = (@match[1] == 'on')
+        print "Automatic reloading is #{source_reloading}.\n"
+      else
+        Debugger.source_reload
+        print "Source code is reloaded. Automatic reloading is #{source_reloading}.\n"
+      end
+    end
+    
+    private
+    
+    def source_reloading
+      Debugger.reload_source_on_change ? 'on' : 'off'
+    end
+    
+    class << self
+      def help_command
+        'reload'
+      end
+
+      def help(cmd)
+        %{
+          r[eload]\tforces source code reloading
+          r[eload] on/off\tenales/disables automatic source code reloading
+        }
+      end
+    end
+  end
 end

data/lib/ruby-debug/processor.rb

@@ -118,6 +118,7 @@ module Debugger
       def initialize
         @frame_pos = 0
         @previous_line = nil
+        @proceed = false
         yield self
       end
 

data/lib/ruby-debug.rb

@@ -5,11 +5,13 @@ require 'ruby_debug.so'
 require 'ruby-debug/processor'
 
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
+SCRIPT_TIMESTAMPS__ = {} unless defined? SCRIPT_TIMESTAMPS__
 
 module Debugger
   PORT = 8989
 
   @processor = CommandProcessor.new
+  @reload_source_on_change = false
   
   class Context
     def interrupt
@@ -48,6 +50,9 @@ module Debugger
     # in remote mode, wait for the remote connection 
     attr_accessor :wait_connection
     
+    # if <tt>true</tt>, checks the modification time of source files and reloads if it was modified
+    attr_accessor :reload_source_on_change
+    
     attr_reader :thread, :control_thread
     
     #
@@ -164,12 +169,28 @@ module Debugger
     private :stop_main_thread
 
     def source_for(file) # :nodoc:
-      if source = SCRIPT_LINES__[file]
-        return source unless source == true
+      unless File.exists?(file)
+        return (source == true ? nil : source)
       end
-      if File.exists?(file)
+      
+      if SCRIPT_LINES__[file].nil? || SCRIPT_LINES__[file] == true
+        SCRIPT_LINES__[file] = File.readlines(file)
+      end
+      
+      change_time = test(?M, file)
+      SCRIPT_TIMESTAMPS__[file] ||= change_time
+      if @reload_source_on_change && SCRIPT_TIMESTAMPS__[file] < change_time
         SCRIPT_LINES__[file] = File.readlines(file)
       end
+      
+      SCRIPT_LINES__[file]
+    end
+    
+    def source_reload
+      SCRIPT_LINES__.keys.each do |file|
+        next unless File.exists?(file)
+        SCRIPT_LINES__[file] = nil
+      end
     end
     
     def line_at(file, line) # :nodoc:
@@ -216,12 +237,14 @@ class Module
   # Wraps the +meth+ method with Debugger.start {...} block.
   #
   def debug_method(meth)
-    alias_method "__debugee_#{meth}".to_sym, meth
+    old_meth = "__debugee_#{meth}"
+    old_meth = "#{$1}_set" if old_meth =~ /^(.+)=$/
+    alias_method old_meth.to_sym, meth
     class_eval <<-EOD
     def #{meth}(*args, &block)
       Debugger.start do
         debugger 2
-        __debugee_#{meth}(*args, &block)
+        #{old_meth}(*args, &block)
       end
     end
     EOD

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
-date: 2006-10-15 18:26:58 -04:00
+  version: 0.4.5
+date: 2006-12-02 14:15:31 -05:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib