pry-stack_explorer 0.2.7pre4 → 0.2.8pre1

data/lib/pry-stack_explorer/commands.rb

@@ -67,33 +67,34 @@ module PryStackExplorer
     helpers do
       def frame_info(b, verbose = false)
         meth = b.eval('__method__')
-        methobj = b.eval('method(__method__)') if meth
         b_self = b.eval('self')
+        meth_obj = Pry::Method.new(b_self.method(meth)) if meth
 
-        desc = b.frame_description ? "#{text.bold('Description:')} #{b.frame_description}".ljust(40) :
-          "#{text.bold('Description:')} #{PryStackExplorer.frame_manager(_pry_).frame_info_for(b)}".ljust(40)
-        sig = meth ? "#{text.bold('Signature:')} #{signature_with_values(b, methobj)}".ljust(40) : "".ljust(32)
-        type = b.frame_type ? "#{text.bold('Type:')} #{b.frame_type}".ljust(20) : "".ljust(20)
-        slf_class = "#{text.bold('Self.class:')} #{b_self.class}".ljust(20)
+        type = b.frame_type ? "(#{b.frame_type})".ljust(20) : "".ljust(20)
+        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)
         path = "#{text.bold("@ File:")} #{b.eval('__FILE__')}:#{b.eval('__LINE__')}"
 
-        "#{desc} #{slf_class} #{sig} #{type if verbose} #{path if verbose}"
+        "#{desc} #{slf_class} #{sig} #{type} #{path if verbose}"
       end
 
-      def signature_with_values(b, meth)
-          args = meth.parameters.inject([]) do |arr, (type, name)|
-            name ||= (type == :block ? 'block' : "arg#{arr.size + 1}")
-            arr << case type
-                   when :req   then "#{name}=#{b.eval(name.to_s)}"
-                   when :opt   then "#{name}=#{b.eval(name.to_s)}"
-                   when :rest  then "*#{name}=#{b.eval(name.to_s)}"
-                   when :block then "&#{name}"
-                   else '?'
-                   end
+      def se_signature_with_owner(meth_obj)
+        args = meth_obj.parameters.inject([]) do |arr, (type, name)|
+          name ||= (type == :block ? 'block' : "arg#{arr.size + 1}")
+          arr << case type
+                 when :req   then name.to_s
+                 when :opt   then "#{name}=?"
+                 when :rest  then "*#{name}"
+                 when :block then "&#{name}"
+                 else '?'
+                 end
         end
-        "#{meth.name}(#{args.join(', ')})"
-      end
 
+        "#{meth_obj.name_with_owner}(#{args.join(', ')})"
+      end
     end
 
   end

data/lib/pry-stack_explorer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-stack_explorer
 version: !ruby/object:Gem::Version
-  version: 0.2.7pre4
+  version: 0.2.8pre1
   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: &70311169718300 !ruby/object:Gem::Requirement
+  requirement: &70361249067800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70311169718300
+  version_requirements: *70361249067800
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70311169717200 !ruby/object:Gem::Requirement
+  requirement: &70361249066920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70311169717200
+  version_requirements: *70361249066920
 description: Walk the stack in a Pry session
 email: jrmair@gmail.com
 executables: []