trepanning 0.0.6 → 0.0.8

data/processor/command/list.rb

@@ -5,7 +5,7 @@ require_relative 'base/cmd'
 
 class Trepan::Command::ListCommand < Trepan::Command
   unless defined?(HELP)
-    NAME          = File.basename(__FILE__, '.rb')
+    NAME = File.basename(__FILE__, '.rb')
     HELP = <<-HELP
 #{NAME}[>] [MODULE] [FIRST [NUM]]
 #{NAME}[>] LOCATION [NUM]
@@ -19,7 +19,7 @@ frame. If a subsequent #{NAME} command was issued with no intervening
 frame changing, then that is start the line after we last one
 previously shown.
 
-If the command has a '>' suffix, then lines centering is disabled and
+If the command has a '>' suffix, then line centering is disabled and
 listing begins at the specificed location.
 
 The number of line to show is controled by the debugger listsize
@@ -59,6 +59,8 @@ Some examples:
 #{NAME} foo.rb:5 2   # Same as above
 #{NAME} FileUtils.cp # List lines around the FileUtils.cp function.
 #{NAME} .            # List lines centered from where we currently are stopped
+#{NAME} . 3          # List 3 lines starting from where we currently are stopped
+                     # if . > 3. Otherwise we list from . to 3.
 #{NAME} -            # List lines previous to those just shown
 
 The output of the #{NAME} command give a line number, and some status
@@ -84,6 +86,12 @@ disabled.
     SHORT_HELP    = 'List source code'
   end
 
+  # If last is less than first, assume last is a count rather than an
+  # end line number.
+  def adjust_last(first, last)
+    last < first ? first + last - 1 : last
+  end
+
   # What a f*cking mess. Necessitated I suppose because we want to 
   # allow somewhat flexible parsing with either module names, files or none
   # and optional line counts or end-line numbers.
@@ -122,7 +130,20 @@ disabled.
         first = [1, @proc.line_no - 2*listsize - 1].max
       elsif args[0] == '.'
         return no_frame_msg unless @proc.line_no
-        first = [1, @proc.frame_line - center_correction].max
+        if args.size == 2
+          opts = {
+            :msg_on_error => 
+            "#{NAME} command last or count parameter expected, " +
+            'got: %s.' % args[2]
+          }
+          second = @proc.get_an_int(args[1], opts)
+          return nil, nil, nil unless second
+          first = @proc.frame_line 
+          last = adjust_last(first, second)
+        else
+          first = [1, @proc.frame_line - center_correction].max
+        end
+
       else
         modfunc, container, first = @proc.parse_position(args[0])
         if first == nil and modfunc == nil
@@ -135,29 +156,23 @@ disabled.
         elsif args.size == 2 or (args.size == 3 and modfunc)
           opts = {
             :msg_on_error => 
-            'Starting line expected, got %s.' % args[-1]
+            "#{NAME} command starting line expected, got %s." % args[-1]
           }
-          num = @proc.get_an_int(args[1], opts)
-
-          return nil, nil, nil unless num 
+          last = @proc.get_an_int(args[1], opts)
+          return nil, nil, nil unless last
           if modfunc
             if first
-              first = num
+              first = last
               if args.size == 3 and modfunc
-                opts[:msg_on_error] = ('last or count parameter expected, ' +
-                                       'got: %s.' % args[2])
+                opts[:msg_on_error] = 
+                  ("#{NAME} command last or count parameter expected, " +
+                   'got: %s.' % args[2])
                 last = @proc.get_an_int(args[2], opts)
+                return nil, nil, nil unless last
               end
-            else
-              last = num
             end
-          else
-            first = num - center_correction
-          end
-          if last and last < first
-            # Assume last is a count rather than an end line number
-            last = first + last - 1
           end
+          last = adjust_last(first, last)
         elsif not modfunc
           errmsg('At most 2 parameters allowed when no module' +
                   ' name is found/given. Saw: %d parameters' % args.size)
@@ -168,7 +183,7 @@ disabled.
           return nil, nil, nil
         end
       end
-    elsif !@proc.line_no and frame
+    elsif !@proc.line_no and @proc.frame
       first = [1, @proc.frame_line - center_correction].max
     else
       first = [1, @proc.line_no - center_correction].max 

data/processor/command/reload.rb

@@ -20,7 +20,7 @@ if __FILE__ == $0
   dbgr, cmd = MockDebugger::setup
 
   # require 'trepanning'
-  # Trepan.debug(:set_restart => true)
+  # Trepan.debug
   xx = Trepan::Command::ReloadCommand.new(cmd)
   cmd.run([cmd.name])
   cmd.run([cmd.name, 'command'])

data/processor/command/restart.rb

@@ -25,20 +25,19 @@ new copy of the debugger is used.
     dbgr = @proc.dbgr
     argv = dbgr.restart_argv
     if argv and argv.size > 0
-      unless File.executable?(argv[0])
-        msg(["File #{argv[0]} not executable.",
-             "Adding Ruby interpreter."])
-        argv.unshift Trepanning::ruby_path
-      end
+      # unless File.executable?(argv[0])
+      #   msg(["File #{argv[0]} not executable.",
+      #        "Adding Ruby interpreter."])
+      #   argv.unshift Trepanning::ruby_path
+      # end
       @proc.run_cmd(%w(show args))
       if not confirm('Restart (exec)?', false)
         msg "Restart not confirmed"
       else
         msg 'Restarting...'
         @proc.run_cmd(%w(save))
-        argv.unshift
         # FIXME: Run atexit finalize routines?
-        Dir.chdir(dbgr.initial_dir) if dbgr.initial_dir
+        Dir.chdir(RubyVM::OS_STARTUP_DIR)
         exec(*argv)
       end
     else
@@ -48,11 +47,11 @@ new copy of the debugger is used.
 end
 
 if __FILE__ == $0
-  exit if ARGV[0] == 'exit'
+  exit if ARGV[-1] == 'exit'
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
   dbgr.restart_argv = []
   cmd.run([cmd.name])
-  dbgr.restart_argv = [File.expand_path($0), 'exit']
+  dbgr.restart_argv = RubyVM::OS_ARGV + ['exit']
   cmd.run([cmd.name])
 end

data/processor/command/set_subcmd/auto.rb

@@ -18,10 +18,9 @@ if __FILE__ == $0
   set_cmd = cmds['set']
   command = Trepan::SubSubcommand::SetAuto.new(dbgr.core.processor, 
                                                set_cmd)
-  name = File.basename(__FILE__, '.rb')
   cmd_args = ['set', name]
   set_cmd.instance_variable_set('@last_args', cmd_args)
   # require_relative '../../../lib/trepanning'
-  # Trepan.debug(:set_restart => true)
+  # Trepan.debug
   command.run(cmd_args)
 end

data/processor/command/set_subcmd/auto_subcmd/eval.rb

@@ -36,7 +36,7 @@ problem. Another possibility is to go into a real Ruby shell via the
 "
     MIN_ABBREV = 'ev'.size
     NAME       = File.basename(__FILE__, '.rb')
-    PREFIX     = %w(set auto eval)
+    PREFIX     = %W(set auto #{NAME})
     SHORT_HELP = "Set evaluation of unrecognized debugger commands"
   end
 
@@ -45,23 +45,10 @@ end
 if __FILE__ == $0
   # Demo it.
   require_relative '../../../mock'
-  name = File.basename(__FILE__, '.rb')
-
-  # FIXME: DRY the below code
-  dbgr, set_cmd = MockTrepan::setup('set')
-  auto_cmd      = Trepan::SubSubcommand::SetAuto.new(dbgr.core.processor, 
-                                                     set_cmd)
-
-  # FIXME: remove the 'join' below
-  cmd_name      = Trepan::SubSubcommand::SetAutoEval::PREFIX.join('')
-  subcmd        = Trepan::SubSubcommand::SetAutoEval.new(set_cmd.proc, 
-                                                         auto_cmd,
-                                                         cmd_name)
-  # require_relative '../../../../lib/trepanning'
-  # Trepan.debug(:set_restart => true)
-
-  subcmd.run([cmd_name])
-  %w(off on 0 1).each { |arg| subcmd.run([cmd_name, arg]) }
+  require_relative '../auto'
+  cmd = MockDebugger::subsub_setup(Trepan::SubSubcommand::SetAuto,
+                                   Trepan::SubSubcommand::SetAutoEval)
+  %w(off on 0 1).each { |arg| cmd.run([cmd.name, arg]) }
   puts '-' * 10
-  puts subcmd.save_command.join("\n")
+  puts cmd.save_command.join("\n")
 end

data/processor/command/set_subcmd/auto_subcmd/irb.rb

@@ -7,7 +7,7 @@ class Trepan::Subcommand::SetAutoIrb < Trepan::SetBoolSubSubcommand
     HELP = "Set to automatically go into irb each time we enter the debugger"
     MIN_ABBREV = 'ir'.size
     NAME       = File.basename(__FILE__, '.rb')
-    PREFIX     = %w(set auto irb)
+    PREFIX     = %W(set auto #{NAME})
   end
 
   def run(args)
@@ -24,26 +24,10 @@ end
 if __FILE__ == $0
   # Demo it.
   require_relative '../../../mock'
-  require_relative '../../../subcmd'
-  require_relative '../../../hook'
-  name = File.basename(__FILE__, '.rb')
-
-  # FIXME: DRY the below code
-  dbgr, set_cmd = MockTrepan::setup('set')
-  auto_cmd      = Trepan::SubSubcommand::SetAuto.new(dbgr.core.processor, 
-                                                     set_cmd)
-  # FIXME: remove the 'join' below
-  cmd_name      = Trepan::Subcommand::SetAutoIrb::PREFIX.join('')
-  autox_cmd     = Trepan::SubSubcommand::SetAutoIrb.new(set_cmd.proc, 
-                                                        auto_cmd,
-                                                        cmd_name)
-  # require_relative '../../../../lib/trepanning'
-  # dbgr = Trepan.new(:set_restart => true)
-  # dbgr.debugger
-  set_cmd.proc.hook_initialize(set_cmd.proc.commands)
-  subcmd_name = Trepan::Subcommand::SetAutoIrb::PREFIX[1..-1].join('')
-  autox_cmd.run([subcmd_name])
-  autox_cmd.run([subcmd_name, 'off'])
-  puts autox_cmd.save_command.join("\n")
-
+  require_relative '../auto'
+  cmd = MockDebugger::subsub_setup(Trepan::SubSubcommand::SetAuto,
+                                   Trepan::SubSubcommand::SetAutoIrb)
+  %w(off on 0 1).each { |arg| cmd.run([cmd.name, arg]) }
+  puts '-' * 10
+  puts cmd.save_command.join("\n")
 end

data/processor/command/set_subcmd/auto_subcmd/list.rb

@@ -25,27 +25,10 @@ end
 if __FILE__ == $0
   # Demo it.
   require_relative '../../../mock'
-  require_relative '../../../subcmd'
-  require_relative '../../../hook'
-  name = File.basename(__FILE__, '.rb')
-
-  # FIXME: DRY the below code
-  dbgr, set_cmd = MockDebugger::setup('set')
-  testcmdMgr    = Trepan::Subcmd.new(set_cmd)
-  auto_cmd      = Trepan::SubSubcommand::SetAuto.new(dbgr.core.processor, 
-                                                     set_cmd)
-  # FIXME: remove the 'join' below
-  cmd_name      = Trepan::Subcommand::SetAutoList::PREFIX.join('')
-  autox_cmd     = Trepan::SubSubcommand::SetAutoList.new(set_cmd.proc, 
-                                                         auto_cmd,
-                                                         cmd_name)
-  # require_relative '../../../../lib/trepanning'
-  # dbgr = Trepan.new(:set_restart => true)
-  # dbgr.debugger
-  set_cmd.proc.hook_initialize(set_cmd.proc.commands)
-  subcmd_name = Trepan::Subcommand::SetAutoList::PREFIX[1..-1].join('')
-  autox_cmd.run([subcmd_name])
-  autox_cmd.run([subcmd_name, 'off'])
+  require_relative '../auto'
+  cmd = MockDebugger::subsub_setup(Trepan::SubSubcommand::SetAuto,
+                                   Trepan::SubSubcommand::SetAutoList)
+  %w(off on 0 1).each { |arg| cmd.run([cmd.name, arg]) }
   puts '-' * 10
-  puts autox_cmd.save_command
+  puts cmd.save_command.join("\n")
 end

data/processor/command/set_subcmd/basename.rb

@@ -15,25 +15,11 @@ end
 
 if __FILE__ == $0
   # Demo it.
+  $0 = __FILE__ + 'notagain' # So we don't run this agin
   require_relative '../../mock'
-  name = File.basename(__FILE__, '.rb')
-
-  # FIXME: DRY the below code
-  dbgr, cmd = MockDebugger::setup('set')
-  subcommand = Trepan::Subcommand::SetBasename.new(cmd)
-  testcmdMgr = Trepan::Subcmd.new(subcommand)
-
-  subcommand.run_show_bool
-  subcommand.summary_help(name)
-
-  # require 'trepanning'
-  # Trepan.debug(:set_restart => true)
-  subcommand.run(['set', name])
-  subcommand.run(['set', name, 'off'])
-  subcommand.run(['set', name, 'on'])
-  subcommand.summary_help(name)
-  puts
-  puts '-' * 20
-  puts subcommand.save_command
-
+  cmd = MockDebugger::sub_setup(Trepan::Subcommand::SetBasename, false)
+  cmd.run(cmd.prefix + ['off'])
+  cmd.run(cmd.prefix + ['ofn'])
+  cmd.run(cmd.prefix)
+  puts cmd.save_command
 end

data/processor/command/set_subcmd/debug.rb

@@ -22,6 +22,6 @@ if __FILE__ == $0
   cmd_args = ['set', name]
   set_cmd.instance_variable_set('@last_args', cmd_args)
   # require_relative '../../../lib/trepanning'
-  # Trepan.debug(:set_restart => true)
+  # Trepan.debug
   command.run(cmd_args)
 end

data/processor/command/set_subcmd/debug_subcmd/dbgr.rb

@@ -4,15 +4,15 @@ require_relative '../../base/subsubcmd'
 
 class Trepan::SubSubcommand::SetDebugDbgr < Trepan::SetBoolSubSubcommand
   unless defined?(HELP)
-    HELP        = 'set debug dbgr [on|off]
+    NAME        = File.basename(__FILE__, '.rb')
+    PREFIX      = %W(set debug #{NAME})
+    HELP        = "#{PREFIX.join(" ")} [on|off]
 
 Facilitates debugging the debugger. Global variables $trepan_cmdproc
 and $trepan_frame are set to the current values of @frame and self
-when the command processor was entered.  '
+when the command processor was entered."
 
     MIN_ABBREV  = 'db'.size
-    NAME        = File.basename(__FILE__, '.rb')
-    PREFIX      = %W(set debug #{NAME})
     SHORT_HELP  = 'Set debugging debugger'
   end
 
@@ -27,23 +27,10 @@ end
 if __FILE__ == $0
   # Demo it.
   require_relative '../../../mock'
-  name = File.basename(__FILE__, '.rb')
-
-  # FIXME: DRY the below code
-  dbgr, dbg_cmd  = MockDebugger::setup('set')
-  debug_cmd      = Trepan::SubSubcommand::SetDebug.new(dbgr.core.processor, 
-                                                        dbg_cmd)
-  # FIXME: remove the 'join' below
-  cmd_name       = Trepan::SubSubcommand::SetDebugDbgr::PREFIX.join('')
-  debugx_cmd     = Trepan::SubSubcommand::SetDebugDbgr.new(dbg_cmd.proc, 
-                                                           debug_cmd,
-                                                           cmd_name)
-  # require_relative '../.././../lib/trepanning'
-  # dbgr = Trepan.new(:set_restart => true)
-  # dbgr.debugger
-  debugx_cmd.run([name])
-  debugx_cmd.run([name, 'on'])
-  debugx_cmd.run([name, 'off'])
+  require_relative '../debug'
+  cmd = MockDebugger::subsub_setup(Trepan::SubSubcommand::SetDebug,
+                                   Trepan::SubSubcommand::SetDebugDbgr)
+  %w(off on 0 1).each { |arg| cmd.run([cmd.name, arg]) }
   puts '-' * 10
-  puts debugx_cmd.save_command
+  puts cmd.save_command.join("\n")
 end

data/processor/command/set_subcmd/debug_subcmd/except.rb

@@ -5,31 +5,19 @@ require_relative '../../base/subsubcmd'
 class Trepan::SubSubcommand::SetDebugExcept < Trepan::SetBoolSubSubcommand
   unless defined?(HELP)
     HELP        = 'Set to show execution traceback on debugger command exception'
-    MIN_ABBREV  = 'sk'.size
+    MIN_ABBREV  = 'ex'.size
     NAME        = File.basename(__FILE__, '.rb')
-    PREFIX      = %w(set debug except)
+    PREFIX      = %W(set debug #{NAME})
   end
 end
 
 if __FILE__ == $0
   # Demo it.
   require_relative '../../../mock'
-  require_relative '../../../subcmd'
-  name = File.basename(__FILE__, '.rb')
-
-  # FIXME: DRY the below code
-  dbgr, dbg_cmd  = MockDebugger::setup('set')
-  debug_cmd      = Trepan::SubSubcommand::SetDebug.new(dbgr.core.processor, 
-                                                        dbg_cmd)
-  # FIXME: remove the 'join' below
-  cmd_name       = Trepan::SubSubcommand::SetDebugExcept::PREFIX.join('')
-  debugx_cmd     = Trepan::SubSubcommand::SetDebugExcept.new(dbg_cmd.proc, 
-                                                              debug_cmd,
-                                                              cmd_name)
-  # require_relative '../../../../lib/trepan'
-  # dbgr = Trepan.new(:set_restart => true)
-  # dbgr.debugger
-  debugx_cmd.run([name, 'off'])
-  debugx_cmd.run([name])
-  debugx_cmd.run([name, 'on'])
+  require_relative '../debug'
+  cmd = MockDebugger::subsub_setup(Trepan::SubSubcommand::SetDebug,
+                                   Trepan::SubSubcommand::SetDebugExcept)
+  %w(off on 0 1).each { |arg| cmd.run([cmd.name, arg]) }
+  puts '-' * 10
+  puts cmd.save_command.join("\n")
 end

data/processor/command/set_subcmd/debug_subcmd/macro.rb

@@ -7,29 +7,17 @@ class Trepan::SubSubcommand::SetDebugMacro < Trepan::SetBoolSubSubcommand
     HELP = "Set macro debugging"
     MIN_ABBREV  = 'macro'.size
     NAME        = File.basename(__FILE__, '.rb')
-    PREFIX      = %w(set debug macro)
+    PREFIX      = %W(set debug #{NAME})
   end
 end
 
 if __FILE__ == $0
   # Demo it.
   require_relative '../../../mock'
-  require_relative '../../../subcmd'
-  name = File.basename(__FILE__, '.rb')
-
-  # FIXME: DRY the below code
-  dbgr, set_cmd  = MockTrepan::setup('set')
-  debug_cmd      = Trepan::SubSubcommand::SetDebug.new(dbgr.core.processor, 
-                                                        set_cmd)
-  # FIXME: remove the 'join' below
-  cmd_name       = Trepan::SubSubcommand::SetDebugMacro::PREFIX.join('')
-  debugx_cmd     = Trepan::SubSubcommand::SetDebugMacro.new(set_cmd.proc, 
-                                                            debug_cmd,
-                                                            cmd_name)
-  # require_relative '../../../../lib/trepanning'
-  # dbgr = Trepan.new(:set_restart => true)
-  # dbgr.debugger
-  debugx_cmd.run([name])
-  debugx_cmd.run([name, 'off'])
-  debugx_cmd.run([name, 'on'])
+  require_relative '../debug'
+  cmd = MockDebugger::subsub_setup(Trepan::SubSubcommand::SetDebug,
+                                   Trepan::SubSubcommand::SetDebugMacro)
+  %w(off on 0 1).each { |arg| cmd.run([cmd.name, arg]) }
+  puts '-' * 10
+  puts cmd.save_command.join("\n")
 end