ruby-debug 0.7.4 → 0.7.5

data/CHANGES

@@ -1,3 +1,8 @@
+0.7.5
+- Fixed 'reload on' command
+- 'reload on' command is removed in favor of 'set autoreload'
+- rdebug will evaluate ~/.rdebugrc script on startup
+
 0.7.4
 - Added a workaround of the Ruby interpreter problem where a method created with Module#define_method 
   and which raises an exception doesn't trigger a :return event, this way screwing the stack trace.

data/bin/rdebug

@@ -93,12 +93,16 @@ else
   Debugger.wait_connection = options.wait
   Debugger.keep_frame_binding = options.frame_bind
   
-  # load user script
-  load "#{ENV["HOME"]}/.rdebugrc" if File.exists?("#{ENV["HOME"]}/.rdebugrc")
+  load_initrc = lambda do
+    script_file = "#{ENV["HOME"] || ENV["HOMEPATH" || "."]}/.rdebugrc"
+    Debugger.run_script script_file  if File.exists?(script_file)
+  end
   
   if options.server
     # start remote mode
     Debugger.start_remote(options.host, [options.port, options.cport], options.post_mortem)
+    # load initrc script
+    load_initrc.call
     # load script
     Debugger.debug_load Debugger::PROG_SCRIPT
   else
@@ -106,6 +110,9 @@ else
     Debugger.start
     # start control thread
     Debugger.start_control(options.host, options.cport)
+
+    # load initrc script
+    load_initrc.call
     
     # run startup script if specified
     if options.script

data/ext/ruby_debug.c

@@ -4,7 +4,7 @@
 #include <rubysig.h>
 #include <st.h>
 
-#define DEBUG_VERSION "0.7.4"
+#define DEBUG_VERSION "0.7.5"
 
 #ifdef _WIN32
 struct FRAME {
@@ -1952,12 +1952,12 @@ context_set_tracing(VALUE self, VALUE value)
 
 /*
  *   call-seq:
- *      context.ignore -> bool
+ *      context.ignored? -> bool
  *
  *   Returns the ignore flag for the current context.
  */
 static VALUE
-context_ignore(VALUE self)
+context_ignored(VALUE self)
 {
     debug_context_t *debug_context;
 
@@ -2069,7 +2069,7 @@ Init_context()
     rb_define_method(cContext, "resume", context_resume, 0);
     rb_define_method(cContext, "tracing", context_tracing, 0);
     rb_define_method(cContext, "tracing=", context_set_tracing, 1);
-    rb_define_method(cContext, "ignore", context_ignore, 0);
+    rb_define_method(cContext, "ignored?", context_ignored, 0);
     rb_define_method(cContext, "frame_binding", context_frame_binding, 1);
     rb_define_method(cContext, "frame_id", context_frame_id, 1);
     rb_define_method(cContext, "frame_line", context_frame_line, 1);

data/lib/ruby-debug.rb

@@ -173,23 +173,23 @@ module Debugger
 
     def source_for(file) # :nodoc:
       finder = lambda do
-        unless File.exists?(file)
-          return (SCRIPT_LINES__[file] == true ? nil : SCRIPT_LINES__[file])
-        end
+        if File.exists?(file)
+          if SCRIPT_LINES__[file].nil? || SCRIPT_LINES__[file] == true
+            SCRIPT_LINES__[file] = File.readlines(file)
+          end
 
-        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
 
-        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)
+          SCRIPT_LINES__[file]
         end
-
-        SCRIPT_LINES__[file]
       end
-      Dir.chdir(File.dirname($0)){finder.call} || finder.call
+      
+      Dir.chdir(File.dirname($0)){finder.call} || finder.call ||
+        (SCRIPT_LINES__[file] == true ? nil : SCRIPT_LINES__[file])
     end
     
     def source_reload

data/lib/ruby-debug/command.rb

@@ -70,13 +70,13 @@ module Debugger
       rescue StandardError, ScriptError => e
         if @@display_stack_trace
           at = eval("caller(1)", b)
-	  print "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
+          print "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
           for i in at
             print "\tfrom %s\n", i
           end
-	else
-	  print "Exception #{e.class}: #{e.message}\n"
-	end
+        else
+          print "#{e.class} Exception: #{e.message}\n"
+        end
         throw :debug_error
       end
     end

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

@@ -70,17 +70,12 @@ module Debugger
     self.control = true
     
     def regexp
-      /^\s*r(?:eload)?(?:\s*(on|off))?$/
+      /^\s*r(?:eload)?$/
     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
+      Debugger.source_reload
+      print "Source code is reloaded. Automatic reloading is #{source_reloading}.\n"
     end
     
     private
@@ -97,7 +92,6 @@ module Debugger
       def help(cmd)
         %{
           r[eload]\tforces source code reloading
-          r[eload] on/off\tenales/disables automatic source code reloading
         }
       end
     end

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

@@ -10,13 +10,16 @@ module Debugger
       case @match[1]
       when /^(no)?autolist$/
         ListCommand.always_run = $1.nil?
-        print "Listing is #{$1.nil? ? 'on' : 'off'}.\n"
+        print "autolist is #{$1.nil? ? 'on' : 'off'}.\n"
       when /^(no)?autoeval$/
         EvalCommand.unknown = $1.nil?
-        print "Evaluation of unrecognized command is #{$1.nil? ? 'on' : 'off'}.\n"
+        print "autoeval is #{$1.nil? ? 'on' : 'off'}.\n"
       when /^(no)?trace$/
         @@display_stack_trace = $1.nil?
         print "Display stack trace is #{$1.nil? ? 'on' : 'off'}.\n"
+      when /^(no)?autoreload$/
+        Debugger.reload_source_on_change = $1.nil?
+        print "autoreload is #{$1.nil? ? 'on' : 'off'}.\n"
       else
         print "Unknown setting.\n"
       end
@@ -30,9 +33,10 @@ module Debugger
       def help(cmd)
         %{
            set <setting>, where <setting>:
-           autolist - execute 'list' command on every breakpoint
-           autoeval - evaluate every unrecognized command
-           trace    - display stack trace when 'eval' raises exception
+           autolist   - execute 'list' command on every breakpoint
+           autoeval   - evaluate every unrecognized command
+           autoreload - enables automatic source code reloading
+           trace      - display stack trace when 'eval' raises exception
            To disable setting, use 'no' prefix, like 'noautolist'
          }
       end

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

@@ -3,7 +3,7 @@ module Debugger
     def display_context(c)
       c_flag = c.thread == Thread.current ? '+' : ' '
       c_flag = '$' if c.suspended?
-      d_flag = debugger_thread?(c) ? '!' : ' '
+      d_flag = c.ignored? ? '!' : ' '
       print "%s%s", c_flag, d_flag
       print "%d ", c.thnum
       print "%s\t", c.thread.inspect
@@ -12,10 +12,6 @@ module Debugger
       end
       print "\n"
     end
-    
-    def debugger_thread?(c)
-      [Debugger.thread, Debugger.control_thread].include?(c.thread)
-    end
   end
 
   class ThreadListCommand < Command # :nodoc:
@@ -60,7 +56,7 @@ module Debugger
       case
       when c == @state.context
         print "It's the current thread.\n"
-      when debugger_thread?(c)
+      when c.ignored?
         print "Can't switch to the debugger thread.\n"
       else
         display_context(c)
@@ -98,7 +94,7 @@ module Debugger
       case
       when c == @state.context
         print "It's the current thread.\n"
-      when debugger_thread?(c)
+      when c.ignored?
         print "Can't stop the debugger thread.\n"
       else
         c.suspend
@@ -160,7 +156,7 @@ module Debugger
       case
       when c == @state.context
         print "It's the current thread.\n"
-      when debugger_thread?(c)
+      when c.ignored?
         print "Can't resume the debugger thread.\n"
       when !c.thread.stop?
         print "Already running."

data/lib/ruby-debug/processor.rb

@@ -96,19 +96,19 @@ module Debugger
       commands.select{|cmd| cmd.class.always_run }.each{|cmd| cmd.execute }
 
       splitter = lambda do |str|
-	str.split(/;/).inject([]) do |m, v|
-	  if m.empty?
-	    m << v
-	  else
-	    if m.last[-1] == ?\\
-	      m.last[-1,1] = ''
-	      m.last << ';' << v
-	    else
-	      m << v
-	    end
-	  end
-	  m
-	end
+        str.split(/;/).inject([]) do |m, v|
+          if m.empty?
+            m << v
+          else
+            if m.last[-1] == ?\\
+              m.last[-1,1] = ''
+              m.last << ';' << v
+            else
+              m << v
+            end
+          end
+          m
+        end
       end
       
       while !state.proceed? and input = @interface.read_command(prompt(context))

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
-date: 2007-02-05 17:50:28 -05:00
+  version: 0.7.5
+date: 2007-02-09 02:00:27 -05:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib