trepanning 0.0.9 → 0.1.0

data/test/functional/tmp/b3.rb

@@ -0,0 +1,5 @@
+    a = 1
+    b = 2
+    c = 3
+    d = 4
+    e = 5

data/test/functional/tmp/immediate-bug1.rb

@@ -0,0 +1,9 @@
+# require_relative '../../../lib/rbdbgr'
+require 'rbdbgr'
+# cmds = ['step', 'continue']
+d = Debugger.new
+    2.times do 
+      x = 1
+      d.debugger(:immediate => true)
+      y = 2
+    end

data/test/integration/helper.rb

@@ -32,25 +32,28 @@ def run_debugger(testname, ruby_file, opts={})
 
   FileUtils.rm(outfile) if File.exist?(outfile)
 
-  cmd = "%s %s --nx --command %s %s '%s' %s >%s" %
-    [Trepanning::ruby_path, dbgr_path, cmdfile, opts[:dbgr], 
-     programfile, opts[:args], outfile]
+  cmd = 
+    if opts[:standalone]
+      "%s %s %s >%s 2>&1" %
+        [Trepanning::ruby_path, programfile, opts[:args], outfile]
+    else
+      "%s %s --nx --command %s %s '%s' %s >%s 2>&1" %
+        [Trepanning::ruby_path, dbgr_path, cmdfile, opts[:dbgr], 
+         programfile, opts[:args], outfile]
+    end
   
   system(cmd)
   return false unless 0 == $?.exitstatus 
   if opts[:do_diff]
-    from_file  = rightfile
-    # fromdate  = time.ctime(os.stat(fromfile).st_mtime)
-    from_lines = File.open(from_file).readlines()
-    to_file    = outfile
-    # todate    = time.ctime(os.stat(tofile).st_mtime)
-    to_lines   = File.open(to_file).readlines()
+    expected_lines = File.open(rightfile).readlines()
+    got_lines      = File.open(outfile).readlines()
+    opts[:filter].call(got_lines, expected_lines) if opts[:filter]
     
     # Seems to be a bug in LCS in that it will return a diff even if two
     # files are the same.
-    return true if from_lines == to_lines
+    return true if expected_lines == got_lines
     
-    sdiffs = Diff::LCS.sdiff(from_lines, to_lines)
+    sdiffs = Diff::LCS.sdiff(expected_lines, got_lines)
     
     if sdiffs.empty?
       FileUtils.rm(outfile)

data/test/integration/test-fname-with-blank.rb

@@ -6,6 +6,10 @@ class TestFnameWithBlank < Test::Unit::TestCase
   @@NAME = File.basename(__FILE__, '.rb')[5..-1]
 
   def test_it
-    assert_equal(true, run_debugger(@@NAME, 'fname with blank.rb'))
+    opts = {}
+    opts[:filter] = Proc.new{|got_lines, correct_lines|
+      got_lines[0] = "-> (fname with blank.rb:1 @0)\n"
+    }
+    assert_equal(true, run_debugger(@@NAME, 'fname with blank.rb', opts))
   end
 end

data/test/integration/test-quit.rb

@@ -5,7 +5,11 @@ require_relative 'helper'
 class TestQuit < Test::Unit::TestCase
   @@NAME = File.basename(__FILE__, '.rb')[5..-1]
 
-  def test_it
-    assert_equal(true, run_debugger(@@NAME, 'null.rb'))
+  def test_trepan_call
+    opts = {}
+    opts[:filter] = Proc.new{|got_lines, correct_lines|
+      got_lines[0] = "-> (null.rb:1 @0)\n"
+    }
+    assert_equal(true, run_debugger(@@NAME, 'null.rb', opts))
   end
 end

data/test/unit/cmd-helper.rb

@@ -1,3 +1,5 @@
+require 'test/unit'
+require 'thread_frame'
 require_relative '../../app/core'
 require_relative '../../app/mock'
 require_relative '../../processor/main' # Have to include before frame!
@@ -13,17 +15,20 @@ module UnitHelper
     @cmdproc  = @core.processor = Trepan::CmdProcessor.new(@core)
     @cmds     = @cmdproc.commands
 
-    def @cmdproc.msg(message)
+    def @cmdproc.msg(message, opts={})
       @msgs << message
     end
-    def @cmdproc.errmsg(message)
+    def @cmdproc.msgs
+      @msgs
+    end
+    def @cmdproc.errmsg(message, opts={})
       @errmsgs << message
     end
     def @cmdproc.errmsgs
       @errmsgs
     end
-    def @cmdproc.msgs
-      @msgs
+    def @cmdproc.section(message, opts={})
+      @msgs << message
     end
     reset_cmdproc_vars
   end

data/test/unit/mock-helper.rb

@@ -0,0 +1,9 @@
+require 'test/unit'
+require_relative '../../processor/mock'
+
+module MockUnitHelper
+  def common_setup(name)
+    @dbg, @cmd = MockDebugger::setup(name, false)
+  end
+end
+

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

@@ -8,7 +8,7 @@ class TestAppBrkpt < Test::Unit::TestCase
   def test_basic
     tf = RubyVM::ThreadFrame.current
     iseq = tf.iseq
-    b1 = Trepanning::Breakpoint.new(iseq, 0)
+    b1 = Trepan::Breakpoint.new(iseq, 0)
     assert_equal(false, b1.temp?)
     assert_equal(0, b1.hits)
     assert_equal('B', b1.icon_char)
@@ -18,13 +18,13 @@ class TestAppBrkpt < Test::Unit::TestCase
     b1.enabled = false
     assert_equal('b', b1.icon_char)
     assert_raises TypeError do 
-      Trepanning::Breakpoint.new(iseq, iseq.iseq_size, :temp => true)
+      Trepan::Breakpoint.new(iseq, iseq.iseq_size, :temp => true)
     end
     assert_raises TypeError do 
-      Trepanning::Breakpoint.new(0, 5)
+      Trepan::Breakpoint.new(0, 5)
     end
     require_relative '../../lib/trepanning.rb'
-    b2 = Trepanning::Breakpoint.new(iseq, 0, :temp => true)
+    b2 = Trepan::Breakpoint.new(iseq, 0, :temp => true)
     assert_equal('t', b2.icon_char)
   end
 end

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

@@ -7,7 +7,7 @@ require 'thread_frame'
 class TestLibAppBrkptMgr < Test::Unit::TestCase
 
   def setup
-    @brkpts = BreakpointMgr.new
+    @brkpts = Trepan::BreakpointMgr.new
   end
 
   def test_basic
@@ -24,7 +24,7 @@ class TestLibAppBrkptMgr < Test::Unit::TestCase
     assert_equal(0, @brkpts.size)
 
     # Try adding via << rather than .add
-    b2 = @brkpts << Trepanning::Breakpoint.new(iseq, offsets[1], :temp => true)
+    b2 = @brkpts << Trepan::Breakpoint.new(iseq, offsets[1], :temp => true)
 
     assert_equal(nil, @brkpts.find(iseq, offset, tf.binding))
     @brkpts.reset

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

@@ -26,7 +26,6 @@ class TestAppFile < Test::Unit::TestCase
 
   def test_find_iseqs
     iseqs = find_iseqs(ISEQS__, "tmpdir")
-    p ISEQS__.keys
     assert_equal(false, iseqs.empty?)
     iseqs = find_iseqs(ISEQS__, "tmpdir@#{__FILE__}")
     assert_equal(true, iseqs.empty?)

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

@@ -7,15 +7,14 @@ require_relative '../../app/options'
 # To have something to work with.
 load 'tmpdir.rb'
 
-class TestAppStringIO < Test::Unit::TestCase
-  include Trepanning
+class TestAppOptions < Test::Unit::TestCase
 
   def setup
-    @options = DEFAULT_CMDLINE_SETTINGS.clone
+    @options = Trepan::DEFAULT_CMDLINE_SETTINGS.clone
     @stderr  = StringIO.new
     @stdout  = StringIO.new
-    @options = copy_default_options
-    @opts = setup_options(@options, @stdout, @stderr)
+    @options = Trepan::copy_default_options
+    @opts    = Trepan::setup_options(@options, @stdout, @stderr)
   end
 
   def test_cd
@@ -57,4 +56,26 @@ class TestAppStringIO < Test::Unit::TestCase
     end
   end
 
+  def test_both_client_server_opts
+    # Try each of --client and --server options separately
+    %w(client server).each do |name|
+      setup
+      o    = ["--#{name}"]
+      rest = @opts.parse o
+      assert_equal('', @stdout.string)
+      assert_equal('', @stderr.string)
+      assert_equal(true, @options[name.to_sym])
+    end
+
+    # Try both --client and --server together. Should give a warning
+    setup
+    o    = %w(--client  --server)
+    rest = @opts.parse o
+    assert_not_equal('', @stderr.string)
+    assert_equal('', @stdout.string)
+    assert_equal(true, @options[:client])
+    assert_equal(false, @options[:server])
+    
+  end
+
 end

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

@@ -12,7 +12,6 @@ end
 $errors = []
 class TestBaseCommandHelp < Test::Unit::TestCase
 
-  Trepan::Subcommand.const_set(:NAME, 'bogus')
   def setup
     $errors   = []
     $msgs     = []

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'test/unit'
 require_relative 'cmd-helper'
 require_relative '../../processor/command/alias'
 require_relative '../../processor/command/unalias'

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

@@ -1,8 +1,4 @@
 #!/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

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'test/unit'
 require_relative 'cmd-helper'
 require_relative '../../app/breakpoint'
 
@@ -7,7 +6,7 @@ class TestCommandEnableDisable < Test::Unit::TestCase
 
   include UnitHelper
   def setup
-    Trepanning::Breakpoint::reset
+    Trepan::Breakpoint::reset
     common_setup
     @break_cmd   = @cmds['break']
     @disable_cmd = @cmds['disable']
@@ -35,7 +34,6 @@ class TestCommandEnableDisable < Test::Unit::TestCase
       reset_cmdproc_vars
     end
 
-    require 'thread_frame'
     tf = RubyVM::ThreadFrame.current
     @cmdproc.frame_setup(tf)
     pc_offset = tf.pc_offset

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'test/unit'
 require_relative 'cmd-helper'
 require_relative '../../processor/command/help'
 

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

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-require_relative '../../processor/mock'
+require_relative './mock-helper'
 require_relative '../../processor/command/kill'
 
 class TestCommandKill < Test::Unit::TestCase
-
+  include MockUnitHelper
   def setup
-    @name      = File.basename(__FILE__, '.rb').split(/-/)[2]
-    @dbg, @cmd = MockDebugger::setup(@name, false)
+    @name = File.basename(__FILE__, '.rb').split(/-/)[2]
+    common_setup(@name)
     def @cmd.msg(message)
       @msgs << message
     end

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

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-require_relative '../../processor/mock'
+require_relative './mock-helper'
 require_relative '../../processor/command/quit'
 
 class TestCommandQuit < Test::Unit::TestCase
-
+  include MockUnitHelper
   def setup
-    @name      = File.basename(__FILE__, '.rb').split(/-/)[2]
-    @dbg, @cmd = MockDebugger::setup(@name, false)
+    @name = File.basename(__FILE__, '.rb').split(/-/)[2]
+    common_setup(@name)
   end
 
   def test_basic
@@ -21,6 +20,4 @@ class TestCommandQuit < Test::Unit::TestCase
     # should test 'confirm' gets run; and should test that
     # 'unconditional' is handled correctly.
   end
-  
-
 end

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

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+require_relative './mock-helper'
+require_relative '../../processor/command/source'
+
+# Test command source
+class TestCommandSource < Test::Unit::TestCase
+
+  include MockUnitHelper
+  def setup
+    @name = File.basename(__FILE__, '.rb').split(/-/)[2]
+    common_setup(@name)
+  end
+
+  def test_source_opts
+
+  [['--quiet',       :verbose, false],
+   ['-q',            :quiet, true],
+   ['--no-quiet',    :quiet, false],
+   ['--continue',    :abort_on_error, false],
+   ['--no-continue', :abort_on_error, true],
+   ['-c',            :abort_on_error, false],
+   ['-v',            :verbose, true],
+   ['--verbose',     :verbose, true],
+   ['--no-verbose',  :verbose, false]
+  ].each do |opt, key, expect|
+      options = 
+        @cmd.parse_options(Trepan::Command::SourceCommand::DEFAULT_OPTIONS.dup,
+                           opt)
+      assert_equal(expect, options[key], 
+                   "Option #{opt} using key #{key} failure")
+    end
+  end
+end

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'test/unit'
 require_relative 'cmd-helper'
 require_relative '../../processor/command/step'
 
@@ -41,5 +40,4 @@ class TestCommandStep < Test::Unit::TestCase
     @my_cmd.run([@name, '1+foo'])
     assert_equal(false,  @cmdproc.leave_cmd_loop)
   end
-
 end

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

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+
+# Unit test for io/tcpclient.rb and io/tcpserver.rb together
+require_relative '../../io/tcpfns'
+require_relative '../../io/tcpclient'
+require_relative '../../io/tcpserver'
+
+# Tests TCPServer together with and TCPClient
+class TestTCPClientServer < Test::Unit::TestCase
+
+  def test_client_server
+    server = Trepan::TCPDbgServer.new({ :open => true,
+                                        :port => 1028,
+                                        :host => 'localhost'
+                                      })
+    client = Trepan::TCPDbgClient.new({ :open => true,
+                                        :port => 1028,
+                                        :host => 'localhost'
+                                      })
+    %w(one, two, three).each do |line|
+      server.writeline(line)
+      assert_equal line, client.read_msg.chomp
+    end
+    %w(four, five, six).each do |line|
+      client.writeline(line)
+      assert_equal line, server.read_msg.chomp
+    end
+    client.close
+    server.close
+  end
+end

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

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+
+# Unit test for io/tcpclient.rb
+require_relative '../../io/tcpfns'
+require_relative '../../io/tcpclient'
+
+class TestTCPDbgClient < Test::Unit::TestCase
+
+  include Trepanning::TCPPacking
+
+  def test_basic
+    client = Trepan::TCPDbgClient.new({ :open => false,
+                                        :port => 1027,
+                                        :host => 'localhost'
+                                      })
+    threads = []
+    Thread.new do
+      server = TCPServer.new('localhost', 1027)
+      session = server.accept
+      while 'quit' != (line = session.gets)
+        session.puts line 
+      end
+      session.close
+    end
+    threads << Thread.new do 
+      # require 'trepanning'; debugger
+      3.times do 
+        begin
+          client.open
+        rescue IOError
+        end
+        break
+      end
+      assert client
+      msgs = %w(four five six)
+      msgs.each do |mess|
+        begin
+          client.writeline(mess)
+          assert_equal mess, client.read_msg.chomp
+        rescue EOFError
+          puts "Got EOF"
+          break
+        rescue Exception => e
+          puts "Got #{e}"
+          break
+        end
+      end
+      client.close
+    end
+    threads.each {|t| t.join }
+  end
+end