bindex 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34aa50088ea6aef2477158e8e8cc6e9c79bc61a9
-  data.tar.gz: f28ceecbdfcb050ad460d5b98ce1c49a3b471ae2
+  metadata.gz: ee2e50960f0fc636073a2d4a2597d169fae84bf2
+  data.tar.gz: d456453d22c61a8f19a6c8e1a73c149c7930a386
 SHA512:
-  metadata.gz: 26de5ac63dd38eee300a749896c9eb24e3c2aa76a3f28264282e703fe7052217e4f0bc6c62a768ed85812b3afe1032a1bcc30a01a76fee7f0873f92b99edfe89
-  data.tar.gz: add6aec5daa85df64266f3632afb64cf38c098bab43dffa41311537de8ee7f24e400aa1b5c2aba772c8524d878d04dc93eca8f101ca3a0d98692dd40615bc6ab
+  metadata.gz: 28100af5bd5b378da0a983d381c10f235ccfb98db38ad6513fa9ac5b793042f07c5755912fe8b1723c8b36438929a4b96aed02b64810fe5b6c6b4e2dda1ddd37
+  data.tar.gz: da0c772ab6d28e3d1edfe1b2284c86fbf2d7a3cbca0a2a3d782807268b97ef2c95bcdd0d0b4e9a208458b0e1be8a181db76aa9af2a66df88915d943ee00eea2e

data/.travis.yml

@@ -1,43 +1,21 @@
 language: ruby
 
 rvm:
-  - ruby-1.9.3-p551
-  - ruby-1.9.3-p550
-  - ruby-1.9.3-p547
-  - ruby-1.9.3-p545
-  - ruby-1.9.3-p484
-
-  - ruby-2.0.0-p598
-  - ruby-2.0.0-p576
-  - ruby-2.0.0-p481
-  - ruby-2.0.0-p451
-  - ruby-2.0.0-p353
-  - ruby-2.0.0-p247
-  - ruby-2.0.0-p195
-  - ruby-2.0.0-p0
-
-  - ruby-2.1.5
-  - ruby-2.1.4
-  - ruby-2.1.3
-  - ruby-2.1.2-clang
-  - ruby-2.1.2
-  - ruby-2.1.1-clang
-  - ruby-2.1.1
-  - ruby-2.1.0-rc1
-  - ruby-2.1.0-preview2
-  - ruby-2.1.0-preview1
+  - ruby-2.0.0-p648
+  - ruby-2.1.10
   - ruby-2.1.0
-
+  - ruby-2.2.6
+  - ruby-2.3.3
+  - ruby-2.4.0
   - ruby-head
 
-  - rbx-2.2.7
-  - rbx-2.2.6
-  - rbx-2.2.2
-
+  - jruby-9.1.8.0
+  - jruby-1.7.26
   - jruby-head
-  - jruby-1.7.9-d19
-  - jruby-1.7.17
-  - jruby-1.7.11
+
+allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
 
 env:
   global:
@@ -46,3 +24,5 @@ env:
 before_install: gem install bundler
 
 sudo: false
+
+cache: bundler

data/bindex.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/gsamokovarov/bindex"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 1.9.3"
+  spec.required_ruby_version = ">= 2.0.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/ext/bindex/com/gsamokovarov/bindex/JRubyIntegration.java

@@ -26,14 +26,14 @@ public class JRubyIntegration {
         }
     }
 
-    private static class BindexMethods {
+    public static class BindexMethods {
         @JRubyMethod(name = "current_bindings", meta = true)
         public static IRubyObject currentBindings(ThreadContext context, IRubyObject self) {
             return RubyBindingsCollector.collectCurrentFor(context);
         }
     }
 
-    private static class ExceptionExtensionMethods {
+    public static class ExceptionExtensionMethods {
         @JRubyMethod
         public static IRubyObject bindings(ThreadContext context, IRubyObject self) {
             InstanceVariables instanceVariables = self.getInstanceVariables();

data/ext/bindex/com/gsamokovarov/bindex/SetExceptionBindingsEventHook.java

@@ -16,6 +16,9 @@ public class SetExceptionBindingsEventHook extends EventHook {
         RubyArray bindings = RubyBindingsCollector.collectCurrentFor(context);
         RubyException exception = (RubyException) context.runtime.getGlobalVariables().get("$!");
 
-        exception.setInstanceVariable("@bindings", bindings);
+        IRubyObject exceptionBindings = exception.getInstanceVariable("@bindings");
+        if (exceptionBindings == null || exceptionBindings.isNil()) {
+            exception.setInstanceVariable("@bindings", bindings);
+        }
     }
 }

data/ext/bindex/cruby.c

@@ -1,32 +1,65 @@
-#include "bindex.h"
+#include <ruby.h>
+#include <ruby/debug.h>
 
 VALUE bx_mBindex;
+static ID id_bindings;
 
 static VALUE
-bx_current_bindings(VALUE self)
+current_bindings_callback(const rb_debug_inspector_t *context, void *data)
 {
-  return current_bindings();
+  VALUE locations = rb_debug_inspector_backtrace_locations(context);
+  VALUE binding, bindings = rb_ary_new();
+  long i, length = RARRAY_LEN(locations);
+
+  for (i = 0; i < length; i++) {
+    binding = rb_debug_inspector_frame_binding_get(context, i);
+
+    if (!NIL_P(binding)) {
+      rb_ary_push(bindings, binding);
+    }
+  }
+
+  return bindings;
 }
 
-static VALUE
-bx_exc_set_backtrace(VALUE self, VALUE bt)
+VALUE
+current_bindings(void)
+{
+  return rb_debug_inspector_open(current_bindings_callback, NULL);
+}
+
+static void
+set_exception_bindings_callback(VALUE tpval, void *data)
 {
-  /* rb_check_backtrace can raise an exception, if the input arguments are not
-   * to its likings. Set the bindings afterwards, so we don't waste when not
-   * needed. */
-  VALUE backtrace = rb_iv_set(self, "bt", rb_check_backtrace(bt));
+  rb_trace_arg_t *trace_arg = rb_tracearg_from_tracepoint(tpval);
+  VALUE exception = rb_tracearg_raised_exception(trace_arg);
+  VALUE bindings = rb_attr_get(exception, id_bindings);
+
+  /* Set the bindings, only if they haven't been set already. This may reset
+   * the binding during reraise. */
+  if (NIL_P(bindings)) {
+    rb_ivar_set(exception, id_bindings, current_bindings());
+  }
+}
 
-  rb_iv_set(self, "bindings", current_bindings());
+void
+set_exception_bindings_on_raise(void)
+{
+  VALUE tpval = rb_tracepoint_new(0, RUBY_EVENT_RAISE, set_exception_bindings_callback, 0);
+  rb_tracepoint_enable(tpval);
+}
 
-  return backtrace;
+static VALUE
+bx_current_bindings(VALUE self)
+{
+  return current_bindings();
 }
 
 static VALUE
 bx_exc_bindings(VALUE self)
 {
-  VALUE bindings;
+  VALUE bindings = rb_attr_get(self, id_bindings);
 
-  bindings = rb_iv_get(self, "bindings");
   if (NIL_P(bindings)) {
     bindings = rb_ary_new();
   }
@@ -38,9 +71,10 @@ void
 Init_cruby(void)
 {
   bx_mBindex = rb_define_module("Bindex");
+  id_bindings = rb_intern("bindings");
 
   rb_define_singleton_method(bx_mBindex, "current_bindings", bx_current_bindings, 0);
-
-  rb_define_method(rb_eException, "set_backtrace", bx_exc_set_backtrace, 1);
   rb_define_method(rb_eException, "bindings", bx_exc_bindings, 0);
+
+  set_exception_bindings_on_raise();
 }

data/ext/bindex/extconf.rb

@@ -2,21 +2,6 @@ case RUBY_ENGINE
 when "ruby"
   require "mkmf"
 
-  case "#{RUBY_VERSION}#{RUBY_PATCHLEVEL}"
-  when /1\.9\.3/
-    $CFLAGS   << " -D RUBY_193"
-    $INCFLAGS << " -I./ruby_193/"
-  when /2\.0\.*/
-    $CFLAGS   << " -D RUBY_20"
-    $INCFLAGS << " -I./ruby_20/"
-  when "2.1.0-1"
-    $CFLAGS   << " -D RUBY_21PREVIEW"
-    $INCFLAGS << " -I./ruby_21PREVIEW/"
-  when /2\.1\.*/
-    $CFLAGS   << " -D RUBY_21"
-    $INCFLAGS << " -I./ruby_21/"
-  end
-
   $CFLAGS << " -Wall"
   $CFLAGS << " -g3 -O0" if ENV["DEBUG"]
 

data/lib/bindex/jruby.rb

@@ -5,6 +5,5 @@ else
 end
 
 java_import com.gsamokovarov.bindex.JRubyIntegration
-java_import com.gsamokovarov.bindex.SetExceptionBindingsEventHook
 
 JRubyIntegration.setup(JRuby.runtime)

data/lib/bindex/version.rb

@@ -1,3 +1,3 @@
 module Bindex
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindex
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Genadi Samokovarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -82,8 +82,6 @@ files:
 - README.md
 - Rakefile
 - bindex.gemspec
-- ext/bindex/bindex.h
-- ext/bindex/bindings.c
 - ext/bindex/com/gsamokovarov/bindex/BindingBuilder.java.erb
 - ext/bindex/com/gsamokovarov/bindex/CurrentBindingsIterator.java
 - ext/bindex/com/gsamokovarov/bindex/JRubyIntegration.java
@@ -93,139 +91,6 @@ files:
 - ext/bindex/com/gsamokovarov/bindex/ThreadContextInternals.java
 - ext/bindex/cruby.c
 - ext/bindex/extconf.rb
-- ext/bindex/ruby_193.h
-- ext/bindex/ruby_193/addr2line.h
-- ext/bindex/ruby_193/constant.h
-- ext/bindex/ruby_193/debug.h
-- ext/bindex/ruby_193/dln.h
-- ext/bindex/ruby_193/encdb.h
-- ext/bindex/ruby_193/eval_intern.h
-- ext/bindex/ruby_193/gc.h
-- ext/bindex/ruby_193/id.h
-- ext/bindex/ruby_193/internal.h
-- ext/bindex/ruby_193/iseq.h
-- ext/bindex/ruby_193/method.h
-- ext/bindex/ruby_193/node.h
-- ext/bindex/ruby_193/parse.h
-- ext/bindex/ruby_193/probes.h
-- ext/bindex/ruby_193/regenc.h
-- ext/bindex/ruby_193/regint.h
-- ext/bindex/ruby_193/regparse.h
-- ext/bindex/ruby_193/revision.h
-- ext/bindex/ruby_193/ruby_atomic.h
-- ext/bindex/ruby_193/siphash.h
-- ext/bindex/ruby_193/thread_pthread.h
-- ext/bindex/ruby_193/thread_win32.h
-- ext/bindex/ruby_193/timev.h
-- ext/bindex/ruby_193/transcode_data.h
-- ext/bindex/ruby_193/transdb.h
-- ext/bindex/ruby_193/verconf.h
-- ext/bindex/ruby_193/version.h
-- ext/bindex/ruby_193/vm_core.h
-- ext/bindex/ruby_193/vm_exec.h
-- ext/bindex/ruby_193/vm_insnhelper.h
-- ext/bindex/ruby_193/vm_opts.h
-- ext/bindex/ruby_20.h
-- ext/bindex/ruby_20/addr2line.h
-- ext/bindex/ruby_20/constant.h
-- ext/bindex/ruby_20/dln.h
-- ext/bindex/ruby_20/encdb.h
-- ext/bindex/ruby_20/eval_intern.h
-- ext/bindex/ruby_20/gc.h
-- ext/bindex/ruby_20/id.h
-- ext/bindex/ruby_20/internal.h
-- ext/bindex/ruby_20/iseq.h
-- ext/bindex/ruby_20/method.h
-- ext/bindex/ruby_20/node.h
-- ext/bindex/ruby_20/parse.h
-- ext/bindex/ruby_20/probes.h
-- ext/bindex/ruby_20/probes_helper.h
-- ext/bindex/ruby_20/regenc.h
-- ext/bindex/ruby_20/regint.h
-- ext/bindex/ruby_20/regparse.h
-- ext/bindex/ruby_20/revision.h
-- ext/bindex/ruby_20/ruby_atomic.h
-- ext/bindex/ruby_20/siphash.h
-- ext/bindex/ruby_20/thread_pthread.h
-- ext/bindex/ruby_20/thread_win32.h
-- ext/bindex/ruby_20/timev.h
-- ext/bindex/ruby_20/transcode_data.h
-- ext/bindex/ruby_20/transdb.h
-- ext/bindex/ruby_20/verconf.h
-- ext/bindex/ruby_20/version.h
-- ext/bindex/ruby_20/vm_core.h
-- ext/bindex/ruby_20/vm_debug.h
-- ext/bindex/ruby_20/vm_exec.h
-- ext/bindex/ruby_20/vm_insnhelper.h
-- ext/bindex/ruby_20/vm_opts.h
-- ext/bindex/ruby_21.h
-- ext/bindex/ruby_21/addr2line.h
-- ext/bindex/ruby_21/constant.h
-- ext/bindex/ruby_21/dln.h
-- ext/bindex/ruby_21/encdb.h
-- ext/bindex/ruby_21/eval_intern.h
-- ext/bindex/ruby_21/gc.h
-- ext/bindex/ruby_21/id.h
-- ext/bindex/ruby_21/internal.h
-- ext/bindex/ruby_21/iseq.h
-- ext/bindex/ruby_21/method.h
-- ext/bindex/ruby_21/node.h
-- ext/bindex/ruby_21/parse.h
-- ext/bindex/ruby_21/probes.h
-- ext/bindex/ruby_21/probes_helper.h
-- ext/bindex/ruby_21/regenc.h
-- ext/bindex/ruby_21/regint.h
-- ext/bindex/ruby_21/regparse.h
-- ext/bindex/ruby_21/revision.h
-- ext/bindex/ruby_21/ruby_atomic.h
-- ext/bindex/ruby_21/siphash.h
-- ext/bindex/ruby_21/thread_native.h
-- ext/bindex/ruby_21/thread_pthread.h
-- ext/bindex/ruby_21/thread_win32.h
-- ext/bindex/ruby_21/timev.h
-- ext/bindex/ruby_21/transcode_data.h
-- ext/bindex/ruby_21/transdb.h
-- ext/bindex/ruby_21/verconf.h
-- ext/bindex/ruby_21/version.h
-- ext/bindex/ruby_21/vm_core.h
-- ext/bindex/ruby_21/vm_debug.h
-- ext/bindex/ruby_21/vm_exec.h
-- ext/bindex/ruby_21/vm_insnhelper.h
-- ext/bindex/ruby_21/vm_opts.h
-- ext/bindex/ruby_21preview.h
-- ext/bindex/ruby_21preview/addr2line.h
-- ext/bindex/ruby_21preview/constant.h
-- ext/bindex/ruby_21preview/dln.h
-- ext/bindex/ruby_21preview/encdb.h
-- ext/bindex/ruby_21preview/eval_intern.h
-- ext/bindex/ruby_21preview/gc.h
-- ext/bindex/ruby_21preview/id.h
-- ext/bindex/ruby_21preview/internal.h
-- ext/bindex/ruby_21preview/iseq.h
-- ext/bindex/ruby_21preview/method.h
-- ext/bindex/ruby_21preview/node.h
-- ext/bindex/ruby_21preview/parse.h
-- ext/bindex/ruby_21preview/probes.h
-- ext/bindex/ruby_21preview/probes_helper.h
-- ext/bindex/ruby_21preview/regenc.h
-- ext/bindex/ruby_21preview/regint.h
-- ext/bindex/ruby_21preview/regparse.h
-- ext/bindex/ruby_21preview/revision.h
-- ext/bindex/ruby_21preview/ruby_atomic.h
-- ext/bindex/ruby_21preview/siphash.h
-- ext/bindex/ruby_21preview/thread_native.h
-- ext/bindex/ruby_21preview/thread_pthread.h
-- ext/bindex/ruby_21preview/thread_win32.h
-- ext/bindex/ruby_21preview/timev.h
-- ext/bindex/ruby_21preview/transcode_data.h
-- ext/bindex/ruby_21preview/transdb.h
-- ext/bindex/ruby_21preview/verconf.h
-- ext/bindex/ruby_21preview/version.h
-- ext/bindex/ruby_21preview/vm_core.h
-- ext/bindex/ruby_21preview/vm_debug.h
-- ext/bindex/ruby_21preview/vm_exec.h
-- ext/bindex/ruby_21preview/vm_insnhelper.h
-- ext/bindex/ruby_21preview/vm_opts.h
 - lib/bindex.rb
 - lib/bindex/jruby.rb
 - lib/bindex/jruby_internals.jar
@@ -252,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -260,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Bindings for your Ruby exceptions

data/ext/bindex/bindex.h

@@ -1,11 +0,0 @@
-#ifndef _BINDEX_H
-#define _BINDEX_H
-
-#include <ruby.h>
-
-VALUE current_bindings(void);
-
-/* This will come from one of the ruby_*.h files. */
-extern VALUE rb_check_backtrace(VALUE);
-
-#endif

data/ext/bindex/bindings.c

@@ -1,106 +0,0 @@
-#include "bindex.h"
-
-#ifdef RUBY_193
-
-#include "ruby_193.h"
-
-static rb_thread_t *current_thread;
-
-#define GetCoreDataFromValueAsExpr(obj, type, ptr) \
-  ((ptr) = (type*)DATA_PTR(obj))
-
-#define ruby_current_thread \
-  GetCoreDataFromValueAsExpr(rb_thread_current(), rb_thread_t, current_thread)
-
-/*
- * Create a binding from a thread and control frame.
- *
- * Based on rb_binding new, defined in proc.c. A major difference from
- * rb_binding_new is that it doesn't raises an exception, when we try to create
- * Binding on top of a Fiber.
- *
- * The reason for this is that binding_new is to be used in exception handling
- * code. If we raise, it may lead to an infinite recursion.
- *
- * Also, we'll assume a bit more hostile environment and check if cfp->iseq is
- * NULL.
- *
- * Ruby nil is returned when the control frame pointer isn't suitable.
- */
-
-static VALUE
-binding_new(rb_thread_t *th, rb_control_frame_t *cfp)
-{
-  VALUE bindval;
-  rb_binding_t *bind;
-
-  if (cfp == NULL || cfp->iseq == NULL) {
-    return Qnil;
-  }
-
-  bindval = binding_alloc(rb_cBinding);
-
-  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);
-  return bindval;
-}
-
-VALUE
-current_bindings(void)
-{
-  rb_thread_t *th = GET_THREAD();
-  rb_control_frame_t *cfp = th->cfp;
-  rb_control_frame_t *cfp_limit = RUBY_VM_END_CONTROL_FRAME(th);
-  VALUE binding, bindings = rb_ary_new();
-
-  while (cfp_limit > cfp) {
-    cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
-    binding = binding_new(th, cfp);
-
-    if (!NIL_P(binding)) {
-      rb_ary_push(bindings, binding);
-    }
-  }
-
-  return bindings;
-}
-
-#else
-
-#include <ruby/debug.h>
-
-#ifdef RUBY_20
-#include "ruby_20.h"
-#elif RUBY_21
-#include "ruby_21.h"
-#elif RUBY_21PREVIEW
-#include "ruby_21preview.h"
-#endif
-
-static VALUE
-current_bindings_callback(const rb_debug_inspector_t *context, void *data)
-{
-  VALUE locations = rb_debug_inspector_backtrace_locations(context);
-  VALUE binding, bindings = rb_ary_new();
-  long i, length = RARRAY_LEN(locations);
-
-  for (i = 0; i < length; i++) {
-    binding = rb_debug_inspector_frame_binding_get(context, i);
-
-    if (!NIL_P(binding)) {
-      rb_ary_push(bindings, binding);
-    }
-  }
-
-  return bindings;
-}
-
-VALUE
-current_bindings(void)
-{
-  return rb_debug_inspector_open(current_bindings_callback, NULL);
-}
-
-#endif