pry-de 0.0.4 → 0.1.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/pry/pry.git
-  revision: 24d9e486d75c3ec9a17e2ef2b1d88c119edf286f
+  revision: 2eca2e1b7e3ff6b9a7471eacc3db1e910f40e567
   specs:
-    pry (0.9.10)
+    pry (0.9.11)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    pry-de (0.0.3)
+    pry-de (0.0.4)
       guard
       pry-full
 
@@ -20,7 +20,7 @@ GEM
     awesome_print (1.1.0)
     binding_of_caller (0.6.8)
     bond (0.4.2)
-    coderay (1.0.7)
+    coderay (1.0.8)
     columnize (0.3.6)
     debugger (1.1.4)
       columnize (>= 0.3.1)
@@ -28,31 +28,32 @@ GEM
       debugger-ruby_core_source (~> 1.1.3)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
+    debugger-ruby_core_source (1.1.5)
     diff-lcs (1.1.3)
-    diffy (2.0.8)
+    diffy (2.1.0)
     eventmachine (1.0.0)
-    ffi (1.1.5)
+    ffi (1.2.0)
     grit (2.5.0)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
-    guard (1.3.3)
+    guard (1.5.4)
       listen (>= 0.4.2)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
       thor (>= 0.14.6)
     guard-minitest (0.5.0)
       guard (>= 0.4)
     highline (1.6.15)
     interception (0.3)
-    jist (1.0.1)
+    jist (1.2.0)
       json
     json (1.7.5)
-    listen (0.5.2)
-    method_source (0.8)
+    listen (0.6.0)
+    lumberjack (1.0.2)
+    method_source (0.8.1)
     mime-types (1.19)
     nokogiri (1.5.5)
-    plymouth (0.3.2)
-      pry-exception_explorer (>= 0.1.7)
     posix-spawn (0.3.6)
     pry-awesome_print (9.6.5)
       awesome_print (~> 1.1.0)
@@ -64,19 +65,22 @@ GEM
     pry-doc (0.4.4)
       pry (>= 0.9.9.6)
       yard (~> 0.8.1)
+    pry-docmore (0.0.2)
+      pry
+      pry-doc
     pry-editline (1.1.1)
     pry-exception_explorer (0.1.9)
       pry-stack_explorer (>= 0.3.9)
-    pry-full (0.6)
+    pry-full (1.0)
       bond
       jist
-      plymouth
       pry-awesome_print
       pry-debugger
       pry-developer_tools
       pry-doc
+      pry-docmore
       pry-editline
-      pry-exception_explorer
+      pry-exception_explorer (= 0.1.9)
       pry-git
       pry-highlight
       pry-pretty-numeric
@@ -100,11 +104,11 @@ GEM
       eventmachine
       highline
       pry (~> 0.9)
-    pry-rescue (0.8)
-      interception
+    pry-rescue (0.13)
+      interception (>= 0.3)
       pry
-    pry-stack_explorer (0.4.6)
-      binding_of_caller (~> 0.6.2)
+    pry-stack_explorer (0.4.7)
+      binding_of_caller (~> 0.6.8)
     pry-syntax-hacks (0.0.6)
       pry (>= 0.9.8)
     pry-theme (0.1.3)
@@ -113,7 +117,7 @@ GEM
       ffi (>= 0.5.0)
     slop (3.3.3)
     thor (0.16.0)
-    yard (0.8.2.1)
+    yard (0.8.3)
 
 PLATFORMS
   ruby

data/bin/rbacktracedit

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'pry-de/backtrace_edit'
+PryDe::BacktraceEdit.interact

data/lib/pry-de.rb

@@ -48,6 +48,13 @@ module PryDe
       run_command 'play --lines 2..-2 -m'
     end
 
+    command ',lft', 'load _file_ and try-again, for pry-rescue/minitest' do
+      current_file = target.eval '_file_'
+      warn "Reloading: " + current_file
+      load current_file
+      _pry_.run_command 'try-again'
+    end
+
     command ',refactor' do
       raw = `git status --porcelain`
       to_examine = raw.split(/\n/).map do |change|
@@ -88,6 +95,11 @@ module PryDe
       end
     end
 
+    command ',hs', 'hist --save ~/.pry_history - e.g. for vim <leader>ph' do
+      # TODO: make this more efficient. (This actually rewrites the whole thing)
+      run 'hist --save ~/.pry_history'
+    end
+
     # XXX needs to not recurse.
     # alias_command ',r', 'hist --replay -1'
 

data/lib/pry-de/backtrace_edit.rb

@@ -1,9 +1,78 @@
+# encoding: utf-8
 module PryDe
   class BacktraceEdit
-    def self.parse_line input
-      r = Hash[[:file, :line, :method, :error].zip(input.split(?:))]
-      r[:method].sub! /^in `(.+)'$/, '\1'
-      r
+    class << self
+      def interact
+        warn green 'ZZ to hop to next, :cq to end.'
+        trace.each do |e| edit e end
+      rescue => e
+        puts yellow e
+      end
+
+      def edit input
+        hash = parse_line input
+        path = hash[:path]
+        unless File.exist? path
+          return warn <<-EOT
+From this line: '#{cyan input}'
+parsed '#{yellow path}', which does not exist.
+Assuming to not be a frame and, skipping
+          EOT
+        end
+        viewer = vim_already_open_for(path) ? 'view' : 'vim'
+        offset = ?+ + hash[:line]
+        cmdheight = '+set cmdheight=2'
+        msg = vim_message_for hash[:extra]
+        warn blue "# #{hash[:extra]} ↴"
+        recenter = '+norm zz'
+        verbose_system viewer, path, cmdheight, msg, recenter, offset
+        raise 'OK, done.' unless $?.success?
+      end
+
+      def trace
+        require 'jist'
+        trace = Jist.paste
+        return trace_via_stdin if trace.empty? or not trace[/:in /]
+        trace.split ?\n
+      end
+
+      def trace_via_stdin
+        warn yellow 'Copy from clipboard not working.'
+        warn cyan 'Paste manually, then hit ^d'
+        STDIN.readlines
+      end
+
+      def vim_already_open_for path
+        swpfile = "%s/.%s.swp" % [ File.dirname(path), File.basename(path) ]
+        File.exist? swpfile
+      end
+
+      def vim_message_for str
+        cleaned = str.gsub ?", '\\"'
+        '+set ch=2|echo "%s"' % cleaned
+      end
+
+      def parse_line input
+        input.chomp!
+        r = Hash[[:path, :line, :extra].zip(input.split(?:, 3))]
+        r[:path].sub! /^\s*from /, ''
+        r
+      end
+
+      def verbose_system *args
+        require 'shellwords'
+        cmd = args.map(&:shellescape).join ' '
+        warn cyan '    '+cmd
+        system *args
+      end
+
+      def green str; color 32, str end
+      def yellow str; color 33, str end
+      def blue str; color 34, str end
+      def cyan str; color 36, str end
+      def color num, str
+        "\e[#{num}m#{str}\e[0m" % [num, str]
+      end
     end
   end
 end

data/lib/pry-de/version.rb

@@ -1,3 +1,3 @@
 module PryDe
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/test/test_backtrace_edit.rb

@@ -6,12 +6,53 @@ class TestBacktraceEdit < MiniTest::Unit::TestCase
   def test_first_line_parse
     input = '/blah/src/scrap/foo.rb:4:in `jump\': foo (RuntimeError)'
     expected = {
-      file: '/blah/src/scrap/foo.rb',
+      path: '/blah/src/scrap/foo.rb',
       line: '4',
-      method: 'jump',
-      error: ' foo (RuntimeError)'
+      extra: 'in `jump\': foo (RuntimeError)'
     }
     actual = PryDe::BacktraceEdit.parse_line input
     assert_equal expected, actual
   end
+
+  def test_line_parse_with_leading_from
+    input = '     from /blah/src/scrap/foo.rb:6:in `block in buz\'`'
+    expected = {
+      path: '/blah/src/scrap/foo.rb',
+      line: '6',
+      extra: 'in `block in buz\'`'
+    }
+    actual = PryDe::BacktraceEdit.parse_line input
+    assert_equal expected, actual
+  end
+
+  def test_a_bunch
+    examples = <<EOT.split ?\n
+/usr/lib64/ruby/1.9.1/drb/drb.rb:736:in `rescue in block in open'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:730:in `block in open'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:729:in `each'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:729:in `open'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1191:in `initialize'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1171:in `new'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1171:in `open'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1087:in `block in method_missing'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1105:in `with_friend'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1086:in `method_missing'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1074:in `respond_to?'
+/home/rking/.gem/ruby/1.9.1/gems/spork-0.9.2/lib/spork/run_strategy/forking.rb:10:in `block in run'
+/home/rking/.gem/ruby/1.9.1/gems/spork-0.9.2/lib/spork/forker.rb:21:in `block in initialize'
+/home/rking/.gem/ruby/1.9.1/gems/spork-0.9.2/lib/spork/forker.rb:18:in `fork'
+/home/rking/.gem/ruby/1.9.1/gems/spork-0.9.2/lib/spork/forker.rb:18:in `initialize'
+/home/rking/.gem/ruby/1.9.1/gems/spork-0.9.2/lib/spork/run_strategy/forking.rb:9:in `new'
+/home/rking/.gem/ruby/1.9.1/gems/spork-0.9.2/lib/spork/run_strategy/forking.rb:9:in `run'
+/home/rking/.gem/ruby/1.9.1/gems/spork-0.9.2/lib/spork/server.rb:48:in `run'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1548:in `perform_without_block'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1508:in `perform'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1586:in `block (2 levels) in main_loop'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1582:in `loop'
+/usr/lib64/ruby/1.9.1/drb/drb.rb:1582:in `block in main_loop'`
+EOT
+    examples.each do |eg|
+      assert PryDe::BacktraceEdit.parse_line(eg), "no-explode for '#{eg}'"
+    end
+  end
 end

data/vim/ftplugin/ruby_pry-de.vim

@@ -6,5 +6,5 @@ map <Leader><Leader>p <Leader>bp
 iabbr bpry require'pry';binding.pry
 
 " Nab lines from ~/.pry_history (respects "count")
-nmap <Leader>pry :<c-u>let pc = (v:count1 ? v:count1 : 1)<cr>:read !tail -<c-r>=pc<cr> ~/.pry_history<cr>:.-<c-r>=pc-1<cr>:norm <c-r>=pc<cr>==<cr>
+nmap <Leader>ph :<c-u>let pc = (v:count1 ? v:count1 : 1)<cr>:read !tail -<c-r>=pc<cr> ~/.pry_history<cr>:.-<c-r>=pc-1<cr>:norm <c-r>=pc<cr>==<cr>
 " ↑ thanks to Houl, ZyX-i, and paradigm of #vim for all dogpiling on this one.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-de
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-full
@@ -62,7 +62,8 @@ dependencies:
         version: '0'
 description: ! 'For the concept, see: https://github.com/pry/pry/wiki/pry-de'
 email: pry-de@sharpsaw.org
-executables: []
+executables:
+- rbacktracedit
 extensions: []
 extra_rdoc_files: []
 files:
@@ -78,6 +79,7 @@ files:
 - Rakefile
 - TODO-Pry
 - VERSION
+- bin/rbacktracedit
 - lib/pry-de.rb
 - lib/pry-de/backtrace_edit.rb
 - lib/pry-de/version.rb