trepanning 0.1.3 → 0.1.4

data/app/frame.rb

@@ -79,7 +79,7 @@ class Trepan
     end
 
     def file
-      source_container[1]
+      iseq.source_container[1]
     end
 
     def format_stack_call(frame, opts)

data/app/irb.rb

@@ -6,53 +6,55 @@ module IRB # :nodoc:
     # FIXME: should we read these out of a directory to 
     #        make this more user-customizable? 
 
-    # A base command class that resume execution
-    class DebuggerResumeCommand
-      def self.execute(conf, *opts)
-        name = 
-          if self.name =~ /IRB::ExtendCommand::(\S+)/
-            $1.downcase
-          else
-            'unknown'
-          end
-        $trepan_args = opts
-        $trepan_command = 
-          if $trepan_irb_statements 
-            $trepan_irb_statements
-          else
-            ([name] + opts).join(' ')
-          end
-
-        throw :IRB_EXIT, name.to_sym
+    unless defined? Continue
+      # A base command class that resume execution
+      class DebuggerResumeCommand
+        def self.execute(conf, *opts)
+          name = 
+            if self.name =~ /IRB::ExtendCommand::(\S+)/
+              $1.downcase
+            else
+              'unknown'
+            end
+          $trepan_args = opts
+          $trepan_command = 
+            if $trepan_irb_statements 
+              $trepan_irb_statements
+            else
+              ([name] + opts).join(' ')
+            end
+          
+          throw :IRB_EXIT, name.to_sym
+        end
       end
-    end
-
-    class Continue < DebuggerResumeCommand ; end
-    class Finish   < DebuggerResumeCommand ; end
-    class Next     < DebuggerResumeCommand ; end
-    class Quit     < DebuggerResumeCommand ; end
-    class Step     < DebuggerResumeCommand ; end
-
-    # Issues a comamnd to the debugger without continuing
-    # execution. 
-    class Dbgr
-      def self.execute(conf, *opts)
-        $trepan_command = 
-          if opts.size == 1 && opts[0].is_a?(String)
-            $trepan_args = opts[0]
+      
+      class Continue < DebuggerResumeCommand ; end
+      class Finish   < DebuggerResumeCommand ; end
+      class Next     < DebuggerResumeCommand ; end
+      class Quit     < DebuggerResumeCommand ; end
+      class Step     < DebuggerResumeCommand ; end
+      
+      # Issues a comamnd to the debugger without continuing
+      # execution. 
+      class Dbgr
+        def self.execute(conf, *opts)
+          $trepan_command = 
+            if opts.size == 1 && opts[0].is_a?(String)
+              $trepan_args = opts[0]
+            else
+              opts.join(' ')
+            end
+          # dbg_cmdproc = conf.workspace.instance_variable_get('@dbg_cmdproc')
+          if $trepan_cmdproc
+            $trepan_cmdproc.run_command($trepan_command) 
           else
-            opts.join(' ')
+            puts "Something's wrong with debugger setup of irb"
           end
-        dbg_cmdproc = conf.workspace.instance_variable_get('@dbg_cmdproc')
-        if dbg_cmdproc
-          dbg_cmdproc.run_command($trepan_command) 
-        else
-          puts "Something's wrong with debugger setup of irb"
         end
       end
     end
-
   end
+
   if defined?(ExtendCommandBundle)
     # New irb Commands which are the same name as their debugger
     # counterpart

data/app/options.rb

@@ -8,7 +8,7 @@ require 'optparse'
 class Trepan
   require_relative 'default'
 
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   PROGRAM = 'trepan'
 
   def self.show_version
@@ -110,7 +110,8 @@ EOB
         end
       end
       opts.on('-x', '--trace', 'Turn on line tracing') do
-        options[:tracing] = true
+        options[:traceprint] = true
+        options[:nx] = true
       end
       opts.separator ''
       opts.on_tail('-?', '--help', 'Show this message') do

data/app/run.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rbconfig'
 module Trepanning
 
@@ -9,17 +9,16 @@ module Trepanning
   # The caller must ensure that ARGV is set up to remove any debugger
   # arguments or things that the debugged program isn't supposed to
   # see.  FIXME: Should we make ARGV an explicit parameter?
-  def debug_program(dbgr, ruby_path, program_to_debug, start_opts={})
+  def debug_program(dbgr, program_to_debug)
 
     # Make sure Ruby script syntax checks okay.
     # Otherwise we get a load message that looks like trepanning has 
     # a problem. 
-    output = `#{RbConfig.ruby} -c #{program_to_debug.inspect} 2>&1`
-    if $?.exitstatus != 0 and RUBY_PLATFORM !~ /mswin/
+    output = ruby_syntax_errors(program_to_debug)
+    if output
       puts output
       exit $?.exitstatus 
     end
-    # print "\032\032starting\n" if Trepan.annotate and Trepan.annotate > 2
 
     dbgr.trace_filter << self.method(:debug_program)
     dbgr.trace_filter << Kernel.method(:load)
@@ -52,8 +51,9 @@ module Trepanning
   # Do a shell-like path lookup for prog_script and return the results.
   # If we can't find anything return prog_script.
   def whence_file(prog_script)
-    if prog_script.index(File::SEPARATOR)
-      # Don't search since this name has path separator components
+    if prog_script.start_with?(File::SEPARATOR) || prog_script.start_with?('.')
+      # Don't search since this name has path is explicitly absolute or
+      # relative.
       return prog_script
     end
     for dirname in ENV['PATH'].split(File::PATH_SEPARATOR) do
@@ -63,6 +63,14 @@ module Trepanning
     # Failure
     return prog_script
   end
+
+  def ruby_syntax_errors(prog_script)
+    output = `#{RbConfig.ruby} -c #{prog_script.inspect} 2>&1`
+    if $?.exitstatus != 0 and RUBY_PLATFORM !~ /mswin/
+      return output
+    end
+    return nil
+  end
 end
 
 if __FILE__ == $0
@@ -70,4 +78,10 @@ if __FILE__ == $0
   include  Trepanning
   puts whence_file('irb')
   puts whence_file('probably-does-not-exist')
+  puts RbConfig.ruby
+  puts "#{__FILE__} is syntactically correct" unless 
+    ruby_syntax_errors(__FILE__)
+  readme = File.join(File.dirname(__FILE__), '..', 'README.textile')
+  puts "#{readme} is not syntactically correct" if
+    ruby_syntax_errors(readme)
 end

data/app/util.rb

@@ -1,11 +1,11 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 
 class Trepan
   module Util
 
     module_function 
     def safe_repr(str, max, elipsis='... ')
-      if str.is_a?(String) && str.size > max && !str.index("\n")
+      if str.is_a?(String) && max > 0 && str.size > max && !str.index("\n")
         "%s%s%s" % [ str[0...max/2], elipsis,  str[str.size-max/2..str.size]]
       else
         str
@@ -45,6 +45,16 @@ class Trepan
       end
       return text
     end
+
+    # Suppress warnings. The main one we encounter is "already initialized
+    # constant" because perhaps another version readline has done that already.
+    def suppress_warnings
+      original_verbosity = $VERBOSE
+      $VERBOSE = nil
+      result = yield
+      $VERBOSE = original_verbosity
+      return result
+    end  
   end
 end
 

data/app/yarv.rb

@@ -8,8 +8,6 @@ module CodeRay
     
     class YARV < Scanner
       
-      include Streamable
-      
       register_for :yarv
       file_extension 'yarv'
 

data/bin/trepan

@@ -54,14 +54,13 @@ if File.basename(__FILE__) == File.basename($0)
     Trepan::PROG_SCRIPT = program_to_debug
 
     opts = {}
-    %w(cmdfiles highlight initial_dir host nx port readline server 
+    %w(cmdfiles highlight initial_dir host nx port readline server traceprint
       ).each do |opt|
       opts[opt.to_sym] = options[opt.to_sym]
     end
 
     # Set global so others may use this debugger.
     $trepan = Trepan.new(opts)
-    debug_program($trepan, RbConfig.ruby,
-                  File.expand_path(program_to_debug))
+    debug_program($trepan, File.expand_path(program_to_debug))
   end
 end

data/data/perldb.bindings

@@ -0,0 +1,17 @@
+# Aliases to simulate some of the Perl debugger command set
+alias = alias
+alias R restart
+alias b break
+alias c continue
+alias f list
+alias n next
+alias p pr
+alias q quit
+alias s step
+alias v list
+macro - Proc.new{|*args| "list -"}
+macro E Proc.new{|*args| "info thread"}
+macro L Proc.new{|*args| "info break"}
+macro T Proc.new{|*args| "info stack"}
+macro l Proc.new{|*args| "list>"}
+macro r Proc.new{|*args| %w(finish step)}

data/interface/script.rb

@@ -4,7 +4,7 @@
 # Module for reading debugger scripts
 
 # Our local modules
-require_relative 'base_intf'
+require_relative '../interface'
 require_relative '../io/input'
 require_relative '../io/string_array'
 

data/interface/server.rb

@@ -2,7 +2,7 @@
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Our local modules
-require_relative 'base_intf'
+require_relative '../interface'
 require_relative 'comcodes'
 require_relative '../io/input'
 require_relative '../io/tcpserver'

data/interface/user.rb

@@ -4,7 +4,7 @@
 # Interface when communicating with the user.
 
 # Our local modules
-require_relative 'base_intf'
+require_relative '../interface'
 require_relative '../io/input'
 
 # Interface when communicating with the user.
@@ -151,4 +151,6 @@ if __FILE__ == $0
     end
   end
   puts "User interface closed?: #{intf.closed?}"
+  intf.close
+  STDERR.puts "User interface closed?: #{intf.closed?}"
 end

data/{interface/base_intf.rb → interface.rb}

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 
 # A base class for a debugger interface.
 

data/io/input.rb

@@ -5,7 +5,7 @@
 # input or GNU Readline.
 # 
 
-require_relative 'base_io'
+require_relative '../io'
 
 class Trepan
 
@@ -132,5 +132,3 @@ if __FILE__ == $0
     end
   end
 end
-
-

data/io/null_output.rb

@@ -5,7 +5,7 @@
 # to see output.
 # 
 
-require_relative 'base_io'
+require_relative '../io'
 
 class Trepan
   class OutputNull < Trepan::OutputBase

data/io/string_array.rb

@@ -3,7 +3,7 @@
 
 # Simulate I/O using lists of strings.
 
-require_relative 'base_io'
+require_relative '../io'
 
 # Simulate I/O using an array of strings. Sort of like StringIO, but
 # even simplier.
@@ -152,4 +152,3 @@ if __FILE__ == $0
   inp.close
   puts "Input is closed? #{inp.closed?}"
 end
-

data/io/tcpclient.rb

@@ -3,7 +3,7 @@
 # Debugger Socket Input/Output Interface.
 
 require 'socket'
-require_relative 'base_io'
+require_relative '../io'
 require_relative 'tcpfns'
 
 class Trepan 

data/io/tcpserver.rb

@@ -4,7 +4,7 @@
 
 require 'socket'
 require_relative '../app/default' # For host and port
-require_relative 'base_io'
+require_relative '../io'
 require_relative 'tcpfns'
 
 class Trepan 

data/lib/trepanning.rb

@@ -66,7 +66,7 @@ class Trepan
         opts[:host] = @settings[:host] if @settings[:host]
         opts[:complete] = @completion_proc
         opts[:readline] ||= @settings[:readline]
-        [Trepan::ClientInterface.new(nil, nil, nil, nil, opts)]
+        [Trepan::ClientInterface.new(nil, nil, nil, {}, opts)]
       else
         opts = {:complete => @completion_proc,
                 :readline => @settings[:readline]}
@@ -78,6 +78,7 @@ class Trepan
     # FIXME: The below option settings is a big crock.
     @settings[:core_opts][:cmdproc_opts] ||= {}
     @settings[:core_opts][:cmdproc_opts][:highlight] ||= settings[:highlight]
+    @settings[:core_opts][:cmdproc_opts][:traceprint] = settings[:traceprint]
 
     @core = Core.new(self, @settings[:core_opts])
     

data/processor/command/alias.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 
 class Trepan::Command::AliasCommand < Trepan::Command
 
@@ -8,7 +8,18 @@ class Trepan::Command::AliasCommand < Trepan::Command
     HELP = <<-HELP
 #{NAME} ALIAS COMMAND
 
-Add an alias for a COMMAND
+Add alias ALIAS for a debugger command COMMAND.  
+
+Add an alias when you want to use a command abbreviation for a command
+that would otherwise be ambigous. For example, by default we make 's'
+be an alias of 'step' to force it to be used. Without the alias, "s"
+might be "step", "show", or "set" among others
+
+Example:
+
+alias cat list   # "cat rubyfile.rb" is the same as "list rubyfile.rb"
+alias s   step   # "s" is now an alias for "step".
+                 # The above examples done by default.
 
 See also 'unalias' and 'show #{NAME}'.
     HELP
@@ -22,9 +33,9 @@ See also 'unalias' and 'show #{NAME}'.
   # Run command. 
   def run(args)
     if args.size == 1
-      @proc.commands['show'].run(%w(show alias))
+      @proc.commands['show'].run(%W(show #{NAME}))
     elsif args.size == 2
-      @proc.commands['show'].run(['show', 'alias', args[1]])
+      @proc.commands['show'].run(%W(show #{NAME} #{args[1]}))
     else
       junk, al, command = args
       old_command = @proc.aliases[al]

data/processor/command/backtrace.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../command'
 class Trepan::Command::BacktraceCommand < Trepan::Command
 
   unless defined?(HELP)

data/processor/command/base/subcmd.rb

@@ -9,7 +9,7 @@
 # Base Class for Trepan subcommands. We pull in some helper
 # functions for command from module cmdfns.
 
-require_relative 'cmd'
+require_relative '../../command'
 
 class Trepan
 
@@ -130,10 +130,6 @@ class Trepan
       ["#{subcmd_prefix_string} #{settings[subcmd_setting_key]}"]
     end
 
-    def settings
-      @proc.settings
-    end
-        
     def subcmd_prefix_string
       self.class.const_get(:PREFIX).join(' ')
     end

data/processor/command/base/submgr.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'cmd'
+require_relative '../../command'
 require_relative '../../subcmd'
 require_relative '../../help'
 require_relative '../../../app/complete'

data/processor/command/base/subsubcmd.rb

@@ -9,7 +9,7 @@
 # Base Class for Trepan subcommands. We pull in some helper
 # functions for command from module cmdfns.
 
-require_relative 'cmd'
+require_relative '../../command'
 require_relative 'subcmd'
 
 class Trepan

data/processor/command/base/subsubmgr.rb

@@ -159,19 +159,19 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
 
   def run(args)
     args = @parent.last_args if args.size == 0
-    if args.size < 3 || args.size == 3 && args[-1] == '*'
+    if args.size < 3 || args.size == 3 && args[2] == '*'
       summary_list(obj_const(self, :NAME), @subcmds)
       return false
     end
 
-    subcmd_prefix = args[0..2].join('')
+    subcmd_prefix = obj_const(self, :PREFIX).join('')
     # We were given: cmd subcmd ...
     # Run that.
-    subcmd = @subcmds.lookup(subcmd_prefix)
+    subcmd = @subcmds.lookup(subcmd_prefix + args[2])
     if subcmd
       subcmd.run(args[2..-1])
     else
-      undefined_subcmd(obj_const(self, :PREFIX).join(' '), args[-1])
+      undefined_subcmd(obj_const(self, :PREFIX).join(' '), args[2])
     end
   end
 

data/processor/command/break.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../breakpoint'
 require_relative '../../app/breakpoint'
 class Trepan::Command::BreakCommand < Trepan::Command

data/processor/command/complete.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../load_cmds'
 class Trepan::Command::CompleteCommand < Trepan::Command
 

data/processor/command/condition.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../command'
 require_relative '../breakpoint'
 require_relative '../../app/breakpoint'
 require_relative '../../app/condition'

data/processor/command/continue.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../running'
 require_relative '../../app/breakpoint' # FIXME: possibly temporary
 

data/processor/command/debug.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
 require 'thread_frame'
-require_relative 'base/cmd'
+require_relative '../command'
 
 class Trepan::Command::DebugCommand < Trepan::Command
   unless defined?(HELP)

data/processor/command/delete.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../command'
 require_relative '../breakpoint'
 require_relative '../../app/breakpoint'
 class Trepan::Command::DeleteCommand < Trepan::Command
@@ -33,9 +33,12 @@ number.
     end
     first = args.shift
     args.each do |num_str|
-      i = @proc.get_an_int(num_str)
-      success = @proc.delete_breakpoint_by_number(num_str.to_i, false) if i
-      msg('Deleted breakpoint %d.' % i) if success
+      opts = {:msg_on_error => '%s must be a number' % num_str}
+      i = @proc.get_an_int(num_str, opts)
+      if i 
+        success = @proc.delete_breakpoint_by_number(num_str.to_i, false) if i
+        msg('Deleted breakpoint %d.' % i) if success
+      end
     end
   end
 end
@@ -47,8 +50,8 @@ if __FILE__ == $0
   cmd.run([cmd.name, '1'])
   cmdproc = dbgr.core.processor
   cmds = dbgr.core.processor.commands
-  break_cmd = cmds['break']
-  break_cmd.run(['break', cmdproc.frame.source_location[0].to_s])
+  break_cmd = cmds[cmd.name]
+  break_cmd.run([cmd.name, cmdproc.frame.source_location[0].to_s])
   # require_relative '../../lib/trepanning'
   # Trepan.debug
   cmd.run([cmd.name, '1'])

data/processor/command/directory.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 class Trepan::Command::DirectoryCommand < Trepan::Command
 
   unless defined?(HELP)