trepanning 1.93.32 → 1.93.35

data/ChangeLog

@@ -1,7 +1,21 @@
+2015-03-12  rocky <rockyb@rubyforge.org>
+
+	* trepanning.gemspec: Get ready for release 1.93.34 (again)
+
+2015-03-12  rocky <rockyb@rubyforge.org>
+
+	* ChangeLog, NEWS, app/markdown.rb, app/options.rb,
+	processor/command/list.rb: Get ready for release 1.93.34
+
+2015-03-12  rocky <rockyb@rubyforge.org>
+
+	* processor.rb, trepanning.gemspec: Empty line runs "next command".
+	Add Markdown in description.
+
 2015-03-08  rocky <rockyb@rubyforge.org>
 
-	* NEWS, app/breakpoint.rb, app/options.rb, trepanning.gemspec: Get
-	ready for release 1.93.32
+	* ChangeLog, NEWS, app/breakpoint.rb, app/options.rb,
+	trepanning.gemspec: Get ready for release 1.93.32
 
 2015-03-08  rocky <rockyb@rubyforge.org>
 

data/NEWS

@@ -1,3 +1,9 @@
+(1.93.40) Mar 12, 2015
+- remove stray space after backtick in markdown
+- list command continues where it last left off
+- empty debugger command repeats last command
+- Use markdown in Gem description
+
 (1.93.32) Mar 8, 2015
 - Remove reference to threadframe
 

data/app/markdown.rb

@@ -58,7 +58,7 @@ module Redcarpet
 
             def codespan(text)
                 if ansi?
-                    Term::ANSIColor.underline + text + Term::ANSIColor.reset + "\n"
+                    Term::ANSIColor.underline + text + Term::ANSIColor.reset
                 else
                     "'" + text + "'"
                 end
@@ -162,6 +162,8 @@ if __FILE__ == $0
 # HI
 This is a paragraph
 
+A `b`, `c`, d
+
 **This** is another *paragraph*.
 EOF
     [[80, true],

data/app/options.rb

@@ -8,7 +8,7 @@ require 'optparse'
 class Trepan
   require_relative 'default'
 
-  VERSION = '1.93.32'
+  VERSION = '1.93.35'
   PROGRAM = 'trepan'
 
   def self.show_version

data/processor.rb

@@ -153,41 +153,42 @@ class Trepan
 
     # Run one debugger command. True is returned if we want to quit.
     def process_command_and_quit?()
-      intf_size = @dbgr.intf.size
-      @intf  = @dbgr.intf[-1]
-      return true if @intf.input_eof? && intf_size == 1
-      while intf_size > 1 || !@intf.input_eof?
-        begin
-          @current_command =
-            if @cmd_queue.empty?
-              # Leave trailing blanks on for the "complete" command
-              read_command.chomp
-            else
-              @cmd_queue.shift
-            end
-          if @current_command.empty?
-            next unless @last_command && intf.interactive?;
-          end
-          next if @current_command[0..0] == '#' # Skip comment lines
-          break
-        rescue IOError, Errno::EPIPE => e
-          if intf_size > 1
-            @dbgr.intf.pop
-            intf_size = @dbgr.intf.size
-            @intf = @dbgr.intf[-1]
-            @last_command = nil
-            print_location
-          else
-            ## FIXME: think of something better.
+        intf_size = @dbgr.intf.size
+        @intf  = @dbgr.intf[-1]
+        return true if @intf.input_eof? && intf_size == 1
+        while intf_size > 1 || !@intf.input_eof?
+            begin
+                @current_command =
+                    if @cmd_queue.empty?
+                        # Leave trailing blanks on for the "complete" command
+                        read_command.chomp
+                    else
+                        @cmd_queue.shift
+                    end
+                if @current_command.empty?
+                    next unless @last_command && intf.interactive?
+                    @current_command = @last_command
+                end
+                next if @current_command[0..0] == '#' # Skip comment lines
+                break
+            rescue IOError, Errno::EPIPE => e
+                if intf_size > 1
+                    @dbgr.intf.pop
+                    intf_size = @dbgr.intf.size
+                    @intf = @dbgr.intf[-1]
+                    @last_command = nil
+                    print_location
+                else
+                    ## FIXME: think of something better.
             quit('quit!')
-            return true
-          end
+                    return true
+                end
+            end
         end
-      end
-      run_command(@current_command)
+        run_command(@current_command)
 
-      # Save it to the history.
-      @intf.history_io.puts @last_command if @last_command && @intf.history_io
+        # Save it to the history.
+        @intf.history_io.puts @last_command if @last_command && @intf.history_io
     end
 
     # This is the main entry point.

data/processor/command/list.rb

@@ -5,11 +5,12 @@ require_relative '../command'
 require_relative '../list'
 
 class Trepan::Command::ListCommand < Trepan::Command
-  unless defined?(HELP)
-    NAME = File.basename(__FILE__, '.rb')
-    HELP = <<-HELP
-**#{NAME}[>]** [*module*] [*first* [*num*]]
-**#{NAME}[>]** *location [*num*]
+    unless defined?(HELP)
+        NAME = File.basename(__FILE__, '.rb')
+        HELP = <<-HELP
+**#{NAME}**[**>**] [*module*] [*first* [*num*]]
+
+**#{NAME}**[**>**] *location* [*num*]
 
 List source code.
 
@@ -21,13 +22,13 @@ changing, then that is start the line after we last one previously
 shown.
 
 If the command has a ">" suffix, then line centering is disabled and
-listing begins at the specificed location.
+listing begins at the specified location.
 
 The number of lines to show is controlled by the debugger "listsize"
 setting. Use 'set max list' or 'show max list' to see or set the
 value.
 
-\"#{NAME} -\" shows lines before a previous listing.
+`#{NAME} -` shows lines before a previous listing.
 
 A *location* is a either:
 
@@ -90,164 +91,166 @@ See also:
 `set max list`, `show max list`, `disassemble`, `help syntax location`
     HELP
 
-    ALIASES       = %W(l #{NAME}> l> cat)
-    CATEGORY      = 'files'
-    MAX_ARGS      = 3
-    SHORT_HELP    = 'List source code'
-  end
-
-  def run(args)
-    if args.empty? and not frame
-      errmsg("No Ruby program loaded.")
-      return
-    end
-    listsize = settings[:maxlist]
-    center_correction =
-      if args[0][-1..-1] == '>'
-        0
-      else
-        (listsize-1) / 2
-      end
-
-    iseq, filename, first, last =
-      @proc.parse_list_cmd(@proc.cmd_argstr, listsize, center_correction)
-    return unless filename
-    container = iseq ? iseq.source_container : ['file', filename]
-    breaklist = @proc.brkpts.line_breaks(container)
-
-    # We now have range information. Do the listing.
-    max_line = LineCache::size(filename)
-    unless max_line
-      errmsg('File "%s" not found.' % filename)
-      return
+        ALIASES       = %W(l #{NAME}> l> cat)
+        CATEGORY      = 'files'
+        MAX_ARGS      = 3
+        SHORT_HELP    = 'List source code'
     end
 
-    if first > max_line
-      errmsg('Bad line range [%d...%d]; file "%s" has only %d lines' %
-             [first, last, filename, max_line])
-      return
-    end
+    def run(args)
+        if args.size == 1 and not @proc.frame
+            errmsg("No Ruby program loaded.")
+            return
+        end
+        listsize = settings[:maxlist]
+        center_correction =
+            if args[0][-1..-1] == '>'
+                0
+            else
+                (listsize-1) / 2
+            end
+
+        iseq, filename, first, last =
+            @proc.parse_list_cmd(@proc.cmd_argstr, listsize, center_correction)
+        return unless filename
+        container = iseq ? iseq.source_container : ['file', filename]
+        breaklist = @proc.brkpts.line_breaks(container)
+
+        # We now have range information. Do the listing.
+        max_line = LineCache::size(filename)
+        unless max_line
+            errmsg('File "%s" not found.' % filename)
+            return
+        end
 
-    if last > max_line
-      # msg('End position changed to last line %d ' % max_line)
-      last = max_line
-    end
+        if first > max_line
+            errmsg('Bad line range [%d...%d]; file "%s" has only %d lines' %
+                   [first, last, filename, max_line])
+            return
+        end
 
-    begin
-      opts = {
-        :reload_on_change => settings[:reload],
-        :output => settings[:highlight]
-      }
-      frame = @proc.frame
-      first.upto(last).each do |lineno|
-        line = LineCache::getline(filename, lineno, opts)
-        unless line
-          msg('[EOF]')
-          break
+        if last > max_line
+            # msg('End position changed to last line %d ' % max_line)
+            last = max_line
+        end
+
+        begin
+            opts = {
+                :reload_on_change => settings[:reload],
+                :output => settings[:highlight]
+            }
+            frame = @proc.frame
+            first.upto(last).each do |lineno|
+                line = LineCache::getline(filename, lineno, opts)
+                unless line
+                    msg('[EOF]')
+                    break
+                end
+                line.chomp!
+                s = '%3d' % lineno
+                s = s + ' ' if s.size < 4
+                s += if breaklist.member?(lineno)
+                         bp = breaklist[lineno]
+                         a_pad = '%02d' % bp.id
+                         bp.icon_char
+                     else
+                         a_pad = '  '
+                         ' '
+                     end
+                s += (frame && lineno == @proc.frame_line &&
+                      filename == frame.source_container[1]) ? '->' : a_pad
+                msg(s + "\t" + line, {:unlimited => true})
+                @proc.line_no = lineno
+            end
+            @proc.list_lineno += listsize + center_correction + 1
+            @proc.list_lineno = max_line if @proc.list_lineno > max_line
+        rescue => e
+            errmsg e.to_s if settings[:debugexcept]
         end
-        line.chomp!
-        s = '%3d' % lineno
-        s = s + ' ' if s.size < 4
-        s += if breaklist.member?(lineno)
-               bp = breaklist[lineno]
-               a_pad = '%02d' % bp.id
-               bp.icon_char
-             else
-               a_pad = '  '
-               ' '
-             end
-        s += (frame && lineno == @proc.frame_line &&
-              filename == frame.source_container[1]) ? '->' : a_pad
-        msg(s + "\t" + line, {:unlimited => true})
-        @proc.line_no = lineno
-      end
-    rescue => e
-      errmsg e.to_s if settings[:debugexcept]
     end
-  end
 end
 
 if __FILE__ == $0
-  if !(ARGV.size == 1 && ARGV[0] == 'noload')
-    ARGV[0..-1]    = ['noload']
-    load(__FILE__)
-  else
-    require_relative '../location'
-    require_relative '../mock'
-    require_relative '../frame'
-    dbgr, cmd = MockDebugger::setup
-    cmd.proc.send('frame_initialize')
-
-    def run_cmd(cmd, args)
-      cmd.proc.instance_variable_set('@cmd_argstr', args[1..-1].join(' '))
-      cmd.run(args)
-    end
+    if !(ARGV.size == 1 && ARGV[0] == 'noload')
+        ARGV[0..-1]    = ['noload']
+        load(__FILE__)
+    else
+        require_relative '../location'
+        require_relative '../mock'
+        require_relative '../frame'
+        dbgr, cmd = MockDebugger::setup
+        cmd.proc.send('frame_initialize')
+
+        def run_cmd(cmd, args)
+            cmd.proc.instance_variable_set('@cmd_argstr', args[1..-1].join(' '))
+            cmd.run(args)
+        end
 
-    LineCache::cache(__FILE__)
-    run_cmd(cmd, [cmd.name])
-    run_cmd(cmd, [cmd.name, __FILE__ + ':10'])
+        LineCache::cache(__FILE__)
+        run_cmd(cmd, [cmd.name])
+        run_cmd(cmd, [cmd.name, __FILE__ + ':10'])
 
-    def run_cmd2(cmd, args)
-      seps = '--' * 10
-      puts "%s %s %s" % [seps, args.join(' '), seps]
-      run_cmd(cmd,args)
-    end
+        def run_cmd2(cmd, args)
+            seps = '--' * 10
+            puts "%s %s %s" % [seps, args.join(' '), seps]
+            run_cmd(cmd,args)
+        end
 
 
-    load 'tmpdir.rb'
-    run_cmd2(cmd, %w(list tmpdir.rb 10))
-    run_cmd2(cmd, %w(list tmpdir.rb))
+        load 'tmpdir.rb'
+        run_cmd2(cmd, %w(list tmpdir.rb 10))
+        run_cmd2(cmd, %w(list tmpdir.rb))
 
-    # cmd.proc.frame = sys._getframe()
-    # cmd.proc.setup()
-    # run_cmd2(['list'])
+        # cmd.proc.frame = sys._getframe()
+        # cmd.proc.setup()
+        # run_cmd2(['list'])
 
-    run_cmd2(cmd, %w(list .))
-    run_cmd2(cmd, %w(list 30))
+        run_cmd2(cmd, %w(list .))
+        run_cmd2(cmd, %w(list 30))
 
-    # run_cmd2(['list', '9+1'])
+        # run_cmd2(['list', '9+1'])
 
-    run_cmd2(cmd, %w(list> 10))
-    run_cmd2(cmd, %w(list 3000))
-    run_cmd2(cmd, %w(list run_cmd2))
+        run_cmd2(cmd, %w(list> 10))
+        run_cmd2(cmd, %w(list 3000))
+        run_cmd2(cmd, %w(list run_cmd2))
 
-    p = Proc.new do
-      |x,y| x + y
-    end
-    require 'thread_frame'
-    tf = RubyVM::Frame.current
-    cmd.proc.frame_setup(tf)
-    run_cmd2(cmd, %w(list p))
+        p = Proc.new do
+            |x,y| x + y
+        end
+        require 'thread_frame'
+        tf = RubyVM::Frame.current
+        cmd.proc.frame_setup(tf)
+        run_cmd2(cmd, %w(list p))
 
-    # Function from a file found via an instruction sequence
-    run_cmd2(cmd, %w(list Columnize.columnize))
+        # Function from a file found via an instruction sequence
+        run_cmd2(cmd, %w(list Columnize.columnize))
 
-    # Use Class/method name. 15 isn't in the function - should this be okay?
-    run_cmd2(cmd, %W(#{cmd.name} Columnize.columnize 15))
+        # Use Class/method name. 15 isn't in the function - should this be okay?
+        run_cmd2(cmd, %W(#{cmd.name} Columnize.columnize 15))
 
-    # Start line and count, since 3 < 30
-    run_cmd2(cmd, %W(#{cmd.name} Columnize.columnize 30 3))
+        # Start line and count, since 3 < 30
+        run_cmd2(cmd, %W(#{cmd.name} Columnize.columnize 30 3))
 
-    # Start line finish line
-    run_cmd2(cmd, %W(#{cmd.name} Columnize.columnize 40 50))
+        # Start line finish line
+        run_cmd2(cmd, %W(#{cmd.name} Columnize.columnize 40 50))
 
-    # puts '--' * 10
-    # run_cmd2([cmd.name, os.path.abspath(__file__)+':3', '4'])
-    # puts '--' * 10
-    # run_cmd2([cmd.name, os.path.abspath(__file__)+':3', '12-10'])
-    # run_cmd2([cmd.name, 'os.path:5'])
+        # puts '--' * 10
+        # run_cmd2([cmd.name, os.path.abspath(__file__)+':3', '4'])
+        # puts '--' * 10
+        # run_cmd2([cmd.name, os.path.abspath(__file__)+':3', '12-10'])
+        # run_cmd2([cmd.name, 'os.path:5'])
 
-    brkpt_cmd = cmd.proc.instance_variable_get('@commands')['break']
-    brkpt_cmd.run(['break'])
-    line = __LINE__
-    run_cmd2(cmd, [cmd.name, __LINE__.to_s])
+        brkpt_cmd = cmd.proc.instance_variable_get('@commands')['break']
+        brkpt_cmd.run(['break'])
+        line = __LINE__
+        run_cmd2(cmd, [cmd.name, __LINE__.to_s])
 
-    disable_cmd = cmd.proc.instance_variable_get('@commands')['disable']
-    disable_cmd.run(['disable', '1'])
+        disable_cmd = cmd.proc.instance_variable_get('@commands')['disable']
+        disable_cmd.run(['disable', '1'])
 
-    run_cmd2(cmd, [cmd.name, line.to_s])
-    run_cmd2(cmd, %W(#{cmd.name} run_cmd2))
-    run_cmd2(cmd, %W(#{cmd.name} run_cmd2))
-    run_cmd2(cmd, %W(#{cmd.name} @0))
+        run_cmd2(cmd, [cmd.name, line.to_s])
+        run_cmd2(cmd, %W(#{cmd.name} run_cmd2))
+        run_cmd2(cmd, %W(#{cmd.name} run_cmd2))
+        run_cmd2(cmd, %W(#{cmd.name} @0))
   end
 end

data/trepanning.gemspec

@@ -10,15 +10,20 @@ Gem::Specification.new do |spec|
   spec.authors      = ['R. Bernstein']
   spec.date         = Time.now
   spec.description = <<-EOF
-A Ruby debugger with both high and low-level debugging support.
+== Description
+
+A gdb-like Ruby debugger with both high and low-level debugging support.
+
+See https://github.com/rocky/rb-trepanning/wiki/Features for a list of features.
 
 To provide the advanced features this version works only with a
-patched MRI Ruby 1.9.3 runtime.
+[patched MRI Ruby 1.9.3. See http://ruby-debugger-runtime.sourceforge.net/
 
-For a version that works with Ruby 2.1.5, install a version
-starting with 2.15.
+This version works only with a patched version of Ruby 1.9.3
+Ruby 2.1.5, look for a version that starts with 2.1.5
 EOF
   spec.add_dependency('rb-trace', '~> 0.5')
+  spec.add_dependency('rb-threadframe', '~> 0.41')
   spec.add_dependency('columnize', '~> 0.9')
   spec.add_dependency('redcarpet', '~> 3.2')
   spec.add_dependency('coderay', '~> 1.1')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trepanning
 version: !ruby/object:Gem::Version
-  version: 1.93.32
+  version: 1.93.35
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-trace
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: rb-threadframe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.41'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: columnize
   requirement: !ruby/object:Gem::Requirement
@@ -107,17 +123,23 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'A Ruby debugger with both high and low-level debugging support.
+description: ! '== Description
+
+
+  A gdb-like Ruby debugger with both high and low-level debugging support.
+
+
+  See https://github.com/rocky/rb-trepanning/wiki/Features for a list of features.
 
 
   To provide the advanced features this version works only with a
 
-  patched MRI Ruby 1.9.3 runtime.
+  [patched MRI Ruby 1.9.3. See http://ruby-debugger-runtime.sourceforge.net/
 
 
-  For a version that works with Ruby 2.1.5, install a version
+  This version works only with a patched version of Ruby 1.9.3
 
-  starting with 2.15.
+  Ruby 2.1.5, look for a version that starts with 2.1.5
 
 '
 email: rockyb@rubyforge.net
@@ -486,7 +508,7 @@ rdoc_options:
 - --main
 - README
 - --title
-- Trepan 1.93.32 Documentation
+- Trepan 1.93.35 Documentation
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement