trepanning 1.93.35 → 2.15.33

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

@@ -3,31 +3,31 @@ require_relative 'cmd-helper'
 require_relative '../../processor/command/list'
 
 class TestCommandParseListCmd < Test::Unit::TestCase
-  include UnitHelper
-  def setup
-    common_setup
-    @cmd = @cmds['list']
-  end
-  def test_parse_list_cmd
-    tf = RubyVM::Frame.current
-    @cmdproc.frame_setup(tf)
-    short_file = File.basename(__FILE__)
-    listsize = 10
-    line = __LINE__ - 8
-    load 'tmpdir.rb'
-    [['', [short_file, line, line+listsize-1]],
-     ["#{__FILE__}:10", [short_file, 5, 14]],
-     ["#{__FILE__} 10", [short_file, 5, 14]],
-     ['tmpdir.rb', ['tmpdir.rb', 1, listsize]],
-     ['tmpdir.rb 10', ['tmpdir.rb', 5, 5+listsize-1]],
-#     ['Columnize.columnize 15', ['columnize.rb', 10, 10+listsize -1]],
-#     ['Columnize.columnize 30 3', ['columnize.rb', 30, 32]],
-#     ['Columnize.columnize 40 50', ['columnize.rb', 40, 50]],
-    ].each do |arg_str, expect|
-      got = @cmdproc.parse_list_cmd(arg_str, listsize, listsize/2)[1..-1]
-      got[0] = File.basename(got[0])
-      assert_equal expect, got
+    include UnitHelper
+    def setup
+        common_setup
+        @cmd = @cmds['list']
     end
+    def test_parse_list_cmd
+        tf = RubyVM::Frame.get
+        @cmdproc.frame_setup(tf)
+        short_file = File.basename(__FILE__)
+        listsize = 10
+        line = __LINE__+5
+        load 'tmpdir.rb'
+        [['', [short_file, line, line+listsize-1]],
+         ["#{__FILE__}:10", [short_file, 5, 14]],
+         ["#{__FILE__} 10", [short_file, 5, 14]],
+         ['tmpdir.rb', ['tmpdir.rb', 1, listsize]],
+         ['tmpdir.rb 10', ['tmpdir.rb', 5, 5+listsize-1]],
+         ['Columnize.columnize 15', ['columnize.rb', 10, 10+listsize -1]],
+         ['Columnize.columnize 30 3', ['columnize.rb', 30, 32]],
+         ['Columnize.columnize 40 50', ['columnize.rb', 40, 50]],
+        ].each do |arg_str, expect|
+            got = @cmdproc.parse_list_cmd(arg_str, listsize, listsize/2)[1..-1]
+            got[0] = File.basename(got[0])
+            assert_equal expect, got
+        end
   end
 
 end

data/test/unit/test-io-tcpserver.rb

@@ -7,43 +7,47 @@ require_relative '../../io/tcpserver'
 
 class TestTCPDbgServer < Test::Unit::TestCase
 
-  include Trepanning::TCPPacking
+    include Trepanning::TCPPacking
 
-  def test_basic
-    server = Trepan::TCPDbgServer.new({ :open => false,
-                                        :port => 1027,
-                                        :host => 'localhost'
-                                      })
-    server.open
-    threads = []
-    msgs = %w(one two three)
-    Thread.new do
-      msgs.each do |msg|
-        begin
-          line = server.read_msg.chomp
-          assert_equal(msg, line)
-        rescue EOFError
-          puts 'Got EOF'
-          break
+    def test_basic
+        server = Trepan::TCPDbgServer.new({ :open => false,
+                                              :port => 1027,
+                                              :host => 'localhost'
+                                          })
+        server.open
+        threads = []
+        msgs = %w(one two three)
+        Thread.new do
+            msgs.each do |msg|
+                begin
+                    line = server.read_msg.chomp
+                    assert_equal(msg, line)
+                rescue EOFError
+                    puts 'Got EOF'
+                    break
+                end
+            end
         end
-      end
-    end
-    threads << Thread.new do 
-      t = TCPSocket.new('localhost', 1027)
-      msgs.each do |msg|
-        begin
-          t.puts(pack_msg(msg))
-        rescue EOFError
-          puts "Got EOF"
-          break
-        rescue Exception => e
-          puts "Got #{e}"
-          break
+        threads << Thread.new do
+            begin
+                t = TCPSocket.new('localhost', 1027)
+                msgs.each do |msg|
+                    begin
+                        t.puts(pack_msg(msg))
+                    rescue EOFError
+                        puts "Got EOF"
+                        break
+                    rescue Exception => e
+                        puts "Got #{e}"
+                        break
+                    end
+                end
+                t.close
+            rescue Errno::ECONNREFUSED
+                skip "Can't open client port 1027"
+            end
         end
-      end
-      t.close
+        threads.each {|t| t.join }
+        server.close
     end
-    threads.each {|t| t.join }
-    server.close
-  end
 end

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

@@ -4,31 +4,32 @@ require 'test/unit'
 # Test Trepan::CmdProcessor::Default
 class TestProcDefault < Test::Unit::TestCase
 
-  DIR = File.dirname(__FILE__)
-  DEFAULT_RBFILE = File.join(%W(#{DIR} .. .. processor default.rb))
+    DIR = File.dirname(__FILE__)
+    DEFAULT_RBFILE = File.join(%W(#{DIR} .. .. processor default.rb))
 
-  def test_maxwidth_setting
-    ENV['COLUMNS'] = '50'
-    Trepan::CmdProcessor.send(:remove_const, 'DEFAULT_SETTINGS') if
-      Trepan::CmdProcessor.const_defined?('DEFAULT_SETTINGS')
-    load DEFAULT_RBFILE
-    assert_equal(50, Trepan::CmdProcessor::DEFAULT_SETTINGS[:maxwidth],
-                 'Pick up COLUMNS environment')
+    def test_maxwidth_setting
+        ENV['COLUMNS'] = '50'
+        Trepan::CmdProcessor.send(:remove_const, 'DEFAULT_SETTINGS') if
+            (defined?(TestProcDefault::Trepan) &&
+             Trepan::CmdProcessor.const_defined?('DEFAULT_SETTINGS'))
+        load DEFAULT_RBFILE
+        assert_equal(50, Trepan::CmdProcessor::DEFAULT_SETTINGS[:maxwidth],
+                     'Pick up COLUMNS environment')
 
-    Trepan::CmdProcessor.send(:remove_const, 'DEFAULT_SETTINGS')
-    load DEFAULT_RBFILE
+        Trepan::CmdProcessor.send(:remove_const, 'DEFAULT_SETTINGS')
+        load DEFAULT_RBFILE
 
-    ENV['COLUMNS'] = '0'
-    assert_operator(Trepan::CmdProcessor::DEFAULT_SETTINGS[:maxwidth],
-                    :>=, 10,
-                 'Change too small COLUMNS environment value')
+        ENV['COLUMNS'] = '0'
+        assert_operator(Trepan::CmdProcessor::DEFAULT_SETTINGS[:maxwidth],
+                        :>=, 10,
+                        'Change too small COLUMNS environment value')
 
-    Trepan::CmdProcessor.send(:remove_const, 'DEFAULT_SETTINGS')
-    load DEFAULT_RBFILE
+        Trepan::CmdProcessor.send(:remove_const, 'DEFAULT_SETTINGS')
+        load DEFAULT_RBFILE
 
-    ENV['COLUMNS'] = 'non-numeric-string'
-    assert_operator(Trepan::CmdProcessor::DEFAULT_SETTINGS[:maxwidth],
-                    :>=, 10,
-                 'Change too small COLUMNS environment value')
-  end
+        ENV['COLUMNS'] = 'non-numeric-string'
+        assert_operator(Trepan::CmdProcessor::DEFAULT_SETTINGS[:maxwidth],
+                        :>=, 10,
+                        'Change too small COLUMNS environment value')
+    end
 end

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

@@ -14,8 +14,7 @@ class TestProcEval < Test::Unit::TestCase
     assert_equal('(eval "x = 1;"...)',
                  cmdp.fake_eval_filename('x = 1; y = 2', 7))
     x = 1
-    require 'thread_frame'
-    cmdp.instance_variable_set('@frame', RubyVM::Frame.current)
+    cmdp.instance_variable_set('@frame', RubyVM::Frame.get)
     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

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'thread_frame'
 require_relative '../../processor'
 require_relative '../../processor/frame'
 require_relative '../../app/mock'
@@ -34,11 +33,11 @@ class TestCmdProcessorFrame < Test::Unit::TestCase
 
   # See that we have can load up commands
   def test_basic
-    @proc.frame_setup(RubyVM::Frame.current)
+    @proc.frame_setup(RubyVM::Frame.get)
 
     # Test absolute positioning. Should all be okay
-    0.upto(@proc.top_frame.stack_size-1) do |i| 
-      @proc.adjust_frame(i, true) 
+    0.upto(@proc.top_frame.stack_size-1) do |i|
+      @proc.adjust_frame(i, true)
       assert_equal(0, $errors.size)
       assert_equal(true, $msgs.size >= i+1)
     end
@@ -53,19 +52,19 @@ class TestCmdProcessorFrame < Test::Unit::TestCase
     assert_equal(frame_index, @proc.frame_index)
 
     setup
-    @proc.top_frame  = @proc.frame = RubyVM::Frame.current
+    @proc.top_frame  = @proc.frame = RubyVM::Frame.get
     @proc.adjust_frame(0, true)
 
-    @proc.top_frame.stack_size-1.times do 
+    @proc.top_frame.stack_size-1.times do
       frame_index = @proc.frame_index
-      @proc.adjust_frame(1, false) 
+      @proc.adjust_frame(1, false)
       assert_equal(0, $errors.size)
       assert_not_equal(frame_index, @proc.frame_index,
                        '@proc.frame_index should have moved')
     end
-    # FIXME: bug in threadframe top_frame.stack_size? 
+    # FIXME: bug in threadframe top_frame.stack_size?
     # # Adjust relative beyond the end
-    # @proc.adjust_frame(1, false) 
+    # @proc.adjust_frame(1, false)
     # assert_equal(1, $errors.size)
 
     # Should have stayed at the end

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

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

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

@@ -18,11 +18,11 @@ class TestCmdProcessorLocation < Test::Unit::TestCase
     assert_equal File.basename(__FILE__), @cmdproc.canonic_file(__FILE__)
   end
 
-  def test_eval_current_source_text
+  def test_eval_get_source_text
     assert_equal File.basename(__FILE__), @cmdproc.canonic_file(__FILE__)
     eval <<-EOE
       @cmdproc.frame_initialize
-      @cmdproc.frame_setup(RubyVM::Frame.current)
+      @cmdproc.frame_setup(RubyVM::Frame.get)
       assert @cmdproc.current_source_text
     EOE
   end

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

@@ -20,14 +20,14 @@ class TestCmdProcessor < Test::Unit::TestCase
     assert @cmds.keys.size > 0, 'Should have found at least one command'
     cmd_name, cmd_obj = @cmds.first
     assert cmd_name.is_a?(String), 'Should have string name for a command'
-    assert(cmd_obj.kind_of?(Trepan::Command), 
+    assert(cmd_obj.kind_of?(Trepan::Command),
            'Command should be a Trapan::Command')
     assert cmd_obj.respond_to?(:run), 'Command should have a run method'
   end
 
   def test_compute_prompt
     assert_equal('(trepan): ', @cmdproc.compute_prompt)
-    Thread.new{ assert_equal('(trepan@55): ', @cmdproc.compute_prompt.gsub(/@\d+/, '@55'))}.join
+    Thread.new{ assert_equal('(trepan@55): ', @cmdproc.compute_prompt.gsub(/@[-]?\d+/, '@55'))}.join
     x = Thread.new{ Thread.pass; x = 1 }
     assert_equal('(trepan@main): ', @cmdproc.compute_prompt)
     x.join
@@ -59,7 +59,7 @@ class TestCmdProcessor < Test::Unit::TestCase
         assert(ary.is_a?(Array),
                "#{const} in command #{cmd_name} should be an Array")
 
-        ary.each do |v| 
+        ary.each do |v|
           assert(v.is_a?(String),
                  "#{const} in command #{cmd_name} should be Array of Strings; got #{v}.")
         end
@@ -71,9 +71,9 @@ class TestCmdProcessor < Test::Unit::TestCase
     def run_and_check(cmd, expect_msgs, expect_errmsgs, add_msg)
       $errs = []; $msgs = []
       @cmdproc.run_command(cmd)
-      assert_equal(expect_msgs, $msgs, 
+      assert_equal(expect_msgs, $msgs,
                    "#{add_msg}: mismatched messages from #{caller[0]}")
-      assert_equal(expect_errmsgs, $errs, 
+      assert_equal(expect_errmsgs, $errs,
                    "Mismatched error messages from #{caller[0]}")
     end
     def @cmdproc.msg(mess, opts={})
@@ -84,13 +84,13 @@ class TestCmdProcessor < Test::Unit::TestCase
     end
     run_and_check('!s=1', ['D=> 1'], [], "! evaluation")
     run_and_check('pr "foo"', ['"foo"'], [], "print command")
-    run_and_check('set autoeval off', 
-                  ['Evaluation of unrecognized debugger commands is off.'], [], 
+    run_and_check('set autoeval off',
+                  ['Evaluation of unrecognized debugger commands is off.'], [],
                   "autoeval set")
-    run_and_check('asdf', [], 
-                  ['Undefined command: "asdf". Try "help".'], 
+    run_and_check('asdf', [],
+                  ['Undefined command: "asdf". Try "help".'],
                   "invalid command")
-    
+
   end
 
 end

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

@@ -3,7 +3,6 @@ require 'test/unit'
 require_relative '../../processor'
 require_relative '../../processor/validate'
 require_relative '../../app/mock'
-require 'thread_frame'
 
 $errors = []
 $msgs   = []
@@ -29,22 +28,21 @@ class TestValidate < Test::Unit::TestCase
   end
 
   def test_get_int
-    [['1', 1],  ['1E', nil], ['bad', nil], ['1+1', 2], ['-5', -5]].each do 
-      |arg, expected|
-      assert_equal(expected, @cmdproc.get_int_noerr(arg))
-    end
+      [['1', 1],  ['1X', nil], ['bad', nil], ['1+1', 2], ['-5', -5]].each do
+          |arg, expected|
+          assert_equal(expected, @cmdproc.get_int_noerr(arg))
+      end
   end
 
   def test_get_on_off
-    onoff = 
-    [['1', true],  ['on', true],
-     ['0', false], ['off', false]].each do |arg, expected|
+    onoff =
+    [['on', true], ['off', false]].each do |arg, expected|
       assert_equal(expected, @cmdproc.get_onoff(arg))
     end
   end
 
   def test_parse_position
-    tf = RubyVM::Frame.current
+    tf = RubyVM::Frame.get
     @cmdproc.frame_setup(tf)
     file = File.basename(__FILE__)
     [[__FILE__, [true, file, nil, nil]],
@@ -71,7 +69,7 @@ class TestValidate < Test::Unit::TestCase
   end
 
   # def test_breakpoint_position
-  #   tf = RubyVM::Frame.current
+  #   tf = RubyVM::Frame.get
   #   @cmdproc.frame_setup(tf)
 
   #   def munge(args)
@@ -81,7 +79,7 @@ class TestValidate < Test::Unit::TestCase
 
   #   assert_equal([0, 'bogus', true, 'true', nil],
   #                munge(@cmdproc.breakpoint_position(%w(@0))))
-  #   assert_equal([1, 'bogus', false, 'true', nil], 
+  #   assert_equal([1, 'bogus', false, 'true', nil],
   #                munge(@cmdproc.breakpoint_position(%w(1))))
   #   assert_equal([2, 'bogus', false, 'a > b', nil],
   #                munge(@cmdproc.breakpoint_position(%w(2 if a > b))))
@@ -97,10 +95,10 @@ class TestValidate < Test::Unit::TestCase
   def test_method?
     def foo; 5 end
     require 'irb'
-    tf = RubyVM::Frame.current
+    tf = RubyVM::Frame.get
     @cmdproc.frame_setup(tf)
     @cmdproc.method?('@cmdproc.errmsg')
-    %w(Array.map @cmdproc.errmsg foo Trepan::CmdProcessor.new IRB.start 
+    %w(Array.map @cmdproc.errmsg foo Trepan::CmdProcessor.new IRB.start
       ).each do |str|
       assert @cmdproc.method?(str), "#{str} should be known as a method"
     end

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

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require_relative '../../processor'
-require_relative '../../app/core'
+require_relative '../../lib/trepanning.rb'
 
 # Test Trepan::CmdProcessor
 class TestSubCmdHelp < Test::Unit::TestCase

data/trepanning.gemspec

@@ -10,22 +10,17 @@ Gem::Specification.new do |spec|
   spec.authors      = ['R. Bernstein']
   spec.date         = Time.now
   spec.description = <<-EOF
-== Description
-
-A gdb-like Ruby debugger with both high and low-level debugging support.
-
-See https://github.com/rocky/rb-trepanning/wiki/Features for a list of features.
+A Ruby debugger with both high and low-level debugging support.
 
 To provide the advanced features this version works only with a
-[patched MRI Ruby 1.9.3. See http://ruby-debugger-runtime.sourceforge.net/
+patched MRI Ruby 2.1.5 runtime.
 
-This version works only with a patched version of Ruby 1.9.3
-Ruby 2.1.5, look for a version that starts with 2.1.5
+This version works only with a patched version of Ruby 2.1.5
+For a version that works with Ruby 1.9.3 look install a version
+starting with 1.93.
 EOF
-  spec.add_dependency('rb-trace', '~> 0.5')
-  spec.add_dependency('rb-threadframe', '~> 0.41')
-  spec.add_dependency('columnize', '~> 0.9')
   spec.add_dependency('redcarpet', '~> 3.2')
+  spec.add_dependency('columnize', '~> 0.9')
   spec.add_dependency('coderay', '~> 1.1')
   spec.add_dependency('term-ansicolor', '~> 1.3')
   spec.add_development_dependency('diff-lcs', '~> 0') # For testing only
@@ -39,9 +34,9 @@ EOF
   spec.name         = 'trepanning'
   spec.license      = 'MIT'
   spec.platform     = Gem::Platform::RUBY
-  spec.required_ruby_version = '~> 1.9.3'
+  spec.required_ruby_version = '~> 2.1.5'
   spec.require_path = 'lib'
-  spec.summary      = 'Enhanced Ruby 1.9.3 Debugger'
+  spec.summary      = 'Enhanced Ruby 2.1 Debugger'
   spec.version      = Trepan::VERSION
 
   # Make the readme file the start page for the generated html