trepanning 0.1.4 → 0.1.6

data/processor/running.rb

@@ -169,7 +169,7 @@ class Trepan
         @different_pos = @settings[:different]
         @stop_events   = nil
       end
-
+      
       return skip_val
     end
 

data/processor/validate.rb

@@ -366,7 +366,7 @@ if __FILE__ == $0
     cmdproc.frame_initialize
     cmdproc.instance_variable_set('@settings', 
                                Trepan::CmdProcessor::DEFAULT_SETTINGS)
-    cmdproc.frame_setup(RubyVM::ThreadFrame.current)
+    cmdproc.frame_setup(RubyVM::Frame.current)
     onoff = %w(1 0 on off)
     onoff.each { |val| puts "onoff(#{val}) = #{cmdproc.get_onoff(val)}" }
     %w(1 1E bad 1+1 -5).each do |val| 

data/test/example/factorial.rb

@@ -0,0 +1,10 @@
+def factorial(n)
+  if n > 0
+    return n * factorial(n-1)
+  else
+    return 1
+  end
+end
+n = ARGV[0] || 5
+puts "#{n}! is #{factorial(5)}"
+

data/test/example/gcd1.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'thread_frame'
-tf = RubyVM::ThreadFrame.current
+tf = RubyVM::Frame.current
 iseq = tf.iseq
 p iseq.child_iseqs
 puts iseq.disassemble

data/test/functional/fn_helper.rb

@@ -37,7 +37,7 @@ module FnTestHelper
 
   # Return the caller's line number
   def get_lineno
-    RubyVM::ThreadFrame.current.prev.source_location[0]
+    RubyVM::Frame.current.prev.source_location[0]
   end
 
   def compare_output(right, d, debugger_cmds)

data/test/functional/test-recursive-bt.rb

@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require 'trace'
+require_relative 'fn_helper'
+
+class TestRecursiveBt < Test::Unit::TestCase
+
+  include FnTestHelper
+
+  def test_recursive_backtrace
+
+    cmds = [
+            'set events line',
+            'set basename on',
+            'step',
+            'bt 1',
+            'step',
+            'step',
+            'bt 2',
+            'step',
+            'step',
+            'bt 3',
+            'step',
+            'step',
+            'step',
+            'bt 5',
+            'step',
+            'step',
+            'step',
+            'bt 7',
+            ]
+    d = strarray_setup(cmds)
+    d.start
+    ##############################
+    def factorial(n)
+      if n > 0
+        return n * factorial(n-1)
+      else
+        return 1
+      end
+    end
+    z = factorial(5)
+    ##############################
+    d.stop
+    out = 
+      ["-- ",
+       "def factorial(n)",
+       "Trace events we may stop on:",
+       "\tbrkpt, line",
+       "basename is on.",
+       "-- ",
+       "z = factorial(5)",
+       "--> #0 METHOD TestRecursiveBt#test_recursive_backtrace() in file test-recursive-bt.rb at line 42",
+       "(More stack frames follow...)",
+       "-- ",
+       "if n > 0",
+       "-- ",
+       "return n * factorial(n-1)",
+       "--> #0 METHOD TestRecursiveBt#factorial(n) in file test-recursive-bt.rb at line 37",
+       "    #1 METHOD TestRecursiveBt#test_recursive_backtrace() in file test-recursive-bt.rb at line 42",
+       "(More stack frames follow...)",
+       "-- ",
+       "if n > 0",
+       "-- ",
+       "return n * factorial(n-1)",
+       "--> #0 METHOD TestRecursiveBt#factorial(n) in file test-recursive-bt.rb at line 37",
+       "    #1 METHOD TestRecursiveBt#factorial(n) in file test-recursive-bt.rb at line 37",
+       "    #2 METHOD TestRecursiveBt#test_recursive_backtrace() in file test-recursive-bt.rb at line 42",
+       "(More stack frames follow...)",
+       "-- ",
+       "if n > 0",
+       "-- ",
+       "return n * factorial(n-1)",
+       "-- ",
+       "if n > 0",
+       "--> #0 METHOD TestRecursiveBt#factorial(n) in file test-recursive-bt.rb at line 36",
+       "    #1 METHOD TestRecursiveBt#factorial(n) in file test-recursive-bt.rb at line 37",
+       "... above line repeated 2 times",
+       "    #4 METHOD TestRecursiveBt#test_recursive_backtrace() in file test-recursive-bt.rb at line 42",
+       "(More stack frames follow...)",
+       "-- ",
+       "return n * factorial(n-1)",
+       "-- ",
+       "if n > 0",
+       "-- ",
+       "return n * factorial(n-1)",
+       "--> #0 METHOD TestRecursiveBt#factorial(n) in file test-recursive-bt.rb at line 37",
+       "    #1 METHOD TestRecursiveBt#factorial(n) in file test-recursive-bt.rb at line 37",
+       "... above line repeated 3 times",
+       "    #5 METHOD TestRecursiveBt#test_recursive_backtrace() in file test-recursive-bt.rb at line 42",
+       "    #6 METHOD TestRecursiveBt#run(runner) in file unit.rb at line xxx",
+       "(More stack frames follow...)",
+       "-- ",
+       "if n > 0",
+       "-- ",
+       "return 1",
+       "-- ",
+       "d.stop"]
+    d.intf[-1].output.output[-8].sub!(/at line \d+$/, 'at line xxx')
+    compare_output(out, d, cmds)
+
+  end
+end

data/test/functional/test-remap.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require 'trace'
+require_relative 'fn_helper'
+
+class TestRemap < Test::Unit::TestCase
+
+  include FnTestHelper
+
+  def test_remap
+    skip "Not sure what this one was supposed to test - Investigate."
+    cmds = [
+            'step',
+            'list',
+            ]
+    d = strarray_setup(cmds)
+    d.start
+    ##############################
+    require 'date'
+    ##############################
+    d.stop
+    out = [
+           '-- ',
+           "require 'date'",
+           'METHOD TestRemap#require(path)',
+           '-> ',
+           'def require(path) # :doc:',
+           ' 20    	  #   is.',
+           ' 21    	  # * Otherwise, installed gems are searched for a file that matches.',
+           " 22    	  #   If it's found in gem 'y', that gem is activated (added to the",
+           ' 23    	  #   loadpath).',
+           ' 24    	  #',
+           ' 25    	  # The normal <tt>require</tt> functionality of returning false if',
+           ' 26    	  # that file has already been loaded is preserved.',
+           ' 27    	',
+           ' 28  ->	  def require(path) # :doc:',
+           ' 29    	    gem_original_require path',
+           '-- ',
+           'gem_original_require path',
+           '<- ',
+           'R=> false',
+           'end',
+           '-- ',
+           'd.stop'
+          ]
+    compare_output(out, d, cmds)
+
+  end
+  
+end

data/test/integration/test-remote.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require_relative 'helper'
+
+class TestQuit < Test::Unit::TestCase
+  @@NAME = File.basename(__FILE__, '.rb')[5..-1]
+
+  def test_trepan_call
+    skip('need a usable fork to run this') unless Process.respond_to?(:fork) 
+    skip('Not ready for prime time yet')
+    cmdfile = File.join(File.dirname(__FILE__), '../data/quit.cmd')
+    child = fork
+    if child
+      ## FIXME: client doesn't work with cmdfile yet.
+      serveropts = {:dbgr => '--client', :cmdfile => cmdfile}
+      run_debugger(@@NAME, 'gcd.rb', serveropts)
+      Process.wait
+    else
+      clientopts = {:dbgr => '--server', :nocommand => true}
+      run_debugger(@@NAME, 'gcd.rb', clientopts)
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ require 'thread_frame'
 class TestAppBrkpt < Test::Unit::TestCase
 
   def test_basic
-    tf = RubyVM::ThreadFrame.current
+    tf = RubyVM::Frame.current
     iseq = tf.iseq
     b1 = Trepan::Breakpoint.new(iseq, 0)
     assert_equal(false, b1.temp?)

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

@@ -11,7 +11,7 @@ class TestLibAppBrkptMgr < Test::Unit::TestCase
   end
 
   def test_basic
-    tf = RubyVM::ThreadFrame.current
+    tf = RubyVM::Frame.current
     iseq = tf.iseq
     offsets = iseq.offsetlines.keys
     offset  = offsets[0]
@@ -32,7 +32,7 @@ class TestLibAppBrkptMgr < Test::Unit::TestCase
   end
 
   def test_multiple_brkpt_per_offset
-    tf = RubyVM::ThreadFrame.current
+    tf = RubyVM::Frame.current
     iseq = tf.iseq
     offsets = iseq.offsetlines.keys
     offset  = offsets[0]

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

@@ -6,7 +6,7 @@ require 'thread_frame'
 class TestLibAppBrkptMgr < Test::Unit::TestCase
 
   def test_basic
-    tf = RubyVM::ThreadFrame.current
+    tf = RubyVM::Frame.current
     mgr = DisplayMgr.new
     x = 1
     assert_equal(0, mgr.size)

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

@@ -8,19 +8,19 @@ class TestAppFrame < Test::Unit::TestCase
   include Trepan::Frame
 
   def test_app_frame
-    frame = RubyVM::ThreadFrame.current
+    frame = RubyVM::Frame.current
     base_count = frame.stack_size
     s = format_stack_entry(frame)
     pat = /^METHOD .*#test_app_frame\(\) in file .*test-app-frame.rb at line \d+/
     assert(s =~ pat, "got #{s}, expected pat #{pat}")
     1.times do 
-      assert_equal(base_count+2, RubyVM::ThreadFrame.current.stack_size)
+      assert_equal(base_count+2, RubyVM::Frame.current.stack_size)
       s = format_stack_entry(frame)
       assert(s =~ pat, "got #{s}, expected pat #{pat}")
     end
 
     def inner_test(count)
-      frame = RubyVM::ThreadFrame.current
+      frame = RubyVM::Frame.current
       assert_equal(count, frame.stack_size)
 
       s = format_stack_entry(frame)

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

@@ -52,7 +52,7 @@ class TestAppOptions < Test::Unit::TestCase
   end
 
   def test_help_and_version_opts
-    omit unless Process.respond_to?(:fork) 
+    skip('need a working fork') unless Process.respond_to?(:fork) 
     Process.fork {
       %w(help version).each do |name|
         setup

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

@@ -18,7 +18,7 @@ class TestCommandBreak < Test::Unit::TestCase
 
   # require_relative '../../lib/trepanning'
   def test_basic
-    tf = RubyVM::ThreadFrame.current
+    tf = RubyVM::Frame.current
     @cmdproc.frame_setup(tf)
     [
      [@name,  __LINE__.to_s],
@@ -66,7 +66,7 @@ class TestCommandBreak < Test::Unit::TestCase
     # require_relative '../../lib/trepanning'
     line = __LINE__  # This is the line we set the breakpoint for.
     1.times do
-      tf = RubyVM::ThreadFrame.current  
+      tf = RubyVM::Frame.current  
       @cmdproc.frame_setup(tf)
       run_cmd(@my_cmd, [@name, line.to_s])
       assert_equal(true, @cmdproc.errmsgs.empty?, @cmdproc.errmsgs)

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

@@ -34,7 +34,7 @@ class TestCommandEnableDisable < Test::Unit::TestCase
       reset_cmdproc_vars
     end
 
-    tf = RubyVM::ThreadFrame.current
+    tf = RubyVM::Frame.current
     @cmdproc.frame_setup(tf)
     pc_offset = tf.pc_offset
     @break_cmd.run(['break'])

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

@@ -9,7 +9,7 @@ class TestCommandParseListCmd < Test::Unit::TestCase
     @cmd = @cmds['list']
   end
   def test_parse_list_cmd
-    tf = RubyVM::ThreadFrame.current
+    tf = RubyVM::Frame.current
     @cmdproc.frame_setup(tf)
     short_file = File.basename(__FILE__)
     listsize = 10

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

@@ -10,6 +10,7 @@ class TestCommandQuit < Test::Unit::TestCase
   end
 
   def test_basic
+    skip('need a working fork') unless Process.respond_to?(:fork) 
     pid = fork { @cmd.run([@name, '10']) }
     Process.wait
     assert_equal(10, $?.exitstatus)

data/test/unit/test-cmd-set-auto-eval.rb.try

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require_relative '../../processor/command/set_subcmd/auto'
+require_relative '../../processor/mock'
+
+class TestCommandStep < Test::Unit::TestCase
+
+  include MockDebugger
+  def test_set_autoeval_save
+    dbgr, cmd = Trepan::MockDebugger::setup('set', false)
+    cmds = dbgr.core.processor.commands
+    set_cmd = cmds['set']
+    auto_cmd = Trepan::SubSubcommand::SetAuto.new(dbgr.core.processor, 
+                                               set_cmd)
+    eval_cmd = Trepan::SubSubcommand::SetAutoEval.new(cmd, auto_cmd, 'eval');
+    eval_cmd.run([eval_cmd.name, 'on'])
+    assert_equal(["set auto eval on"], eval_cmd.save_command)
+  end
+end

data/test/unit/test-proc-eval.rb

@@ -15,7 +15,7 @@ class TestProcEval < Test::Unit::TestCase
                  cmdp.fake_eval_filename('x = 1; y = 2', 7))
     x = 1
     require 'thread_frame'
-    cmdp.instance_variable_set('@frame', RubyVM::ThreadFrame.current)
+    cmdp.instance_variable_set('@frame', RubyVM::Frame.current)
     cmdp.instance_variable_set('@settings', {:stack_trace_on_error => true})
     assert_equal('1', cmdp.debug_eval('x = "#{x}"'))
     x = 2

data/test/unit/test-proc-frame.rb

@@ -34,7 +34,7 @@ class TestCmdProcessorFrame < Test::Unit::TestCase
 
   # See that we have can load up commands
   def test_basic
-    @proc.frame_setup(RubyVM::ThreadFrame.current)
+    @proc.frame_setup(RubyVM::Frame.current)
 
     # Test absolute positioning. Should all be okay
     0.upto(@proc.top_frame.stack_size-1) do |i| 
@@ -53,7 +53,7 @@ class TestCmdProcessorFrame < Test::Unit::TestCase
     assert_equal(frame_index, @proc.frame_index)
 
     setup
-    @proc.top_frame  = @proc.frame = RubyVM::ThreadFrame.current
+    @proc.top_frame  = @proc.frame = RubyVM::Frame.current
     @proc.adjust_frame(0, true)
 
     @proc.top_frame.stack_size-1.times do 

data/test/unit/test-proc-list.rb

@@ -29,7 +29,7 @@ class TestProcList < Test::Unit::TestCase
   end
 
   def test_basic
-    @proc.frame_setup(RubyVM::ThreadFrame.current)
+    @proc.frame_setup(RubyVM::Frame.current)
 
     def foo; 5 end
     def check(cmdp, arg, last=10)

data/test/unit/test-proc-location.rb

@@ -22,7 +22,7 @@ class TestCmdProcessorLocation < Test::Unit::TestCase
     assert_equal File.basename(__FILE__), @cmdproc.canonic_file(__FILE__)
     eval <<-EOE
       @cmdproc.frame_initialize
-      @cmdproc.frame_setup(RubyVM::ThreadFrame.current)
+      @cmdproc.frame_setup(RubyVM::Frame.current)
       assert @cmdproc.current_source_text
     EOE
   end

data/test/unit/test-proc-validate.rb

@@ -44,7 +44,7 @@ class TestValidate < Test::Unit::TestCase
   end
 
   def test_parse_position
-    tf = RubyVM::ThreadFrame.current
+    tf = RubyVM::Frame.current
     @cmdproc.frame_setup(tf)
     file = File.basename(__FILE__)
     [[__FILE__, [true, file, nil, nil]],
@@ -71,7 +71,7 @@ class TestValidate < Test::Unit::TestCase
   end
 
   # def test_breakpoint_position
-  #   tf = RubyVM::ThreadFrame.current
+  #   tf = RubyVM::Frame.current
   #   @cmdproc.frame_setup(tf)
 
   #   def munge(args)
@@ -97,7 +97,7 @@ class TestValidate < Test::Unit::TestCase
   def test_method?
     def foo; 5 end
     require 'irb'
-    tf = RubyVM::ThreadFrame.current
+    tf = RubyVM::Frame.current
     @cmdproc.frame_setup(tf)
     @cmdproc.method?('@cmdproc.errmsg')
     %w(Array.map @cmdproc.errmsg foo Trepan::CmdProcessor.new IRB.start 

data/trepanning.gemspec

@@ -14,12 +14,12 @@ A modular, testable, Ruby debugger using some of the best ideas from ruby-debug,
 
 Some of the core debugger concepts have been rethought. As a result, some of this may be experimental.
 
-This version works only with a patched version of Ruby 1.9.2 and rb-threadframe.
+This version works only with a patched version of Ruby 1.9.2 or Ruby 1.9.3 and rb-threadframe.
 
 See also rbx-trepanning for a version that works with Rubinius.
 EOF
-  spec.add_dependency('rb-threadframe', '>= 0.38')
-  spec.add_dependency('rb-trace', '>= 0.5')
+  spec.add_dependency('rb-threadframe', '>= 0.39.9')
+  spec.add_dependency('rb-trace', '>= 0.5.9')
   spec.add_dependency('linecache-tf', '>= 1.0')
   spec.add_dependency('columnize')
   spec.add_development_dependency('diff-lcs') # For testing only
@@ -34,8 +34,8 @@ EOF
   spec.license      = 'MIT'
   spec.platform     = Gem::Platform::RUBY
   spec.require_path = 'lib'
-  spec.required_ruby_version = '~> 1.9.2frame'
-  spec.summary      = 'Modular Ruby 1.9.2 Debugger'
+  # spec.required_ruby_version = '~> 1.9.2frame'
+  spec.summary      = 'Modular Ruby 1.9.2 or 1.9.3 Debugger'
   spec.version      = Trepan::VERSION
 
   # Make the readme file the start page for the generated html