pry-stack_explorer 0.4.8pre1 → 0.4.8

data/Rakefile

@@ -23,9 +23,10 @@ def apply_spec_defaults(s)
   s.description = s.summary
   s.require_path = 'lib'
   s.add_dependency("binding_of_caller","~>0.6.8")
+  s.add_dependency("pry","~>0.9.11")
   s.add_development_dependency("bacon","~>1.1.0")
   s.add_development_dependency('rake', '~> 0.9')
-  s.homepage = "https://github.com/banister"
+  s.homepage = "https://github.com/pry/pry-stack_explorer"
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")
 end
@@ -94,7 +95,7 @@ task :rmgems => ["ruby:clobber_package"]
 desc "reinstall gem"
 task :reinstall => :gems do
   sh "gem uninstall pry-stack_explorer" rescue nil
-  sh "gem install #{direc}/pkg/#{PROJECT_NAME}-#{PryStackExplorer::VERSION}.gem"
+  sh "gem install -l #{direc}/pkg/#{PROJECT_NAME}-#{PryStackExplorer::VERSION}.gem"
 end
 
 task :install => :reinstall

data/lib/pry-stack_explorer.rb

@@ -108,8 +108,8 @@ module PryStackExplorer
     def bindings_equal?(b1, b2)
       (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}") })
+        (b1.eval('local_variables').map { |v| b1.eval("#{v}") }.equal?(
+         b2.eval('local_variables').map { |v| b2.eval("#{v}") }))
     end
   end
 end

data/lib/pry-stack_explorer/version.rb

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

data/lib/pry-stack_explorer/when_started_hook.rb

@@ -5,33 +5,13 @@ module PryStackExplorer
     def caller_bindings(target)
       bindings = binding.callers
 
-      start_frames = bindings.each_with_index.select do |b, i|
-        b.frame_type == :method &&
-          safe_send(b.eval("self"), :equal?, Pry) &&
-          safe_send(b.eval("__method__"), :==, :start)
-      end
-
-      start_frame_index = start_frames.first.last
-
-      if start_frames.size >= 2
-        idx1, idx2 = start_frames.take(2).map(&:last)
-
-        is_nested_session = bindings[idx1..idx2].detect do |b|
-          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_while { |b| b.eval("__FILE__") =~ /pry-(?:nav|debugger)/ }
-      bindings = bindings.drop(1) if safe_send(bindings.first.eval("__method__"), :==, :pry)
+      bindings = remove_internal_frames(bindings)
+      bindings = remove_debugger_frames(bindings)
+      bindings = bindings.drop(1) if pry_method_frame?(bindings.first)
 
       # 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)
@@ -51,7 +31,7 @@ module PryStackExplorer
       if options[:call_stack].is_a?(Array)
         bindings = options[:call_stack]
 
-        if bindings.empty? || !bindings.all? { |v| v.is_a?(Binding) }
+        if !valid_call_stack?(bindings)
           raise ArgumentError, ":call_stack must be an array of bindings"
         end
       else
@@ -60,5 +40,54 @@ module PryStackExplorer
 
       PryStackExplorer.create_and_push_frame_manager bindings, _pry_, :initial_frame => options[:initial_frame]
     end
+
+    private
+
+    # remove internal frames related to setting up the session
+    def remove_internal_frames(bindings)
+      start_frames = internal_frames_with_indices(bindings)
+      start_frame_index = start_frames.first.last
+
+      if start_frames.size >= 2
+        # god knows what's going on in here
+        idx1, idx2 = start_frames.take(2).map(&:last)
+        start_frame_index = idx2 if !nested_session?(bindings[idx1..idx2])
+      end
+
+      bindings.drop(start_frame_index + 1)
+    end
+
+    # remove pry-nav / pry-debugger frames
+    def remove_debugger_frames(bindings)
+      bindings.drop_while { |b| b.eval("__FILE__") =~ /pry-(?:nav|debugger)/ }
+    end
+
+    # binding.pry frame
+    # @return [Boolean]
+    def pry_method_frame?(binding)
+      safe_send(binding.eval("__method__"), :==, :pry)
+    end
+
+    # When a pry session is started within a pry session
+    # @return [Boolean]
+    def nested_session?(bindings)
+      bindings.detect do |b|
+        safe_send(b.eval("__method__"), :==, :re) &&
+          safe_send(b.eval("self.class"), :equal?, Pry)
+      end
+    end
+
+    # @return [Array<Array<Binding, Fixnum>>]
+    def internal_frames_with_indices(bindings)
+      bindings.each_with_index.select do |b, i|
+        b.frame_type == :method &&
+          safe_send(b.eval("self"), :equal?, Pry) &&
+          safe_send(b.eval("__method__"), :==, :start)
+      end
+    end
+
+    def valid_call_stack?(bindings)
+      bindings.any? && bindings.all? { |v| v.is_a?(Binding) }
+    end
   end
 end

data/pry-stack_explorer.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "pry-stack_explorer"
-  s.version = "0.4.8pre1"
+  s.version = "0.4.8"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2013-01-30"
+  s.date = "2013-02-07"
   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.homepage = "https://github.com/pry/pry-stack_explorer"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
   s.summary = "Walk the stack in a Pry session"
@@ -21,15 +21,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<binding_of_caller>, ["~> 0.6.8"])
+      s.add_runtime_dependency(%q<pry>, ["~> 0.9.11"])
       s.add_development_dependency(%q<bacon>, ["~> 1.1.0"])
       s.add_development_dependency(%q<rake>, ["~> 0.9"])
     else
       s.add_dependency(%q<binding_of_caller>, ["~> 0.6.8"])
+      s.add_dependency(%q<pry>, ["~> 0.9.11"])
       s.add_dependency(%q<bacon>, ["~> 1.1.0"])
       s.add_dependency(%q<rake>, ["~> 0.9"])
     end
   else
     s.add_dependency(%q<binding_of_caller>, ["~> 0.6.8"])
+    s.add_dependency(%q<pry>, ["~> 0.9.11"])
     s.add_dependency(%q<bacon>, ["~> 1.1.0"])
     s.add_dependency(%q<rake>, ["~> 0.9"])
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pry-stack_explorer
 version: !ruby/object:Gem::Version
-  version: 0.4.8pre1
-  prerelease: 5
+  version: 0.4.8
+  prerelease: 
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.8
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +104,7 @@ files:
 - test/test_frame_manager.rb
 - test/test_stack_explorer.rb
 - tester.rb
-homepage: https://github.com/banister
+homepage: https://github.com/pry/pry-stack_explorer
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -103,9 +119,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24