rb8-trepanning 0.1.5 → 0.1.6

data/app/complete.rb

@@ -12,21 +12,21 @@ module Trepan
     def complete_token(complete_ary, prefix)
       complete_ary.select { |cmd| cmd.to_s.start_with?(prefix) }.sort
     end
-    
+
     def complete_token_with_next(complete_hash, prefix, cmd_prefix='')
       result = []
-      complete_hash.each do |cmd_name, cmd_obj| 
-        result << [cmd_name.to_s[cmd_prefix.size..-1], cmd_obj] if 
+      complete_hash.each do |cmd_name, cmd_obj|
+        result << [cmd_name.to_s[cmd_prefix.size..-1], cmd_obj] if
           cmd_name.to_s.start_with?(cmd_prefix + prefix)
       end
       result.sort{|a, b| a[0] <=> b[0]}
     end
-    
+
     # Find all starting matches in Hash +aliases+ that start with +prefix+,
     # but filter out any matches already in +expanded+.
     def complete_token_filtered(aliases, prefix, expanded)
       complete_ary = aliases.keys
-      complete_ary.select { |cmd| 
+      complete_ary.select { |cmd|
         cmd.to_s.start_with?(prefix) && ! expanded.member?(aliases[cmd])}.sort
     end
 
@@ -37,31 +37,31 @@ module Trepan
       complete_ary = aliases.keys
       expanded_ary = expanded.keys
       result = []
-      complete_ary.each do |cmd| 
-        if cmd.to_s.start_with?(prefix) && 
+      complete_ary.each do |cmd|
+        if cmd.to_s.start_with?(prefix) &&
             !expanded_ary.member?(aliases[cmd])
-          result << [cmd, commands[aliases[cmd]]] 
+          result << [cmd, commands[aliases[cmd]]]
         end
       end
-      result
+      result.sort
     end
 
     # Find the next token in str string from start_pos, we return
-    # the token and the next blank position after the token or 
+    # the token and the next blank position after the token or
     # str.size if this is the last token. Tokens are delimited by
     # white space.
     def next_token(str, start_pos)
       look_at = str[start_pos..-1]
       next_nonblank_pos = start_pos + (look_at =~ /\S/ || 0)
-      next_blank_pos = 
+      next_blank_pos =
         if next_match = str[next_nonblank_pos..-1] =~ /\s/
-          next_nonblank_pos + next_match 
+          next_nonblank_pos + next_match
         else
           str.size
         end
       return [next_blank_pos, str[next_nonblank_pos...next_blank_pos]]
     end
-    
+
   end
 end
 

data/app/default.rb

@@ -2,8 +2,8 @@
 require 'rubygems'; require 'require_relative'
 module Trepan
   # Default options to Trepan.start
-  DEFAULT_START_SETTINGS = { 
-    :init        => true,  # Set $0 and save ARGV? 
+  DEFAULT_START_SETTINGS = {
+    :init        => true,  # Set $0 and save ARGV?
     :post_mortem => false, # post-mortem debugging on uncaught exception?
     :tracing     => nil    # Debugger.tracing value. true/false resets,
                            # nil keeps the prior value
@@ -14,10 +14,10 @@ module Trepan
 
   # What file is used for debugger startup commands.
   unless defined?(CMD_INITFILE_BASE)
-    CMD_INITFILE_BASE = 
+    CMD_INITFILE_BASE =
       if RUBY_PLATFORM =~ /mswin/
         # Of course MS Windows has to be different
-        HOME_DIR =  (ENV['HOME'] || 
+        HOME_DIR =  (ENV['HOME'] ||
                      ENV['HOMEDRIVE'].to_s + ENV['HOMEPATH'].to_s).to_s
         'trepan8.ini'
     else
@@ -28,12 +28,12 @@ module Trepan
 
   CMD_INITFILE = File.join(HOME_DIR, CMD_INITFILE_BASE) unless
     defined?(CMD_INITFILE)
-  
+
   # Default settings for a Trepan class object
   DEFAULT_SETTINGS = {
     :cmdproc_opts    => {},    # Default Trepan::CmdProcessor settings
     :core_opts       => {},    # Default Trepan::Core settings
-    :delete_restore  => true,  # Delete restore profile after reading? 
+    :delete_restore  => true,  # Delete restore profile after reading?
     :initial_dir     => nil,   # If --cd option was given, we save it here.
     :nx              => false, # Don't run user startup file (e.g. .trepanxrc)
     :offset          => 0,     # skipping back +offset+ frames. This lets you start
@@ -42,7 +42,7 @@ module Trepan
     # Default values used only when 'server' or 'client'
     # (out-of-process debugging)
     :port            => 1955,
-    :host            => 'localhost', 
+    :host            => 'localhost',
 
     :restart_argv    => [],
     :server          => false  # Out-of-process debugging?
@@ -79,7 +79,7 @@ module Trepan
     # If start_sentinal is set, it is a string to look for in caller()
     # and is used to see if the call stack is truncated. Is also
     # defined in lib/trepanning.rb
-    start_sentinal = nil;  
+    start_sentinal = nil;
   end
 end
 

data/app/display.rb

@@ -13,14 +13,14 @@ end
 
 # Manage a list of display expressions.
 class DisplayMgr
-  
+
   def initialize
     @next = 0
     @list = []
   end
-  
+
   def [](index)
-    raise TypeError, 
+    raise TypeError,
     "index #{index} should be a Fixnum, is #{index.class}" unless
       index.is_a?(Fixnum)
     @list.detect {|disp| disp.number == index }
@@ -108,7 +108,7 @@ class Display
   attr_reader   :number
   attr_reader   :signature
   attr_accessor :enabled
-  
+
   def initialize(frame, arg, fmt, number)
     @signature = display_signature(frame)
     @fmt       = fmt
@@ -135,7 +135,7 @@ class Display
 
   def to_s(frame)
     return 'No symbol "' + @arg + '" in current context.' unless frame
-    
+
     begin
       val = eval(@arg, frame.binding)
     rescue
@@ -148,7 +148,7 @@ class Display
   # format display item
   def format(show_enabled=true)
     what = ''
-    what += @enabled ? ' y ' : ' n ' if 
+    what += @enabled ? ' y ' : ' n ' if
       show_enabled
     what += (@fmt + ' ') if @fmt
     what += @arg if @arg
@@ -167,7 +167,7 @@ if __FILE__ == $0
     mgr.all.each {|line| puts line}
     puts '=' * 40
   end
-    
+
   frame = Debugger.current_context
 
   x = 1

data/app/frame.rb

@@ -12,7 +12,7 @@ module Trepan
     end
 
     def reset
-      @binding = @klass = @file = @line = 
+      @binding = @klass = @file = @line =
         @local_variables = @method_name = @thread = nil
     end
 
@@ -42,19 +42,19 @@ module Trepan
           if opts[:callstyle] == :tracked
             arg_info = @context.frame_args_info(@index)
           end
-          call_str << "#{klass}." 
+          call_str << "#{klass}."
         end
         call_str << method_name
         if args.any?
           call_str << "("
           args.each_with_index do |name, i|
-            case opts[:callstyle] 
+            case opts[:callstyle]
             when :short
               call_str += "%s, " % [name]
             when :last
               klass = locals[name].class
               if klass.inspect.size > 20+3
-                klass = klass.inspect[0..20]+"..." 
+                klass = klass.inspect[0..20]+"..."
               end
               call_str += "%s#%s, " % [name, klass]
             when :tracked
@@ -70,7 +70,7 @@ module Trepan
               break
             end
           end
-          call_str[-2..-1] = ")" # Strip off trailing ', ' if any 
+          call_str[-2..-1] = ")" # Strip off trailing ', ' if any
         end
       end
       return call_str
@@ -149,12 +149,12 @@ if __FILE__ == $0
   def foo(str, num)
     x = 1
     context = Debugger.current_context
-    Debugger.skip do 
+    Debugger.skip do
       0.upto(Debugger.current_context.stack_size-1) do |i|
         frame = Trepan::Frame.new(context)
         frame.index = i
-        puts "Frame #{i}: #{frame.file}, line #{frame.line}, " + 
-          "class #{frame.klass}, thread: #{frame.thread}, " + 
+        puts "Frame #{i}: #{frame.file}, line #{frame.line}, " +
+          "class #{frame.klass}, thread: #{frame.thread}, " +
           "method: #{frame.method_name}"
         p frame.local_variables
         puts frame.describe(:maxwidth => 80, :callstyle=>:tracked)

data/app/irb.rb

@@ -3,49 +3,49 @@
 require 'rubygems'; require 'require_relative'
 require_relative 'util'
 
-Trepan::Util.suppress_warnings { 
+Trepan::Util.suppress_warnings {
   require 'irb'
 }
 
 module IRB # :nodoc:
   module ExtendCommand # :nodoc:
-    # FIXME: should we read these out of a directory to 
-    #        make this more user-customizable? 
+    # FIXME: should we read these out of a directory to
+    #        make this more user-customizable?
 
     unless defined? TContinue
 
       # A base command class that resume execution
       class TrepanResumeCommand
         def self.execute(conf, *opts)
-          name = 
+          name =
             if self.name =~ /IRB::ExtendCommand::(\S+)/
               $1[1..-1].downcase
             else
               'unknown'
             end
           $trepan_args = opts
-          $trepan_command = 
-            if $trepan_irb_statements 
+          $trepan_command =
+            if $trepan_irb_statements
               $trepan_irb_statements
             else
               ([name] + opts).join(' ')
             end
-          
+
           throw :IRB_EXIT, name.to_sym
         end
       end
-      
+
       class TContinue < TrepanResumeCommand ; end
       class TFinish   < TrepanResumeCommand ; end
       class TNext     < TrepanResumeCommand ; end
       class TQuit     < TrepanResumeCommand ; end
       class TStep     < TrepanResumeCommand ; end
-    
+
       # Issues a comamnd to the debugger without continuing
-      # execution. 
+      # execution.
       class TDbgr
         def self.execute(conf, *opts)
-          $trepan_command = 
+          $trepan_command =
             if opts.size == 1 && opts[0].is_a?(String)
               $trepan_args = opts[0]
             else
@@ -79,7 +79,7 @@ module IRB # :nodoc:
     unless @__initialized
 
       # Set to run the standard trepan IRB profile
-      irbrc = File.expand_path(File.join(File.dirname(__FILE__), 
+      irbrc = File.expand_path(File.join(File.dirname(__FILE__),
                                          %w(.. data irbrc)))
       ENV['IRBRC'] = irbrc
 
@@ -87,7 +87,7 @@ module IRB # :nodoc:
       ARGV.replace([])
       IRB.setup(nil)
       ARGV.replace(args)
-      
+
       # If the user has a IRB profile, run that now.
       if ENV['TREPANX_IRB']
         ENV['IRBRC'] = ENV['TREPANX_IRB']
@@ -97,7 +97,7 @@ module IRB # :nodoc:
 
       @__initialized = true
     end
-    
+
     workspace = WorkSpace.new(binding)
 
     irb = Irb.new(workspace)
@@ -105,7 +105,7 @@ module IRB # :nodoc:
     @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
     @CONF[:MAIN_CONTEXT] = irb.context
     conf.each {|k, v| @CONF[k] = v}
-    # A copy of this back_trace_limit is already active. How? 
+    # A copy of this back_trace_limit is already active. How?
     IRB.CurrentContext.back_trace_limit = @CONF[:BACK_TRACE_LIMIT]
 
     catch(:IRB_EXIT) do

data/app/options.rb

@@ -2,14 +2,14 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 #=== Summary
-# Parses command-line options. 
+# Parses command-line options.
 
 require 'optparse'
 module Trepan
   require 'rubygems'; require 'require_relative'
   require_relative 'default'
 
-  VERSION = '0.1.5' unless defined? Trepan::VERSION
+  VERSION = '0.1.6' unless defined? Trepan::VERSION
   PROGRAM = 'trepan8' unless defined? Trepan::PROGRAM
 
   module_function
@@ -21,7 +21,7 @@ module Trepan
   def copy_default_options
     options = {}
     DEFAULT_CMDLINE_SETTINGS.each do |key, value|
-      begin 
+      begin
         options[key] = value.clone
       rescue TypeError
         options[key] = value
@@ -46,8 +46,8 @@ EOB
           options[:client] = true
         end
       end
-      opts.on('-c', '--command FILE', String, 
-              'Execute debugger commands from FILE') do |cmdfile| 
+      opts.on('-c', '--command FILE', String,
+              'Execute debugger commands from FILE') do |cmdfile|
         if File.readable?(cmdfile)
           options[:cmdfiles] << cmdfile
         elsif File.exists?(cmdfile)
@@ -56,7 +56,7 @@ EOB
           stderr.puts "Command file '#{cmdfile}' does not exist."
         end
       end
-      opts.on('--cd DIR', String, 'Change current directory to DIR') do |dir| 
+      opts.on('--cd DIR', String, 'Change current directory to DIR') do |dir|
         if File.directory?(dir)
           if File.executable?(dir)
             options[:chdir] = dir
@@ -67,14 +67,14 @@ EOB
           stderr.puts "\"#{dir}\" is not a directory. Option --cd ignored."
         end
       end
-      opts.on('--basename', 
-              'Show only file basename in file locations') do 
+      opts.on('--basename',
+              'Show only file basename in file locations') do
         options[:basename] = true
       end
-      opts.on('-d', '--debug', 'Set $DEBUG=true') do 
+      opts.on('-d', '--debug', 'Set $DEBUG=true') do
         $DEBUG = true
       end
-      opts.on('--cport PORT', Integer, 'Port used for control commands') do 
+      opts.on('--cport PORT', Integer, 'Port used for control commands') do
         |cport|
         options[:cport] = cport
       end
@@ -89,23 +89,23 @@ EOB
           end
           unless LineCache.respond_to?(:clear_file_format_cache)
             stderr.puts "Your version of LineCache doesn't support terminal highlight"
-            options[:higlight] = false 
+            options[:higlight] = false
           end
         end
       end
-      opts.on('-h', '--host NAME', String, 
-              'Host or IP used in TCP connections for --server or --client. ' + 
-              "Default is #{DEFAULT_SETTINGS[:host].inspect}.") do 
-        |name_or_ip| 
+      opts.on('-h', '--host NAME', String,
+              'Host or IP used in TCP connections for --server or --client. ' +
+              "Default is #{DEFAULT_SETTINGS[:host].inspect}.") do
+        |name_or_ip|
         options[:host] = name_or_ip
       end
       opts.on('-I', '--include PATH', String, 'Add PATH to $LOAD_PATH') do |path|
         $LOAD_PATH.unshift(path)
       end
-      opts.on('--keep-frame-binding', 'Keep frame bindings') do 
+      opts.on('--keep-frame-binding', 'Keep frame bindings') do
         options[:frame_bind] = true
       end
-      opts.on('-m', '--post-mortem', 'Activate post-mortem mode') do 
+      opts.on('-m', '--post-mortem', 'Activate post-mortem mode') do
         options[:post_mortem] = true
       end
       opts.on('--nx',
@@ -115,10 +115,10 @@ EOB
       opts.on('--[no-]control', 'Start [not] control thread') do |v|
         options[:control] = v
       end
-      opts.on('-p', '--port NUMBER', Integer, 
-              'Port number used in TCP connections for --server or --client. ' + 
-              "Default is #{DEFAULT_SETTINGS[:port]}.") do 
-        |num| 
+      opts.on('-p', '--port NUMBER', Integer,
+              'Port number used in TCP connections for --server or --client. ' +
+              "Default is #{DEFAULT_SETTINGS[:port]}.") do
+        |num|
         options[:port] = num
       end
       opts.on('--[no-]quit', 'Do [not] quit when script finishes') do |v|
@@ -143,7 +143,7 @@ EOB
       opts.on('--[no-]stop', 'Do not stop when script is loaded') do |v|
         options[:stop] = v
       end
-      opts.on('--script FILE', String, 'Name of the script file to run') do 
+      opts.on('--script FILE', String, 'Name of the script file to run') do
         |script|
         options[:script] = script
         unless File.exists?(options[:script])
@@ -162,7 +162,7 @@ EOB
       opts.on('-w', '--wait', 'Wait for a client connection; implies -s option') do
         options[:wait] = true
       end
-      opts.on('-x', '--trace', 'Turn on line tracing') do 
+      opts.on('-x', '--trace', 'Turn on line tracing') do
         options[:traceprint] = true
         options[:nx] = true
       end
@@ -170,9 +170,9 @@ EOB
       opts.on_tail('-?', '--help', 'Show this message') do
         options[:help] = true
         stdout.puts opts
-        exit 
+        exit
       end
-      opts.on_tail('-v', '--version', 
+      opts.on_tail('-v', '--version',
                    'print the version') do
         options[:version] = true
         stdout.puts show_version