binding_of_caller 0.6.3 → 0.7.3.pre1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a17f0ae87a78728422870616ded5e86b588dd3d0
+  data.tar.gz: f6ca5bc763c572972d999997d03c55c836c0d2e6
+SHA512:
+  metadata.gz: a9f7b1fbf6fc53920a35e66b76c1e324be60997a51c76b3d8029bc51675748776ef572bef36a56d746ee2916402695db1856ef7d6f609ba5c73e05b0780103cf
+  data.tar.gz: 1c6485ebd4c0953f31129368086e25c70c42bc659113610bd8adaf4ed6f4e27fe10d330f42376f0276646b1fc93e321938607d6df0fb85690cee43bce8058abe

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

@@ -0,0 +1,31 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - rbx-19mode
+
+notifications:
+  irc: "irc.freenode.org#pry"
+  recipients:
+    - jrmair@gmail.com
+
+branches:
+  only:
+    - master
+
+matrix:
+  include:
+    - rvm: jruby
+      env: JRUBY_OPTS=-X-C
+  allow_failures:
+    - rvm: jruby
+
+#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 'https://rubygems.org'
+gemspec

data/HISTORY

@@ -0,0 +1,35 @@
+## 0.7.3.pre1 / 2014-08-20
+
+This release includes compatibility fixes for different ruby versions
+and some minor enhancements.
+
+*   C Extensions are only compiled on MRI 1.9.x.
+
+    For MRI >= 2 the native API is used, so this should speedup
+    installation.
+
+    For JRuby this will avoid crashes on gem installation.
+
+    This was alredy being checked for Rubinius.
+
+    *Amadeus Folego*
+
+*    Added experimental JRuby support for 1.7.x series.
+
+     Only the main API is implemented and `Binding#eval` is
+     monkey-patched as it is private on JRuby.
+
+     This requires the compiler to be run on interpreted mode,
+     otherwise an exception will be thrown when `of_caller` is called.
+
+    *Charles Nutter*
+
+*   Remove executability from non-executable files.
+
+    *David Celis*
+
+*   Test and notice MRI 2.1 as a working Ruby implementation.
+
+    *Lennart Fridén*
+
+## 0.7.2 / 2013-06-07

data/README.md

@@ -1,9 +1,11 @@
+[![Build Status](https://secure.travis-ci.org/banister/binding_of_caller.png)](http://travis-ci.org/banister/binding_of_caller)
+
 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_
+_Retrieve the binding of a method's caller in MRI 1.9.2+, MRI 2.0, MRI 2.1 and RBX (Rubinius)_
 
 The `binding_of_caller` gem provides the `Binding#of_caller` method.
 
@@ -13,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 and 1.9.3**
+**Only works in MRI Ruby 1.9.2, 1.9.3, 2.0, 2.1 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)
@@ -50,8 +52,11 @@ This project is a spinoff from the [Pry REPL project.](http://pry.github.com)
 Features and limitations
 -------------------------
 
-* Only works with MRI 1.9.2 and 1.9.3
+* Only works with MRI 1.9.2, 1.9.3, 2.0, 2.1 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.
+* There is experimental support for jruby 1.7.x, but it only works in interpreted
+mode (i.e. use the option `-Djruby.compile.mode=OFF` or append
+`compile.mode=OFF` to your `.jrubyrc`)
 
 Contact
 -------
@@ -64,7 +69,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

@@ -1,112 +1,134 @@
-dlext = Config::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. 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")
-  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
-
-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.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 "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", "rbx:gem"]
-
-task :gem => [:gems]
-
-task :rbxgem => "rbx:gem"
-
-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'
+
+require 'rake/clean'
+require 'rubygems/package_task'
+
+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 = "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'
+  s.author = "John Mair (banisterfiend)"
+  s.email = 'jrmair@gmail.com'
+  s.description = s.summary
+  s.require_path = 'lib'
+  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")
+  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) or defined?(JRuby)
+    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/binding_of_caller/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
+
+desc "build the binaries"
+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
+  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/binding_of_caller-#{BindingOfCaller::VERSION}.gem"
+end
+
+task :install => :reinstall
+
+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,39 @@
+# -*- encoding: utf-8 -*-
+# stub: binding_of_caller 0.7.3.pre1 ruby lib
+# stub: ext/binding_of_caller/extconf.rb
+
+Gem::Specification.new do |s|
+  s.name = "binding_of_caller"
+  s.version = "0.7.3.pre1"
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["John Mair (banisterfiend)"]
+  s.date = "2014-08-20"
+  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/benchmark.rb", "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/jruby_interpreted.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.rubygems_version = "2.2.2"
+  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 = 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
+end

data/examples/benchmark.rb

@@ -0,0 +1,63 @@
+require 'benchmark'
+
+unless Object.const_defined? :BindingOfCaller
+  $:.unshift File.expand_path '../../lib', __FILE__
+  require 'binding_of_caller'
+  require 'binding_of_caller/version'
+end
+
+
+n = 250000
+
+Benchmark.bm(10) do |x|
+  x.report("#of_caller") do
+    1.upto(n) do
+      1.times do
+        1.times do
+          binding.of_caller(2)
+          binding.of_caller(1)
+        end
+      end
+    end
+  end
+
+  x.report("#frame_count") do
+    1.upto(n) do
+      1.times do
+        1.times do
+          binding.frame_count
+        end
+      end
+    end
+  end
+
+  x.report("#callers") do
+    1.upto(n) do
+      1.times do
+        1.times do
+          binding.callers
+        end
+      end
+    end
+  end
+
+  x.report("#frame_description") do
+    1.upto(n) do
+      1.times do
+        1.times do
+          binding.of_caller(1).frame_description
+        end
+      end
+    end
+  end
+
+  x.report("#frame_type") do
+    1.upto(n) do
+      1.times do
+        1.times do
+          binding.of_caller(1).frame_type
+        end
+      end
+    end
+  end
+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()))
 
@@ -78,8 +79,12 @@ binding_alloc(VALUE klass)
   return obj;
 }
 
+static bool ifunc_p(rb_control_frame_t * cfp) {
+  return (cfp->flag & VM_FRAME_MAGIC_MASK) == VM_FRAME_MAGIC_IFUNC;
+}
+
 static bool valid_frame_p(rb_control_frame_t * cfp, rb_control_frame_t * limit_cfp) {
-  return cfp->iseq && !NIL_P(cfp->self);
+  return cfp->iseq && !ifunc_p(cfp) && !NIL_P(cfp->self);
 }
 
 static rb_control_frame_t * find_valid_frame(rb_control_frame_t * cfp, rb_control_frame_t * limit_cfp) {
@@ -105,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");
@@ -144,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,13 +1,28 @@
-require 'mkmf'
-
-$CFLAGS += " -O0"
-$CFLAGS += " -std=c99"
+def fake_makefile
+  File.open(File.join(File.dirname(__FILE__), "Makefile"), "w") do |f|
+    f.puts %[install:\n\techo "Nada."]
+  end
+end
 
-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"
+def mri_1_9?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" &&
+    RUBY_VERSION =~ /^1\.9/
 end
 
-create_makefile('binding_of_caller')
+if mri_1_9?
+  require 'mkmf'
+
+  $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
+
+  create_makefile('binding_of_caller')
+else
+  fake_makefile
+end

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