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

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

@@ -0,0 +1,97 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require 'rubygems'; require 'require_relative'
+require_relative '../../app/cmd_parse'
+
+class TestCmdParse < Test::Unit::TestCase
+
+  # require_relative '../../lib/trepanning'
+  def test_parse_location
+    [['fn', [:fn, nil, nil]],
+     ['fn 2', [:fn, :line, 2]],
+     ['fn @5', [:fn, :offset, 5]],
+     ['@3',   [nil, :offset, 3]],
+     ['fn:6', [:fn, :line, 6]],
+     ["#{__FILE__}:5", [:file, :line, 5]],
+     ['fn:@15', [:fn, :offset, 15]],
+    ].each do |location, expect|
+      cp = parse_location(location)
+      assert cp, "should be able to parse #{location} as a location"
+      assert_equal(expect[0], cp.container_type, 
+                   "mismatch container_type on #{location}")
+      assert_equal(expect[1], cp.position_type, 
+                   "mismatch position_type on #{location}")
+      assert_equal(expect[2], cp.position, 
+                   "mismatch position on #{location}")
+    end
+    
+    # %w(0 1e10 a.b).each do |location|
+    #   begin
+    #     cp = CmdParse.new(name)
+    #     assert_equal nil cp._location, 
+    #     "should be able to parse #{name} as a location"
+    #   end
+    # end
+  end
+  
+  module Testing
+    def testing; 5 end
+    module_function :testing
+  end
+
+  def test_parse_identifier
+    %w(a a1 $global __FILE__ Constant).each do |name|
+      cp = CmdParse.new(name)
+      assert cp._identifier, "should be able to parse #{name} as an identifier"
+    end
+    %w(0 1e10 @10).each do |name|
+      cp = CmdParse.new(name)
+      assert_equal(true, !cp._identifier, 
+                   "should not have been able to parse of #{name}")
+    end
+  end
+
+  def test_parse_method
+    [['Object', 0], ['A::B', 1], ['A::B::C', 2],
+     ['A::B::C::D', 3], ['A::B.c', 2], ['A.b.c.d', 3]].each do |name, count|
+      cp = CmdParse.new(name)
+      assert cp._class_module_chain, "should be able to parse of #{name}"
+      m = cp.result
+      count.times do |i|
+        assert m, "Chain item #{i} of #{name} should not be nil"
+        m = m.chain[1]
+      end
+      assert_nil m.chain, "#{count} chain item in #{cp.result} should be nil"
+    end
+    ['A(5)'].each do |name|
+      cp = CmdParse.new(name)
+      cp._class_module_chain
+      assert_not_equal(name, cp.result.name,
+                   "should not have been able to parse of #{name}")
+    end
+  end
+
+  include Trepan::CmdParser
+  def test_method_name
+    def five; 5 end
+    %w(five Rubinius::VM.backtrace Kernel.eval
+        Testing.testing Kernel::eval File.basename).each do |str|
+      meth = meth_for_string(str, binding)
+      assert meth.kind_of?(Method), "#{str} method's class should be Method, not #{meth.class}"
+    end
+    x = File
+    def x.five; 5; end
+    %w(x.basename x.five).each do |str|
+      meth = meth_for_string(str, binding)
+      assert meth.kind_of?(Method), "#{str} method's class should be Method, not #{meth.class}"
+    end
+    %w(Array.map).each do |str|
+      meth = meth_for_string(str, binding)
+      assert meth.kind_of?(UnboundMethod), "#{meth.class}"
+    end
+    %w(O5).each do |str|
+      meth = meth_for_string(str, binding)
+      assert_equal nil, meth, "should have found a method for #{str}"
+    end
+  end
+end

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

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

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

@@ -31,6 +31,7 @@ class TestAppOptions < Test::Unit::TestCase
     assert_equal(orig_cd, @options[:chdir])
     assert_not_equal('', @stderr.string)
     assert_equal('', @stdout.string)
+    File.unlink tf.path
     # FIXME: add test where directory isn't executable.
   end
 

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

@@ -6,8 +6,8 @@ require_relative '../../app/validate'
 class TestAppValidate < Test::Unit::TestCase
   include Trepan::Validate
   def test_line_or_ip
-    [['o1',  [1, nil]],
-     ['O2',   [2, nil]],
+    [
+     ['@2',   [2, nil]],
      ['oink', [nil, nil]],
      ['1'   , [nil, 1]],
      ['12',   [nil, 12]],

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

@@ -10,13 +10,55 @@ class TestCommandBreak < Test::Unit::TestCase
     @cmdproc.frame_setup
     @name   = File.basename(__FILE__, '.rb').split(/-/)[2]
     @my_cmd = @cmds[@name]
+    @brkpt_set_pat = /^Set breakpoint \d+: .*$/ 
   end
-  
+
+  def run_cmd(cmd, args) 
+    cmd.proc.instance_variable_set('@cmd_argstr', args[1..-1].join(' '))
+    cmd.run(args)
+  end
+
+  # require_relative '../../lib/trepanning'
   def test_basic
-    place = "#{self.class}#test_basic:#{__LINE__}"
-    @my_cmd.run([@name, place])
-    assert_equal(true, @cmdproc.errmsgs.empty?,
-                 @cmdproc.errmsgs)
+    # [
+    #  [@name,  __LINE__.to_s],
+    # ].each_with_index do |args, i|
+    #   run_cmd(@my_cmd, args)
+    #   assert_equal(true, @cmdproc.errmsgs.empty?, @cmdproc.errmsgs)
+    #   assert_equal(0, @cmdproc.msgs[0] =~ @brkpt_set_pat, @cmdproc.msgs[0])
+    #   reset_cmdproc_vars
+    # end
+
+    # pc_offset = tf.pc_offset
+    # [[@name],
+    #  [@name, "@#{pc_offset}"],
+    #  #[@name, 'FileUtils.cp']
+    # ].each_with_index do |args, i|
+    #   run_cmd(@my_cmd, args)
+    #   assert_equal(true, @cmdproc.errmsgs.empty?, @cmdproc.errmsgs)
+    #   assert_equal(0, @cmdproc.msgs[0] =~ @brkpt_set_pat, @cmdproc.msgs[0])
+    #   reset_cmdproc_vars
+    # end
+
+    common_setup
+    def foo
+      5 
+    end
+    [[@name, 'foo', (__LINE__-3).to_s]].each_with_index do |args, i|
+      run_cmd(@my_cmd, args)
+      assert_equal(true, @cmdproc.errmsgs.empty?,
+                   @cmdproc.errmsgs)
+      assert_equal(true, @cmdproc.errmsgs.empty?, @cmdproc.errmsgs)
+      reset_cmdproc_vars
+    end
+
+    # [[@name, 'foo']].each_with_index do |args, i|
+    #   run_cmd(@my_cmd, args)
+    #   assert_equal(true, @cmdproc.errmsgs.empty?,
+    #                @cmdproc.errmsgs)
+    #   assert_equal(0, @cmdproc.msgs[0] =~ @brkpt_set_pat, @cmdproc.msgs[0])
+    #   reset_cmdproc_vars
+    # end
   end
 
 end

data/test/unit/test-completion.rb

@@ -28,7 +28,8 @@ class TestCompletion < Test::Unit::TestCase
 
      ['set auto e', 'e', ['eval']],
      ['disas', 'disas', ['disassemble']], # Another single completion
-     ['help syn', 'syn', ['syntax']],
+     ## FIXME:
+     # ['help syn', 'syn', ['syntax']],
      ['help br', 'br', ['break', 'breakpoints']],
      ['where', 'where', ['where']],  # Single alias completion
      ['set basename o', 'o', ['off', 'on']],

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

@@ -47,7 +47,18 @@ class TestCmdProcessorLocation < Test::Unit::TestCase
     dir = @proc.settings[:directory] = File.dirname(__FILE__)
     loc, line_no, text = @proc.loc_and_text('hi')
     assert loc and line_no.is_a?(Fixnum) and text 
+    assert @proc.current_source_text
     # FIXME test that filename remapping works.
   end
 
+  def test_eval_current_source_text
+    eval <<-EOE
+      @proc.frame_index = 0
+      @proc.frame_initialize
+      @proc.frame_setup
+      LineCache::clear_file_cache
+      assert @proc.current_source_text
+    EOE
+  end
+
 end

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

@@ -5,6 +5,7 @@ require_relative '../../processor/main' # Have to include before validate!
                                         # FIXME
 require_relative '../../processor/validate'
 require_relative '../../app/mock'
+require_relative 'cmd-helper'
 
 $errors = []
 $msgs   = []
@@ -13,11 +14,12 @@ $msgs   = []
 class TestValidate < Test::Unit::TestCase
 
   def setup
-    $errors = []
-    $msgs   = []
-    @proc    = Trepan::CmdProcessor.new(Trepan::MockCore.new())
+    $errors  = []
+    $msgs    = []
+    @dbg   ||= MockDebugger::MockDebugger.new(:nx => true)
+    @cmdproc = Trepan::CmdProcessor.new(@dbg)
 
-    class << @proc
+    class << @cmdproc
       def errmsg(msg)
         $errors << msg
       end
@@ -29,61 +31,97 @@ class TestValidate < Test::Unit::TestCase
     end
   end
 
-  # See that we have can load up commands
-  def test_basic
+  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
+  end
+
+  def test_get_on_off
     onoff = 
     [['1', true],  ['on', true],
      ['0', false], ['off', false]].each do |arg, expected|
-      assert_equal(expected, @proc.get_onoff(arg))
+      assert_equal(expected, @cmdproc.get_onoff(arg))
     end
-    [['1', 1],  ['1E', nil], ['bad', nil], ['1+1', 2], ['-5', -5]].each do 
-      |arg, expected|
-      assert_equal(expected, @proc.get_int_noerr(arg))
+  end
+
+  include UnitHelper
+  def outer_line
+    @line = __LINE__
+  end
+
+  def test_parse_position
+    common_setup
+    outer_line
+    @dbg.instance_variable_set('@current_frame',
+                               Trepan::Frame.new(self, 0,
+                                                 Rubinius::VM.backtrace(0, true)[0]))
+    @cmdproc.frame_setup
+    file = File.basename(__FILE__)
+    [
+     [__FILE__, [false, file, nil, nil]],
+     ['@8', [true, file, 8, :offset]],
+     [@line.to_s , [true, file, @line, :line]],
+     ['8' , [true, file, 8, :line]],
+     ["#{__FILE__}:#{__LINE__}" , [true, file, __LINE__, :line]],
+     ["#{__FILE__} #{__LINE__}" , [true, file, __LINE__, :line]]
+    ].each do |pos_str, expected|
+      result = @cmdproc.parse_position(pos_str)
+      result[1] = File.basename(result[1])
+      result[0] = !!result[0]
+      assert_equal(expected, result, "parsing position #{pos_str}")
     end
   end
 
-  def no_test_breakpoint_position
-    require 'thread_frame'
-    tf = RubyVM::ThreadFrame.current
-    @proc.frame_setup(tf)
+  def test_breakpoint_position
+    start_line = __LINE__
+    common_setup
+    outer_line
+    @dbg.instance_variable_set('@current_frame',
+                               Trepan::Frame.new(self, 0,
+                                                 Rubinius::VM.backtrace(0, true)[0]))
+    @cmdproc.frame_setup
 
     def munge(args)
-      args[1] = 'bogus'
+      args[0] = args[0].class
       args
     end
 
-    assert_equal([0, 'bogus', true, 'true', nil],
-                 munge(@proc.breakpoint_position(%w(O0))))
-    assert_equal([1, 'bogus', false, 'true', nil], 
-                 munge(@proc.breakpoint_position(%w(1))))
-    assert_equal([2, 'bogus', false, 'a > b', nil],
-                 munge(@proc.breakpoint_position(%w(2 if a > b))))
+    assert_equal([Rubinius::CompiledMethod, start_line, 0, 'true', false],
+                 munge(@cmdproc.breakpoint_position('@0', false)))
+    result = @cmdproc.breakpoint_position("outer_line:#{@line}", true)
+    result[0] = result[0].name
+    assert_equal([:outer_line, @line, 0, 'true', false], result)
+    result = @cmdproc.breakpoint_position("#{@line} unless 1 == 2", true)
+    result[0] = result[0].name
+    assert_equal([:outer_line, @line, 0, '1 == 2', true], result)
   end
 
   def test_int_list
-    assert_equal([1,2,3], @proc.get_int_list(%w(1+0 3-1 3)))
+    assert_equal([1,2,3], @cmdproc.get_int_list(%w(1+0 3-1 3)))
     assert_equal(0, $errors.size)
-    assert_equal([2,3], @proc.get_int_list(%w(a 2 3)))
+    assert_equal([2,3], @cmdproc.get_int_list(%w(a 2 3)))
     assert_equal(1, $errors.size)
   end
 
-  def no__test_method?
+  def test_method?
     def foo; 5 end
     
     # require_relative '../../lib/rbdbgr'
     # dbgr = Trepan.new(:set_restart => true)
-    # FIXME: 'foo', 'errmsg'
-    ['Array#map', 'Trepan::CmdProcessor.new'
+    # FIXME: 'foo',
+    ['Array.map', 'Trepan::CmdProcessor.new',
+     'errmsg'
     ].each do |str|
       # dbgr.debugger if 'foo' == str
-      assert_equal(true, @proc.method?(str),
-                   "#{str} should be known as a method")
+      assert @cmdproc.method?(str), "#{str} should be known as a method"
     end
     ['food', '.errmsg'
     ].each do |str|
       # dbgr.debugger if 'foo' == str
-      assert_equal(false, @proc.method?(str),
-                   "#{str} should be known as a method")
+      assert_equal(false, !!@cmdproc.method?(str),
+                   "#{str} should not be known as a method")
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbx-trepanning
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: universal-rubinius-1.2
 authors: 
 - R. Bernstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -05:00
+date: 2011-03-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,11 +68,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id004
 description: |
@@ -104,6 +104,9 @@ files:
 - app/breakpoint.rb
 - app/brkptmgr.rb
 - app/client.rb
+- app/cmd_parse.kpeg
+- app/cmd_parse.rb
+- app/cmd_parser.rb
 - app/complete.rb
 - app/condition.rb
 - app/default.rb
@@ -123,8 +126,6 @@ files:
 - bin/trepanx
 - data/.gitignore
 - data/irbrc
-- doc/.gitignore
-- doc/debugger.html
 - interface/.gitignore
 - interface/base_intf.rb
 - interface/client.rb
@@ -168,10 +169,15 @@ files:
 - processor/command/finish.rb
 - processor/command/frame.rb
 - processor/command/help.rb
+- processor/command/help/.gitignore
+- processor/command/help/command.txt
+- processor/command/help/filename.txt
+- processor/command/help/location.txt
 - processor/command/info.rb
 - processor/command/info_subcmd/.gitignore
 - processor/command/info_subcmd/breakpoints.rb
 - processor/command/info_subcmd/files.rb
+- processor/command/info_subcmd/frame.rb
 - processor/command/info_subcmd/line.rb
 - processor/command/info_subcmd/method.rb
 - processor/command/info_subcmd/program.rb
@@ -186,6 +192,7 @@ files:
 - processor/command/pr.rb
 - processor/command/ps.rb
 - processor/command/restart.rb
+- processor/command/save.rb
 - processor/command/server.rb
 - processor/command/set.rb
 - processor/command/set_subcmd/.gitignore
@@ -292,6 +299,7 @@ files:
 - test/data/quit2.cmd
 - test/data/quit2.right
 - test/example/.gitignore
+- test/example/debugger-stop.rb
 - test/example/fname with blank.rb
 - test/example/gcd-server.rb
 - test/example/gcd.rb
@@ -302,6 +310,7 @@ files:
 - test/functional/fn_helper.rb
 - test/functional/test-break-name.rb
 - test/functional/test-break.rb
+- test/functional/test-eval.rb
 - test/functional/test-finish.rb
 - test/functional/test-fn_helper.rb
 - test/functional/test-list.rb
@@ -321,6 +330,8 @@ files:
 - test/unit/mock-helper.rb
 - test/unit/test-app-brkpt.rb
 - test/unit/test-app-brkptmgr.rb
+- test/unit/test-app-cmd_parse.rb
+- test/unit/test-app-cmd_parser.rb
 - test/unit/test-app-complete.rb
 - test/unit/test-app-condition.rb
 - test/unit/test-app-iseq.rb
@@ -390,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Trepan Ruby Debugger for Rubinius 1.2.1 and higher
@@ -407,6 +418,7 @@ test_files:
 - test/data/quit2.cmd
 - test/data/quit2.right
 - test/example/.gitignore
+- test/example/debugger-stop.rb
 - test/example/fname with blank.rb
 - test/example/gcd-server.rb
 - test/example/gcd.rb
@@ -417,6 +429,7 @@ test_files:
 - test/functional/fn_helper.rb
 - test/functional/test-break-name.rb
 - test/functional/test-break.rb
+- test/functional/test-eval.rb
 - test/functional/test-finish.rb
 - test/functional/test-fn_helper.rb
 - test/functional/test-list.rb
@@ -436,6 +449,8 @@ test_files:
 - test/unit/mock-helper.rb
 - test/unit/test-app-brkpt.rb
 - test/unit/test-app-brkptmgr.rb
+- test/unit/test-app-cmd_parse.rb
+- test/unit/test-app-cmd_parser.rb
 - test/unit/test-app-complete.rb
 - test/unit/test-app-condition.rb
 - test/unit/test-app-iseq.rb

data/doc/debugger.html

@@ -1,108 +0,0 @@
----
-title: Debugger
----
-
-Debugger
-========
-
-Trepanning source-level debugger 
-
-Invoking in Code
-----------------
-
-The Rubinius debugger can be invoked from code by embedding a call to start
-the debugger
-
-Consider the following code in app.rb
-
-    class Toast
-      attr_accessor :setting
-      def initialize
-        require 'rubygems'
-        require 'trepanning'
-        Trepan.start ## See Note 1 below.
-        @setting = :brown
-        @kind    = :rye
-      end
-    end
-
-    p Toast.new.setting
-
-Running the code in Rubinius would produce the following:
-
-    $ rbx app.rb
-
-    | Breakpoint: Toast#initialize at tmp/toast.rb:5
-    | 5:     Trepan.start ## See Note 1 below.
-    (trepanx): help
-
-    Classes of commands:
-    breakpoints   -- Making the program stop at certain points
-    data          -- Examining data
-    files         -- Specifying and examining files
-    running       -- Running the program
-    stack         -- Examining the call stack
-    status        -- Status inquiries
-    support       -- Support facilities
-
-    Type "help" followed by a class name for a list of commands in that class.
-    Type "help *" for the list of all commands.
-    Type "help REGEXP" for the list of commands matching /^#{REGEXP}/
-    Type "help CLASS *" for the list of all commands in class CLASS.
-    Type "help" followed by command name for full documentation.
-
-    (trepanx): help *
-    All command names:
-      alias        delete         exit     kill     restart    step   
-      backtrace    disassemble    frame    next     set        tbreak 
-      break        down           help     nexti    show       unalias
-      continue     eval           info     ps       source     up     
-    (trepanx):  bt
-    Backtrace:
-       0 Toast#initialize at tmp/toast.rb:5
-       1 main.__script__ at tmp/toast.rb:11
-       2 Rubinius::CodeLoader#load_script(debug) at kernel/delta/codeloader.rb:67
-       3 Rubinius::CodeLoader.load_script(name) at kernel/delta/codeloader.rb:91
-       4 Rubinius::Loader#script at kernel/loader.rb:460
-       5 Rubinius::Loader#main at kernel/loader.rb:552
-       6 Rubinius::Loader.main at kernel/loader.rb:589
-       7 Object#__script__ at kernel/loader.rb:601
-    (trepanx):  n
-
-    | Breakpoint: Toast#initialize at app.rb:6 (16)
-    | 6:     @setting = :brown
-    (trepanx):  n
-
-    | Breakpoint: Toast#initialize at app.rb:7 (21)
-    | 7:     @kind = :rye
-    (trepanx):  eval @setting = :light_brown  ## See Note 2 below.
-    $d0 = :light_brown
-    (trepanx):  c  # See Note 3.
-    :light_brown   # output from running program
-
-Help for the debugger commands is available by typing `help` when in the
-debugger. 
-
-** Note 1.
-Or if you haven't mucked with ARGV, Dir.pwd, and $0 use:
-Trepan.start(:set_restart => true).  This tells the debugger to
-capture this information so you can easily restart your program if you
-need to.
-
-** Note 2. 
-If you run "set autoeval on" (actually this is on by default), then
-unrecognized commands are automatically evaluated. So the "eval" is
-not needed. However if this confuses you "set autoeval off".  Another
-way to explicitly evaluate commands is to start the line with !.
-
-** Note 3.
-
-To quit execution, you can use exit which prompts for confimation or
-q! which won't prompt. You can supply an exit code to return to the
-OS. A related command is "kill" which sends a signal to the process,
-the default when none is supplied being "TERM". Finally there's
-"restart" which you would use if you had started with :set_restart =>
-true.
-
-
-More later....