binding_of_caller 0.4.0 → 0.6.6

data/.travis.yml

@@ -0,0 +1,23 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+
+notifications:
+  irc: "irc.freenode.org#pry"
+  recipients:
+    - jrmair@gmail.com
+
+branches:
+  only:
+    - master
+
+#script: rake test --trace
+#
+#before_install:
+#  - gem update --system
+#  - gem --version
+#  - gem install rake bacon
+#  - rake gem
+#  - gem install pkg/*.gem

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/README.md

@@ -3,7 +3,7 @@ binding_of_caller
 
 (C) John Mair (banisterfiend) 2011
 
-_Retrieve the binding of a method's caller in MRI 1.9.2_
+_Retrieve the binding of a method's caller in MRI 1.9.2+_
 
 The `binding_of_caller` gem provides the `Binding#of_caller` method.
 
@@ -13,7 +13,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**
+**Only works in MRI Ruby 1.9.2 and 1.9.3**
 
 * 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)
@@ -50,8 +50,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
-* Broken in 1.9.3, support will hopefully be provided in the near future.
+* Only works with MRI 1.9.2 and 1.9.3
 * Does not work in 1.8.7, but there is a well known (continuation-based) hack to get a `Binding#of_caller` there.
 
 Contact

data/Rakefile

@@ -1,80 +1,137 @@
-dlext = Config::CONFIG['DLEXT']
-
-$:.unshift 'lib'
-
-PROJECT_NAME = "binding_of_caller"
-
-require 'rake/clean'
-require 'rake/gempackagetask'
-require "#{PROJECT_NAME}/version"
-
-CLOBBER.include("**/*.#{dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o")
-CLEAN.include("ext/**/*.#{dlext}", "ext/**/*.log", "ext/**/*.o",
-              "ext/**/*~", "ext/**/*#*", "ext/**/*.obj", "**/*#*", "**/*#*.*",
-              "ext/**/*.def", "ext/**/*.pdb", "**/*_flymake*.*", "**/*_flymake")
-
-def apply_spec_defaults(s)
-  s.name = PROJECT_NAME
-  s.summary = "Retrieve the binding of a method's caller. Can also retrieve bindings even further up the stack. Currently only works for MRI 1.9.2."
-  s.version = BindingOfCaller::VERSION
-  s.date = Time.now.strftime '%Y-%m-%d'
-  s.author = "John Mair (banisterfiend)"
-  s.email = 'jrmair@gmail.com'
-  s.description = s.summary
-  s.require_path = 'lib'
-  s.add_development_dependency("bacon","~>1.1.0")
-  s.homepage = "http://github.com/banister/binding_of_caller"
-  s.has_rdoc = 'yard'
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- test/*`.split("\n")
-end
-
-desc "Run tests"
-task :test do
-  sh "bacon -Itest -rubygems test.rb -q"
-end
-
-task :pry do
-  puts "loading binding_of_caller into pry"
-  sh "pry -r ./lib/binding_of_caller"
-end
-
-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"]
-  end
-
-  Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.need_zip = false
-    pkg.need_tar = false
-  end
-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/"
-  end
-end
-
-desc "build all platform gems at once"
-task :gems => [:clean, :rmgems, "ruby:gem"]
-
-task :gem => [:gems]
-
-desc "remove all platform gems"
-task :rmgems => ["ruby:clobber_package"]
-
-desc "build and push latest gems"
-task :pushgems => :gems do
-  chdir("./pkg") do
-    Dir["*.gem"].each do |gemfile|
-      sh "gem push #{gemfile}"
-    end
-  end
-end
+dlext = RbConfig::CONFIG['DLEXT']
+direc = File.dirname(__FILE__)
+
+$:.unshift 'lib'
+
+PROJECT_NAME = "binding_of_caller"
+
+require 'rake/clean'
+require 'rubygems/package_task'
+
+require "#{PROJECT_NAME}/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 apply_spec_defaults(s)
+  s.name = PROJECT_NAME
+  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'
+  s.author = "John Mair (banisterfiend)"
+  s.email = 'jrmair@gmail.com'
+  s.description = s.summary
+  s.require_path = 'lib'
+  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")
+  s.test_files = `git ls-files -- test/*`.split("\n")
+end
+
+desc "Show version"
+task :version do
+  puts "BindingOfCaller version: #{BindingOfCaller::VERSION}"
+end
+
+desc "run tests"
+task :default => [:test]
+
+desc "Run tests"
+task :test do
+  unless defined?(Rubinius)
+    Rake::Task['compile'].execute
+  end
+
+  $stdout.puts("\033[33m")
+  sh "bacon -Itest -rubygems -a -q"
+  $stdout.puts("\033[0m")
+
+  unless defined?(Rubinius)
+    Rake::Task['cleanup'].execute
+  end
+end
+
+task :pry do
+  puts "loading binding_of_caller into pry"
+  sh "pry -r ./lib/binding_of_caller"
+end
+
+desc "generate gemspec"
+task :gemspec => "ruby:gemspec"
+
+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"]
+  end
+
+  Gem::PackageTask.new(spec) do |pkg|
+    pkg.need_zip = false
+    pkg.need_tar = false
+  end
+
+  desc  "Generate gemspec file"
+  task :gemspec do
+    File.open("#{spec.name}.gemspec", "w") do |f|
+      f << spec.to_ruby
+    end
+  end
+end
+
+# namespace :rbx do
+#   spec = Gem::Specification.new do |s|
+#     apply_spec_defaults(s)
+#     s.platform = Gem::Platform::RUBY #.new(["universal", "rubinius"])
+#   end
+
+#   Gem::PackageTask.new(spec) do |pkg|
+#     pkg.need_zip = false
+#     pkg.need_tar = false
+#   end
+# 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/"
+  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'
+  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"
+end
+
+desc "build all platform gems at once"
+task :gems => [:clean, :rmgems, "ruby:gem"]
+
+task :gem => [:gems]
+
+desc "remove all platform gems"
+task :rmgems => ["ruby:clobber_package"]
+
+desc "build and push latest gems"
+task :pushgems => :gems do
+  chdir("./pkg") do
+    Dir["*.gem"].each do |gemfile|
+      sh "gem push #{gemfile}"
+    end
+  end
+end

data/binding_of_caller.gemspec

@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "binding_of_caller"
+  s.version = "0.6.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["John Mair (banisterfiend)"]
+  s.date = "2012-03-01"
+  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.homepage = "http://github.com/banister/binding_of_caller"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.12"
+  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
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bacon>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+    else
+      s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+  end
+end

data/ext/binding_of_caller/binding_of_caller.c

@@ -1,15 +1,31 @@
 /* (c) 2011 John Mair (banisterfiend), MIT license */
 
 #include <ruby.h>
-
-#include <ruby/io.h>
-#include <ruby/re.h>
 #include "vm_core.h"
 #include "gc.h"
 
 typedef enum { false, true } bool;
 
-const int max_frame_errors = 4;
+static VALUE
+string2sym(const char * string)
+{
+  return ID2SYM(rb_intern(string));
+}
+
+static inline const rb_data_type_t *
+threadptr_data_type(void)
+{
+  static const rb_data_type_t *thread_data_type;
+  if (!thread_data_type) {
+    VALUE current_thread = rb_thread_current();
+    thread_data_type = RTYPEDDATA_TYPE(current_thread);
+  }
+  return thread_data_type;
+}
+
+#define ruby_thread_data_type *threadptr_data_type()
+
+#define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
 
 static size_t
 binding_memsize(const void *ptr)
@@ -37,7 +53,11 @@ binding_mark(void *ptr)
   if (ptr) {
     bind = ptr;
     RUBY_MARK_UNLESS_NULL(bind->env);
+
+#ifdef RUBY_192
     RUBY_MARK_UNLESS_NULL(bind->filename);
+#endif
+
   }
   RUBY_MARK_LEAVE("binding");
 }
@@ -59,31 +79,48 @@ binding_alloc(VALUE klass)
 }
 
 static bool valid_frame_p(rb_control_frame_t * cfp, rb_control_frame_t * limit_cfp) {
-  if (cfp > limit_cfp)
-    rb_raise(rb_eRuntimeError, "Invalid frame, gone beyond end of stack!");
-
   return cfp->iseq && !NIL_P(cfp->self);
 }
 
 static rb_control_frame_t * find_valid_frame(rb_control_frame_t * cfp, rb_control_frame_t * limit_cfp) {
-  int error_count = 0;
-
-  while (error_count <= max_frame_errors) {
+  while (cfp < limit_cfp) {
     cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
 
+    if (cfp >= limit_cfp)
+      return NULL;
+
     if (valid_frame_p(cfp, limit_cfp))
       return cfp;
-    else
-      error_count += 1;
   }
 
-  // never reached
-  return 0;
+  // beyond end of stack
+  return NULL;
+}
+
+static VALUE
+frametype_name(VALUE flag)
+{
+  switch (flag & VM_FRAME_MAGIC_MASK) {
+  case VM_FRAME_MAGIC_METHOD: return string2sym("method");
+  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");
+  case VM_FRAME_MAGIC_EVAL:   return string2sym("eval");
+  case VM_FRAME_MAGIC_LAMBDA: return string2sym("lambda");
+  default:
+    rb_raise(rb_eRuntimeError, "Unknown frame type! got flag: %d", FIX2INT(flag));
+  }
 }
 
 static VALUE binding_of_caller(VALUE self, VALUE rb_level)
 {
-  rb_thread_t *th = GET_THREAD();
+  rb_thread_t *th;
+  GetThreadPtr(rb_thread_current(), th);
+
   rb_control_frame_t *cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
   rb_control_frame_t *limit_cfp = (void *)(th->stack + th->stack_size);
   int level = FIX2INT(rb_level);
@@ -92,6 +129,9 @@ static VALUE binding_of_caller(VALUE self, VALUE rb_level)
   for (int i = 0; i < level; i++) {
     cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
 
+    if (cfp >= limit_cfp)
+      rb_raise(rb_eRuntimeError, "Invalid frame, gone beyond end of stack!");
+
     // skip invalid frames
     if (!valid_frame_p(cfp, limit_cfp))
       cfp = find_valid_frame(cfp, limit_cfp);
@@ -100,23 +140,81 @@ static VALUE binding_of_caller(VALUE self, VALUE rb_level)
   VALUE bindval = binding_alloc(rb_cBinding);
   rb_binding_t *bind;
 
-  if (cfp == 0) {
+  if (cfp == 0)
     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);
+
   return bindval;
 }
 
+static VALUE
+frame_type(VALUE self)
+{
+  return rb_iv_get(self, "@frame_type");
+}
+
+static VALUE
+frame_description(VALUE self)
+{
+  return rb_iv_get(self, "@frame_description");
+}
+
+static VALUE frame_count(VALUE self)
+{
+  rb_thread_t *th;
+  GetThreadPtr(rb_thread_current(), th);
+
+  rb_control_frame_t *cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
+  rb_control_frame_t *limit_cfp = (void *)(th->stack + th->stack_size);
+
+  int i = 1;
+  while (cfp < limit_cfp) {
+    cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+
+    if (cfp >= limit_cfp)
+      return INT2FIX(i);
+
+    // skip invalid frames
+    if (!valid_frame_p(cfp, limit_cfp))
+      cfp = find_valid_frame(cfp, limit_cfp);
+
+    if (!cfp)
+      break;
+
+    i++;
+  }
+
+  return INT2FIX(i);
+}
+
+static VALUE
+callers(VALUE self)
+{
+  VALUE ary = rb_ary_new();
+
+  for (int i = 0; i < FIX2INT(frame_count(self)); i++)
+    rb_ary_push(ary, binding_of_caller(self, INT2FIX(i)));
+
+  return ary;
+}
+
 void
 Init_binding_of_caller()
 {
   VALUE mBindingOfCaller = rb_define_module("BindingOfCaller");
 
   rb_define_method(mBindingOfCaller, "of_caller", binding_of_caller, 1);
+  rb_define_method(mBindingOfCaller, "frame_count", frame_count, 0);
+  rb_define_method(mBindingOfCaller, "frame_type", frame_type, 0);
+  rb_define_method(mBindingOfCaller, "frame_description", frame_description, 0);
+  rb_define_method(mBindingOfCaller, "callers", callers, 0);
   rb_include_module(rb_cBinding, mBindingOfCaller);
 }
 

data/ext/binding_of_caller/extconf.rb

@@ -1,14 +1,24 @@
-require 'mkmf'
+def fake_makefile
+  File.open(File.join(File.dirname(__FILE__), "Makefile"), "w") {|f|
+    f.puts %[install:\n\techo "Nada."]
+  }
+end
+
+if RUBY_ENGINE && RUBY_ENGINE =~ /rbx/
+  fake_makefile
+else
+  require 'mkmf'
+
+  $CFLAGS += " -O0"
+  $CFLAGS += " -std=c99"
 
-$CFLAGS += " -O0"
-$CFLAGS += " -std=c99"
+  case RUBY_VERSION
+  when /1.9.2/
+    $CFLAGS += " -I./ruby_headers/192/ -DRUBY_192"
+  when /1.9.3/
+    $CFLAGS += " -I./ruby_headers/193/ -DRUBY_193"
+  end
 
-case RUBY_VERSION
-when /1.9.2/
-  $CFLAGS += " -I./ruby_headers/192/"
-when /1.9.3/
-  puts "hit 193"
-  $CFLAGS += " -I./ruby_headers/193/"
+  create_makefile('binding_of_caller')
 end
 
-create_makefile('binding_of_caller')

data/lib/binding_of_caller/version.rb

@@ -1,3 +1,3 @@
-module BindingOfCaller
-  VERSION = "0.4.0"
-end
+module BindingOfCaller
+  VERSION = "0.6.6"
+end

data/lib/binding_of_caller.rb

@@ -0,0 +1,86 @@
+dlext = RbConfig::CONFIG['DLEXT']
+direc = File.dirname(__FILE__)
+
+if RUBY_ENGINE && RUBY_ENGINE == "ruby"
+  require "binding_of_caller.#{dlext}"
+
+elsif defined?(Rubinius)
+  module BindingOfCaller
+    module BindingExtensions
+
+      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
+
+      def frame_description
+        @frame_description
+      end
+
+      def callers
+        ary = []
+        n = 0
+        loop {
+          begin
+            ary << Binding.of_caller(n)
+          rescue
+            break
+          end
+
+          n += 1
+        }
+
+        ary
+      end
+
+      def frame_count
+        n = 1
+        loop {
+          begin
+            Binding.of_caller(n)
+          rescue
+            break
+          end
+
+          n += 1
+        }
+
+        n
+      end
+
+      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
+end

data/test/test_binding_of_caller.rb

@@ -0,0 +1,91 @@
+unless Object.const_defined? :BindingOfCaller
+  $:.unshift File.expand_path '../../lib', __FILE__
+  require 'binding_of_caller'
+  require 'binding_of_caller/version'
+end
+
+puts "Testing binding_of_caller version #{BindingOfCaller::VERSION}..."
+puts "Ruby version: #{RUBY_VERSION}"
+
+describe BindingOfCaller do
+  describe "of_caller" do
+    it "should fetch immediate caller's binding when 0 is passed" do
+      o = Object.new
+      def o.a
+        var = 1
+        binding.of_caller(0).eval('var')
+      end
+
+      o. a.should == 1
+    end
+
+    it "should fetch parent of caller's binding when 1 is passed" do
+      o = Object.new
+      def o.a
+        var = 1
+        b
+      end
+
+      def o.b
+        binding.of_caller(1).eval('var')
+      end
+
+      o.a.should == 1
+    end
+
+    it "should modify locals in parent of caller's binding" do
+      o = Object.new
+      def o.a
+        var = 1
+        b
+        var
+      end
+
+      def o.b
+        binding.of_caller(1).eval('var = 20')
+      end
+
+      o.a.should == 20
+    end
+
+    it "should raise an exception when retrieving an out of band binding" do
+      o = Object.new
+      def o.a
+        binding.of_caller(100)
+      end
+
+      lambda { o.a }.should.raise RuntimeError
+    end
+  end
+
+  describe "frame_count" do
+    it 'frame_count should equal callers.count' do
+      binding.frame_count.should == binding.callers.count
+    end
+  end
+
+  describe "frame_type" do
+    it 'should return the correct frame types' do
+      o = Object.new
+
+      # method frame
+      def o.a
+        b
+      end
+
+      # method frame
+      def o.b
+        # block frame
+        proc do
+          binding.callers
+        end.call
+      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
+
+  end
+end
+

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: binding_of_caller
 version: !ruby/object:Gem::Version 
+  hash: 1509392978297545075
   prerelease: 
-  version: 0.4.0
+  segments: 
+  - 0
+  - 6
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 Z
+date: 2012-03-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bacon
@@ -18,12 +23,29 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id001
-description: Retrieve the binding of a method's caller. Can also retrieve bindings even further up the stack. Currently only works for MRI 1.9.2.
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2002549777813010636
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: Retrieve the binding of a method's caller. Can also retrieve bindings even further up the stack.
 email: jrmair@gmail.com
 executables: []
 
@@ -34,11 +56,14 @@ extra_rdoc_files: []
 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
@@ -90,8 +115,9 @@ files:
 - 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.rb
+- test/test_binding_of_caller.rb
 homepage: http://github.com/banister/binding_of_caller
 licenses: []
 
@@ -105,19 +131,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2002549777813010636
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2002549777813010636
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
-summary: Retrieve the binding of a method's caller. Can also retrieve bindings even further up the stack. Currently only works for MRI 1.9.2.
+summary: Retrieve the binding of a method's caller. Can also retrieve bindings even further up the stack.
 test_files: 
-- test/test.rb
+- test/test_binding_of_caller.rb

data/test/test.rb

@@ -1,59 +0,0 @@
-unless Object.const_defined? :BindingOfCaller
-  $:.unshift File.expand_path '../../lib', __FILE__
-  require 'binding_of_caller'
-  require 'binding_of_caller/version'
-end
-
-puts "Testing binding_of_caller version #{BindingOfCaller::VERSION}..."
-puts "Ruby version: #{RUBY_VERSION}"
-
-describe BindingOfCaller do
-  it "should fetch immediate caller's binding when 0 is passed" do
-    o = Object.new
-    def o.a
-      var = 1
-      binding.of_caller(0).eval('var')
-    end
-
-   o. a.should == 1
-  end
-
-  it "should fetch parent of caller's binding when 1 is passed" do
-    o = Object.new
-    def o.a
-      var = 1
-      b
-    end
-
-    def o.b
-      binding.of_caller(1).eval('var')
-    end
-
-   o.a.should == 1
-  end
-
-  it "should modify locals in parent of caller's binding" do
-    o = Object.new
-    def o.a
-      var = 1
-      b
-      var
-    end
-
-    def o.b
-      binding.of_caller(1).eval('var = 20')
-    end
-
-   o.a.should == 20
-  end
-
-  it "should raise an exception when retrieving an out of band binding" do
-    o = Object.new
-    def o.a
-      binding.of_caller(100)
-    end
-
-    lambda { o.a }.should.raise RuntimeError
-  end
-end
-