trepanning 0.0.6 → 0.0.8

data/test/functional/fn_helper.rb

@@ -32,7 +32,7 @@ module FnTestHelper
 
   unless defined?(TREPAN_PROMPT)
     TREPAN_PROMPT = /^\(trepan\): /
-    TREPAN_LOC    = /.. \(.+:\d+\)/
+    TREPAN_LOC    = /.. \(.+:\d+( @\d+)?\)/
   end
 
   # Return the caller's line number
@@ -79,7 +79,17 @@ module FnTestHelper
     # becomes:
     #   -- 
     a2 = a.map do |s|
-      s =~ TREPAN_LOC ? s.gsub(/\(.+:\d+\)\n/, '').chomp : s.chomp
+      s =~ TREPAN_LOC ? s.gsub(/\(.+:\d+( @\d+)?\)\n/, '').chomp : s.chomp
+    end
+
+    # Canonicalize breakpoint messages. 
+    # For example: 
+    #   Set breakpoint 1: test/functional/test-tbreak.rb:10 (@0)
+    # becomes :
+    #   Set breakpoint 1: foo.rb:55 (@3)
+    a3 = a2.map do |s|
+      s.gsub(/^Breakpoint (\d+) set at line (\d+) in file .+,/, 
+             'Breakpoint \1 set at line 55 in file foo.rb,')
     end
 
     # Remove VM offset locations. 
@@ -87,10 +97,10 @@ module FnTestHelper
     #	VM offset 2 of instruction sequence "block in compare_output".
     # becomes 
     #   VM offset 55 of instruction sequence "block in compare_output".
-    a3 = a2.map do |s|
+    a4 = a3.map do |s|
       s.gsub(/VM offset \d+/, 'VM offset 55')
     end
-    return a3
+    return a4
   end
 
 end

data/test/functional/test-break.rb

@@ -1,87 +1,49 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'trace'
 require_relative 'fn_helper'
-require_relative '../../app/breakpoint'
 
-class TestBreak < Test::Unit::TestCase
+class TestBreak2 < Test::Unit::TestCase
 
   include FnTestHelper
 
-  def setup
-    Trepanning::Breakpoint::reset
-  end
-
-  def test_break_same_level
-
-    # See that we can stop at a breakpoint
-    cmds = ['set basename on',
-            'break ' + (__LINE__ + 7).to_s, 
-            'continue']
+  def test_line_only_break
+    # Check that we can set breakpoints in parent, sibling and children
+    # of sibling returns. We have one more 'continue' than we need
+    # just in case something goes wrong.
+    cmds_pat = ((['break %d'] * 3) + (%w(continue) * 4)).join("\n")
+    line = __LINE__
+    cmds = (cmds_pat % [line, line+11, line+14]).split(/\n/)
     d = strarray_setup(cmds)
-    d.start
-    ########### b1 ###############
-    x = 5
-    y = 6
-    z = 7
     ##############################
-    d.stop
-    out = ['-- ',
-           'x = 5',
-           'basename is on.',
-           "Breakpoint 1 set at line 26 in file test-break.rb,\n" + 
-           "\tVM offset 55 of instruction sequence \"test_break_same_level\".",
-           'xx ',
-           'z = 7']
-    compare_output(out, d, cmds)
-
-    # Try a disabling the breakpoint
-    cmds = ['set basename on',
-            'break ' + (__LINE__ + 8).to_s, 
-            'break ' + (__LINE__ + 8).to_s, 
-            'disable 1',
-            'continue']
-    d = strarray_setup(cmds)
-    d.start
-    ########### b2 ###############
-    x = 7
-    y = 8
-    z = 8+1
+    def foo      # line +  4  
+      a = 5      # line +  5
+      b = 6      # line +  6
+    end          # line +  7
+    1.times do   # line +  8 
+      d.start    # line +  9
+      1.times do # line + 10
+        x = 11   # line + 11
+        foo      # line + 12
+      end        # line + 13
+      c = 14     # line + 14
+    end
     ##############################
-    d.stop
-    out = ['-- ',
-           'x = 7',
-           'basename is on.',
-           "Breakpoint 1 set at line 48 in file test-break.rb,\n" + 
-           "\tVM offset 55 of instruction sequence \"test_break_same_level\".",
-           "Breakpoint 2 set at line 49 in file test-break.rb,\n" + 
-           "\tVM offset 55 of instruction sequence \"test_break_same_level\".",
-           "Breakpoint 1 disabled.",
-           'xx ',
-           'z = 8+1']
+    d.stop # ({:remove => true})
+    out = ["-- ",
+           "1.times do # line + 10",
+           "Breakpoint 1 set at line 55 in file foo.rb,
+\tVM offset 55 of instruction sequence \"test_line_only_break\".",
+           "Breakpoint 2 set at line 55 in file foo.rb,
+\tVM offset 55 of instruction sequence \"block (2 levels) in test_line_only_break\".",
+           "Breakpoint 3 set at line 55 in file foo.rb,
+\tVM offset 55 of instruction sequence \"block in test_line_only_break\".",
+           "xx ",
+           "x = 11   # line + 11",
+           "xx ",
+           "c = 14     # line + 14"]
     compare_output(out, d, cmds)
-
-    # Stepping after a breakpoint should not stay at same location.
-    cmds = ['set basename on',
-            'continue ' + (__LINE__ + 8).to_s, 
-            'continue']
-    dbg = strarray_setup(cmds)
-    dbg.start
-    ########### b3 ###############
-    a = 1
-    b = 2
-    c = 3
-    d = 4
-    e = 5
-    ##############################
-    dbg.stop
-    out = ['-- ',
-           'a = 1',
-           'basename is on.',
-           'xx ',
-           'd = 4' ]
-    compare_output(out, dbg, cmds)
   end
-    
+
 end
 
+

data/test/functional/test-condition.rb

@@ -27,9 +27,8 @@ class TestBreak < Test::Unit::TestCase
     out = ['-- ',
            'x = 6',
            'basename is on.',
-           "Breakpoint 1 set at line #{__LINE__-7} in file #{file},\n" + 
-           "\tVM offset 55 of instruction sequence \"test_condition\"."
-          ]
+           "Breakpoint 1 set at line 55 in file foo.rb,
+\tVM offset 55 of instruction sequence \"test_condition\"."]
     compare_output(out, d, cmds)
 
     # Try a condition that fails
@@ -45,13 +44,13 @@ class TestBreak < Test::Unit::TestCase
     z = 8
     ##############################
     d.stop
-    out = ['-- ',
-           'x = 6',
-           'basename is on.',
-           "Breakpoint 1 set at line #{__LINE__-7} in file #{file},\n" + 
-           "\tVM offset 55 of instruction sequence \"test_condition\".",
-           'xx ',
-           'y = 7']
+    out = ["-- ",
+           "x = 6",
+           "basename is on.",
+           "Breakpoint 1 set at line 55 in file foo.rb,
+\tVM offset 55 of instruction sequence \"test_condition\".",
+           "xx ",
+           "y = 7"]
     compare_output(out, d, cmds)
   end
     

data/test/functional/test-delete.rb

@@ -29,7 +29,7 @@ class TestDelete < Test::Unit::TestCase
     out = ['-- ',
            'va = 1',
            'basename is on.',
-           "Breakpoint 1 set at line #{__LINE__-8} in file test-delete.rb,\n\tVM offset 55 of instruction sequence \"test_delete\".",
+           "Breakpoint 1 set at line 55 in file foo.rb,\n\tVM offset 55 of instruction sequence \"test_delete\".",
            "Deleted breakpoint 1."]
     compare_output(out, d, cmds)
 
@@ -57,8 +57,10 @@ class TestDelete < Test::Unit::TestCase
            "va = 1",
            "basename is on.",
            "Evaluation of unrecognized debugger commands is on.",
-           "Breakpoint 1 set at line #{__LINE__-10} in file test-delete.rb,\n\tVM offset 55 of instruction sequence \"test_delete\".",
-           "Breakpoint 2 set at line #{__LINE__-9} in file test-delete.rb,\n\tVM offset 55 of instruction sequence \"test_delete\".",
+           "Breakpoint 1 set at line 55 in file foo.rb,
+\tVM offset 55 of instruction sequence \"test_delete\".",
+           "Breakpoint 2 set at line 55 in file foo.rb,
+\tVM offset 55 of instruction sequence \"test_delete\".",
            "Deleted breakpoint 1.",
            "xx ",
            "vd = 4",

data/test/unit/test-app-disassemble.rb

@@ -50,11 +50,23 @@ local table (size: 6, argc: 1 [opts: 0, rest: -1, post: 0, block: -1] s1)
   def test_disassemble_split
     expect = {
       0=>
-      "0000 trace            8                                               (  26)",
+      '0000 trace            8                                               (  26)',
       2=>
-      "0002 trace            1                                               (  27)",
-      4=>"0004 putnil           "
+      '0002 trace            1                                               (  27)',
+      4=>'0004 putnil           '
     }
     assert_equal(expect, disassemble_split(@dis_string))
   end
+
+  # Test shortening lines via setting the maxwidth parameter
+  def test_shorten_dissassembly
+    ary = mark_disassembly(@dis_string, false, 2, [], 70)
+    assert_equal([
+'     0000 trace            8                                    (  26)',
+'     0002 trace            1                                    (  27)',
+'     0004 putnil           '],
+                 ary[3..-1])
+  end
+
+
 end

data/test/unit/test-app-run.rb

@@ -10,10 +10,6 @@ class TestAppRun < Test::Unit::TestCase
     assert_equal(true, File.executable?(ng) || ng == 'probably-does-not-exist')
     rp = ruby_path
     assert_equal(true, File.executable?(rp))
-    tup = explicit_restart_argv(ARGV)
-    assert_equal(rp, tup[0])
-    assert_equal(true, File.readable?(tup[1]))
-    assert_equal(ARGV.size + 2, tup.size)
   end
 
 end

data/test/unit/test-cmd-break.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 require 'thread_frame'
+require 'fileutils' # To test FileUtils.cp
+
 require_relative 'cmd-helper'
 
 class TestCommandBreak < Test::Unit::TestCase
@@ -28,6 +30,7 @@ class TestCommandBreak < Test::Unit::TestCase
     pc_offset = tf.pc_offset
     [[@name],
      [@name, "O#{pc_offset}"],
+     #[@name, 'FileUtils.cp']
     ].each_with_index do |args, i|
       @my_cmd.run(args)
       assert_equal(true, @cmdproc.errmsgs.empty?, @cmdproc.errmsgs)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - R. Bernstein
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -04:00
+date: 2010-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 33
-        version: "0.33"
+        - 34
+        version: "0.34"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        version: "0.2"
+        - 3
+        version: "0.3"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,7 +55,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 45
+        version: "0.45"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -130,6 +131,7 @@ files:
 - interface/base_intf.rb
 - interface/user.rb
 - io/base_io.rb
+- io/null_output.rb
 - io/string_array.rb
 - io/input.rb
 - lib/trepanning.rb
@@ -160,6 +162,7 @@ files:
 - processor/command/set_subcmd/substitute.rb
 - processor/command/set_subcmd/return.rb
 - processor/command/set_subcmd/debug.rb
+- processor/command/set_subcmd/hidelevel.rb
 - processor/command/set_subcmd/auto_subcmd/list.rb
 - processor/command/set_subcmd/auto_subcmd/irb.rb
 - processor/command/set_subcmd/auto_subcmd/eval.rb
@@ -242,6 +245,7 @@ files:
 - processor/command/show_subcmd/debug_subcmd/macro.rb
 - processor/command/show_subcmd/debug.rb
 - processor/command/show_subcmd/args.rb
+- processor/command/show_subcmd/hidelevel.rb
 - processor/command/show_subcmd/auto_subcmd/list.rb
 - processor/command/show_subcmd/auto_subcmd/irb.rb
 - processor/command/show_subcmd/auto_subcmd/eval.rb
@@ -321,7 +325,7 @@ files:
 - test/functional/test-debugger-call-bug.rb
 - test/functional/test-delete.rb
 has_rdoc: true
-homepage: http://wiki.github.com/rocky/rbdbgr
+homepage: http://wiki.github.com/rocky/rb-trepanning
 licenses: 
 - MIT
 post_install_message: 
@@ -329,13 +333,13 @@ rdoc_options:
 - --main
 - README
 - --title
-- Trepan 0.0.6 Documentation
+- Trepan 0.0.8 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - "="
+  - - ~>
     - !ruby/object:Gem::Version 
       segments: 
       - 1