rbx-trepanning 0.0.8-universal-rubinius-1.2 → 0.1.0-universal-rubinius-1.2

data/processor/virtual.rb

@@ -0,0 +1,33 @@
+# The class serves as the parent for Trepan::CmdProcessor which is
+# quite large and spans over several files. By declaring "initialize"
+# below, we have a consistent initialization routine and many of the
+# others don't need to define "initialize".
+
+# Also, simple versions of the I/O routines make it possible
+# to do testing without having to bring in the whole "Interface"
+# and I/O routines that trepanning (and "main.rb") use.
+
+# Note that via this file we can change 'class Trepan' to 'module
+# Trepan' or vice versa. So this takes effect on all of the places
+# which subclass this. They use class Trepan::CmdProcessor <
+# Trepan::VirtualCmdProcessor rather than breaking this down into to
+# parts as below.
+class Trepan
+  class VirtualCmdProcessor
+    attr_accessor :settings
+    def initialize(interfaces, settings={})
+      @interfaces      = interfaces
+      @intf            = interfaces[-1]
+      @settings        = settings
+    end
+    def errmsg(message)
+      puts "Error: #{message}"
+    end
+    def msg(message)
+      puts message
+    end
+    def section(message, opts={})
+      puts "Section: #{message}"
+    end
+  end
+end

data/rbx-trepanning.gemspec

@@ -3,14 +3,13 @@
 require 'rake'
 require 'rubygems' unless 
   Object.const_defined?(:Gem)
-require File.dirname(__FILE__) + "/app/options" unless 
-  Object.const_defined?(:'Trepan')
-
+require File.dirname(__FILE__) + "/app/options"
 Gem::Specification.new do |s|
   s.add_dependency('columnize')
-  s.add_dependency('diff-lcs') # For testing only
-  s.add_dependency('rbx-require-relative')
-  s.add_dependency('rbx-linecache', '~>1.2')
+  s.add_development_dependency('diff-lcs') # For testing only
+  s.add_dependency('rbx-require-relative', '>=0.0.4')
+  s.add_dependency('rbx-linecache', '~>1.3')
+  s.add_dependency('coderay', '>=1.0')
   s.authors      = ['R. Bernstein']
   s.date         = Time.now
   s.description = <<-EOF
@@ -33,8 +32,8 @@ EOF
   s.license       = 'MIT'
   s.platform      = Gem::Platform::new ['universal', 'rubinius', '1.2']
   s.require_paths = ['lib']
-  s.required_ruby_version = '~> 1.8.7'
-  s.summary      = 'Trepan Ruby Debugger for Rubinius 1.2.1 and higher'
+  # s.required_ruby_version = '~> 1.8.7'
+  s.summary      = 'Trepan Ruby Debugger for Rubinius 1.2.4 and higher'
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version      = Trepan::VERSION
 end

data/sample/rocky-trepanx-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/fname-with-blank.right

@@ -2,3 +2,5 @@
 puts "Ha!"
 basename is off.
 Ha!
+trepanx: That's all, folks...
+trepanx: That's all, folks...

data/test/data/inline-call.right

@@ -1,13 +1,14 @@
 -- (inline-call.rb:11 @12)
 if a > b
 basename is off.
-  6   	$dbgr = Trepan.new(:nx => true, :cmdfiles => [cmdfile])
-  7   	# GCD. We assume positive numbers
-  8   	def gcd(a, b)
-  9   	  $dbgr.debugger
- 10   	  # Make: a <= b
- 11 ->	  if a > b
- 12   	    a, b = [b, a]
- 13   	  end
- 14   	
- 15   	  return nil if a <= 0
+  3    	require_relative '../../lib/trepanning.rb'
+  4    	DATA_DIR = File.join(File.dirname(RequireRelative::abs_file), %w(.. data))
+  5    	cmdfile = File.join(DATA_DIR, 'inline-call.cmd')
+  6    	$dbgr = Trepan.new(:nx => true, :cmdfiles => [cmdfile])
+  7    	# GCD. We assume positive numbers
+  8    	def gcd(a, b)
+  9    	  $dbgr.debugger
+ 10    	  # Make: a <= b
+ 11  ->	  if a > b
+ 12    	    a, b = [b, a]
+trepanx: That's all, folks...

data/test/data/quit.right

@@ -1,2 +1,3 @@
 -> (null.rb:1 @0)
 # Nothing here. Move along.
+trepanx: That's all, folks...

data/test/example/debugger-stop.rb

@@ -12,5 +12,5 @@ module Foo
     5
   end
 end
-debugger
+debugger(:immediate=>true)
 Foo::five

data/test/example/goto2goto.rb

@@ -0,0 +1,11 @@
+def find_main_script(loc)
+  candidate = nil
+  if loc
+    candidate = 20
+  else
+    return 10
+  end
+  candidate
+end
+
+find_main_script('foo')

data/test/functional/fn_helper.rb

@@ -16,7 +16,7 @@ module FnTestHelper
                               :nx     => true}
     d                      = Trepan.new(d_opts)
 
-    d.settings[:basename]  = true
+    d.settings[:basename]  = d.processor.settings[:basename] = true
     d.settings[:different] = false
     d.settings[:autoeval]  = false
     return d
@@ -79,7 +79,7 @@ module FnTestHelper
     #   Set breakpoint 1: test/functional/test-tbreak.rb:10 (@0)
     # becomes :
     #   Set breakpoint 1: foo.rb:55 (@3)
-     a3 = a2.map do |s|
+    a3 = a2.map do |s|
       s.gsub(/^Set (temporary )?breakpoint (\d+): .+:(\d+) \(@\d+\)/, 
              'Set \1breakpoint \2: foo.rb:55 (@3)')
     end

data/test/functional/test-list.rb

@@ -35,17 +35,18 @@ class TestBreak < Test::Unit::TestCase
            "-- ",
            "foo",
            "max list is 2.",
-           " 30   \t    d.start      # line +  8",
-           " 31 ->\t    foo",
+           " 31  ->\t    foo",
+           " 32    \t    ##############################",
            "Set temporary breakpoint 1: foo.rb:55 (@3)",
            "x1 ",
            "a = 5      # line +  5",
-           " 26   \t    def foo      # line +  4  ",
-           " 27 ->\t      a = 5      # line +  5",
+           " 27  ->\t      a = 5      # line +  5",
+           " 28    \t      b = 6      # line +  6",
+           "--> #1 TestBreak#test_list_frame_change at test-list.rb:31",
            "   ",
            "foo",
-           " 31 ->\t    foo",
-           " 32   \t    ##############################"
+           " 31  ->\t    foo",
+           " 32    \t    ##############################"
           ]
     compare_output(out, d, cmds)
   end

data/test/integration/helper.rb

@@ -1,7 +1,7 @@
+require 'rubygems'; require 'require_relative'
 require 'diff/lcs'
 require 'fileutils'
-require 'rubygems'; require 'require_relative'
-require_relative '../../app/run' # for ruby_path
+require_relative '../../app/run' # for RbConfig.ruby
 
 DEFAULT_DEBUGGER_OPTS = {
   :args        => '', 
@@ -37,13 +37,13 @@ def run_debugger(testname, ruby_file, opts={})
   cmd += 
     if opts[:xdebug]
     "%s -Xdebug '%s' %s >%s 2>&1 <%s" %
-        [Trepanning::ruby_path, programfile, opts[:args], outfile, cmdfile]
+        [RbConfig.ruby, programfile, opts[:args], outfile, cmdfile]
     elsif opts[:standalone]
       "%s %s %s >%s 2>&1" %
-        [Trepanning::ruby_path, programfile, opts[:args], outfile]
+        [RbConfig.ruby, programfile, opts[:args], outfile]
     else
       "%s %s --nx --command %s %s '%s' %s >%s 2>&1" %
-        [Trepanning::ruby_path, dbgr_path, cmdfile, opts[:dbgr], 
+        [RbConfig.ruby, dbgr_path, cmdfile, opts[:dbgr], 
          programfile, opts[:args], outfile]
     end
   puts cmd if opts[:verbose]

data/test/unit/cmd-helper.rb

@@ -1,20 +1,16 @@
 require 'test/unit'
 require 'rubygems'; require 'require_relative'
-# require_relative '../../app/core'
 require_relative '../../processor/mock'
-require_relative '../../processor/main' # Have to include before frame!
-                                        # FIXME
 require_relative '../../processor/frame'
 
-
 module UnitHelper
 
   module_function
   def common_setup
     @dbg      ||= MockDebugger::MockDebugger.new(:nx => true)
-    @cmdproc  = Trepan::CmdProcessor.new(@dbg)
+    @cmdproc  ||= Trepan::CmdProcessor.new(@dbg)
     @cmdproc.frame_initialize
-    @cmdproc.dbgr  = @dbg
+    @cmdproc.dbgr  ||= @dbg
     @cmds     = @cmdproc.commands
 
     def @cmdproc.errmsg(message, opts={})

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

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 require 'test/unit'
+require 'rubygems'; require 'require_relative'
 require_relative '../../app/cmd_parser'
 
 class TestAppCmdParser < Test::Unit::TestCase
   def setup
-    @cp = CmdParse.new('', true)
+    @cp = CmdParse.new('', :debug=>true)
   end
 
   def test_parse_filename
@@ -14,7 +15,7 @@ class TestAppCmdParser < Test::Unit::TestCase
      ['this\ is\ another\ filename', 'this is another filename'],
      ['C\:filename', 'C:filename']
     ].each do |name, expect|
-      @cp.setup_parser(name, true)
+      @cp.setup_parser(name, :debug => true)
       res = @cp._filename
       assert_equal(expect, @cp.result)
     end

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

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require 'rubygems'; require 'require_relative'
+require 'test/unit'
+require_relative '../../app/display'
+require_relative '../../app/frame'
+
+class TestLibAppBrkptMgr < Test::Unit::TestCase
+
+  def test_basic
+    mgr = DisplayMgr.new
+#    frame = Trepan::Frame.new(self, 0, Rubinius::VM.backtrace(0)[1])
+    assert_equal(0, mgr.size)
+#    disp = mgr.add(frame, '3 > 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

@@ -53,16 +53,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

@@ -9,8 +9,6 @@ class TestAppRun < Test::Unit::TestCase
     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')
-    rp = ruby_path
-    assert_equal(true, File.executable?(rp))
   end
 
 end

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

@@ -18,10 +18,27 @@ class TestAppUtil < Test::Unit::TestCase
     locs = Rubinius::VM.backtrace(0, true)
     i = find_main_script(locs)
     assert_equal(true, !!i)
-    j = locs.size - i
-    if j > 0
-      locs = Rubinius::VM.backtrace(j, true)
-      assert_equal(false, !!find_main_script(locs))
+    assert_equal(false, !!find_main_script(locs[0..i]))
+  end
+
+  def test_abbrev
+    list = %w(disassemble disable distance up)
+    [['dis', 'dis'],
+     ['disas', 'disassemble'],
+     ['u', 'up'],
+     ['upper', 'upper'],
+     ['foo', 'foo']].each do |name, expect|
+      assert_equal expect, uniq_abbrev(list, name)
+    end
+  end
+
+  def test_extract_expression
+    [['if condition("if")',        'condition("if")'],
+     ['until until_termination',   'until_termination'],
+     ['return return_value',       'return_value'],
+     ['nothing_to_be.done',         'nothing_to_be.done'],
+    ].each do |stmt, expect|
+      assert_equal expect, extract_expression(stmt)
     end
   end
 end

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

@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 require 'rubygems'; require 'require_relative'
-require_relative '../../processor/command/base/cmd'
+require_relative '../../processor/command'
 
-class Trepan
-  class Command::Test < Trepan::Command
-    NAME = 'test'
-    CATEGORY = 'testcategory'
-    completion %w(a aa ab ba aac)
-  end
+class Trepan::Command::Test < Trepan::Command
+  NAME = 'test'
+  CATEGORY = 'testcategory'
+  completion %w(a aa ab ba aac)
 end
 
 class TestBaseCommand < Test::Unit::TestCase

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

@@ -2,14 +2,10 @@
 require 'test/unit'
 require 'rubygems'; require 'require_relative'
 # require_relative '../../app/core'
-require_relative '../../processor/main'
+require_relative '../../processor'
 require_relative '../../processor/command/exit'
 require_relative '../../processor/command/base/subcmd'
 
-# Mock debugger stub. FIXME: put in common helper routine.
-class Trepan
-end
-
 $errors = []
 class TestBaseSubCommand < Test::Unit::TestCase
 

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

@@ -14,7 +14,7 @@ class TestBaseSubcommandMgr < Test::Unit::TestCase
   def test_basic
     my_cmd = @cmds['show']
     # require 'trepanning'; debugger
-    assert_equal(%w(debug different), my_cmd.complete('d'),
+    assert_equal(%w(debug different directories), my_cmd.complete('d'),
                  "Should be able to complete 'd'")
     assert_equal(%w(show args), my_cmd.subcmds.lookup('ar').prefix,
                  "Should be able to complete lookup('ar')")

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

@@ -3,10 +3,6 @@ require 'test/unit'
 require 'rubygems'; require 'require_relative'
 require_relative '../../processor/command/base/subsubcmd'
 
-# Mock debugger stub. FIXME: put in common helper routine.
-class Trepan
-end
-
 $errors = []
 class TestBaseSubCommand < Test::Unit::TestCase
 

data/test/unit/test-bin-trepanx.rb

@@ -8,8 +8,8 @@ class TestBinTrepan < Test::Unit::TestCase
 
   include Trepanning
 
-  def test_ruby_path
-    rb_path = ruby_path
+  def test_RbConfig_ruby
+    rb_path = RbConfig.ruby
     assert_equal(true, File.executable?(rb_path),
                  "#{rb_path} should be an executable Ruby interpreter")
 

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

@@ -20,6 +20,8 @@ class TestCommandBreak < Test::Unit::TestCase
 
   # require_relative '../../lib/trepanning'
   def test_basic
+    assert true
+    return
     # [
     #  [@name,  __LINE__.to_s],
     # ].each_with_index do |args, i|

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

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'rubygems'; require 'require_relative'
+require_relative './mock-helper'
+require_relative './cmd-helper'
+require_relative '../../processor/command/edit'
+
+class TestCommandEdit < Test::Unit::TestCase
+  include MockUnitHelper
+  def setup
+    @name = File.basename(__FILE__, '.rb').split(/-/)[2]
+    $msgs = []
+    $errmsgs = []
+    common_setup(@name)
+    def @cmd.msg(message)
+      $msgs << message
+    end
+    def @cmd.errmsg(message)
+      $errmsgs << message
+    end
+  end
+
+  def test_basic
+    old_editor = ENV['EDITOR']
+    ENV['EDITOR'] = '#'
+    base_file = File.basename(__FILE__)
+    @cmd.proc.settings[:basename] = true
+    @cmd.run([@name])
+    assert_equal "Running # +7 \"mock-helper.rb\"...", $msgs[-1]
+    @cmd.run([@name, 8])
+    assert_equal "Running # +8 \"mock-helper.rb\"...", $msgs[-1]
+    @cmd.run([@name, __FILE__])
+    assert_equal "Running # +1 \"#{base_file}\"...", $msgs[-1]
+  end
+end