pry-stack_explorer 0.4.7 → 0.4.8pre1

data/Rakefile

@@ -6,7 +6,7 @@ direc = File.dirname(__FILE__)
 PROJECT_NAME = "pry-stack_explorer"
 
 require 'rake/clean'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require "#{PROJECT_NAME}/version"
 
 CLOBBER.include("**/*~", "**/*#*", "**/*.log")
@@ -72,7 +72,7 @@ namespace :ruby do
     s.platform = Gem::Platform::RUBY
   end
 
-  Rake::GemPackageTask.new(spec) do |pkg|
+  Gem::PackageTask.new(spec) do |pkg|
     pkg.need_zip = false
     pkg.need_tar = false
   end
@@ -97,6 +97,8 @@ task :reinstall => :gems do
   sh "gem install #{direc}/pkg/#{PROJECT_NAME}-#{PryStackExplorer::VERSION}.gem"
 end
 
+task :install => :reinstall
+
 desc "build and push latest gems"
 task :pushgems => :gems do
   chdir("#{File.dirname(__FILE__)}/pkg") do
@@ -106,4 +108,4 @@ task :pushgems => :gems do
   end
 end
 
-
+task :pushgem => :pushgems

data/lib/pry-stack_explorer/version.rb

@@ -1,3 +1,3 @@
 module PryStackExplorer
-  VERSION = "0.4.7"
+  VERSION = "0.4.8pre1"
 end

data/lib/pry-stack_explorer/when_started_hook.rb

@@ -1,13 +1,14 @@
 module PryStackExplorer
   class WhenStartedHook
+    include Pry::Helpers::BaseHelpers
 
     def caller_bindings(target)
       bindings = binding.callers
 
       start_frames = bindings.each_with_index.select do |b, i|
         b.frame_type == :method &&
-          b.eval("self") == Pry &&
-          b.eval("__method__") == :start
+          safe_send(b.eval("self"), :equal?, Pry) &&
+          safe_send(b.eval("__method__"), :==, :start)
       end
 
       start_frame_index = start_frames.first.last
@@ -16,21 +17,21 @@ module PryStackExplorer
         idx1, idx2 = start_frames.take(2).map(&:last)
 
         is_nested_session = bindings[idx1..idx2].detect do |b|
-          b.eval("__method__") == :re &&
-            b.eval("self.class") == Pry
+          safe_send(b.eval("__method__"), :==, :re) &&
+            safe_send(b.eval("self.class"), :equal?, Pry)
         end
 
         start_frame_index = idx2 if !is_nested_session
       end
 
       bindings = bindings.drop(start_frame_index + 1)
-
-      bindings = bindings.drop(1) if bindings.first.eval("__method__") == :pry
-      bindings = bindings.drop_while { |b| b.eval("self.inspect") =~ /PryNav/ }
+      bindings = bindings.drop_while { |b| b.eval("__FILE__") =~ /pry-(?:nav|debugger)/ }
+      bindings = bindings.drop(1) if safe_send(bindings.first.eval("__method__"), :==, :pry)
 
       # Use the binding returned by #of_caller if possible (as we get
       # access to frame_type).
       # Otherwise stick to the given binding (target).
+
       if !PryStackExplorer.bindings_equal?(target, bindings.first)
         bindings.shift
         bindings.unshift(target)

data/lib/pry-stack_explorer.rb

@@ -106,7 +106,7 @@ module PryStackExplorer
     # @param [Binding] b2 Second binding.
     # @return [Boolean] Whether the `Binding`s are equal.
     def bindings_equal?(b1, b2)
-      (b1.eval('self') == b2.eval('self')) &&
+      (b1.eval('self').equal?(b2.eval('self'))) &&
         (b1.eval('__method__') == b2.eval('__method__')) &&
         (b1.eval('local_variables').map { |v| b1.eval("#{v}") } ==
          b2.eval('local_variables').map { |v| b2.eval("#{v}") })

data/pry-stack_explorer.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "pry-stack_explorer"
-  s.version = "0.4.7"
+  s.version = "0.4.8pre1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2012-10-04"
+  s.date = "2013-01-30"
   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", "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.15"
+  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/test_stack_explorer.rb

@@ -84,6 +84,19 @@ describe PryStackExplorer do
         o.frame.should == :beta
       end
 
+      # regression test for #12
+      it 'does not infinite loop when pry is started in MyObject#==' do
+        o = Object.new
+        def o.==(other)
+          binding.pry
+        end
+
+        redirect_pry_io(InputTester.new(":hello", "exit-all"), out=StringIO.new) do
+          o.==(1)
+        end
+
+        out.string.should =~ /hello/
+      end
     end
 
     describe ":call_stack option" do
@@ -375,7 +388,6 @@ describe PryStackExplorer do
           p1.backtrace.should == "my backtrace1"
         end
       end
-
     end
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: pry-stack_explorer
 version: !ruby/object:Gem::Version
-  version: 0.4.7
-  prerelease: 
+  version: 0.4.8pre1
+  prerelease: 5
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
-  requirement: &70257163759380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70257163759380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.8
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70257163758760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70257163758760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70257163758240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +53,12 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70257163758240
+  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: []
@@ -88,12 +103,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Walk the stack in a Pry session