trepanning 2.15.33 → 2.15.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e00fc82ddd7fc2774cfabfc75c3f6351ce6a9e21
-  data.tar.gz: 5288b85fe907200db5002ebb8d27952d08eb89bc
+  metadata.gz: 881c378f5a00c045da7730303e3edbc6571f3d05
+  data.tar.gz: 30f530b6ade78288c1658b134b4d6e8e0424d4e5
 SHA512:
-  metadata.gz: 14b6a7fedac002c92523f975d8ad38a4cbfa3392bc05dd720cab6a4afea63fcaa79415a46fc15e2868843b6b588cb291efbcacfe39dfd85dc2a5b8e87bd58ffd
-  data.tar.gz: 28777e369fa958cbc2d3ed508d8f0d5da015c7fb4c3541432f0820486c579c01b74e0992fc4641b77cb1f491b3dacdaa154cf679620cb98fe4418b0701b42653
+  metadata.gz: a1f06de92e91df34d0c6cdbb3397dc07bbafd04c2a095af4a1c66677de66c2f9e6877715053e51e12ed9026bc0d62d11fb1fc2339becfa7154f5bc94612929e8
+  data.tar.gz: f35612f05b692c8b132e33bb2b37c1a227c39cae8da422d8064eeb1a180f7a46ee0a13481c016f7b85a5619e0c4450c48af8c89ce2ca21b5e20dfff608bf23ec

data/ChangeLog

@@ -1,6 +1,25 @@
+2015-03-12  rocky <rockyb@rubyforge.org>
+
+	* app/options.rb, trepanning.gemspec: Get ready for release 2.15.35
+
+2015-03-12  rocky <rockyb@rubyforge.org>
+
+	* app/markdown.rb, processor/command/list.rb, processor/frame.rb,
+	processor/list.rb, test/unit/test-cmd-parse_list_cmd.rb: markdown:
+	remove stray space after `` list: subsequent list command continue
+	from where we last left off.
+
+2015-03-12  rocky <rockyb@rubyforge.org>
+
+	* processor.rb: empty string repeats last command.
+
+2015-03-12  rocky <rockyb@rubyforge.org>
+
+	* trepanning.gemspec: Use markdown in spec description.
+
 2015-03-08  rocky <rockyb@rubyforge.org>
 
-	* NEWS, app/options.rb: Get ready for release 2.15.33
+	* ChangeLog, NEWS, app/options.rb: Get ready for release 2.15.33
 
 2015-03-08  rocky <rockyb@rubyforge.org>
 

data/app/markdown.rb

@@ -53,7 +53,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
@@ -155,7 +155,9 @@ if __FILE__ == $0
     include Trepan::Markdown
     string = <<EOF
 # HI
-This is a paragraph
+This is a paragraph.
+
+A `b`, `c`, d
 
 **This** is another *paragraph*.
 EOF

data/app/options.rb

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

data/processor.rb

@@ -156,6 +156,7 @@ class Trepan
                         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

data/processor/command/list.rb

@@ -9,8 +9,9 @@ class Trepan::Command::ListCommand < Trepan::Command
     unless defined?(HELP)
         NAME = File.basename(__FILE__, '.rb')
         HELP = <<-HELP
-**#{NAME}[>]** [*module*] [*first* [*num*]]
-**#{NAME}[>]** *location [*num*]
+**#{NAME}**[**>**] [*module*] [*first* [*num*]]
+
+**#{NAME}**[**>**] *location* [*num*]
 
 List source code.
 
@@ -22,13 +23,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:
 
@@ -170,6 +171,8 @@ See also:
                 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

data/processor/frame.rb

@@ -14,8 +14,9 @@ class Trepan
     # frame index in a "backtrace" command
     attr_accessor :frame_index
     attr_accessor :hide_level
+    attr_accessor :list_lineno
 
-    # Hash[thread_id] -> FixNum, the level of the last frame to
+    # Hash[thread_id] -> Fixnum, the level of the last frame to
     # show. If we called the debugger directly, then there is
     # generally a portion of a backtrace we don't want to show. We
     # don't need to store this for all threads, just those we want to
@@ -54,7 +55,7 @@ class Trepan
           print_stack_trace_from_to(frame_num, frame_num, frame, opts)
           print_location
         end
-        @line_no = frame_line() - 1
+        @list_lineno = @line_no = frame_line() - 1
         @frame
       else
         nil
@@ -126,6 +127,7 @@ class Trepan
             else
                 @hidelevels[@current_thread]
             end
+        @list_lineno = frame_line()
 
     end
 

data/processor/list.rb

@@ -17,9 +17,9 @@ class Trepan
     end
 
     def frame_filename
-      
+
       container = frame_container(frame, false)
-      
+
       # FIXME: put into a helper routine
       # See also duplicate code in print_location
       if container[0] != 'file'
@@ -35,7 +35,7 @@ class Trepan
         end
         container = try_container if try_container[0] == 'file'
       end
-      
+
       return container[1]
     end
 
@@ -47,7 +47,7 @@ class Trepan
       iseq = nil
       if position_str.empty?
         filename = frame_filename
-        first = [1, frame_line - center_correction].max
+        first = [1, @list_lineno - center_correction].max
       else
         ## FIXME: push into parse
         if RbConfig::CONFIG['target_os'].start_with?('mingw') and
@@ -70,7 +70,7 @@ class Trepan
           elsif position == '.'
             return no_frame_msg_for_list unless frame_line
             if (second = list_cmd_parse.num)
-              first = frame_line 
+              first = frame_line
               last = adjust_last(first, second)
             else
               first = [1, frame_line - center_correction].max
@@ -79,21 +79,21 @@ class Trepan
           end
           filename = frame_filename
         else
-          meth_or_frame, filename, offset, offset_type = 
+          meth_or_frame, filename, offset, offset_type =
             parse_position(position)
           return [nil] * 4 unless filename
           if offset_type == :line
             first = offset
           elsif meth_or_frame
             if iseq = meth_or_frame.iseq
-              iseq, first, vm_offset = 
+              iseq, first, vm_offset =
                 position_to_line_and_offset(iseq, filename, position, offset_type)
               unless first
               errmsg("Unable to get location in #{meth_or_frame}")
-                return [nil] * 4 
+                return [nil] * 4
               end
             end
-          elsif !offset 
+          elsif !offset
             first = 1
           else
             errmsg("Unable to parse list position #{position_str}")
@@ -105,7 +105,7 @@ class Trepan
         first, last = [first + last, first] if last < 0
         last = adjust_last(first, last)
       else
-        first = [1, first - center_correction].max 
+        first = [1, first - center_correction].max
         last = first + listsize - 1 unless last
       end
       if filename
@@ -115,12 +115,12 @@ class Trepan
       end
       return [iseq, filename, first, last]
     end
-    
+
     def no_frame_msg_for_list
       errmsg("No Ruby program loaded.")
       return nil, nil, nil, nil
     end
-    
+
   end
 end
 
@@ -129,18 +129,18 @@ if __FILE__ == $0
   if !(ARGV.size == 1 && ARGV[0] == 'noload')
     ARGV[0..-1]    = ['noload']
     load(__FILE__)
-  else    
+  else
     require 'thread_frame'
     require_relative '../app/mock'
     require_relative './default'
     require_relative 'frame'
 
     # FIXME: Have to include before defining CmdProcessor!
-    require_relative '../processor' 
+    require_relative '../processor'
 
     cmdproc = Trepan::CmdProcessor.new(Trepan::MockCore.new())
     cmdproc.frame_initialize
-    cmdproc.instance_variable_set('@settings', 
+    cmdproc.instance_variable_set('@settings',
                                Trepan::CmdProcessor::DEFAULT_SETTINGS)
     cmdproc.frame_setup(RubyVM::Frame.current)
     def foo; 5 end

data/test/unit/test-cmd-parse_list_cmd.rb

@@ -15,7 +15,7 @@ class TestCommandParseListCmd < Test::Unit::TestCase
         listsize = 10
         line = __LINE__+5
         load 'tmpdir.rb'
-        [['', [short_file, line, line+listsize-1]],
+        [['.', [short_file, line+5, line+listsize-1+5]],
          ["#{__FILE__}:10", [short_file, 5, 14]],
          ["#{__FILE__} 10", [short_file, 5, 14]],
          ['tmpdir.rb', ['tmpdir.rb', 1, listsize]],

data/trepanning.gemspec

@@ -10,14 +10,15 @@ 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.
 
 To provide the advanced features this version works only with a
 patched MRI Ruby 2.1.5 runtime.
 
-This version works only with a patched version of Ruby 2.1.5
-For a version that works with Ruby 1.9.3 look install a version
-starting with 1.93.
+For a version that works with Ruby 1.9.3, install a version
+starting with 1.93
 EOF
   spec.add_dependency('redcarpet', '~> 3.2')
   spec.add_dependency('columnize', '~> 0.9')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trepanning
 version: !ruby/object:Gem::Version
-  version: 2.15.33
+  version: 2.15.35
 platform: ruby
 authors:
 - R. Bernstein
 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: redcarpet
@@ -81,14 +81,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |
-  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.
 
   To provide the advanced features this version works only with a
   patched MRI Ruby 2.1.5 runtime.
 
-  This version works only with a patched version of Ruby 2.1.5
-  For a version that works with Ruby 1.9.3 look install a version
-  starting with 1.93.
+  For a version that works with Ruby 1.9.3, install a version
+  starting with 1.93
 email: rockyb@rubyforge.net
 executables:
 - trepan
@@ -459,7 +460,7 @@ rdoc_options:
 - "--main"
 - README
 - "--title"
-- Trepan 2.15.33 Documentation
+- Trepan 2.15.35 Documentation
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement