pry-stack_explorer 0.2.8pre1 → 0.2.8pre3

data/lib/pry-stack_explorer/commands.rb

@@ -1,6 +1,6 @@
 module PryStackExplorer
   StackCommands = Pry::CommandSet.new do
-    command "up", "Go up to the caller's context" do |inc_str|
+    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
 
       if !PryStackExplorer.frame_manager(_pry_)
@@ -11,14 +11,18 @@ module PryStackExplorer
       end
     end
 
-    command "down", "Go down to the callee's context." do |inc_str|
+    command "down", "Go down to the callee's context. Accepts optional numeric parameter for how many frames to move down." do |inc_str|
       inc = inc_str.nil? ? 1 : inc_str.to_i
 
       if !PryStackExplorer.frame_manager(_pry_)
         output.puts "Nowhere to go!"
       else
         binding_index = PryStackExplorer.frame_manager(_pry_).binding_index
-        PryStackExplorer.frame_manager(_pry_).change_frame_to binding_index - inc
+        if binding_index - inc < 0
+          output.puts "Warning: At bottom of stack, cannot go further!"
+        else
+          PryStackExplorer.frame_manager(_pry_).change_frame_to binding_index - inc
+        end
       end
     end
 
@@ -36,19 +40,22 @@ module PryStackExplorer
       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"
+        content = ""
+        content << "\n#{text.bold('Showing all accessible frames in stack:')}\n--\n"
 
         PryStackExplorer.frame_manager(_pry_).each_with_index do |b, i|
           if i == PryStackExplorer.frame_manager(_pry_).binding_index
-            output.puts "=> ##{i} #{frame_info(b, opts[:v])}"
+            content << "=> ##{i} #{frame_info(b, opts[:v])}\n"
           else
-            output.puts "   ##{i} #{frame_info(b, opts[:v])}"
+            content << "   ##{i} #{frame_info(b, opts[:v])}\n"
           end
         end
+
+        stagger_output content
       end
     end
 
-    command "frame", "Switch to a particular frame." do |frame_num|
+    command "frame", "Switch to a particular frame. Accepts numeric parameter for the target frame to switch to (use with show-stack). Negative frame numbers allowed." do |frame_num|
       if !PryStackExplorer.frame_manager(_pry_)
         output.puts "nowhere to go!"
       else
@@ -70,12 +77,12 @@ module PryStackExplorer
         b_self = b.eval('self')
         meth_obj = Pry::Method.new(b_self.method(meth)) if meth
 
-        type = b.frame_type ? "(#{b.frame_type})".ljust(20) : "".ljust(20)
+        type = b.frame_type ? "(#{b.frame_type})" : ""
         desc = b.frame_description ? "#{text.bold('Description:')} #{b.frame_description}".ljust(60) :
           "#{text.bold('Description:')} #{PryStackExplorer.frame_manager(_pry_).frame_info_for(b)}".ljust(60)
         sig = meth ? "#{text.bold('Signature:')} #{se_signature_with_owner(meth_obj)}".ljust(40) : "".ljust(32)
 
-        slf_class = "#{text.bold('Self.class:')} #{b_self.class}".ljust(30)
+        slf_class = "#{text.bold('Self.class:')} #{b_self.class}".ljust(40)
         path = "#{text.bold("@ File:")} #{b.eval('__FILE__')}:#{b.eval('__LINE__')}"
 
         "#{desc} #{slf_class} #{sig} #{type} #{path if verbose}"

data/lib/pry-stack_explorer/frame_manager.rb

@@ -1,8 +1,8 @@
 module PryStackExplorer
-  
+
   class FrameManager
     include Enumerable
-    
+
     attr_accessor :binding_index
     attr_accessor :bindings
 
@@ -42,7 +42,7 @@ module PryStackExplorer
     # Ensure the Pry instance's active binding is the frame manager's
     # active binding.
     def refresh_frame
-      change_frame_to binding_index 
+      change_frame_to binding_index
     end
 
     # @return [Binding] The currently active frame
@@ -57,15 +57,18 @@ module PryStackExplorer
 
       if index > bindings.size - 1
         @pry.output.puts "Warning: At top of stack, cannot go further!"
-      elsif index < 0
+      elsif index < -bindings.size
         @pry.output.puts "Warning: At bottom of stack, cannot go further!"
       else
+        # wrap around negative indices
+        index = (bindings.size - 1) + index + 1 if index < 0
+
         self.binding_index = index
         @pry.binding_stack[-1] = bindings[binding_index]
 
         @pry.run_command "whereami"
       end
     end
-    
+
   end
 end

data/lib/pry-stack_explorer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-stack_explorer
 version: !ruby/object:Gem::Version
-  version: 0.2.8pre1
+  version: 0.2.8pre3
   prerelease: 5
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
-  requirement: &70361249067800 !ruby/object:Gem::Requirement
+  requirement: &70151324507000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70361249067800
+  version_requirements: *70151324507000
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70361249066920 !ruby/object:Gem::Requirement
+  requirement: &70151324504220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70361249066920
+  version_requirements: *70151324504220
 description: Walk the stack in a Pry session
 email: jrmair@gmail.com
 executables: []