pry-stack_explorer 0.2.9pre1 → 0.2.9pre2

data/lib/pry-stack_explorer.rb

@@ -9,6 +9,12 @@ require "binding_of_caller"
 
 module PryStackExplorer
 
+  # @return [Hash] The hash storing all frames for all Pry instances for
+  #   the current thread
+  def self.frame_hash
+    Thread.current[:__pry_frame_managers__]
+  end
+
   def self.init_frame_hash
     Thread.current[:__pry_frame_managers__] ||= Hash.new { |h, k| h[k] = [] }
   end
@@ -19,7 +25,7 @@ module PryStackExplorer
   # @param [Pry] _pry_ The Pry instance associated with the frame manager
   def self.create_and_push_frame_manager(bindings, _pry_)
     init_frame_hash
-    Thread.current[:__pry_frame_managers__][_pry_].push FrameManager.new(bindings, _pry_)
+    frame_hash[_pry_].push FrameManager.new(bindings, _pry_)
   end
 
   # Return the complete frame manager stack for the Pry instance
@@ -28,21 +34,25 @@ module PryStackExplorer
   # @return [Array] The stack of Pry::FrameManager objections
   def self.frame_managers(_pry_)
     init_frame_hash
-    Thread.current[:__pry_frame_managers__][_pry_]
+    frame_hash[_pry_]
   end
 
   # Delete the currently active frame manager
   # @param [Pry] _pry_ The Pry instance associated with the frame managers
   def self.pop_frame_manager(_pry_)
     init_frame_hash
-    Thread.current[:__pry_frame_managers__][_pry_].pop
+    popped = frame_managers(_pry_).pop
+    frame_hash.delete(_pry_) if frame_managers(_pry_).empty?
+    _pry_.backtrace = popped.prior_backtrace
+    popped
   end
 
   # Clear the stack of frame managers for the Pry instance
   # @param [Pry] _pry_ The Pry instance associated with the frame managers
   def self.clear_frame_managers(_pry_)
     init_frame_hash
-    Thread.current[:__pry_frame_managers__][_pry_].clear
+    pop_frame_manager(_pry_) until frame_managers(_pry_).empty?
+    frame_hash.delete(_pry_) # this line should be unnecessary!
   end
 
   class << self; alias_method :delete_frame_managers, :clear_frame_managers; end
@@ -50,7 +60,7 @@ module PryStackExplorer
   # @return [PryStackExplorer::FrameManager] The currently active frame manager
   def self.frame_manager(_pry_)
     init_frame_hash
-    Thread.current[:__pry_frame_managers__][_pry_].last
+    frame_hash[_pry_].last
   end
 
   # Simple test to check whether two `Binding` objects are equal.
@@ -104,7 +114,7 @@ Pry.config.hooks.add_hook(:when_started, :save_caller_bindings) do |binding_stac
 end
 
 # Import the StackExplorer commands
-Pry.config.commands.import PryStackExplorer::StackCommands
+Pry.config.commands.import PryStackExplorer::Commands
 
 # monkey-patch the whereami command to show some frame information,
 # useful for navigating stack.

data/lib/pry-stack_explorer/commands.rb

@@ -1,7 +1,7 @@
 require 'pry'
 
 module PryStackExplorer
-  StackCommands = Pry::CommandSet.new do
+  Commands = Pry::CommandSet.new do
     command "up", "Go up to the caller's context. Accepts optional numeric parameter for how many frames to move up." do |inc_str|
       inc = inc_str.nil? ? 1 : inc_str.to_i
 

data/lib/pry-stack_explorer/frame_manager.rb

@@ -13,12 +13,17 @@ module PryStackExplorer
     #   FrameManager took over.
     attr_reader :prior_binding
 
+    # @return [Array] The backtrace of the Pry instance before the
+    #   FrameManager took over.
+    attr_reader :prior_backtrace
+
     def initialize(bindings, _pry_)
       self.bindings      = bindings
       self.binding_index = 0
       @pry               = _pry_
       @user              = {}
       @prior_binding     = _pry_.binding_stack.last
+      @prior_backtrace   = _pry_.backtrace
     end
 
     # Iterate over all frames

data/lib/pry-stack_explorer/version.rb

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

data/pry-stack_explorer.gemspec

@@ -1,21 +1,21 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "pry-stack_explorer"
-  s.version = "0.2.9pre1"
+  s.name = %q{pry-stack_explorer}
+  s.version = "0.2.9pre2"
 
   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-01-12"
-  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", "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.authors = [%q{John Mair (banisterfiend)}]
+  s.date = %q{2012-01-14}
+  s.description = %q{Walk the stack in a Pry session}
+  s.email = %q{jrmair@gmail.com}
+  s.files = [%q{.gemtest}, %q{.gitignore}, %q{.travis.yml}, %q{.yardopts}, %q{CHANGELOG}, %q{Gemfile}, %q{LICENSE}, %q{README.md}, %q{Rakefile}, %q{examples/example.rb}, %q{examples/example2.rb}, %q{lib/pry-stack_explorer.rb}, %q{lib/pry-stack_explorer/commands.rb}, %q{lib/pry-stack_explorer/frame_manager.rb}, %q{lib/pry-stack_explorer/version.rb}, %q{pry-stack_explorer.gemspec}, %q{test/helper.rb}, %q{test/test_commands.rb}, %q{test/test_frame_manager.rb}, %q{test/test_stack_explorer.rb}, %q{tester.rb}]
+  s.homepage = %q{https://github.com/banister}
+  s.require_paths = [%q{lib}]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
-  s.rubygems_version = "1.8.11"
-  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"]
+  s.rubygems_version = %q{1.8.6}
+  s.summary = %q{Walk the stack in a Pry session}
+  s.test_files = [%q{test/helper.rb}, %q{test/test_commands.rb}, %q{test/test_frame_manager.rb}, %q{test/test_stack_explorer.rb}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_commands.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-describe PryStackExplorer::StackCommands do
+describe PryStackExplorer::Commands do
 
   before do
     Pry.config.hooks.add_hook(:when_started, :save_caller_bindings, &WhenStartedHook)

data/test/test_stack_explorer.rb

@@ -130,6 +130,13 @@ describe PryStackExplorer do
         PryStackExplorer.frame_manager(_pry_).prior_binding.should == b
       end
 
+      it 'should save prior backtrace in FrameManager instance' do
+        _pry_ = Pry.new
+        _pry_.backtrace = ["my backtrace"]
+        PryStackExplorer.create_and_push_frame_manager(@bindings, _pry_)
+        PryStackExplorer.frame_manager(_pry_).prior_backtrace.should == _pry_.backtrace
+      end
+
       it  "should create and push multiple FrameManagers" do
         PE.create_and_push_frame_manager(@bindings, @pry_instance)
         PE.create_and_push_frame_manager(@bindings, @pry_instance)
@@ -193,6 +200,31 @@ describe PryStackExplorer do
         PE.frame_managers(@pry_instance).count.should == 0
         PE.frame_managers(p2).count.should == 1
       end
+
+      it "should remove key when no frames remaining for Pry instance" do
+        PE.create_and_push_frame_manager(@bindings, @pry_instance)
+        PE.create_and_push_frame_manager(@bindings, @pry_instance)
+        PE.pop_frame_manager(@pry_instance)
+        PE.pop_frame_manager(@pry_instance)
+        PE.frame_hash.has_key?(@pry_instance).should == false
+      end
+
+      describe "_pry_.backtrace" do
+        it "should restore backtrace when frame is popped" do
+          p1 = Pry.new
+          bindings = [binding, binding]
+          p1.backtrace = "my backtrace1"
+          PE.create_and_push_frame_manager(bindings, p1)
+          p1.backtrace = "my backtrace2"
+          PE.create_and_push_frame_manager(bindings, p1)
+          p1.backtrace = "my backtrace3"
+
+          PE.pop_frame_manager(p1)
+          p1.backtrace.should == "my backtrace2"
+          PE.pop_frame_manager(p1)
+          p1.backtrace.should == "my backtrace1"
+        end
+      end
     end
 
     describe "PryStackExplorer.clear_frame_managers" do
@@ -200,18 +232,41 @@ describe PryStackExplorer do
         PE.create_and_push_frame_manager(@bindings, @pry_instance)
         PE.create_and_push_frame_manager(@bindings, @pry_instance)
         PE.clear_frame_managers(@pry_instance)
-        PE.frame_managers(@pry_instance).count.should == 0
+        PE.frame_hash.has_key?(@pry_instance).should == false
       end
 
-      it "should clear all FrameManagers for a Pry instance" do
+      it "should clear all FrameManagers for a Pry instance but leave others untouched" do
         p2 = Pry.new
         bindings = [binding, binding]
         PE.create_and_push_frame_manager(@bindings, @pry_instance)
         PE.create_and_push_frame_manager(bindings, p2)
         PE.clear_frame_managers(@pry_instance)
         PE.frame_managers(p2).count.should == 1
-        PE.frame_managers(@pry_instance).count.should == 0
+        PE.frame_hash.has_key?(@pry_instance).should == false
+      end
+
+      it "should remove key" do
+        PE.create_and_push_frame_manager(@bindings, @pry_instance)
+        PE.create_and_push_frame_manager(@bindings, @pry_instance)
+        PE.clear_frame_managers(@pry_instance)
+        PE.frame_hash.has_key?(@pry_instance).should == false
+      end
+
+      describe "_pry_.backtrace" do
+        it "should restore backtrace to initial one when frame managers are cleared" do
+          p1 = Pry.new
+          bindings = [binding, binding]
+          p1.backtrace = "my backtrace1"
+          PE.create_and_push_frame_manager(bindings, p1)
+          p1.backtrace = "my backtrace2"
+          PE.create_and_push_frame_manager(bindings, p1)
+          p1.backtrace = "my backtrace3"
+
+          PE.clear_frame_managers(p1)
+          p1.backtrace.should == "my backtrace1"
+        end
       end
+
     end
   end
 end

metadata

@@ -1,70 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pry-stack_explorer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.9pre2
   prerelease: 5
-  version: 0.2.9pre1
 platform: ruby
-authors: 
+authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: binding_of_caller
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70272934305720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70272934305720
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70272934305080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.9.8pre4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70272934305080
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &70272934304360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70272934304360
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70272934303560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *70272934303560
 description: Walk the stack in a Pry session
 email: jrmair@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - .travis.yml
@@ -88,32 +84,29 @@ files:
 - tester.rb
 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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+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.11
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Walk the stack in a Pry session
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_commands.rb
 - test/test_frame_manager.rb