binding_of_caller 0.6.8 → 0.7.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f3fb3c7ee20b9b9ca1237d0540c2768efc657111
+  data.tar.gz: be4845aeca79432000b44be789993c23c1955715
+SHA512:
+  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,7 @@
 rvm:
   - 1.9.2
   - 1.9.3
-  - rbx-18mode
+  - 2.0.0
   - rbx-19mode
 
 notifications:

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/Rakefile

@@ -3,20 +3,23 @@ direc = File.dirname(__FILE__)
 
 $:.unshift 'lib'
 
-PROJECT_NAME = "binding_of_caller"
-
 require 'rake/clean'
 require 'rubygems/package_task'
 
-require "#{PROJECT_NAME}/version"
+require "binding_of_caller/version"
 
 CLOBBER.include("**/*.#{dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o")
 CLEAN.include("ext/**/*.#{dlext}", "ext/**/*.log", "ext/**/*.o",
               "ext/**/*~", "ext/**/*#*", "ext/**/*.obj", "**/*#*", "**/*#*.*",
               "ext/**/*.def", "ext/**/*.pdb", "**/*_flymake*.*", "**/*_flymake", "**/*.rbc")
 
+def mri_2?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" &&
+    RUBY_VERSION =~ /^2/
+end
+
 def apply_spec_defaults(s)
-  s.name = PROJECT_NAME
+  s.name = "binding_of_caller"
   s.summary = "Retrieve the binding of a method's caller. Can also retrieve bindings even further up the stack."
   s.version = BindingOfCaller::VERSION
   s.date = Time.now.strftime '%Y-%m-%d'
@@ -24,8 +27,9 @@ def apply_spec_defaults(s)
   s.email = 'jrmair@gmail.com'
   s.description = s.summary
   s.require_path = 'lib'
-  s.add_development_dependency('bacon')
-  s.add_development_dependency('rake')
+  s.add_dependency 'debug_inspector', '>= 0.0.1'
+  s.add_development_dependency 'bacon'
+  s.add_development_dependency 'rake'
   s.homepage = "http://github.com/banister/binding_of_caller"
   s.has_rdoc = 'yard'
   s.files = `git ls-files`.split("\n")
@@ -67,7 +71,7 @@ namespace :ruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)
     s.platform = Gem::Platform::RUBY
-    s.extensions = ["ext/#{PROJECT_NAME}/extconf.rb"]
+    s.extensions = ["ext/binding_of_caller/extconf.rb"]
   end
 
   Gem::PackageTask.new(spec) do |pkg|
@@ -84,29 +88,34 @@ namespace :ruby do
 end
 
 desc "build the binaries"
-task :compile do
-  chdir "./ext/#{PROJECT_NAME}/" do
-    sh "ruby extconf.rb"
-    sh "make clean"
-    sh "make"
-    sh "cp *.#{dlext} ../../lib/"
+task :compile => :cleanup do
+  if !mri_2?  
+    chdir "./ext/binding_of_caller/" do
+      sh "ruby extconf.rb"
+      sh "make"
+      sh "cp *.#{dlext} ../../lib/"
+    end
   end
 end
 
 desc 'cleanup the extensions'
 task :cleanup do
-  sh 'rm -rf lib/binding_of_caller.so'
-  chdir "./ext/#{PROJECT_NAME}/" do
-    sh 'make clean'
+  if !mri_2?
+    sh 'rm -rf lib/binding_of_caller.so'
+    chdir "./ext/binding_of_caller/" do
+      sh 'make clean' 
+    end
   end
 end
 
 desc "reinstall gem"
 task :reinstall => :gems do
   sh "gem uninstall binding_of_caller" rescue nil
-  sh "gem install #{direc}/pkg/#{PROJECT_NAME}-#{BindingOfCaller::VERSION}.gem"
+  sh "gem install #{direc}/pkg/binding_of_caller-#{BindingOfCaller::VERSION}.gem"
 end
 
+task :install => :reinstall
+
 desc "build all platform gems at once"
 task :gems => [:clean, :rmgems, "ruby:gem"]
 

data/binding_of_caller.gemspec

@@ -2,32 +2,35 @@
 
 Gem::Specification.new do |s|
   s.name = "binding_of_caller"
-  s.version = "0.6.8"
+  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 = "2012-09-12"
+  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/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 = "1.8.11"
+  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"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<debug_inspector>, [">= 0.0.1"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
     else
+      s.add_dependency(%q<debug_inspector>, [">= 0.0.1"])
       s.add_dependency(%q<bacon>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
+    s.add_dependency(%q<debug_inspector>, [">= 0.0.1"])
     s.add_dependency(%q<bacon>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
   end

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;
 
@@ -24,6 +24,7 @@ threadptr_data_type(void)
 }
 
 #define ruby_thread_data_type *threadptr_data_type()
+#define ruby_threadptr_data_type *threadptr_data_type()
 
 #define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
 
@@ -109,7 +110,6 @@ frametype_name(VALUE flag)
   case VM_FRAME_MAGIC_BLOCK:  return string2sym("block");
   case VM_FRAME_MAGIC_CLASS:  return string2sym("class");
   case VM_FRAME_MAGIC_TOP:    return string2sym("top");
-  case VM_FRAME_MAGIC_FINISH: return string2sym("finish");
   case VM_FRAME_MAGIC_CFUNC:  return string2sym("cfunc");
   case VM_FRAME_MAGIC_PROC:   return string2sym("proc");
   case VM_FRAME_MAGIC_IFUNC:  return string2sym("ifunc");
@@ -148,10 +148,11 @@ static VALUE binding_of_caller(VALUE self, VALUE rb_level)
     rb_raise(rb_eRuntimeError, "Can't create Binding Object on top of Fiber.");
 
   GetBindingPtr(bindval, bind);
+
   bind->env = rb_vm_make_env_object(th, cfp);
   bind->filename = cfp->iseq->filename;
   bind->line_no = rb_vm_get_sourceline(cfp);
-
+  
   rb_iv_set(bindval, "@frame_type", frametype_name(cfp->flag));
   rb_iv_set(bindval, "@frame_description", cfp->iseq->name);
 

data/ext/binding_of_caller/extconf.rb

@@ -1,10 +1,19 @@
 def fake_makefile
-  File.open(File.join(File.dirname(__FILE__), "Makefile"), "w") {|f|
+  File.open(File.join(File.dirname(__FILE__), "Makefile"), "w") do |f|
     f.puts %[install:\n\techo "Nada."]
-  }
+  end
+end
+
+def mri_2?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" &&
+    RUBY_VERSION =~ /^2/
+end
+
+def rbx?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
 end
 
-if RUBY_ENGINE && RUBY_ENGINE =~ /rbx/
+if mri_2? || rbx?
   fake_makefile
 else
   require 'mkmf'

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

@@ -0,0 +1,69 @@
+require 'debug_inspector'
+
+module BindingOfCaller
+  module BindingExtensions
+    # Retrieve the binding of the nth caller of the current frame.
+    # @return [Binding]
+    def of_caller(n)
+      c = callers.drop(1)
+      if n > (c.size - 1)
+        raise "No such frame, gone beyond end of stack!"
+      else
+        c[n]
+      end
+    end
+
+    # Return bindings for all caller frames.
+    # @return [Array<Binding>]
+    def callers
+      ary = []
+    
+      RubyVM::DebugInspector.open do |i|
+        n = 0
+        loop do
+          begin
+            b = i.frame_binding(n) 
+          rescue ArgumentError
+            break
+          end
+
+          if b
+            b.instance_variable_set(:@iseq, i.frame_iseq(n))
+            ary << b
+          end
+          
+          n += 1
+        end
+      end
+      
+      ary.drop(1)
+    end
+
+    # Number of parent frames available at the point of call.
+    # @return [Fixnum]
+    def frame_count
+      callers.size - 1
+    end
+
+    # The type of the frame.
+    # @return [Symbol]
+    def frame_type
+      return nil if !@iseq
+      
+      # apparently the 9th element of the iseq array holds the frame type
+      # ...not sure how reliable this is.
+      @frame_type ||= @iseq.to_a[9]
+    end
+
+    # The description of the frame.
+    # @return [String]
+    def frame_description
+      return nil if !@iseq
+      @frame_description ||= @iseq.label
+    end
+  end
+end
+
+class ::Binding
+  include BindingOfCaller::BindingExtensions
+end

data/lib/binding_of_caller/rubinius.rb

@@ -0,0 +1,74 @@
+module BindingOfCaller
+  module BindingExtensions
+
+    # Retrieve the binding of the nth caller of the current frame.
+    # @return [Binding]
+    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.constant_scope,
+                        bt.variables.self,
+                        bt
+                        )
+
+      b.instance_variable_set :@frame_description,
+                              bt.describe.gsub("{ } in", "block in")
+
+      b
+    end
+
+    # The description of the frame.
+    # @return [String]
+    def frame_description
+      @frame_description
+    end
+
+    # Return bindings for all caller frames.
+    # @return [Array<Binding>]
+    def callers
+      ary = []
+      n = 0
+      loop do
+        begin
+          ary << Binding.of_caller(n)
+        rescue
+          break
+        end
+        n += 1
+      end
+      ary.drop_while do |v|
+        !(v.frame_type == :method && v.eval("__method__") == :callers)
+      end.drop(1)
+    end
+
+    # Number of parent frames available at the point of call.
+    # @return [Fixnum]
+    def frame_count
+      callers.size - 1
+    end
+
+    # The type of the frame.
+    # @return [Symbol]
+    def frame_type
+      if compiled_code.for_module_body?
+        :class
+      elsif compiled_code.for_eval?
+        :eval
+      elsif compiled_code.is_block?
+        :block
+      else
+        :method
+      end
+    end
+  end
+end
+
+class ::Binding
+  include BindingOfCaller::BindingExtensions
+  extend BindingOfCaller::BindingExtensions
+end

data/lib/binding_of_caller/version.rb

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

data/lib/binding_of_caller.rb

@@ -1,85 +1,14 @@
 dlext = RbConfig::CONFIG['DLEXT']
-direc = File.dirname(__FILE__)
 
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
-  require "binding_of_caller.#{dlext}"
+def mri_2?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" &&
+    RUBY_VERSION =~ /^2/
+end
 
+if mri_2?
+  require 'binding_of_caller/mri2'
+elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
+  require "binding_of_caller.#{dlext}"
 elsif defined?(Rubinius)
-  module BindingOfCaller
-    module BindingExtensions
-
-      # Retrieve the binding of the nth caller of the current frame.
-      # @return [Binding]
-      def of_caller(n)
-        bt = Rubinius::VM.backtrace(1 + n, true).first
-
-        b = Binding.setup(
-                      bt.variables,
-                      bt.variables.method,
-                      bt.static_scope,
-                      bt.variables.self,
-                      bt
-                      )
-
-        b.instance_variable_set(:@frame_description, bt.describe)
-
-        b
-        rescue
-          raise RuntimeError, "Invalid frame, gone beyond end of stack!"
-      end
-
-      # The description of the frame.
-      # @return [String]
-      def frame_description
-        @frame_description
-      end
-
-      # Return bindings for all caller frames.
-      # @return [Array<Binding>]
-      def callers
-        ary = []
-        n = 0
-        loop do
-          begin
-            ary << Binding.of_caller(n)
-          rescue
-            break
-          end
-          n += 1
-        end
-        ary.drop_while do |v|
-          !(v.frame_type == :method && v.eval("__method__") == :callers)
-        end.drop(1)
-      end
-
-      # Number of parent frames available at the point of call.
-      # @return [Fixnum]
-      def frame_count
-        callers.size - 1
-      end
-
-      # 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/
-          :eval
-        else
-          if frame_description =~ /__(?:class|module)_init__/
-            :class
-          else
-            :method
-          end
-        end
-      end
-
-    end
-  end
-
-  class ::Binding
-    include BindingOfCaller::BindingExtensions
-    extend BindingOfCaller::BindingExtensions
-  end
+  require 'binding_of_caller/rubinius'
 end

data/test/test_binding_of_caller.rb

@@ -4,6 +4,10 @@ unless Object.const_defined? :BindingOfCaller
   require 'binding_of_caller/version'
 end
 
+class Module
+  public :remove_const
+end
+
 puts "Testing binding_of_caller version #{BindingOfCaller::VERSION}..."
 puts "Ruby version: #{RUBY_VERSION}"
 
@@ -81,28 +85,77 @@ describe BindingOfCaller do
     end
   end
 
-  describe "frame_type" do
-    it 'should return the correct frame types' do
+  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
+
+    it 'describes a method frame' do
       o = Object.new
+      def o.horsey_malone
+        binding.of_caller(0).frame_description.should =~ /horsey_malone/
+      end
+      o.horsey_malone
+    end
 
-      # method frame
-      def o.a
-        b
+    it 'describes a class frame' do
+      class HorseyMalone
+        binding.of_caller(0).frame_description.should =~ /class/i
       end
+      Object.remove_const(:HorseyMalone)
+    end
+  end
 
-      # method frame
-      def o.b
-        # block frame
-        proc do
-          binding.callers
-        end.call
+  describe "frame_type" do
+    it 'can be called on ordinary binding without raising' do
+      lambda { binding.frame_type }.should.not.raise 
+    end
+
+    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
+
+      it 'returns :class' do
+        @binding.frame_type.should == :class
+      end
+    end
+
+    describe "when evaluated" do
+      before { @binding = eval("binding.of_caller(0)") }
+
+      it 'returns :eval' do
+        @binding.frame_type.should == :eval
       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
 
+    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,38 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: binding_of_caller
 version: !ruby/object:Gem::Version
-  version: 0.6.8
-  prerelease: 
+  version: 0.7.2
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: debug_inspector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70130738847880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130738847880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70130738846740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130738846740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Retrieve the binding of a method's caller. Can also retrieve bindings
   even further up the stack.
 email: jrmair@gmail.com
@@ -57,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
@@ -65,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
@@ -81,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
@@ -92,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
@@ -103,31 +122,32 @@ files:
 - 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
 homepage: http://github.com/banister/binding_of_caller
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Retrieve the binding of a method's caller. Can also retrieve bindings even
   further up the stack.
 test_files: