pry-stack_explorer 0.4.2 → 0.4.3

data/Rakefile

@@ -47,6 +47,11 @@ task :example2 do
   sh "ruby -I#{direc}/lib/ #{direc}/examples/example2.rb "
 end
 
+desc "Run example3"
+task :example3 do
+  sh "ruby -I#{direc}/lib/ #{direc}/examples/example3.rb "
+end
+
 desc "Show version"
 task :version do
   puts "PryStackExplorer version: #{PryStackExplorer::VERSION}"

data/examples/example3.rb

@@ -0,0 +1,46 @@
+unless Object.const_defined? :PryStackExplorer
+  $:.unshift File.expand_path '../../lib', __FILE__
+  require 'pry'
+end
+
+require 'pry-stack_explorer'
+
+def b
+  x = 30
+  proc {
+    c
+  }.call
+end
+
+def c
+  u = 50
+  V.new.beta
+end
+
+# hello
+class V
+  def beta
+    gamma
+  end
+
+  def gamma
+    zeta
+  end
+end
+
+def zeta
+  vitamin = 100
+  binding.pry
+end
+#
+
+proc {
+  class J
+    def alphabet(y)
+      x = 20
+      b
+    end
+  end
+}.call
+
+J.new.alphabet(122)

data/lib/pry-stack_explorer.rb

@@ -5,7 +5,6 @@ require "pry-stack_explorer/version"
 require "pry-stack_explorer/commands"
 require "pry-stack_explorer/frame_manager"
 require "pry-stack_explorer/when_started_hook"
-require "pry"
 require "binding_of_caller"
 
 module PryStackExplorer

data/lib/pry-stack_explorer/commands.rb

@@ -1,5 +1,3 @@
-require 'pry'
-
 module PryStackExplorer
   module FrameHelpers
     private
@@ -88,6 +86,33 @@ module PryStackExplorer
 
     #  Regexp.new(args[0])
     def find_frame_by_regex(regex, up_or_down)
+      frame_index = find_frame_by_block(up_or_down) do |b|
+        b.eval("__method__").to_s =~ regex
+      end
+
+      if frame_index
+        frame_index
+      else
+        raise Pry::CommandError, "No frame that matches #{regex.source} found!"
+      end
+    end
+
+    def find_frame_by_object_regex(class_regex, method_regex, up_or_down)
+      frame_index = find_frame_by_block(up_or_down) do |b|
+        class_match = b.eval("self.class").to_s =~ class_regex
+        meth_match = b.eval("__method__").to_s =~ method_regex
+
+        class_match && meth_match
+      end
+
+      if frame_index
+        frame_index
+      else
+        raise Pry::CommandError, "No frame that matches #{class_regex.source}" + '#' + "#{method_regex.source} found!"
+      end
+    end
+
+    def find_frame_by_block(up_or_down)
       start_index = frame_manager.binding_index
 
       if up_or_down == :down
@@ -97,19 +122,14 @@ module PryStackExplorer
       end
 
       new_frame = enum.find do |b|
-        b.eval("__method__").to_s =~ regex
+        yield(b)
       end
 
       frame_index = frame_manager.bindings.index(new_frame)
-
-      if frame_index
-        frame_index
-      else
-        raise Pry::CommandError, "No frame that matches #{regex.source} found!"
-      end
     end
   end
 
+
   Commands = Pry::CommandSet.new do
     create_command "up", "Go up to the caller's context." do
       include FrameHelpers
@@ -131,6 +151,9 @@ module PryStackExplorer
         else
           if inc =~ /\d+/
             frame_manager.change_frame_to frame_manager.binding_index + inc.to_i
+          elsif match = /^([A-Z]+[^#.]*)(#|\.)(.+)$/.match(inc)
+            new_frame_index = find_frame_by_object_regex(Regexp.new(match[1]), Regexp.new(match[3]), :up)
+            frame_manager.change_frame_to new_frame_index
           elsif inc =~ /^[^-].*$/
             new_frame_index = find_frame_by_regex(Regexp.new(inc), :up)
             frame_manager.change_frame_to new_frame_index
@@ -163,6 +186,9 @@ module PryStackExplorer
             else
               frame_manager.change_frame_to frame_manager.binding_index - inc.to_i
             end
+          elsif match = /^([A-Z]+[^#.]*)(#|\.)(.+)$/.match(inc)
+            new_frame_index = find_frame_by_object_regex(Regexp.new(match[1]), Regexp.new(match[3]), :down)
+            frame_manager.change_frame_to new_frame_index
           elsif inc =~ /^[^-].*$/
             new_frame_index = find_frame_by_regex(Regexp.new(inc), :down)
             frame_manager.change_frame_to new_frame_index
@@ -192,6 +218,9 @@ module PryStackExplorer
 
           if args[0] =~ /\d+/
             frame_manager.change_frame_to args[0].to_i
+          elsif match = /^([A-Z]+[^#.]*)(#|\.)(.+)$/.match(args[0])
+            new_frame_index = find_frame_by_object_regex(Regexp.new(match[1]), Regexp.new(match[3]), :up)
+            frame_manager.change_frame_to new_frame_index
           elsif args[0] =~ /^[^-].*$/
             new_frame_index = find_frame_by_regex(Regexp.new(args[0]), :up)
             frame_manager.change_frame_to new_frame_index
@@ -277,8 +306,8 @@ module PryStackExplorer
 
           stagger_output content
         end
-
       end
+
     end
   end
 end

data/lib/pry-stack_explorer/version.rb

@@ -1,3 +1,3 @@
 module PryStackExplorer
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/pry-stack_explorer.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "pry-stack_explorer"
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2012-04-18"
+  s.date = "2012-07-13"
   s.description = "Walk the stack in a Pry session"
   s.email = "jrmair@gmail.com"
-  s.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG", "Gemfile", "LICENSE", "README.md", "Rakefile", "examples/example.rb", "examples/example2.rb", "lib/pry-stack_explorer.rb", "lib/pry-stack_explorer/commands.rb", "lib/pry-stack_explorer/frame_manager.rb", "lib/pry-stack_explorer/version.rb", "lib/pry-stack_explorer/when_started_hook.rb", "pry-stack_explorer.gemspec", "test/helper.rb", "test/test_commands.rb", "test/test_frame_manager.rb", "test/test_stack_explorer.rb", "tester.rb"]
+  s.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG", "Gemfile", "LICENSE", "README.md", "Rakefile", "examples/example.rb", "examples/example2.rb", "examples/example3.rb", "lib/pry-stack_explorer.rb", "lib/pry-stack_explorer/commands.rb", "lib/pry-stack_explorer/frame_manager.rb", "lib/pry-stack_explorer/version.rb", "lib/pry-stack_explorer/when_started_hook.rb", "pry-stack_explorer.gemspec", "test/helper.rb", "test/test_commands.rb", "test/test_frame_manager.rb", "test/test_stack_explorer.rb", "tester.rb"]
   s.homepage = "https://github.com/banister"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.16"
+  s.rubygems_version = "1.8.24"
   s.summary = "Walk the stack in a Pry session"
   s.test_files = ["test/helper.rb", "test/test_commands.rb", "test/test_frame_manager.rb", "test/test_stack_explorer.rb"]
 

data/test/helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'ostruct'
+require 'pry'
 
 unless Object.const_defined? 'PryStackExplorer'
   $:.unshift File.expand_path '../../lib', __FILE__

data/test/test_commands.rb

@@ -1,5 +1,39 @@
 require 'helper'
 
+
+class Top
+  attr_accessor :method_list, :middle
+  def initialize method_list
+    @method_list = method_list
+  end
+  def bing
+    @middle = Middle.new method_list
+    @middle.bong
+  end
+end
+
+class Middle
+  attr_accessor :method_list, :bottom
+  def initialize method_list
+    @method_list = method_list
+  end
+  def bong
+    @bottom = Bottom.new method_list
+    @bottom.bang
+  end
+end
+
+class Bottom
+  attr_accessor :method_list
+  def initialize method_list
+    @method_list = method_list
+  end
+  def bang
+    Pry.start(binding)
+  end
+end
+
+
 describe PryStackExplorer::Commands do
 
   before do
@@ -11,6 +45,9 @@ describe PryStackExplorer::Commands do
     def @o.bing() bong end
     def @o.bong() bang end
     def @o.bang() Pry.start(binding) end
+
+    method_list = []
+    @top = Top.new method_list
   end
 
   after do
@@ -83,6 +120,58 @@ describe PryStackExplorer::Commands do
         out.string.should =~ /Error: No frame that matches/
       end
     end
+
+
+    describe 'by Class#method name regex' do
+      it 'should move to the method and class that matches the regex' do
+        redirect_pry_io(InputTester.new("@method_list << self.class.to_s + '#' + __method__.to_s",
+                                        'up Middle#bong',
+                                        "@method_list << self.class.to_s + '#' + __method__.to_s",
+                                        "exit-all"), out=StringIO.new) do
+          @top.bing
+        end
+
+        @top.method_list.should  == ['Bottom#bang', 'Middle#bong']
+      end
+
+      ### ????? ###
+      # it 'should be case sensitive' do
+      # end
+      ### ????? ###
+
+      it 'should allow partial class names' do
+          redirect_pry_io(InputTester.new("@method_list << self.class.to_s + '#' + __method__.to_s",
+                                        'up Mid#bong',
+                                        "@method_list << self.class.to_s + '#' + __method__.to_s",
+                                        "exit-all"), out=StringIO.new) do
+          @top.bing
+        end
+
+        @top.method_list.should  == ['Bottom#bang', 'Middle#bong']
+
+      end
+
+      it 'should allow partial method names' do
+          redirect_pry_io(InputTester.new("@method_list << self.class.to_s + '#' + __method__.to_s",
+                                        'up Middle#bo',
+                                        "@method_list << self.class.to_s + '#' + __method__.to_s",
+                                        "exit-all"), out=StringIO.new) do
+          @top.bing
+        end
+
+        @top.method_list.should  == ['Bottom#bang', 'Middle#bong']
+
+      end
+
+      it 'should error if it cant find frame to match regex' do
+        redirect_pry_io(InputTester.new('up Conrad#irwin',
+                                        "exit-all"), out=StringIO.new) do
+          @top.bing
+        end
+
+        out.string.should =~ /Error: No frame that matches/
+      end
+    end
   end
 
   describe "down" do
@@ -153,6 +242,34 @@ describe PryStackExplorer::Commands do
       end
     end
 
+    describe 'by Class#method name regex' do
+      it 'should move to the method and class that matches the regex' do
+        redirect_pry_io(InputTester.new('frame Top#bing',
+                                        "@method_list << self.class.to_s + '#' + __method__.to_s",
+                                        'down Middle#bong',
+                                        "@method_list << self.class.to_s + '#' + __method__.to_s",
+                                        "exit-all"), out=StringIO.new) do
+          @top.bing
+        end
+
+        @top.method_list.should == ['Top#bing', 'Middle#bong']
+      end
+
+      ### ????? ###
+      # it 'should be case sensitive' do
+      # end
+      ### ????? ###
+
+      it 'should error if it cant find frame to match regex' do
+        redirect_pry_io(InputTester.new('down Conrad#irwin',
+                                        "exit-all"), out=StringIO.new) do
+          @top.bing
+        end
+
+        out.string.should =~ /Error: No frame that matches/
+      end
+    end
+
   end
 
   describe "frame" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-stack_explorer
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
-  requirement: &70234086143460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70234086143460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70234086141020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *70234086141020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70234086155340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70234086155340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70234086154720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,12 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70234086154720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Walk the stack in a Pry session
 email: jrmair@gmail.com
 executables: []
@@ -72,6 +92,7 @@ files:
 - Rakefile
 - examples/example.rb
 - examples/example2.rb
+- examples/example3.rb
 - lib/pry-stack_explorer.rb
 - lib/pry-stack_explorer/commands.rb
 - lib/pry-stack_explorer/frame_manager.rb
@@ -103,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Walk the stack in a Pry session