rubinius-debugger 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a832fe4c69253b6458abd0bb1bf6743f839880d5
-  data.tar.gz: 863249772b7628de46bc7392c8ce49fd866b5a73
+  metadata.gz: c435decbf9c2161060b0328b744f8430faa06df5
+  data.tar.gz: eb7acf5b8bf72ca9c0ff777ce3e26eab866f8b14
 SHA512:
-  metadata.gz: 9475acd4681205b0ec14fb4a8473c42e4d7a2faebf7a666a05fdbe0a9fc693d297244188cf9cb4606b4199a91c979961f5c265cd618d52904622c23bd43bc114
-  data.tar.gz: e47567b803b2f8b2db7c16c5e60cfc56e156e63b9ff0920a046434f68a49ca4a6a5df2ba1d6b0e65c3179335570a71eed243f043d86fb1bc76c79eee122af385
+  metadata.gz: 109a0daaa86d91862ef75f502f4898af65008c69b6c3a7b694b9e4b7aa2ca979dd10e0abb0d9e6d2c68ba25630bea00f7b776b955a52689e28bfe1e6a0b6cded
+  data.tar.gz: 871d3f032600b57f8944a03003e04841ca0b1f1ae990d4a6bcd23ed65ed453ee3d85cbf974767a44a2f63a1df8d35a21dcbd390dc68bcf44bd092b364bcff6fa

data/lib/rubinius/debugger.rb

@@ -193,6 +193,7 @@ class Rubinius::Debugger
       cmd = @last_command
     else
       @last_command = cmd
+      Readline::History << cmd
     end
 
     command, args = cmd.to_s.strip.split(/\s+/, 2)
@@ -238,7 +239,7 @@ class Rubinius::Debugger
     end
   end
 
-  def eval_code(args)
+  def eval_code(args, pretty = false)
     obj = @current_frame.run(args)
 
     idx = @user_variables
@@ -246,7 +247,13 @@ class Rubinius::Debugger
 
     str = "$d#{idx}"
     Rubinius::Globals[str.to_sym] = obj
-    puts "#{str} = #{obj.inspect}\n"
+
+    if pretty
+      require 'pp'
+      puts "#{str} = #{obj.pretty_inspect}\n"
+    else
+      puts "#{str} = #{obj.inspect}\n"
+    end
   end
 
   def frame(num)
@@ -265,7 +272,7 @@ class Rubinius::Debugger
     end
   end
 
-  def set_breakpoint_method(descriptor, method, line=nil, condition=nil)
+  def set_breakpoint_method(descriptor, method, line=nil, condition=nil, commands=nil, index=nil)
     exec = method.executable
 
     unless exec.kind_of?(Rubinius::CompiledCode)
@@ -288,9 +295,14 @@ class Rubinius::Debugger
     bp = BreakPoint.new(descriptor, exec, ip, line, condition)
     bp.activate
 
-    @breakpoints << bp
-
-    info "Set breakpoint #{@breakpoints.size}: #{bp.location}"
+    if index
+      bp.set_commands(commands)
+      @breakpoints[index] = bp
+      info "Set breakpoint #{index+1}: #{bp.location}"
+    else
+      @breakpoints << bp
+      info "Set breakpoint #{@breakpoints.size}: #{bp.location}"
+    end
 
     return bp
   end

data/lib/rubinius/debugger/breakpoint.rb

@@ -104,8 +104,12 @@ class Rubinius::Debugger
       @name = name
       @line = line
       @list = list
+      @commands = nil
+      @condition = nil
     end
 
+    attr_reader :condition, :commands
+
     def descriptor
       "#{@klass_name}#{@which}#{@name}"
     end
@@ -129,7 +133,8 @@ class Rubinius::Debugger
 
       @debugger.info "Resolved breakpoint for #{@klass_name}#{@which}#{@name}"
 
-      @debugger.set_breakpoint_method descriptor, method, @line
+      index = @debugger.breakpoints.index(self)
+      @debugger.set_breakpoint_method descriptor, method, @line, @condition, @commands, index
 
       return true
     end
@@ -143,5 +148,21 @@ class Rubinius::Debugger
         @list.delete self
       end
     end
+
+    def set_commands(commands)
+      @commands = commands
+    end
+
+    def has_commands?
+      !@commands.nil?
+    end
+
+    def set_condition(condition)
+      @condition = condition
+    end
+
+    def has_condition?
+      !@condition.nil?
+    end
   end
 end

data/lib/rubinius/debugger/commands.rb

@@ -505,6 +505,19 @@ next to the inspect output of the value.
       end
     end
 
+    class PrettyPrintEvalCode < Command
+      pattern "pp"
+      help "Run code in the current context"
+      ext_help <<-HELP
+Run code in the context of the current frame. Like 'eval', but
+pretty prints the result with 'pp'.
+      HELP
+
+      def run(args)
+        @debugger.eval_code(args, true)
+      end
+    end
+
     class Disassemble < Command
       pattern "dis", "disassemble"
       help "Show the bytecode for the current line or method"

data/lib/rubinius/debugger/version.rb

@@ -1,5 +1,5 @@
 module Rubinius
   module Debugger
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-debugger
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler