rbx-trepanning 0.2.0-universal-rubinius-2.0 → 0.2.1-universal-rubinius-2.0

data/processor/command/shell.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 require 'irb'
 require 'rubygems'; require 'require_relative'
 require_relative '../command'
@@ -13,10 +13,10 @@ class Trepan::Command::IRBCommand < Trepan::Command
 starts an Interactive Ruby (IRB) session.
 
 If -d is added you can get access to debugger frame the global variables
-$trepan_frame and $trepan_cmdproc. 
+$trepan_frame and $trepan_cmdproc.
 
-#{NAME} is extended with methods 'cont', 'ne', and, 'q', 'step' which 
-run the corresponding debugger commands 'continue', 'next', 'exit' and 'step'. 
+#{NAME} is extended with methods 'cont', 'ne', and, 'q', 'step' which
+run the corresponding debugger commands 'continue', 'next', 'exit' and 'step'.
 
 To issue a debugger command, inside #{NAME} nested inside a debugger use
 'dbgr'. For example:
@@ -43,7 +43,7 @@ Here then is a loop to query VM stack values:
 
   # This method runs the command
   def run(args)
-    add_debugging = 
+    add_debugging =
       if args.size > 1
         '-d' == args[1]
       else
@@ -59,7 +59,7 @@ Here then is a loop to query VM stack values:
       throw :IRB_EXIT, :cont if $trepan_in_irb
     end
 
-    $trepan = @proc.dbgr 
+    $trepan = @proc.dbgr
     if add_debugging
       $trepan_cmdproc  = @proc
       $trepan_frame    = @proc.frame
@@ -72,32 +72,32 @@ Here then is a loop to query VM stack values:
             :RC => true}
 
     # ?? Should we set GNU readline to what we have,
-    # or let IRB make its own determination? 
+    # or let IRB make its own determination?
 
-    # Save the Readline history and set the Readline completion function 
-    # to be IRB's function 
-    if Trepan::GNU_readline? 
+    # Save the Readline history and set the Readline completion function
+    # to be IRB's function
+    if Trepan::GNU_readline?
       @proc.intf.save_history if @proc.intf.respond_to?(:save_history)
       require 'irb/completion'
       Readline.completion_proc = IRB::InputCompletor::CompletionProc
     end
 
-    # And just when you thought, we'd never get around to 
+    # And just when you thought, we'd never get around to
     # actually running irb...
     cont = IRB.start_session(@proc.frame.binding, @proc, conf)
     trap('SIGINT', save_trap) # Restore our old interrupt function.
 
-    # Restore the debuggers' Readline history and the Readline completion 
+    # Restore the debuggers' Readline history and the Readline completion
     # function
     if Trepan::GNU_readline? && @proc.dbgr.completion_proc
       @proc.intf.read_history if @proc.intf.respond_to?(:read_history)
-      Readline.completion_proc = @proc.dbgr.completion_proc 
+      Readline.completion_proc = @proc.dbgr.completion_proc
     end
 
     # Respect any backtrace limit set in irb.
     back_trace_limit = IRB.CurrentContext.back_trace_limit
     if settings[:maxstack] !=  back_trace_limit
-      msg("\nSetting debugger's BACK_TRACE_LIMIT (%d) to match irb's last setting (%d)" % 
+      msg("\nSetting debugger's BACK_TRACE_LIMIT (%d) to match irb's last setting (%d)" %
           [settings[:maxstack], back_trace_limit])
       settings[:maxstack]= IRB.CurrentContext.back_trace_limit
     end
@@ -106,13 +106,13 @@ Here then is a loop to query VM stack values:
     when :continue
       @proc.continue
     when :finish
-      @proc.finish 
+      @proc.finish
     when :next
-      @proc.step ('next', 1, {})
+      @proc.step('next', 1, {})
     when :quit
       @proc.quit
     when :step
-      @proc.step ('step', 1, {})
+      @proc.step('step', 1, {})
     else
       @proc.print_location
     end

data/processor/help.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 
 class Trepan
   # class SubHelp
@@ -9,7 +9,7 @@ class Trepan
   #   end
 
   #   def load_sub_help_files(dir)
-  #     Dir.glob(dir, '*.txt').each do |txt| 
+  #     Dir.glob(dir, '*.txt').each do |txt|
   #       basename = File.basename(txt, '.txt')
   #       @list << basename
   #     end
@@ -33,16 +33,14 @@ class Trepan
       # The below was the simplest way I could find to do this since
       # we are the super class but want to set the subclass's constant.
       # defined? didn't seem to work here.
-      c = subcmd.class.constants
-      if c.member?('HELP') and !c.member?('SHORT_HELP')
-        short_help = subcmd.class.const_get('HELP').split("\n")[0].chomp('.')
-        subcmd.class.const_set(:SHORT_HELP, short_help)
-      end
-      
+      short_help = get_const(self.class, 'SHORT_HELP')
+      short_help = get_const(self.class, 'HELP') unless short_help
+      short_help = short_help.split("\n")[0].chomp('.')
+
       '  %-12s -- %s' %
-          [abbrev_stringify(obj_const(subcmd, :NAME), 
+          [abbrev_stringify(obj_const(subcmd, :NAME),
                             obj_const(subcmd, :MIN_ABBREV)),
-           obj_const(subcmd, :SHORT_HELP)]
+           short_help]
     end
 
     # We were given cmd without a subcommand; cmd is something
@@ -77,7 +75,7 @@ Long description goes here.'
     MIN_ABBREV = 1
     NAME       = File.basename(__FILE__)
     def obj_const(obj, name)
-      obj.class.const_get(name) 
+      obj.class.const_get(name)
     end
     def msg(mess)
       puts mess

data/processor/load_cmds.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 require 'tmpdir'
+require 'redcard/rubinius'
 
 # Part of Trepan::CmdProcess that loads up debugger commands from
 # builtin and user directories.
@@ -33,6 +34,18 @@ class Trepan
       end
     end
 
+    def get_class_aliases(klass)
+        if RedCard.check '1.9' and
+            klass.constants.member?(:ALIASES)
+          klass.const_get(:ALIASES)
+        elsif RedCard.check '1.8' and
+            klass.constants.member?('ALIASES')
+          klass.const_get('ALIASES')
+        else
+          []
+        end
+    end
+
     # Loads in debugger commands by require'ing each ruby file in the
     # 'command' directory. Then a new instance of each class of the
     # form Trepan::xxCommand is added to @commands and that array
@@ -63,12 +76,11 @@ class Trepan
         klass = Trepan::Command.const_get(name)
         cmd = klass.send(:new, self)
 
+      cmd_name = klass.const_get(:NAME)
+
         # Add to list of commands and aliases.
         cmd_name = klass.const_get(:NAME)
-        if klass.constants.member?('ALIASES')
-          aliases= klass.const_get('ALIASES')
-          aliases.each {|a| @aliases[a] = cmd_name}
-        end
+        get_class_aliases(klass).each {|a| @aliases[a] = cmd_name}
         @commands[cmd_name] = cmd
       end
     end
@@ -83,10 +95,7 @@ class Trepan
 
       # Add to list of commands and aliases.
       cmd_name = klass.const_get(:NAME)
-      if klass.constants.member?(:ALIASES)
-        aliases= klass.const_get(:ALIASES)
-        aliases.each {|a| @aliases[a] = cmd_name}
-      end
+      get_class_aliases.each {|a| @aliases[a] = cmd_name}
       @commands[cmd_name] = cmd
     end
 
@@ -227,14 +236,6 @@ if __FILE__ == $0
   end
 
   cmdproc = Trepan::CmdProcessor.new(nil)
-  cmddir = File.join(File.dirname(__FILE__), 'command')
-  cmdproc.instance_variable_set('@settings', {})
-  cmdproc.load_cmds_initialize
-  require 'columnize'
-  puts Columnize.columnize(cmdproc.commands.keys.sort)
-  puts '=' * 20
-  puts Columnize.columnize(cmdproc.aliases.keys.sort)
-  puts '=' * 20
 
   def cmdproc.errmsg(mess)
     puts "** #{mess}"
@@ -244,6 +245,15 @@ if __FILE__ == $0
     puts mess
   end
 
+  cmddir = File.join(File.dirname(__FILE__), 'command')
+  cmdproc.instance_variable_set('@settings', {})
+  cmdproc.load_cmds_initialize
+  require 'columnize'
+  puts Columnize.columnize(cmdproc.commands.keys.sort)
+  puts '=' * 20
+  puts Columnize.columnize(cmdproc.aliases.keys.sort)
+  puts '=' * 20
+
   cmdproc.run_cmd('foo')  # Invalid - not an Array
   cmdproc.run_cmd([])     # Invalid - empty Array
   cmdproc.run_cmd(['list', 5])  # Invalid - nonstring arg

data/processor/mock.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 # Mock setup for commands.
 require 'rubygems'; require 'require_relative'
 
@@ -18,14 +18,14 @@ module MockDebugger
     attr_accessor :intf         # The way the outside world interfaces with us.
     attr_reader   :initial_dir  # String. Current directory when program
                                 # started. Used in restart program.
-    attr_accessor :restart_argv # How to restart us, empty or nil. 
+    attr_accessor :restart_argv # How to restart us, empty or nil.
                                 # Note restart[0] is typically $0.
     attr_reader   :settings     # Hash[:symbol] of things you can configure
     attr_accessor :processor
 
     # FIXME: move more stuff of here and into Trepan::CmdProcessor
     # These below should go into Trepan::CmdProcessor.
-    attr_reader :cmd_argstr, :cmd_name, :vm_locations, :current_frame, 
+    attr_reader :cmd_argstr, :cmd_name, :vm_locations, :current_frame,
                 :debugee_thread, :completion_proc
 
     def initialize(settings={:start_frame=>1})
@@ -45,7 +45,7 @@ module MockDebugger
       @completion_proc = Proc.new{|str| str}
 
       # Don't allow user commands in mocks.
-      ## @core.processor.settings[:user_cmd_dir] = nil 
+      ## @core.processor.settings[:user_cmd_dir] = nil
 
     end
 
@@ -54,7 +54,7 @@ module MockDebugger
     end
   end
 
-  # Common Mock debugger setup 
+  # Common Mock debugger setup
   def setup(name=nil, show_constants=true)
     unless name
       loc = Rubinius::VM.backtrace(1, true)[0]
@@ -72,7 +72,7 @@ module MockDebugger
     cmdproc = Trepan::CmdProcessor.new(dbgr)
     cmdproc.frame = dbgr.frame(0)
     dbgr.processor = cmdproc
-    
+
     cmdproc.load_cmds_initialize
     cmds = cmdproc.commands
     cmd  = cmds[name]
@@ -116,9 +116,8 @@ module MockDebugger
   module_function :subsub_setup
 
   def show_special_class_constants(cmd)
-    puts 'ALIASES: %s' % [cmd.class.const_get('ALIASES').inspect] if
-      cmd.class.constants.member?(:ALIASES)
-    %w(CATEGORY MIN_ARGS MAX_ARGS 
+    puts 'ALIASES: %s' % [cmd.proc.get_class_aliases(cmd.class).inspect]
+    %w(CATEGORY MIN_ARGS MAX_ARGS
        NAME NEED_STACK SHORT_HELP).each do |name|
       puts '%s: %s' % [name, cmd.class.const_get(name).inspect]
     end

data/processor/subcmd.rb

@@ -12,13 +12,13 @@ class Trepan
       @subcmds = {}
       @cmdlist = []
     end
-    
+
     # Find subcmd in self.subcmds
     def lookup(subcmd_prefix, use_regexp=true)
-      compare = 
+      compare =
         if !@cmd.settings[:abbrev]
           lambda{|name| name.to_s == subcmd_prefix}
-        elsif use_regexp 
+        elsif use_regexp
           lambda{|name| name.to_s =~ /^#{subcmd_prefix}/}
         else
           lambda{|name| 0 == name.to_s.index(subcmd_prefix)}
@@ -46,7 +46,7 @@ class Trepan
           prefix = ''
         end
         if entry.respond_to?(:short_help)
-          prefix += ' -- ' if prefix 
+          prefix += ' -- ' if prefix
           @proc.msg(prefix + entry.short_help)
         end
       else
@@ -89,23 +89,23 @@ if __FILE__ == $0
   require_relative 'command'
 
   class Trepan::TestCommand < Trepan::Command
-    
+
     HELP = 'Help string string for testing'
     CATEGORY = 'data'
     MIN_ARGS = 0
     MAX_ARGS = 5
     NAME_ALIASES = %w(test)
-    
+
     def initialize(proc); @proc  = proc end
-    
+
     def run(args); puts 'test command run' end
   end
-  
+
   class TestTestingSubcommand
     HELP = 'Help string for test testing subcommand'
-    
+
     def initialize; @name  = 'testing' end
-    
+
     SHORT_HELP = 'This is short help for test testing'
     MIN_ABREV = 4
     IN_LIST   = true
@@ -119,12 +119,12 @@ if __FILE__ == $0
   # testcmdMgr = Subcmd.new('test', testcmd)
   # testsub = TestTestingSubcommand.new
   # testcmdMgr.add(testsub)
-  
+
   # %w(tes test testing testing1).each do |prefix|
   #   x = testcmdMgr.lookup(prefix)
   #   puts x ? x.name : 'Non'
   # end
-  
+
   # testcmdMgr.short_help(testcmd, 'testing')
   # testcmdMgr.short_help(testcmd, 'test', true)
   # testcmdMgr.short_help(testcmd, 'tes')

data/test/functional/fn_helper.rb

@@ -32,10 +32,11 @@ module FnTestHelper
     Rubinius::VM.backtrace(0)[1].line
   end
 
-  def compare_output(right, d, debugger_cmds)
+  def compare_output(right, d, debugger_cmds, filter_fn = nil)
     # require_relative '../../lib/trepanning'
     # Trepan.debug(:set_restart => true)
     got = filter_line_cmd(d.intf[-1].output.output)
+    got = send(:filter_fn, got) if filter_fn
     if got != right
       got.each_with_index do |got_line, i|
         if i < right.size and got_line != right[i]
@@ -65,22 +66,22 @@ module FnTestHelper
      s =~ TREPAN_PROMPT ? nil : s
     end.compact unless show_prompt
 
-    # Remove debugger location lines. 
-    # For example: 
+    # Remove debugger location lines.
+    # For example:
     #   -- (/src/external-vcs/trepan/tmp/gcd.rb:4 @21)
     # becomes:
-    #   -- 
+    #   --
     a2 = a.map do |s|
       s =~ TREPAN_LOC ? s.gsub(/\(.+:\d+( @\d+)?\)\n/, '').chomp : s.chomp
     end
 
-    # Canonicalize breakpoint messages. 
-    # For example: 
+    # Canonicalize breakpoint messages.
+    # For example:
     #   Set breakpoint 1: test/functional/test-tbreak.rb:10 (@0)
     # becomes :
     #   Set breakpoint 1: foo.rb:55 (@3)
     a3 = a2.map do |s|
-      s.gsub(/^Set (temporary )?breakpoint (\d+): .+:(\d+) \(@\d+\)/, 
+      s.gsub(/^Set (temporary )?breakpoint (\d+): .+:(\d+) \(@\d+\)/,
              'Set \1breakpoint \2: foo.rb:55 (@3)')
     end
     return a3

data/test/functional/test-recursive-bt.rb

@@ -7,6 +7,16 @@ class TestRecursiveBt < Test::Unit::TestCase
 
   include FnTestHelper
 
+  def filter_fn(a)
+    a.map { |line|
+      if line =~ /#6 MiniTest::Unit::TestCase/
+        "    #6 Test::Unit::TestCase(TestRecursiveBt)#run(result) at testcase.rb:78"
+      else
+        line
+      end
+    }
+  end
+
   def test_recursive_backtrace
 
     cmds = [
@@ -42,28 +52,28 @@ class TestRecursiveBt < Test::Unit::TestCase
     z = factorial(5)
     ##############################
     d.stop
-    out = 
+    out =
       ["-- ",
        "def factorial(n)",
        "basename is on.",
        "-- ",
        "z = factorial(5)",
-       "--> #0 TestRecursiveBt#test_recursive_backtrace at test-recursive-bt.rb:42",
+       "--> #0 TestRecursiveBt#test_recursive_backtrace at test-recursive-bt.rb:52",
        "(More stack frames follow...)",
        "-> ",
        "if n > 0",
        "-- ",
        "return n * factorial(n-1)",
-       "--> #0 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:37",
-       "    #1 TestRecursiveBt#test_recursive_backtrace at test-recursive-bt.rb:42",
+       "--> #0 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:47",
+       "    #1 TestRecursiveBt#test_recursive_backtrace at test-recursive-bt.rb:52",
        "(More stack frames follow...)",
        "-> ",
        "if n > 0",
        "-- ",
        "return n * factorial(n-1)",
-       "--> #0 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:37",
-       "    #1 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:37",
-       "    #2 TestRecursiveBt#test_recursive_backtrace at test-recursive-bt.rb:42",
+       "--> #0 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:47",
+       "    #1 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:47",
+       "    #2 TestRecursiveBt#test_recursive_backtrace at test-recursive-bt.rb:52",
        "(More stack frames follow...)",
        "-> ",
        "if n > 0",
@@ -71,10 +81,10 @@ class TestRecursiveBt < Test::Unit::TestCase
        "return n * factorial(n-1)",
        "-> ",
        "if n > 0",
-       "--> #0 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:36",
-       "    #1 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:37",
+       "--> #0 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:46",
+       "    #1 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:47",
        "... above line repeated 2 times",
-       "    #4 TestRecursiveBt#test_recursive_backtrace at test-recursive-bt.rb:42",
+       "    #4 TestRecursiveBt#test_recursive_backtrace at test-recursive-bt.rb:52",
        "(More stack frames follow...)",
        "-- ",
        "return n * factorial(n-1)",
@@ -82,13 +92,14 @@ class TestRecursiveBt < Test::Unit::TestCase
        "if n > 0",
        "-- ",
        "return n * factorial(n-1)",
-       "--> #0 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:37",
-       "    #1 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:37",
+       "--> #0 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:47",
+       "    #1 TestRecursiveBt#factorial(n) at test-recursive-bt.rb:47",
        "... above line repeated 3 times",
-       "    #5 TestRecursiveBt#test_recursive_backtrace at test-recursive-bt.rb:42",
+       "    #5 TestRecursiveBt#test_recursive_backtrace at test-recursive-bt.rb:52",
        "    #6 Test::Unit::TestCase(TestRecursiveBt)#run(result) at testcase.rb:78",
-       "(More stack frames follow...)"]
-    compare_output(out, d, cmds)
+       "(More stack frames follow...)"
+      ]
+    compare_output(out, d, cmds, :filter_fn)
 
   end
 end