trepanning 0.1.1 → 0.1.2

data/ChangeLog

@@ -1,3 +1,45 @@
+2011-03-23  rocky <rockyb@rubyforge.org>
+
+	* app/core.rb, app/frame.rb, processor/command/edit.rb,
+	processor/command/info_subcmd/files.rb: Add frame.file. Fix up
+	"edit" command demo code.
+
+2011-03-23  rocky <rockyb@rubyforge.org>
+
+	* processor/command/edit.rb, processor/command/eval.rb: Add "edit"
+	command
+
+2011-03-17  rocky <rockyb@rubyforge.org>
+
+	Merge branch 'master' of github.com:rocky/rb-trepanning
+
+2011-03-17  rocky <rockyb@rubyforge.org>
+
+	* Rakefile, app/options.rb, app/run.rb, bin/trepan,
+	test/integration/helper.rb, test/unit/test-app-run.rb,
+	test/unit/test-bin-trepan.rb: Trepan::ruby_path -> RbConfig.ruby
+
+2011-03-15  rocky <rockyb@rubyforge.org>
+
+	Dependency administrivia
+
+2011-03-15  rocky <rockyb@rubyforge.org>
+
+	* trepanning.gemspec: Remove mention of intermediate dev's in
+	dependency.
+
+2011-03-15  rocky <rockyb@rubyforge.org>
+
+	Merge branch 'master' of github.com:rocky/rb-trepanning
+
+2011-03-15  rocky <rockyb@rubyforge.org>
+
+	* app/options.rb, trepanning.gemspec: Get ready for release 1.1
+
+2011-03-15  rocky <rockyb@rubyforge.org>
+
+	* ChangeLog, NEWS: Get ready for release.
+
 2011-03-12  rocky <rockyb@rubyforge.org>
 
 	* processor/command/help/command.txt, trepanning.gemspec: tabke ->
@@ -101,6 +143,10 @@
 	All functional, integration and unit tests work again after KPEG
 	refactoring
 
+2011-03-07  rocky <rockyb@rubyforge.org>
+
+	* processor/main.rb: Handle error when errmsg is borked
+
 2011-03-07  rocky <rockyb@rubyforge.org>
 
 	* app/file.rb, app/iseq.rb, processor/command/break.rb,

data/NEWS

@@ -1,4 +1,8 @@
-March 15, 2011  (0.0.6)
+March 28, 2011  (0.1.2)
+- Release to correct threadrame and trace package dependencies
+- add "edit" command
+
+March 15, 2011  (0.1.1)
 - Revise breakpoint location parsing
   * Add: break <location> if/unless <condition>
   * Add: step until <condition>
@@ -12,8 +16,6 @@ March 15, 2011  (0.0.6)
    * trailing "then", "do"
 - Save and restore some debugger state across a restart
 - Redo command completion
-
-Feb 15, 2011  (0.0.5)
 - "disassemble" command: allow disassembly of specified line numbers
 - GNU Readline: 
   * Start GNU readline tab (command) completion. 

data/Rakefile

@@ -41,13 +41,11 @@ desc "same as test"
 task :check => :test
 
 require 'rbconfig'
-RUBY_PATH = File.join(RbConfig::CONFIG['bindir'],  
-                      RbConfig::CONFIG['RUBY_INSTALL_NAME'])
 
 def run_standalone_ruby_files(list)
   puts '*' * 40
   list.each do |ruby_file|
-    system(RUBY_PATH, ruby_file)
+    system(RbConfig.ruby, ruby_file)
     p $?.exitstatus
     break if $?.exitstatus != 0 && !opts[:continue]
   end
@@ -58,7 +56,7 @@ def run_standalone_ruby_file(directory, opts={})
   Dir.chdir(directory) do
     Dir.glob('*.rb').each do |ruby_file|
       puts(('-' * 20) + ' ' + ruby_file + ' ' + ('-' * 20))
-      system(RUBY_PATH, ruby_file)
+      system(RbConfig.ruby, ruby_file)
       break if $?.exitstatus != 0 && !opts[:continue]
     end
   end
@@ -170,7 +168,7 @@ end
 
 task :check => %w(check:lib check:processor check:commands).map{|c| c.to_sym}
 
-desc "Test everything - same as test."
+desc "Default action is same as 'test'."
 task :default => :test
 
 desc "Generate the gemspec"

data/app/cmd_parse.rb

@@ -131,7 +131,7 @@ class Trepan
       parse ? parse.result : nil
     end
 
-    def parse_list(str)
+    def parse_list_cmd(str)
       parse = parse_terminal(:_list_stmt, str)
       parse ? parse.result : nil
     end

data/app/core.rb

@@ -114,7 +114,7 @@ class Trepan
         @hook_arg = arg
         
         ### debug:
-        ### puts "#{frame.source_container[1]}:#{frame.source_location[0]}:in `#{frame.method}' #{event}" # if %w(line).member?(event)
+        ### puts "#{frame.file[1]}:#{frame.source_location[0]}:in `#{frame.method}' #{event}" # if %w(line).member?(event)
         @processor.process_commands(@frame)
                 
         # FIXME: There should be a Trace.event_mask which should return the first

data/app/frame.rb

@@ -16,6 +16,8 @@ class Trepan
 
     include Trepan::Util
 
+    module_function
+
     def all_param_names(iseq, delineate=true)
       return '' unless iseq
       params = param_names(iseq, 0, iseq.argc-1, '')
@@ -75,7 +77,10 @@ class Trepan
       retval = $1 if retval =~ /^\(eval "(.+)"\)/
       retval
     end
-    module_function :eval_string
+
+    def file
+      source_container[1]
+    end
 
     def format_stack_call(frame, opts)
       # FIXME: prettify 

data/app/options.rb

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

data/app/run.rb

@@ -14,7 +14,7 @@ module Trepanning
     # Make sure Ruby script syntax checks okay.
     # Otherwise we get a load message that looks like trepanning has 
     # a problem. 
-    output = `#{ruby_path} -c #{program_to_debug.inspect} 2>&1`
+    output = `#{RbConfig.ruby} -c #{program_to_debug.inspect} 2>&1`
     if $?.exitstatus != 0 and RUBY_PLATFORM !~ /mswin/
       puts output
       exit $?.exitstatus 
@@ -49,11 +49,6 @@ module Trepanning
     untrace_var(:$0, dollar_0_tracker)
   end
 
-  # Path name of Ruby interpreter we were invoked with.
-  def ruby_path
-    File.join(%w(bindir RUBY_INSTALL_NAME).map{|k| RbConfig::CONFIG[k]})
-  end
-
   # 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)
@@ -75,5 +70,4 @@ if __FILE__ == $0
   include  Trepanning
   puts whence_file('irb')
   puts whence_file('probably-does-not-exist')
-  puts ruby_path
 end

data/bin/trepan

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 # Invoke debugger from the command line. 
+require 'rbconfig' # For RbConfig.ruby
 require_relative '../app/run'
 require_relative '../app/options'
 require_relative '../app/client'
@@ -33,7 +34,6 @@ if File.basename(__FILE__) == File.basename($0)
 
     # FIXME: do we need to test defined? 
     # FIXME: Should (some of) these be instance variables?
-    Trepan::RUBY_PATH    = ruby_path
     Trepan::TREPAN_PATH  = trepan_path
 
     if ARGV.empty?
@@ -61,7 +61,7 @@ if File.basename(__FILE__) == File.basename($0)
 
     # Set global so others may use this debugger.
     $trepan = Trepan.new(opts)
-    debug_program($trepan, Trepan::RUBY_PATH, 
+    debug_program($trepan, RbConfig.ruby,
                   File.expand_path(program_to_debug))
   end
 end

data/processor/command/edit.rb

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative './base/cmd'
+
+class Trepan::Command::EditCommand < Trepan::Command
+
+  old_verbose = $VERBOSE  
+  $VERBOSE    = nil
+  NAME        = File.basename(__FILE__, '.rb')
+  HELP    = <<-HELP
+#{NAME} [LOCATION]
+
+With no argument, edits file containing most recent line listed.
+
+Editing targets can also be specified.
+      HELP
+
+  ALIASES       = %w(e)
+  CATEGORY      = 'files'
+  NEED_STACK    = false
+  SHORT_HELP    = 'Edit specified file or function'
+  $VERBOSE      = old_verbose 
+
+  def run(args)
+    if args.size == 1
+
+      unless true # @state.context
+        errmsg "We are not in a state that has an associated file.\n"
+        return 
+      end
+    else
+      text = @proc.cmd_argstr
+    end
+    editor = ENV['EDITOR'] || '/bin/ex'
+    file = @proc.frame.file
+    if File.readable?(file)
+      edit_cmd = "#{editor} +#{@proc.frame.line} \"#{file}\""
+      msg "Running #{edit_cmd}..."
+      system(edit_cmd)
+      msg "Warning: return code was #{$?.exitstatus}" if $?.exitstatus != 0
+    else
+      errmsg "File \"#{file}\" is not readable.\n"
+    end
+  end
+end
+
+if __FILE__ == $0
+  require_relative '../mock'
+  dbgr, cmd = MockDebugger::setup
+  dbgr, cmd = MockDebugger::setup
+  cmd.run [cmd.name] if ARGV.size > 0
+end

data/processor/command/eval.rb

@@ -6,7 +6,7 @@ class Trepan::Command::EvalCommand < Trepan::Command
 
   old_verbose = $VERBOSE  
   $VERBOSE    = nil
-  NAME          = File.basename(__FILE__, '.rb')
+  NAME        = File.basename(__FILE__, '.rb')
   HELP    = <<-HELP
 #{NAME} [STRING]
 

data/processor/command/info_subcmd/files.rb

@@ -84,7 +84,7 @@ EOH
           return false
           nil
         else
-          frame_file = @proc.frame.source_container[1]
+          frame_file = @proc.frame.file
           LineCache::map_file(frame_file) || File.expand_path(frame_file)
         end
       else

data/processor/validate.rb

@@ -281,7 +281,7 @@ class Trepan
       get_method(meth)
     end
 
-    # parse_position(self, arg)->(meth, filename, offset, offset_type)
+    # parse_position(self)->(meth, filename, offset, offset_type)
     # See app/cmd_parser.kpeg for the syntax of a position which
     # should include things like:
     # Parse arg as [filename:]lineno | function | module

data/test/integration/helper.rb

@@ -1,6 +1,5 @@
 require 'diff/lcs'
 require 'fileutils'
-require_relative '../../app/run' # for ruby_path
 
 DEFAULT_DEBUGGER_OPTS = {
   :args        => '', 
@@ -36,10 +35,10 @@ def run_debugger(testname, ruby_file, opts={})
   cmd += 
     if opts[:standalone]
       "%s %s %s >%s 2>&1" %
-        [Trepanning::ruby_path, programfile, opts[:args], outfile]
+        [RbConfig.ruby, programfile, opts[:args], outfile]
     else
       "%s %s --nx --command %s %s '%s' %s >%s 2>&1" %
-        [Trepanning::ruby_path, dbgr_path, cmdfile, opts[:dbgr], 
+        [RbConfig.ruby, dbgr_path, cmdfile, opts[:dbgr], 
          programfile, opts[:args], outfile]
     end
   puts cmd if opts[:verbose]

data/test/unit/test-app-run.rb

@@ -8,8 +8,6 @@ class TestAppRun < Test::Unit::TestCase
     assert_equal(true, File.executable?(whence_file('irb')))
     ng = whence_file('probably-does-not-exist')
     assert_equal(true, File.executable?(ng) || ng == 'probably-does-not-exist')
-    rp = ruby_path
-    assert_equal(true, File.executable?(rp))
   end
 
 end

data/test/unit/test-bin-trepan.rb

@@ -8,23 +8,6 @@ class TestBinTrepan < Test::Unit::TestCase
 
   include Trepanning
 
-  def test_ruby_path
-    rb_path = ruby_path
-    assert_equal(true, File.executable?(rb_path),
-                 "#{rb_path} should be an executable Ruby interpreter")
-
-    # Let us test that we get *exactly* the same configuration as we
-    # have in this. I'm a ball buster.
-    cmd = "#{rb_path} -rrbconfig -e 'puts Marshal.dump(RbConfig::CONFIG)'"
-    rb_config = Marshal.load(`#{cmd}`)
-    assert_equal(RbConfig::CONFIG, rb_config,
-                 "#{rb_path} config doesn't match got:
-#{rb_config.pretty_inspect}
-expected: 
-#{RbConfig::CONFIG.pretty_inspect}
-")
-  end
-
   def test_whence_file
     abs_path_me = File.expand_path(__FILE__)
     assert_equal(abs_path_me, whence_file(abs_path_me),

data/trepanning.gemspec

@@ -18,9 +18,9 @@ This version works only with a patched version of Ruby 1.9.2 and rb-threadframe.
 
 See also rbx-trepanning for a version that works with Rubinius.
 EOF
-  spec.add_dependency('rb-threadframe', '~> 0.38')
+  spec.add_dependency('rb-threadframe', '>= 0.38')
   spec.add_dependency('rb-trace', '>= 0.4')
-  spec.add_dependency('linecache-tf', '~> 1.0.dev')
+  spec.add_dependency('linecache-tf', '>= 1.0')
   spec.add_dependency('columnize')
   spec.add_dependency('diff-lcs') # For testing only
   spec.author       = 'R. Bernstein'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - R. Bernstein
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -04:00
+date: 2011-03-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -51,13 +51,12 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
-        - dev
-        version: 1.0.dev
+        version: "1.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -182,6 +181,7 @@ files:
 - processor/command/disassemble.rb
 - processor/command/display.rb
 - processor/command/down.rb
+- processor/command/edit.rb
 - processor/command/enable.rb
 - processor/command/eval.rb
 - processor/command/exit.rb
@@ -424,7 +424,7 @@ rdoc_options:
 - --main
 - README
 - --title
-- Trepan 0.1.1 Documentation
+- Trepan 0.1.2 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement