binding_of_caller 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb405aa7190a04a128baff727db90ef40ae1468c
-  data.tar.gz: 43cc746def25b335c279df78b070d926bdb43ebc
+  metadata.gz: f3fb3c7ee20b9b9ca1237d0540c2768efc657111
+  data.tar.gz: be4845aeca79432000b44be789993c23c1955715
 SHA512:
-  metadata.gz: 2352e3c209510a9bed92399403425165c3b18bdaa559803d6a042ff5b98b52e70fb9b299236dad9d9895e06b533bcee7a3f1952bd8e7fea972d944b244e8e345
-  data.tar.gz: 7e47b06c1867cec238f1a772a8659acc738b328fd4425601b7a0bb7ce55925be0ebbbee43709bc453efef4ba41e989eed560d6ed7232fc030b83b2c17185910a
+  metadata.gz: 3fd5d2a9ffbda43fcc2d8afa739ec51052f5dacc8632c3e88b60b7be90c2bd67c8a813156dab341e9f3399e46db667f3a1246043d50f1f60b6654d5c07e4e93c
+  data.tar.gz: 13fe3b6ab87052403c99be357fb91ea3ed2c9e9e5a8bafadc3123293bbb0a47bd7a235c67f7d25adb020f07bef0dee6d5a00424c7f59bf4c8b59dfc1f691d5c8

data/.gitignore

@@ -1,7 +1,8 @@
-Makefile
-*.so
-*.o
-*.def
-doc/
-pkg/
-.yardoc/
+Makefile
+*.so
+*.o
+*.def
+doc/
+pkg/
+.yardoc/
+Gemfile.lock

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - 2.0.0
+  - rbx-19mode
 
 notifications:
   irc: "irc.freenode.org#pry"

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/README.md

@@ -3,9 +3,9 @@
 binding_of_caller
 ===========
 
-(C) John Mair (banisterfiend) 2011
+(C) John Mair (banisterfiend) 2012
 
-_Retrieve the binding of a method's caller in MRI 1.9.2+, and RBX (Rubinius)_
+_Retrieve the binding of a method's caller in MRI 1.9.2+, MRI 2.0 and RBX (Rubinius)_
 
 The `binding_of_caller` gem provides the `Binding#of_caller` method.
 
@@ -15,7 +15,7 @@ call stack, not limited to just the immediate caller.
 
 **Recommended for use only in debugging situations. Do not use this in production apps.**
 
-**Only works in MRI Ruby 1.9.2, 1.9.3 and RBX (Rubinius)**
+**Only works in MRI Ruby 1.9.2, 1.9.3, 2.0 and RBX (Rubinius)**
 
 * Install the [gem](https://rubygems.org/gems/binding_of_caller): `gem install binding_of_caller`
 * See the [source code](http://github.com/banister/binding_of_caller)
@@ -52,7 +52,7 @@ This project is a spinoff from the [Pry REPL project.](http://pry.github.com)
 Features and limitations
 -------------------------
 
-* Only works with MRI 1.9.2, 1.9.3 and RBX (Rubinius)
+* Only works with MRI 1.9.2, 1.9.3, 2.0 and RBX (Rubinius)
 * Does not work in 1.8.7, but there is a well known (continuation-based) hack to get a `Binding#of_caller` there.
 
 Contact
@@ -66,7 +66,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2011 (John Mair)
+Copyright (c) 2012 (John Mair)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/binding_of_caller.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = "binding_of_caller"
-  s.version = "0.6.9"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2013-02-14"
+  s.date = "2013-06-07"
   s.description = "Retrieve the binding of a method's caller. Can also retrieve bindings even further up the stack."
   s.email = "jrmair@gmail.com"
   s.extensions = ["ext/binding_of_caller/extconf.rb"]
-  s.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "Gemfile", "HISTORY", "LICENSE", "README.md", "Rakefile", "binding_of_caller.gemspec", "examples/example.rb", "ext/binding_of_caller/binding_of_caller.c", "ext/binding_of_caller/extconf.rb", "ext/binding_of_caller/ruby_headers/192/debug.h", "ext/binding_of_caller/ruby_headers/192/dln.h", "ext/binding_of_caller/ruby_headers/192/eval_intern.h", "ext/binding_of_caller/ruby_headers/192/gc.h", "ext/binding_of_caller/ruby_headers/192/id.h", "ext/binding_of_caller/ruby_headers/192/iseq.h", "ext/binding_of_caller/ruby_headers/192/method.h", "ext/binding_of_caller/ruby_headers/192/node.h", "ext/binding_of_caller/ruby_headers/192/regenc.h", "ext/binding_of_caller/ruby_headers/192/regint.h", "ext/binding_of_caller/ruby_headers/192/regparse.h", "ext/binding_of_caller/ruby_headers/192/thread_pthread.h", "ext/binding_of_caller/ruby_headers/192/thread_win32.h", "ext/binding_of_caller/ruby_headers/192/timev.h", "ext/binding_of_caller/ruby_headers/192/transcode_data.h", "ext/binding_of_caller/ruby_headers/192/version.h", "ext/binding_of_caller/ruby_headers/192/vm_core.h", "ext/binding_of_caller/ruby_headers/192/vm_exec.h", "ext/binding_of_caller/ruby_headers/192/vm_insnhelper.h", "ext/binding_of_caller/ruby_headers/192/vm_opts.h", "ext/binding_of_caller/ruby_headers/193/addr2line.h", "ext/binding_of_caller/ruby_headers/193/atomic.h", "ext/binding_of_caller/ruby_headers/193/constant.h", "ext/binding_of_caller/ruby_headers/193/debug.h", "ext/binding_of_caller/ruby_headers/193/dln.h", "ext/binding_of_caller/ruby_headers/193/encdb.h", "ext/binding_of_caller/ruby_headers/193/eval_intern.h", "ext/binding_of_caller/ruby_headers/193/gc.h", "ext/binding_of_caller/ruby_headers/193/id.h", "ext/binding_of_caller/ruby_headers/193/internal.h", "ext/binding_of_caller/ruby_headers/193/iseq.h", "ext/binding_of_caller/ruby_headers/193/method.h", "ext/binding_of_caller/ruby_headers/193/node.h", "ext/binding_of_caller/ruby_headers/193/parse.h", "ext/binding_of_caller/ruby_headers/193/regenc.h", "ext/binding_of_caller/ruby_headers/193/regint.h", "ext/binding_of_caller/ruby_headers/193/regparse.h", "ext/binding_of_caller/ruby_headers/193/revision.h", "ext/binding_of_caller/ruby_headers/193/thread_pthread.h", "ext/binding_of_caller/ruby_headers/193/thread_win32.h", "ext/binding_of_caller/ruby_headers/193/timev.h", "ext/binding_of_caller/ruby_headers/193/transcode_data.h", "ext/binding_of_caller/ruby_headers/193/transdb.h", "ext/binding_of_caller/ruby_headers/193/version.h", "ext/binding_of_caller/ruby_headers/193/vm_core.h", "ext/binding_of_caller/ruby_headers/193/vm_exec.h", "ext/binding_of_caller/ruby_headers/193/vm_insnhelper.h", "ext/binding_of_caller/ruby_headers/193/vm_opts.h", "lib/binding_of_caller.rb", "lib/binding_of_caller/mri2.rb", "lib/binding_of_caller/rubinius.rb", "lib/binding_of_caller/version.rb", "test/test_binding_of_caller.rb"]
+  s.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "Gemfile", "HISTORY", "LICENSE", "README.md", "Rakefile", "binding_of_caller.gemspec", "examples/example.rb", "ext/binding_of_caller/binding_of_caller.c", "ext/binding_of_caller/extconf.rb", "ext/binding_of_caller/ruby_headers/192/debug.h", "ext/binding_of_caller/ruby_headers/192/dln.h", "ext/binding_of_caller/ruby_headers/192/eval_intern.h", "ext/binding_of_caller/ruby_headers/192/id.h", "ext/binding_of_caller/ruby_headers/192/iseq.h", "ext/binding_of_caller/ruby_headers/192/method.h", "ext/binding_of_caller/ruby_headers/192/node.h", "ext/binding_of_caller/ruby_headers/192/regenc.h", "ext/binding_of_caller/ruby_headers/192/regint.h", "ext/binding_of_caller/ruby_headers/192/regparse.h", "ext/binding_of_caller/ruby_headers/192/rubys_gc.h", "ext/binding_of_caller/ruby_headers/192/thread_pthread.h", "ext/binding_of_caller/ruby_headers/192/thread_win32.h", "ext/binding_of_caller/ruby_headers/192/timev.h", "ext/binding_of_caller/ruby_headers/192/transcode_data.h", "ext/binding_of_caller/ruby_headers/192/version.h", "ext/binding_of_caller/ruby_headers/192/vm_core.h", "ext/binding_of_caller/ruby_headers/192/vm_exec.h", "ext/binding_of_caller/ruby_headers/192/vm_insnhelper.h", "ext/binding_of_caller/ruby_headers/192/vm_opts.h", "ext/binding_of_caller/ruby_headers/193/addr2line.h", "ext/binding_of_caller/ruby_headers/193/atomic.h", "ext/binding_of_caller/ruby_headers/193/constant.h", "ext/binding_of_caller/ruby_headers/193/debug.h", "ext/binding_of_caller/ruby_headers/193/dln.h", "ext/binding_of_caller/ruby_headers/193/encdb.h", "ext/binding_of_caller/ruby_headers/193/eval_intern.h", "ext/binding_of_caller/ruby_headers/193/id.h", "ext/binding_of_caller/ruby_headers/193/internal.h", "ext/binding_of_caller/ruby_headers/193/iseq.h", "ext/binding_of_caller/ruby_headers/193/method.h", "ext/binding_of_caller/ruby_headers/193/node.h", "ext/binding_of_caller/ruby_headers/193/parse.h", "ext/binding_of_caller/ruby_headers/193/regenc.h", "ext/binding_of_caller/ruby_headers/193/regint.h", "ext/binding_of_caller/ruby_headers/193/regparse.h", "ext/binding_of_caller/ruby_headers/193/revision.h", "ext/binding_of_caller/ruby_headers/193/rubys_gc.h", "ext/binding_of_caller/ruby_headers/193/thread_pthread.h", "ext/binding_of_caller/ruby_headers/193/thread_win32.h", "ext/binding_of_caller/ruby_headers/193/timev.h", "ext/binding_of_caller/ruby_headers/193/transcode_data.h", "ext/binding_of_caller/ruby_headers/193/transdb.h", "ext/binding_of_caller/ruby_headers/193/version.h", "ext/binding_of_caller/ruby_headers/193/vm_core.h", "ext/binding_of_caller/ruby_headers/193/vm_exec.h", "ext/binding_of_caller/ruby_headers/193/vm_insnhelper.h", "ext/binding_of_caller/ruby_headers/193/vm_opts.h", "lib/binding_of_caller.rb", "lib/binding_of_caller/mri2.rb", "lib/binding_of_caller/rubinius.rb", "lib/binding_of_caller/version.rb", "test/test_binding_of_caller.rb"]
   s.homepage = "http://github.com/banister/binding_of_caller"
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.0.rc.2"
+  s.rubygems_version = "2.0.3"
   s.summary = "Retrieve the binding of a method's caller. Can also retrieve bindings even further up the stack."
   s.test_files = ["test/test_binding_of_caller.rb"]
 

data/ext/binding_of_caller/binding_of_caller.c

@@ -2,7 +2,7 @@
 
 #include <ruby.h>
 #include "vm_core.h"
-#include "gc.h"
+#include "rubys_gc.h"
 
 typedef enum { false, true } bool;
 

data/ext/binding_of_caller/ruby_headers/192/version.h

@@ -1,13 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-<<<<<<< HEAD
-<<<<<<< HEAD
-#define RUBY_PATCHLEVEL 34
-=======
-#define RUBY_PATCHLEVEL 27
->>>>>>> 7f5d559... merges r29155 from trunk into ruby_1_9_2. fixes #3777, #3772 and #3722.
-=======
 #define RUBY_PATCHLEVEL 30
->>>>>>> 13fdd22... merges r29188 from trunk into ruby_1_9_2.
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

data/lib/binding_of_caller/mri2.rb

@@ -23,15 +23,15 @@ module BindingOfCaller
         loop do
           begin
             b = i.frame_binding(n) 
-
-            if b
-              iseq = i.frame_iseq(n) 
-              b.instance_variable_set(:@iseq, iseq)
-              ary << b
-            end
           rescue ArgumentError
             break
           end
+
+          if b
+            b.instance_variable_set(:@iseq, i.frame_iseq(n))
+            ary << b
+          end
+          
           n += 1
         end
       end

data/lib/binding_of_caller/rubinius.rb

@@ -6,19 +6,20 @@ module BindingOfCaller
     def of_caller(n)
       bt = Rubinius::VM.backtrace(1 + n, true).first
 
+      raise RuntimeError, "Invalid frame, gone beyond end of stack!" if bt.nil?
+
       b = Binding.setup(
                         bt.variables,
                         bt.variables.method,
-                        bt.static_scope,
+                        bt.constant_scope,
                         bt.variables.self,
                         bt
                         )
 
-      b.instance_variable_set(:@frame_description, bt.describe)
+      b.instance_variable_set :@frame_description,
+                              bt.describe.gsub("{ } in", "block in")
 
       b
-    rescue
-      raise RuntimeError, "Invalid frame, gone beyond end of stack!"
     end
 
     # The description of the frame.
@@ -54,20 +55,16 @@ module BindingOfCaller
     # The type of the frame.
     # @return [Symbol]
     def frame_type
-      case self.variables.method.metadata.to_a.first.to_s
-      when /block/
-        :block
-      when /eval/
+      if compiled_code.for_module_body?
+        :class
+      elsif compiled_code.for_eval?
         :eval
+      elsif compiled_code.is_block?
+        :block
       else
-        if frame_description =~ /__(?:class|module)_init__/
-          :class
-        else
-          :method
-        end
+        :method
       end
     end
-
   end
 end
 

data/lib/binding_of_caller/version.rb

@@ -1,3 +1,3 @@
 module BindingOfCaller
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/test/test_binding_of_caller.rb

@@ -84,12 +84,12 @@ describe BindingOfCaller do
       binding.frame_count.should == binding.callers.count
     end
   end
-  
+
   describe "frame_descripton" do
     it 'can be called on ordinary binding without raising' do
       lambda { binding.frame_description }.should.not.raise 
     end
-    
+
     it 'describes a block frame' do
       binding.of_caller(0).frame_description.should =~ /block/
     end
@@ -104,7 +104,7 @@ describe BindingOfCaller do
 
     it 'describes a class frame' do
       class HorseyMalone
-        binding.of_caller(0).frame_description.should =~ /class/
+        binding.of_caller(0).frame_description.should =~ /class/i
       end
       Object.remove_const(:HorseyMalone)
     end
@@ -114,36 +114,48 @@ describe BindingOfCaller do
     it 'can be called on ordinary binding without raising' do
       lambda { binding.frame_type }.should.not.raise 
     end
-    
-    it 'should return the correct frame types' do
-      o = Object.new
 
-      # method frame
-      def o.a
-        b
+    describe "when inside a class definition" do
+      before do
+        class HorseyMalone
+          @binding = binding.of_caller(0)
+          def self.binding; @binding; end
+        end
+        @binding = HorseyMalone.binding
       end
 
-      # method frame
-      def o.b
-        # block frame
-        proc do
-          binding.callers
-        end.call
+      it 'returns :class' do
+        @binding.frame_type.should == :class
       end
-      caller_bindings = o.a
-      caller_bindings[0].frame_type.should == :block
-      caller_bindings[1].frame_type.should == :method
-      caller_bindings[2].frame_type.should == :method
     end
 
-    it 'identifies a class frame' do
-      class HorseyMalone
-        binding.of_caller(0).frame_type.should == :class
+    describe "when evaluated" do
+      before { @binding = eval("binding.of_caller(0)") }
+
+      it 'returns :eval' do
+        @binding.frame_type.should == :eval
       end
+    end
 
-      Object.remove_const(:HorseyMalone)
+    describe "when inside a block" do
+      before { @binding = proc { binding.of_caller(0) }.call }
+
+      it 'returns :block' do
+        @binding.frame_type.should == :block
+      end
     end
 
+    describe "when inside an instance method" do
+      before do
+        o = Object.new
+        def o.a; binding.of_caller(0); end
+        @binding = o.a;
+      end
+
+      it 'returns :method' do
+        @binding.frame_type.should == :method
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: binding_of_caller
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug_inspector
@@ -76,7 +76,6 @@ files:
 - ext/binding_of_caller/ruby_headers/192/debug.h
 - ext/binding_of_caller/ruby_headers/192/dln.h
 - ext/binding_of_caller/ruby_headers/192/eval_intern.h
-- ext/binding_of_caller/ruby_headers/192/gc.h
 - ext/binding_of_caller/ruby_headers/192/id.h
 - ext/binding_of_caller/ruby_headers/192/iseq.h
 - ext/binding_of_caller/ruby_headers/192/method.h
@@ -84,6 +83,7 @@ files:
 - ext/binding_of_caller/ruby_headers/192/regenc.h
 - ext/binding_of_caller/ruby_headers/192/regint.h
 - ext/binding_of_caller/ruby_headers/192/regparse.h
+- ext/binding_of_caller/ruby_headers/192/rubys_gc.h
 - ext/binding_of_caller/ruby_headers/192/thread_pthread.h
 - ext/binding_of_caller/ruby_headers/192/thread_win32.h
 - ext/binding_of_caller/ruby_headers/192/timev.h
@@ -100,7 +100,6 @@ files:
 - ext/binding_of_caller/ruby_headers/193/dln.h
 - ext/binding_of_caller/ruby_headers/193/encdb.h
 - ext/binding_of_caller/ruby_headers/193/eval_intern.h
-- ext/binding_of_caller/ruby_headers/193/gc.h
 - ext/binding_of_caller/ruby_headers/193/id.h
 - ext/binding_of_caller/ruby_headers/193/internal.h
 - ext/binding_of_caller/ruby_headers/193/iseq.h
@@ -111,6 +110,7 @@ files:
 - ext/binding_of_caller/ruby_headers/193/regint.h
 - ext/binding_of_caller/ruby_headers/193/regparse.h
 - ext/binding_of_caller/ruby_headers/193/revision.h
+- ext/binding_of_caller/ruby_headers/193/rubys_gc.h
 - ext/binding_of_caller/ruby_headers/193/thread_pthread.h
 - ext/binding_of_caller/ruby_headers/193/thread_win32.h
 - ext/binding_of_caller/ruby_headers/193/timev.h
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Retrieve the binding of a method's caller. Can also retrieve bindings even