pry-stack_explorer 0.2.3pre1 → 0.2.5pre1

data/Rakefile

@@ -22,7 +22,7 @@ def apply_spec_defaults(s)
   s.email = 'jrmair@gmail.com'
   s.description = s.summary
   s.require_path = 'lib'
-  s.add_dependency("binding_of_caller","~>0.5.0")
+  s.add_dependency("binding_of_caller","~>0.6.0")
   s.add_development_dependency("bacon","~>1.1.0")
   s.homepage = "https://github.com/banister"
   s.files = Dir["lib/**/*.rb", "test/*.rb", "CHANGELOG", "README.md", "Rakefile"]
@@ -33,6 +33,11 @@ task :pry do
   exec("pry -I#{direc}/lib/ -r #{direc}/lib/#{PROJECT_NAME}")
 end
 
+desc "Run example"
+task :example do
+  sh "ruby -I#{direc}/lib/ #{direc}/examples/example.rb "
+end
+
 desc "run tests"
 task :test do
   sh "bacon -Itest -rubygems -a"

data/lib/pry-stack_explorer/version.rb

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

data/lib/pry-stack_explorer.rb

@@ -7,12 +7,17 @@ require "binding_of_caller"
 
 module PryStackExplorer
 
-  def self.frame_manager
-    Thread.current[:__pry_frame_manager__]
+  def self.add_frame_manager(bindings, _pry_)
+    Thread.current[:__pry_frame_managers__] ||= {}
+    Thread.current[:__pry_frame_managers__][_pry_] = FrameManager.new(bindings, _pry_)
   end
 
-  def self.frame_manager=(obj)
-    Thread.current[:__pry_frame_manager__] = obj
+  def self.delete_frame_manager(_pry_)
+    Thread.current[:__pry_frame_managers__].delete(_pry_)
+  end
+
+  def self.frame_manager(_pry_)
+    Thread.current[:__pry_frame_managers__][_pry_]
   end
 
   def self.bindings_equal?(b1, b2)
@@ -26,9 +31,10 @@ module PryStackExplorer
     attr_reader   :binding_index
     attr_accessor :bindings
 
-    def initialize(bindings)
+    def initialize(bindings, _pry_)
       @bindings      = bindings
       @binding_index = 0
+      @pry           = _pry_
     end
 
     def convert_from_one_index(n)
@@ -40,18 +46,43 @@ module PryStackExplorer
     end
     private :convert_from_one_index
 
-    def change_binding_to(index, pry_instance)
+    def signature(b)
+      if b.eval('__method__')
+        "#{closure_type} in #{b.eval('self').class}##{b.eval('__method__')}"
+      else
+        if b.eval('self').is_a?(Module)
+          "#{closure_type} in <class:#{b.eval('self')}>"
+        end
+      end
+    end
+
+    def binding_info_for(b)
+      b_self = b.eval('self')
+      b_method = b.eval('__method__')
+
+      if b_method && b_method != :__binding__ && b_method != :__binding_impl__
+        b_method.to_s
+      elsif b_self.instance_of?(Module)
+        "<module:#{b_self}>"
+      elsif b_self.instance_of?(Class)
+        "<class:#{b_self}>"
+      else
+        "<main>"
+      end
+    end
+
+    def change_binding_to(index)
       index = convert_from_one_index(index)
 
       if index > bindings.size - 1
-        pry_instance.output.puts "Warning: At top of stack, cannot go further!"
+        @pry.output.puts "Warning: At top of stack, cannot go further!"
       elsif index < 0
-        pry_instance.output.puts "Warning: At bottom of stack, cannot go further!"
+        @pry.output.puts "Warning: At bottom of stack, cannot go further!"
       else
         @binding_index = index
-        pry_instance.binding_stack[-1] = bindings[binding_index]
+        @pry.binding_stack[-1] = bindings[binding_index]
 
-        pry_instance.run_command "whereami"
+        @pry.run_command "whereami"
       end
     end
   end
@@ -60,41 +91,89 @@ module PryStackExplorer
     command "up", "Go up to the caller's context" do |inc_str|
       inc = inc_str.nil? ? 1 : inc_str.to_i
 
-      if !PryStackExplorer.frame_manager
+      if !PryStackExplorer.frame_manager(_pry_)
         output.puts "Nowhere to go!"
       else
-        binding_index = PryStackExplorer.frame_manager.binding_index
-        PryStackExplorer.frame_manager.change_binding_to binding_index + inc + 1, _pry_
+        binding_index = PryStackExplorer.frame_manager(_pry_).binding_index
+        PryStackExplorer.frame_manager(_pry_).change_binding_to binding_index + inc + 1
       end
     end
 
     command "down", "Go down to the callee's context." do |inc_str|
       inc = inc_str.nil? ? 1 : inc_str.to_i
 
-      if !PryStackExplorer.frame_manager
+      if !PryStackExplorer.frame_manager(_pry_)
         output.puts "Nowhere to go!"
       else
-        binding_index = PryStackExplorer.frame_manager.binding_index
-        PryStackExplorer.frame_manager.change_binding_to binding_index - inc + 1, _pry_
+        binding_index = PryStackExplorer.frame_manager(_pry_).binding_index
+        PryStackExplorer.frame_manager(_pry_).change_binding_to binding_index - inc + 1
+      end
+    end
+
+    command "show-stack", "Show all frames" do |*args|
+      opts = parse_options!(args) do |opt|
+        opt.banner unindent <<-USAGE
+            Usage: show-stack [OPTIONS]
+            Show all accessible stack frames.
+            e.g: show-stack -v
+          USAGE
+
+        opt.on :v, :verbose, "Include extra information."
+      end
+
+      if !PryStackExplorer.frame_manager(_pry_)
+        output.puts "No caller stack available!"
+      else
+        output.puts "\n#{text.bold('Showing all accessible frames in stack:')}\n--\n"
+
+        PryStackExplorer.frame_manager(_pry_).bindings.each_with_index do |b, i|
+          meth = b.eval('__method__')
+          b_self = b.eval('self')
+
+          desc = b.frame_description ? "#{text.bold('Description:')} #{b.frame_description}".ljust(40) :
+            "#{text.bold('Description:')} #{PryStackExplorer.frame_manager(_pry_).binding_info_for(b)}".ljust(40)
+          sig = meth ? "#{text.bold('Signature:')} #{Pry::Method.new(b_self.method(meth)).signature}".ljust(40) : "".ljust(32)
+          type = b.frame_type ? "#{text.bold('Type:')} #{b.frame_type}".ljust(20) : "".ljust(20)
+          slf = "#{text.bold('Self:')} #{b_self}".ljust(20)
+          path = "#{text.bold("@ File:")} #{b.eval('__FILE__')}:#{b.eval('__LINE__')}"
+
+          info = "##{i + 1} #{desc} #{sig} #{slf if opts[:v]} #{type \
+                  if opts[:v]} #{path if opts[:v]}"
+          if i == PryStackExplorer.frame_manager(_pry_).binding_index
+
+            output.puts "=> #{info}"
+          else
+            output.puts "   #{info}"
+          end
+        end
       end
     end
 
     command "frame", "Switch to a particular frame." do |frame_num|
-      PryStackExplorer.frame_manager.change_binding_to frame_num.to_i, _pry_
+      if !PryStackExplorer.frame_manager(_pry_)
+        output.puts "nowhere to go!"
+      else
+        PryStackExplorer.frame_manager(_pry_).change_binding_to frame_num.to_i
+      end
     end
 
     command "frame-type", "Display current frame type." do
-      bindex = PryStackExplorer.frame_manager.binding_index
-      output.puts PryStackExplorer.frame_manager.bindings[bindex].frame_type
+      output.puts _pry_.binding_stack.last.frame_type
     end
   end
 end
 
-Pry.config.hooks.add_hook(:when_started, :save_caller_bindings) do |target|
-  if binding.of_caller(5).eval('__method__') == :pry
-    drop_number = 6
+Pry.config.hooks.add_hook(:after_session, :delete_frame_manager) do |_, _, _pry_|
+  PryStackExplorer.delete_frame_manager(_pry_)
+end
+
+Pry.config.hooks.add_hook(:when_started, :save_caller_bindings) do |binding_stack, _pry_|
+  target = binding_stack.last
+
+  if binding.of_caller(6).eval('__method__') == :pry
+    drop_number = 7
   else
-    drop_number = 5
+    drop_number = 6
   end
 
   bindings = binding.callers.drop(drop_number)
@@ -107,7 +186,8 @@ Pry.config.hooks.add_hook(:when_started, :save_caller_bindings) do |target|
     bindings.unshift(target)
   end
 
-  PryStackExplorer.frame_manager = PryStackExplorer::FrameManager.new(bindings)
+  binding_stack.replace([bindings.first])
+  PryStackExplorer.add_frame_manager(bindings, _pry_)
 end
 
 Pry.config.commands.import PryStackExplorer::StackCommands
@@ -115,12 +195,12 @@ Pry.config.commands.import PryStackExplorer::StackCommands
 # monkey-patch the whereami command to show some frame information,
 # useful for navigating stack.
 Pry.config.commands.before_command("whereami") do |num|
-  if PryStackExplorer.frame_manager
-    bindings      = PryStackExplorer.frame_manager.bindings
-    binding_index = PryStackExplorer.frame_manager.binding_index
+  if PryStackExplorer.frame_manager(_pry_)
+    bindings      = PryStackExplorer.frame_manager(_pry_).bindings
+    binding_index = PryStackExplorer.frame_manager(_pry_).binding_index
 
     output.puts "\n"
     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
+    output.puts "#{Pry::Helpers::Text.bold('Frame type:')} #{bindings[binding_index].frame_type}" if bindings[binding_index].frame_type
   end
 end

metadata

@@ -1,44 +1,48 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pry-stack_explorer
-version: !ruby/object:Gem::Version
-  version: 0.2.3pre1
+version: !ruby/object:Gem::Version 
   prerelease: 5
+  version: 0.2.5pre1
 platform: ruby
-authors:
+authors: 
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-06 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: binding_of_caller
-  requirement: &70114011666420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70114011666420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bacon
-  requirement: &70114011665900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.1.0
   type: :development
-  prerelease: false
-  version_requirements: *70114011665900
+  version_requirements: *id002
 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
@@ -47,26 +51,30 @@ 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
-      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
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Walk the stack in a Pry session
 test_files: []
+