ruby-debug 0.8.1 → 0.9

data/CHANGES

@@ -1,3 +1,18 @@
+0.9
+- Kernel#debugger method will start the debugger if it's not running.
+- Added Context#stop_reason method.
+- Calling a method with a block will create a new frame. This changes the behavior of 'next' command. So in order to step into a block, 'step' command must be used. That fixes bug #9629.
+- Added the possibility to add a temporary context-specific breakpoint. Context#breakpoint and Context#set_breakpoint methods are added. 
+- 'cont' command now accepts a numerical parameter which implements 'Continue until line' behavior.
+- Added new Context.frame_class method
+- Added new 'framefullpath' setting.
+- Added new 'frameclassname' setting.
+- All Ruby's 'eval' and require/load methods create a new frame. Fixes bug #9686.
+
+0.8.1
+- Added a shortcut module 'debugger'. require "ruby-debug/debugger" will start the debugger and stop at the next line (similar to require 'debug').
+- Fixed remote debugging.
+
 0.8
 - Extract the base debugger API into a separate gem (ruby-debug-base), so it will be easier to add a new interface.
 - Added 'set autoirb' setting.

data/cli/ruby-debug/command.rb

@@ -42,9 +42,15 @@ module Debugger
       def options
         @options ||= {}
       end
+      
+      def setting(name)
+        class_variable_get("@@#{name}")
+      end
     end
 
     @@display_stack_trace = false
+    @@full_file_names = true
+    @@full_class_names = false
     
     def initialize(state)
       @state = state

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

@@ -57,7 +57,8 @@ module Debugger
 
       def help(cmd)
         %{
-          b[reak] [file|class(:|.|#)]<line|method> [if expr] -
+          b[reak] file:line [if expr]
+          b[reak] class(.|#)method [if expr]
           \tset breakpoint to some position, (optionally) if expr == true
         }
       end

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

@@ -1,6 +1,27 @@
 module Debugger
+  module EvalFunctions
+    def run_with_binding
+      binding = @state.context ? get_binding : TOPLEVEL_BINDING
+      $__dbg_interface = @state.interface
+      eval(<<-EOC, binding)
+        def dbg_print(*args)
+          $__dbg_interface.print(*args)
+        end
+        def dbg_puts(*args)
+          $__dbg_interface.print(*args)
+          $__dbg_interface.print("\n")
+        end
+      EOC
+      yield binding
+    ensure
+      $__dbg_interface = nil
+    end
+  end
+  
   class EvalCommand < Command # :nodoc:
     self.control = true
+    
+    include EvalFunctions
 
     def match(input)
       @input = input
@@ -13,8 +34,9 @@ module Debugger
 
     def execute
       expr = @match ? @match.post_match : @input
-      binding = @state.context ? get_binding : TOPLEVEL_BINDING
-      print "%s\n", debug_eval(expr, binding).inspect
+      run_with_binding do |b|
+        print "%s\n", debug_eval(expr, b).inspect
+      end
     end
 
     class << self
@@ -39,14 +61,22 @@ module Debugger
   end
 
   class PPCommand < Command # :nodoc:
+    self.control = true
+    
+    include EvalFunctions
+    
     def regexp
       /^\s*pp\s+/
     end
 
     def execute
       out = StringIO.new
-      PP.pp(debug_eval(@match.post_match), out) rescue out.puts $!.message
+      run_with_binding do |b|
+        PP.pp(debug_eval(@match.post_match, b), out)
+      end
       print out.string
+    rescue 
+      out.puts $!.message
     end
 
     class << self
@@ -56,7 +86,7 @@ module Debugger
 
       def help(cmd)
         %{
-          pp expression\tevaluate expression and print its value
+          pp expression\tevaluate expression and pretty-print its value
         }
       end
     end

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

@@ -39,8 +39,28 @@ module Debugger
     end
 
     def print_frame(pos, adjust = false)
-      file, line, id = @state.context.frame_file(pos), @state.context.frame_line(pos), @state.context.frame_id(pos)
-      print "#%d %s:%d%s\n", pos, file, line, id ? " in `#{id.id2name}'" : ""
+      file = @state.context.frame_file(pos)
+      line = @state.context.frame_line(pos)
+      id = @state.context.frame_method(pos)
+      klass = @state.context.frame_class(pos)
+
+      method = ""
+      if id
+        method << " in '"
+        method << "#{klass}." if Command.setting('full_class_names') && klass
+        method << id.id2name
+        method << "'"
+      end
+      
+      unless Command.setting('full_file_names')
+        path_components = file.split(/[\\\/]/)
+        if path_components.size > 3
+          path_components[0...-3] = '...'
+          file = path_components.join(File::ALT_SEPARATOR || File::SEPARATOR)
+        end
+      end
+      
+      print "#%d %s:%d%s\n", pos, file, line, method
       print "\032\032%s:%d\n", file, line if ENV['EMACS'] && adjust
     end
   end

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

@@ -7,12 +7,13 @@ module Debugger
     end
 
     def execute
-      print "ruby-debug help v.#{Debugger::VERSION}\n"
+      print "ruby-debug help v#{Debugger::VERSION}\n"
       cmds = @state.commands.select{ |cmd| [cmd.help_command].flatten.include?(@match[1]) }
       unless cmds.empty?
         help = cmds.map{ |cmd| cmd.help(@match[1]) }.join
         print help.split("\n").reject{|l| l =~ /^\s*$/ }.map{|l| l.gsub(/^ +/, '')}.join("\n")
       else
+        print "Type 'help <command-name>' for help on a specific command\n\n"
         print "Available commands:\n"
         cmds = @state.commands.map{ |cmd| cmd.help_command }
         cmds = cmds.flatten.uniq.sort

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

@@ -16,7 +16,13 @@ module Debugger
         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"
+        print "Displaying stack trace is #{$1.nil? ? 'on' : 'off'}.\n"
+      when /^(no)?framefullpath$/
+        @@full_file_names = $1.nil?
+        print "Displaying frame's full file names is #{$1.nil? ? 'on' : 'off'}.\n"
+      when /^(no)?frameclassname$/
+        @@full_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?
         print "autoreload is #{$1.nil? ? 'on' : 'off'}.\n"
@@ -36,11 +42,13 @@ module Debugger
       def help(cmd)
         %{
            set <setting>, where <setting>:
-           autolist   - execute 'list' command on every breakpoint
-           autoeval   - evaluate every unrecognized command
-           autoreload - enables automatic source code reloading
-           autoirb    - debugger invokes IRB on every stop
-           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
+           autoirb        - debugger invokes IRB on every stop
+           trace          - display stack trace when 'eval' raises exception
+           framefullpath  - frame will display full file names
+           frameclassname - frame will display class names
            To disable setting, use 'no' prefix, like 'noautolist'
          }
       end

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

@@ -19,7 +19,7 @@ module Debugger
 
       def help(cmd)
         %{
-          n[ext][ nnn]\tgo over one line or till line nnn
+          n[ext][ nnn]\tstep over once or nnn times
         }
       end
     end
@@ -44,7 +44,7 @@ module Debugger
 
       def help(cmd)
         %{
-          s[tep][ nnn]\tstep (into methods) one line or till line nnn
+          s[tep][ nnn]\tstep (into methods) once or nnn times
         }
       end
     end
@@ -82,10 +82,14 @@ module Debugger
 
   class ContinueCommand < Command # :nodoc:
     def regexp
-      /^\s*c(?:ont)?$/
+      /^\s*c(?:ont)?(?:\s+(\d+))?$/
     end
 
     def execute
+      if @match[1] && !@state.context.dead?
+        file = File.expand_path(@state.file)
+        @state.context.set_breakpoint(file, @match[1].to_i)
+      end
       @state.proceed
     end
 
@@ -96,7 +100,7 @@ module Debugger
 
       def help(cmd)
         %{
-          c[ont]\trun until program ends or hit breakpoint
+          c[ont][ nnn]\trun until program ends or hits breakpoint or reaches line nnn 
         }
       end
     end

data/cli/ruby-debug/interface.rb

@@ -34,7 +34,7 @@ module Debugger
             Readline::HISTORY.to_a.last(500).each do |line|
               file.puts line unless line.strip.empty?
             end
-	  end rescue nil
+          end rescue nil
         end
         public :save_history 
       end

data/cli/ruby-debug/processor.rb

@@ -205,7 +205,8 @@ module Debugger
     end
     
     class State # :nodoc:
-      attr_reader :commands
+      attr_reader :commands, :interface
+      
       def initialize(interface, commands)
         @interface = interface
         @commands = commands

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
-date: 2007-03-19 03:56:11 -04:00
+  version: "0.9"
+date: 2007-04-01 13:18:02 -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.8.1
+        version: "0.9"
     version: