ruby-debug 0.9.2 → 0.9.3

data/CHANGES

@@ -1,3 +1,9 @@
+0.9.3
+- Fixed if..elsif..end stepping.
+- From irb session Ctrl-C or 'cont' command continues execution without showing the debugger prompt.
+- Added Debugger.settings method to programatically modify command settings.
+- Added Kernel#breakpoint as alias to Kernel#debugger is the former is not already defined.
+
 0.9.2
 - Fixed file comparison in Windows platform.
 - Added setter methods to Breakpoint properties

data/bin/rdebug

@@ -8,9 +8,11 @@ require 'ruby-debug'
 options = OpenStruct.new(
   'server'      => false,
   'client'      => false,
+  'debug_module'=> 'debug',
   'host'        => nil,
   'port'        => Debugger::PORT,
   'cport'       => Debugger::PORT + 1,
+  'control'     => true,
   'wait'        => false,
   'nostop'      => false,
   'post_mortem' => false,
@@ -32,6 +34,7 @@ EOB
   opts.on("-h", "--host HOST", "Host name used for remote debugging") {|options.host|}
   opts.on("-p", "--port PORT", Integer, "Port used for remote debugging") {|options.port|}
   opts.on("--cport PORT", Integer, "Port used for contol commands") {|options.cport|}
+  opts.on("--no-control", "Do not automatically start control thread") {options.control = false}
   opts.on("-x", "--trace", "turn on line tracing") {options.tracing = true}
   opts.on("-n", "--nostop", "Do not stop when stript is loaded") {options.nostop = true}
   opts.on("-m", "--post-mortem", "Activate post-mortem mode") {options.post_mortem = true}
@@ -44,6 +47,13 @@ EOB
       exit
     end
   end
+  opts.on("-r", "--require debug", String,
+          "Compatibility with Ruby-distributed debug module") do |options.debug_module|
+    if options.debug_module != 'debug'
+      puts "Use '-r' option only with 'debug' (You supplied '#{options.debug_module}'). " + 
+        "This option is ignored."
+    end
+  end
   opts.on("--keep-frame-binding", "Keep frame bindings") {options.frame_bind = true}
   opts.on("--emacs", "Activates emacs mode") {ENV['EMACS'] = '1'}
   opts.separator ""
@@ -110,7 +120,7 @@ else
     # activate debugger
     Debugger.start
     # start control thread
-    Debugger.start_control(options.host, options.cport)
+    Debugger.start_control(options.host, options.cport) if options.control
 
     # load initrc script
     load_initrc.call

data/cli/ruby-debug.rb

@@ -64,7 +64,7 @@ module Debugger
     end
     alias start_server start_remote
     
-    def start_control(host = nil, ctrl_port = PORT + 1)
+    def start_control(host = nil, ctrl_port = PORT + 1) # :nodoc:
       raise "Debugger is not started" unless started?
       return if @control_thread
       @control_thread = DebugThread.new do

data/cli/ruby-debug/command.rb

@@ -42,16 +42,50 @@ module Debugger
       def options
         @options ||= {}
       end
+
+      def settings_map
+        @@settings_map ||= {}
+      end
+      private :settings_map
       
-      def setting(name)
-        class_variable_get("@@#{name}")
+      def settings
+        unless @settings
+          @settings = Object.new
+          map = settings_map
+          class << @settings; self end.send(:define_method, :[]) do |name|
+            raise "No such setting #{name}" unless map.has_key?(name)
+            map[name][:getter].call
+          end
+          class << @settings; self end.send(:define_method, :[]=) do |name, value|
+            raise "No such setting #{name}" unless map.has_key?(name)
+            map[name][:setter].call(value)
+          end
+        end
+        @settings
+      end
+
+      def register_setting_var(name, default)
+        var_name = "@@#{name}"
+        class_variable_set(var_name, default)
+        register_setting_get(name) { class_variable_get(var_name) }
+        register_setting_set(name) { |value| class_variable_set(var_name, value) }
+      end
+
+      def register_setting_get(name, &block)
+        settings_map[name] ||= {}
+        settings_map[name][:getter] = block
+      end
+
+      def register_setting_set(name, &block)
+        settings_map[name] ||= {}
+        settings_map[name][:setter] = block
       end
     end
 
-    @@display_stack_trace = false
-    @@full_file_names = true
-    @@full_class_names = false
-    @@force_stepping = false
+    register_setting_var(:stack_trace_on_error, false)
+    register_setting_var(:frame_full_path, true)
+    register_setting_var(:frame_class_names, false)
+    register_setting_var(:force_stepping, false)
     
     def initialize(state)
       @state = state
@@ -75,7 +109,7 @@ module Debugger
       begin
         val = eval(str, b)
       rescue StandardError, ScriptError => e
-        if @@display_stack_trace
+        if Command.settings[:stack_trace_on_error]
           at = eval("caller(1)", b)
           print "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
           for i in at
@@ -110,4 +144,21 @@ module Debugger
   end
   
   Command.load_commands
+
+  # Returns setting object.
+  # Use Debugger.settings[] and Debugger.settings[]= methods to query and set
+  # debugger settings. These settings are available:
+  # 
+  # - :autolist - automatically calls 'list' command on breakpoint
+  # - :autoeval - evaluates input in the current binding if it's not recognized as a debugger command
+  # - :autoirb - automatically calls 'irb' command on breakpoint
+  # - :stack_trace_on_error - shows full stack trace if eval command results with an exception
+  # - :frame_full_path - displays full paths when showing frame stack
+  # - :frame_class_names - displays method's class name when showing frame stack
+  # - :reload_source_on_change - makes 'list' command to always display up-to-date source code
+  # - :force_stepping - stepping command asways move to the new line
+  # 
+  def self.settings
+    Command.settings
+  end
 end

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

@@ -1,5 +1,5 @@
 module Debugger
-  module EvalFunctions
+  module EvalFunctions # :nodoc:
     def run_with_binding
       binding = @state.context ? get_binding : TOPLEVEL_BINDING
       $__dbg_interface = @state.interface
@@ -23,6 +23,13 @@ module Debugger
     
     include EvalFunctions
 
+    register_setting_get(:autoeval) do
+      EvalCommand.unknown
+    end
+    register_setting_set(:autoeval) do |value|
+      EvalCommand.unknown = value
+    end
+
     def match(input)
       @input = input
       super

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

@@ -47,12 +47,12 @@ module Debugger
       method = ""
       if id
         method << " in '"
-        method << "#{klass}." if Command.setting('full_class_names') && klass
+        method << "#{klass}." if Command.settings[:frame_class_names] && klass
         method << id.id2name
         method << "'"
       end
       
-      unless Command.setting('full_file_names')
+      unless Command.settings[:frame_full_path]
         path_components = file.split(/[\\\/]/)
         if path_components.size > 3
           path_components[0...-3] = '...'

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

@@ -1,5 +1,15 @@
 require 'irb'
+
 module IRB # :nodoc:
+  module ExtendCommand # :nodoc:
+    class Continue # :nodoc:
+      def self.execute(conf)
+        throw :IRB_EXIT, :cont
+      end
+    end
+  end
+  ExtendCommandBundle.def_extend_command "cont", :Continue
+  
   def self.start_session(binding)
     unless @__initialized
       args = ARGV
@@ -16,10 +26,6 @@ module IRB # :nodoc:
     @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
     @CONF[:MAIN_CONTEXT] = irb.context
 
-#     trap("SIGINT") do
-#       irb.signal_handle
-#     end
-
     catch(:IRB_EXIT) do
       irb.eval_input
     end
@@ -28,6 +34,14 @@ end
 
 module Debugger
   class IRBCommand < Command # :nodoc:
+
+    register_setting_get(:autoirb) do 
+      IRBCommand.always_run
+    end
+    register_setting_set(:autoirb) do |value|
+      IRBCommand.always_run = value
+    end
+
     def regexp
       /^irb$/
     end
@@ -37,7 +51,17 @@ module Debugger
         print "Command is available only in local mode.\n"
         throw :debug_error
       end
-      IRB.start_session(get_binding)
+
+      save_trap = trap("SIGINT") do
+        throw :IRB_EXIT, :cont if $debug_in_irb
+      end
+
+      $debug_in_irb = true
+      cont = IRB.start_session(get_binding)
+      @state.proceed if cont == :cont
+    ensure
+      $debug_in_irb = false
+      trap("SIGINT", save_trap) if save_trap
     end
     
     class << self

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

@@ -1,5 +1,13 @@
 module Debugger
   class ListCommand < Command # :nodoc:
+
+    register_setting_get(:autolist) do
+      ListCommand.always_run 
+    end
+    register_setting_set(:autolist) do |value|
+      ListCommand.always_run = value
+    end
+
     def regexp
       /^\s*l(?:ist)?(?:\s*([-=])|\s+(.+))?$/
     end
@@ -68,6 +76,13 @@ module Debugger
 
   class ReloadCommand < Command # :nodoc:
     self.control = true
+
+    register_setting_get(:reload_source_on_change) do 
+      Debugger.reload_source_on_change
+    end
+    register_setting_set(:reload_source_on_change) do |value|
+      Debugger.reload_source_on_change = value
+    end
     
     def regexp
       /^\s*r(?:eload)?$/

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

@@ -9,28 +9,28 @@ module Debugger
     def execute
       case @match[1]
       when /^(no)?autolist$/
-        ListCommand.always_run = $1.nil?
+        Command.settings[:autolist] = $1.nil?
         print "autolist is #{$1.nil? ? 'on' : 'off'}.\n"
       when /^(no)?autoeval$/
-        EvalCommand.unknown = $1.nil?
+        Command.settings[:autoeval] = $1.nil?
         print "autoeval is #{$1.nil? ? 'on' : 'off'}.\n"
       when /^(no)?trace$/
-        @@display_stack_trace = $1.nil?
+        Command.settings[:stack_trace_on_error] = $1.nil?
         print "Displaying stack trace is #{$1.nil? ? 'on' : 'off'}.\n"
       when /^(no)?framefullpath$/
-        @@full_file_names = $1.nil?
+        Command.settings[:frame_full_path] = $1.nil?
         print "Displaying frame's full file names is #{$1.nil? ? 'on' : 'off'}.\n"
       when /^(no)?frameclassname$/
-        @@full_class_names = $1.nil?
+        Command.settings[:frame_class_names] = $1.nil?
         print "Displaying frame's original class name is #{$1.nil? ? 'on' : 'off'}.\n"
       when /^(no)?autoreload$/
-        Debugger.reload_source_on_change = $1.nil?
+        Command.settings[:reload_source_on_change] = $1.nil?
         print "autoreload is #{$1.nil? ? 'on' : 'off'}.\n"
       when /^(no)?autoirb$/
-        IRBCommand.always_run = $1.nil?
+        Command.settings[:autoirb] = $1.nil?
         print "autoirb is #{$1.nil? ? 'on' : 'off'}.\n"
       when /^(no)?forcestep$/
-        @@force_stepping = $1.nil?
+        self.class.settings[:force_stepping] = $1.nil?
         print "force-stepping is #{$1.nil? ? 'on' : 'off'}.\n"
       else
         print "Unknown setting.\n"

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

@@ -7,7 +7,7 @@ module Debugger
     end
 
     def execute
-      force = @match[1] == '+' || (@match[1].nil? && @@force_stepping)
+      force = @match[1] == '+' || (@match[1].nil? && Command.settings[:force_stepping])
       steps = @match[2] ? @match[2].to_i : 1
       @state.context.step_over steps, @state.frame_pos, force
       @state.proceed
@@ -35,7 +35,7 @@ module Debugger
     end
 
     def execute
-      force = @match[1] == '+' || (@match[1].nil? && @@force_stepping)
+      force = @match[1] == '+' || (@match[1].nil? && Command.settings[:force_stepping])
       steps = @match[2] ? @match[2].to_i : 1
       @state.context.step(steps, force)
       @state.proceed

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
-date: 2007-04-04 16:19:46 -04:00
+  version: 0.9.3
+date: 2007-04-27 20:32:40 -04:00
 summary: Command line interface (CLI) for ruby-debug-base
 require_paths: 
 - cli
@@ -78,5 +78,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: