trepanning 0.1.3 → 0.1.4

data/processor/validate.rb

@@ -27,12 +27,8 @@ class Trepan
     include Trepan::ThreadHelper
     include Trepan::Condition
 
-    def confirm(msg, default)
-      @settings[:confirm] ? @dbgr.intf[-1].confirm(msg, default) : true
-    end
-
-    # Like cmdfns.get_an_int(), but if there's a stack frame use that
-    # in evaluation.
+    # Check that arg is an Integer between opts[:min_value] and
+    # opts[:max_value]
     def get_an_int(arg, opts={})
       ret_value = get_int_noerr(arg)
       if !ret_value
@@ -230,7 +226,7 @@ class Trepan
         else
           errmsg "Come back later..."
         end
-      elsif @frame.iseq.source_container[1] == file 
+      elsif @frame.file == file 
         line_no, vm_offset = position_to_line_and_offset(@frame.iseq, position, 
                                                          offset_type)
         return [@frame.iseq, line_no, vm_offset] + tail
@@ -362,8 +358,9 @@ if __FILE__ == $0
     require_relative '../app/mock'
     require_relative './default'
     require_relative 'frame'
-    require_relative 'main' # Have to include before defining CmdProcessor!
-                            # FIXME
+
+    # FIXME: Have to include before defining CmdProcessor!
+    require_relative '../processor'  
 
     cmdproc = Trepan::CmdProcessor.new(Trepan::MockCore.new())
     cmdproc.frame_initialize

data/{processor/main.rb → processor.rb}

@@ -2,14 +2,12 @@
 # The main "driver" class for a command processor. Other parts of the 
 # command class and debugger command objects are pulled in from here.
 
-require 'set'
-
 %w(default breakpoint display eventbuf eval load_cmds location frame hook msg 
    running validate).each do
   |mod_str|
-  require_relative mod_str
+  require_relative "processor/#{mod_str}"
 end
-require_relative '../app/brkptmgr'
+require_relative 'app/brkptmgr'
 
 class Trepan
   class CmdProcessor < VirtualCmdProcessor
@@ -34,6 +32,7 @@ class Trepan
     attr_accessor :event           # Stop event. Same as @core.event
     attr_reader   :intf            # Current interface
                                    # Trepan::Core instance)
+    attr_reader   :interfaces      # Array of all interfaces
     attr_accessor :leave_cmd_loop  # Commands set this to signal to leave
                                    # the command loop (which often continues to 
                                    # run the debugged program). 
@@ -58,35 +57,6 @@ class Trepan
                                   #  current_thread, pc_offset]
 
 
-    unless defined?(EVENT2ICON)
-      # Event icons used in printing locations.
-      EVENT2ICON = {
-        'brkpt'          => 'xx',
-        'tbrkpt'         => 'x1',
-        'c-call'         => 'C>',
-        'c-return'       => '<C',
-        'call'           => '->',
-        'send'           => '=>',
-        'leave'          => '<=',
-        'class'          => '::',
-        'coverage'       => '[]',
-        'debugger-call'  => ':o',
-        'end'            => '-|',
-        'line'           => '--',
-        'raise'          => '!!',
-        'return'         => '<-',
-        'switch'         => 'sw',
-        'trace-var'      => '$V',
-        'unknown'        => '?!',
-        'vm'             => 'VM',
-        'vm-insn'        => '..',
-        'yield'          => '<>',
-      } 
-      # These events are important enough event that we always want to
-      # stop on them.
-      UNMASKABLE_EVENTS = Set.new(['end', 'raise', 'unknown'])
-    end
-
     def initialize(core, settings={})
       @cmd_queue       = []
       @core            = core
@@ -128,6 +98,8 @@ class Trepan
         self.send("#{submod}_initialize")
       end
       hook_initialize(commands)
+      unconditional_prehooks.insert_if_new(-1, *trace_hook) if 
+        @settings[:traceprint]
 
       # FIXME: run start file and start commands.
     end
@@ -194,11 +166,7 @@ class Trepan
               @cmd_queue.shift
             end
           if @current_command.empty? 
-            if @last_command && intf.interactive?
-              @current_command = @last_command 
-            else
-              next
-            end
+            next unless @last_command && intf.interactive?;
           end
           next if @current_command[0..0] == '#' # Skip comment lines
           break
@@ -253,8 +221,11 @@ class Trepan
                      @frame.pc_offset]
       else
         return if stepping_skip? || @stack_size <= @hide_level
+        if @settings[:traceprint]
+          step
+          return
+        end
       end
-
       @prompt = compute_prompt
 
       @leave_cmd_loop = false
@@ -376,7 +347,7 @@ end
 
 if __FILE__ == $0
   $0 = 'foo' # So we don't get here again
-  require_relative '../lib/trepanning'
+  require_relative 'lib/trepanning'
   dbg =  Trepan.new(:nx => true)
   dbg.core.processor.msg('I am main')
   cmdproc = dbg.core.processor

data/sample/rocky-trepan-colors.rb

@@ -14,7 +14,6 @@
 
 require 'rubygems'
 require 'coderay'
-require 'coderay/encoders/term'
 TERM_TOKEN_COLORS = {
   :comment => '3;37',        # sienna #8b4726
   :constant => '1;34',       # Bold Midnight Blue #191970

data/test/data/enable.cmd

@@ -1,7 +1,7 @@
 # ********************************************************
 # This tests the enable command.
 # ********************************************************
-set basename off
+set basename on
 break gcd
 # Should have a breakpoint 1
 enable 1

data/test/data/trace.cmd

@@ -0,0 +1,6 @@
+# ***************************************************
+# This file is not used, but is here to make it 
+# easy for the helper function.
+# ***************************************************
+continue
+

data/test/data/trace.right

@@ -0,0 +1,39 @@
+-- (gcd.rb:4 @2)
+def gcd(a, b)
+-- (gcd.rb:18 @2)
+a, b = ARGV[0..1].map {|arg| arg.to_i}
+-- (gcd.rb:18 @2)
+a, b = ARGV[0..1].map {|arg| arg.to_i}
+<= (gcd.rb:18 @11)
+a, b = ARGV[0..1].map {|arg| arg.to_i}
+-- (gcd.rb:19 @45)
+puts "The GCD of %d and %d is %d" % [a, b, gcd(a, b)]
+-- (gcd.rb:6 @4)
+if a > b
+-- (gcd.rb:12 @40)
+if a == 1 or b-a == 0
+METHOD Object#gcd(a, b)
+-> (gcd.rb:4 @2)
+def gcd(a, b)
+-- (gcd.rb:10 @24)
+return nil if a <= 0
+-- (gcd.rb:15 @71)
+return gcd(b-a, a)
+-- (gcd.rb:6 @4)
+if a > b
+-- (gcd.rb:12 @40)
+if a == 1 or b-a == 0
+<- (gcd.rb:13 @68)
+R=> 1
+return a
+<- (gcd.rb:16 @88)
+R=> 1
+end
+<- (gcd.rb:16 @88)
+R=> 1
+end
+<= (gcd.rb:16 @88)
+end
+The GCD of 3 and 5 is 1
+<= (gcd.rb:19 @73)
+puts "The GCD of %d and %d is %d" % [a, b, gcd(a, b)]

data/test/example/gcd.rb

@@ -3,7 +3,6 @@
 # GCD. We assume positive numbers
 def gcd(a, b)
   # Make: a <= b
-  debugger
   if a > b
     a, b = [b, a]
   end

data/test/functional/test-next.rb

@@ -65,7 +65,7 @@ class TestNext < Test::Unit::TestCase
     end
     ##############################
     d.stop # ({:remove => true})
-    out = ['-- ', 'begin']
+    out = ['-- ', 'begin', "#<ZeroDivisionError: divided by 0>", "!! ", "x = 4/0"]
     compare_output(out, d, cmds)
   end
 end

data/test/integration/helper.rb

@@ -36,6 +36,10 @@ def run_debugger(testname, ruby_file, opts={})
     if opts[:standalone]
       "%s %s %s >%s 2>&1" %
         [RbConfig.ruby, programfile, opts[:args], outfile]
+    elsif opts[:nocommand]
+      "%s %s --nx %s '%s' %s >%s 2>&1" %
+        [RbConfig.ruby, dbgr_path, opts[:dbgr], 
+         programfile, opts[:args], outfile]
     else
       "%s %s --nx --command %s %s '%s' %s >%s 2>&1" %
         [RbConfig.ruby, dbgr_path, cmdfile, opts[:dbgr], 

data/test/integration/test-trace.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require_relative 'helper'
+
+class TestTrace < Test::Unit::TestCase
+  @@NAME = File.basename(__FILE__, '.rb')[5..-1]
+  TREPAN_LOC    = /.. \(.+:\d+( @\d+)?\)/
+
+  def test_trepan_trace
+    opts = {:dbgr => '-x', :args => '3 5', :nocommand => true}
+    opts[:filter] = Proc.new{|got_lines, correct_lines|
+      got_lines.each do |line|
+        line.gsub!(/\((?:.*\/)?(.+:\d+) @/, '(\1 @') if line =~ TREPAN_LOC
+      end
+    }
+    assert_equal(true, run_debugger(@@NAME, 'gcd.rb', opts))
+  end
+end

data/test/unit/cmd-helper.rb

@@ -7,10 +7,10 @@ require_relative '../../processor/frame'
 module UnitHelper
 
   def common_setup
-    @dbg      = Trepan::MockDebugger.new(:nx => true)
-    @core     = Trepan::Core.new(@dbg)
-    @cmdproc  = @core.processor = Trepan::CmdProcessor.new(@core)
-    @cmds     = @cmdproc.commands
+    @dbg      ||= Trepan::MockDebugger.new(:nx => true)
+    @core     ||= Trepan::Core.new(@dbg)
+    @cmdproc  ||= @core.processor = Trepan::CmdProcessor.new(@core)
+    @cmds     ||= @cmdproc.commands
 
     def @cmdproc.msg(message, opts={})
       @msgs << message

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

@@ -101,7 +101,7 @@ class TestCmdParse < Test::Unit::TestCase
     end
     %w(O5).each do |str|
       meth = meth_for_string(str, binding)
-      assert_equal nil, meth, "should have found a method for #{str}"
+      assert_equal nil, meth, "should not have found a method for #{str}"
     end
   end
 end

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

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require_relative '../../app/display'
+require 'thread_frame'
+
+class TestLibAppBrkptMgr < Test::Unit::TestCase
+
+  def test_basic
+    tf = RubyVM::ThreadFrame.current
+    mgr = DisplayMgr.new
+    x = 1
+    assert_equal(0, mgr.size)
+    disp = mgr.add(tf, 'x > 1')
+    assert_equal(1, mgr.max)
+    assert_equal(true, disp.enabled?)
+    
+    mgr.enable_disable(disp.number, false)
+    assert_equal(false, disp.enabled?)
+    mgr.enable_disable(disp.number, true)
+    assert_equal(true, disp.enabled?)
+  end
+end

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

@@ -52,16 +52,20 @@ class TestAppOptions < Test::Unit::TestCase
   end
 
   def test_help_and_version_opts
-    %w(help version).each do |name|
-      setup
-      o    = ["--#{name}"]
-      rest = @opts.parse o
-      assert_not_equal('', @stdout.string)
-      assert_equal('', @stderr.string)
-      assert_equal(true, @options[name.to_sym])
-      other_sym = 'help' == name ? :version : :help
-      assert_equal(false, @options.member?(other_sym))
-    end
+    omit unless Process.respond_to?(:fork) 
+    Process.fork {
+      %w(help version).each do |name|
+        setup
+        o    = ["--#{name}"]
+        rest = @opts.parse o
+        assert_not_equal('', @stdout.string)
+        assert_equal('', @stderr.string)
+        assert_equal(true, @options[name.to_sym])
+        other_sym = 'help' == name ? :version : :help
+        assert_equal(false, @options.member?(other_sym))
+      end
+    }
+    Process.wait
   end
 
   def test_both_client_server_opts

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

@@ -4,10 +4,16 @@ require_relative '../../app/run'
 
 class TestAppRun < Test::Unit::TestCase
   include Trepanning
-  def test_basic
+  def test_whence
     assert_equal(true, File.executable?(whence_file('irb')))
     ng = whence_file('probably-does-not-exist')
     assert_equal(true, File.executable?(ng) || ng == 'probably-does-not-exist')
   end
 
+  def test_ruby_syntax_errors
+    assert_nil ruby_syntax_errors __FILE__
+    readme = File.join(File.dirname(__FILE__), %w(.. .. README.textile))
+    assert ruby_syntax_errors(readme)
+  end
+
 end

data/test/unit/test-base-subcmd.rb

@@ -2,7 +2,7 @@
 require 'test/unit'
 require_relative '../../app/core'
 require_relative '../../app/mock'
-require_relative '../../processor/main'
+require_relative '../../processor'
 require_relative '../../processor/command/exit'
 require_relative '../../processor/command/base/subcmd'
 

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

@@ -23,10 +23,17 @@ class TestCommandKill < Test::Unit::TestCase
   end
   
   def test_kill_command
-      @cmd.run([@name, 'foo'])
-      assert_equal(false,  @cmd.proc.leave_cmd_loop)
-      assert_equal(1, @cmd.instance_variable_get('@errmsgs').size)
-      
+    assert_equal(['unconditionally'], @cmd.complete('uncon'))
+
+    if Signal.list.member?('HUP')
+      assert_equal(['hup'], @cmd.complete('hu'))
+      assert_equal(['HUP'], @cmd.complete('HU'))
+    end
+
+    @cmd.run([@name, 'foo'])
+    assert_equal(false,  @cmd.proc.leave_cmd_loop)
+    assert_equal(1, @cmd.instance_variable_get('@errmsgs').size)
+    
     if false
       save_trap = Signal.trap(10) {
         @success = true

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

@@ -24,7 +24,7 @@ class TestCommandParseListCmd < Test::Unit::TestCase
      ['Columnize.columnize 30 3', ['columnize.rb', 30, 32]],
      ['Columnize.columnize 40 50', ['columnize.rb', 40, 50]],
     ].each do |arg_str, expect|
-      got = @cmd.parse_list_cmd(arg_str, listsize, listsize/2)[1..-1]
+      got = @cmdproc.parse_list_cmd(arg_str, listsize, listsize/2)[1..-1]
       got[0] = File.basename(got[0])
       assert_equal expect, got
     end

data/test/unit/{test-base-cmd.rb → test-command.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require_relative '../../processor/command/base/cmd'
+require_relative '../../processor/command'
 
 class Trepan::Command::Test < Trepan::Command
   NAME = 'test'

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

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require_relative '../../processor/main' # Have to include before frame!
-                                        # FIXME
+require_relative '../../processor'
 require_relative '../../processor/eval'
 require_relative '../../app/mock'
 

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

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 require 'thread_frame'
-require_relative '../../processor/main' # Have to include before frame!
-                                        # FIXME
+require_relative '../../processor'
 require_relative '../../processor/frame'
 require_relative '../../app/mock'
 

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

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require_relative '../../processor'
+require_relative '../../processor/list'
+require_relative '../../app/mock'
+
+# Test Trepan::CmdProcessor List portion
+class TestProcList < Test::Unit::TestCase
+
+  def setup
+    $errors = []
+    $msgs   = []
+    @proc    = Trepan::CmdProcessor.new(Trepan::MockCore.new())
+    @proc.frame_index = 0
+    @proc.frame_initialize
+    class << @proc
+      def msg(msg)
+        $msgs << msg
+      end
+      def errmsg(msg)
+        $errors << msg
+      end
+      def print_location
+        # $msgs << "#{@frame.source_container} #{@frame.source_location[0]}"
+        $msgs << "#{@frame.source_container} "
+        # puts $msgs
+      end
+    end
+  end
+
+  def test_basic
+    @proc.frame_setup(RubyVM::ThreadFrame.current)
+
+    def foo; 5 end
+    def check(cmdp, arg, last=10)
+      r =  cmdp.parse_list_cmd('.', last)
+      assert r[1]
+      assert r[2]
+      assert r[3]
+    end
+    check(@proc, '-')
+    check(@proc, 'foo')
+    check(@proc, '@0')
+    check(@proc, "#{__LINE__}")
+    check(@proc, "#{__FILE__}   @0")
+    check(@proc, "#{__FILE__}:#{__LINE__}")
+    check(@proc, "#{__FILE__} #{__LINE__}")
+    check(@proc, "#{__FILE__} #{__LINE__}", -10)
+    check(@proc, "@proc.errmsg")
+    check(@proc, "@proc.errmsg:@0")
+  end
+end

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require_relative '../../processor/main'
+require_relative '../../processor'
 require_relative '../../app/mock'
 
 class TestCmdProcessorLoadCmds < Test::Unit::TestCase

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

@@ -1,17 +1,24 @@
 #!/usr/bin/env ruby
 require_relative 'cmd-helper'
 
-# Test Debugger:CmdProcessor Location portion
-class TestProcLocation < Test::Unit::TestCase
+# Test Debugger:CmdProcessor location portion
+class TestCmdProcessorLocation < Test::Unit::TestCase
 
   include UnitHelper
   def setup
     common_setup
-    @name = File.basename(__FILE__, '.rb').split(/-/)[2]
+    @name ||= File.basename(__FILE__, '.rb').split(/-/)[2]
     @cmdproc.settings[:basename] = true
   end
 
-  def test_it
+  def test_canonic_file
+    @cmdproc.settings[:basename] = false
+    assert_equal File.expand_path(__FILE__), @cmdproc.canonic_file(__FILE__)
+    @cmdproc.settings[:basename] = true
+    assert_equal File.basename(__FILE__), @cmdproc.canonic_file(__FILE__)
+  end
+
+  def test_eval_current_source_text
     assert_equal File.basename(__FILE__), @cmdproc.canonic_file(__FILE__)
     eval <<-EOE
       @cmdproc.frame_initialize

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 require_relative '../../app/mock'
-require_relative '../../processor/main'
+require_relative '../../processor'
 require_relative '../../app/core'
 
 # Test Trepan:CmdProcessor

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

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require_relative '../../processor/main' # Have to include before validate!
-                                        # FIXME
+require_relative '../../processor'
 require_relative '../../processor/validate'
 require_relative '../../app/mock'
 require 'thread_frame'

data/test/unit/test-subcmd-help.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require_relative '../../processor/main'
+require_relative '../../processor'
 require_relative '../../app/core'
 
 # Test Trepan::CmdProcessor

data/trepanning.gemspec

@@ -22,7 +22,7 @@ EOF
   spec.add_dependency('rb-trace', '>= 0.5')
   spec.add_dependency('linecache-tf', '>= 1.0')
   spec.add_dependency('columnize')
-  spec.add_dependency('diff-lcs') # For testing only
+  spec.add_development_dependency('diff-lcs') # For testing only
   spec.author       = 'R. Bernstein'
   spec.bindir       = 'bin'
   spec.email        = 'rockyb@rubyforge.net'