pry-stack_explorer 0.2.0pre1 → 0.2.1pre1

data/lib/pry-stack_explorer/version.rb

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

data/lib/pry-stack_explorer.rb

@@ -23,7 +23,6 @@ module PryStackExplorer
   end
 
   class FrameManager
-    attr_reader   :pry_instance
     attr_reader   :binding_index
     attr_accessor :bindings
 
@@ -32,7 +31,17 @@ module PryStackExplorer
       @binding_index = 0
     end
 
+    def convert_from_one_index(n)
+      if n >= 0
+        n - 1
+      else
+        n
+      end
+    end
+
     def change_binding_to(index, pry_instance)
+      index = convert_from_one_index(index)
+
       if index > bindings.size - 1
         pry_instance.output.puts "Warning: At top of stack, cannot go further!"
       elsif index < 0
@@ -52,9 +61,9 @@ module PryStackExplorer
 
       if !PryStackExplorer.frame_manager
         output.puts "Nowhere to go!"
-        else
+      else
         binding_index = PryStackExplorer.frame_manager.binding_index
-        PryStackExplorer.frame_manager.change_binding_to binding_index + inc, _pry_
+        PryStackExplorer.frame_manager.change_binding_to binding_index + inc + 1, _pry_
       end
     end
 
@@ -65,7 +74,7 @@ module PryStackExplorer
         output.puts "Nowhere to go!"
       else
         binding_index = PryStackExplorer.frame_manager.binding_index
-        PryStackExplorer.frame_manager.change_binding_to binding_index - inc, _pry_
+        PryStackExplorer.frame_manager.change_binding_to binding_index - inc + 1, _pry_
       end
     end
 
@@ -80,35 +89,55 @@ module PryStackExplorer
   end
 end
 
-class << Pry
-  alias_method :PSE_old_start, :start
-  def start(target, *args, &block)
-    target = Pry.binding_for(target)
-
-    # we need to know how many frames to skip depending on whether we
-    # were invoked with Pry.start or Object#pry
-    if binding.of_caller(1).eval('__method__') == :pry
-      drop_number = 2
-    else
-      drop_number = 1
-    end
-
-    bindings = binding.callers.drop(drop_number)
-
-    # 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)
-    end
+Pry.config.hooks.add_hook(:when_started) do |target|
+  if binding.of_caller(4).eval('__method__') == :pry
+    drop_number = 5
+  else
+    drop_number = 4
+  end
 
-    PryStackExplorer.frame_manager = PryStackExplorer::FrameManager.new(bindings)
+  bindings = binding.callers.drop(drop_number)
 
-    PSE_old_start(bindings.first, *args, &block)
+  # 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)
   end
+
+  PryStackExplorer.frame_manager = PryStackExplorer::FrameManager.new(bindings)
 end
 
+# class << Pry
+#   alias_method :PSE_old_start, :start
+#   def start(target, *args, &block)
+#     target = Pry.binding_for(target)
+
+#     # we need to know how many frames to skip depending on whether we
+#     # were invoked with Pry.start or Object#pry
+#     if binding.of_caller(1).eval('__method__') == :pry
+#       drop_number = 2
+#     else
+#       drop_number = 1
+#     end
+
+#     bindings = binding.callers.drop(drop_number)
+
+#     # 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)
+#     end
+
+#     PryStackExplorer.frame_manager = PryStackExplorer::FrameManager.new(bindings)
+
+#     PSE_old_start(bindings.first, *args, &block)
+#   end
+# end
+
 Pry.config.commands.import PryStackExplorer::StackCommands
 
 Pry.config.commands.alias_command "__old_whereami__", "whereami", ""
@@ -121,7 +150,7 @@ Pry.config.commands.command "whereami", "Show the code context for the session.
     binding_index = PryStackExplorer.frame_manager.binding_index
 
     output.puts "\n"
-    output.puts "#{Pry::Helpers::Text.bold('Frame number:')} #{binding_index}/#{bindings.size - 1}"
+    output.puts "#{Pry::Helpers::Text.bold('Frame number:')} #{binding_index + 1}/#{bindings.size}"
     output.puts "#{Pry::Helpers::Text.bold('Frame type:')} #{bindings[binding_index].frame_type}" rescue nil
   end
 

metadata

@@ -1,65 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pry-stack_explorer
-version: !ruby/object:Gem::Version 
-  hash: 1923831947
+version: !ruby/object:Gem::Version
+  version: 0.2.1pre1
   prerelease: 5
-  segments: 
-  - 0
-  - 2
-  - 0
-  - pre
-  - 1
-  version: 0.2.0pre1
 platform: ruby
-authors: 
+authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: binding_of_caller
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70296103138940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70296103138940
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &70296103138400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70296103138400
 description: Walk the stack in a Pry session
 email: jrmair@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/pry-stack_explorer/version.rb
 - lib/pry-stack_explorer.rb
 - test/test.rb
@@ -68,38 +47,26 @@ files:
 - Rakefile
 homepage: https://github.com/banister
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Walk the stack in a Pry session
 test_files: []
-