debase 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43a4f24d6fce6507d60290b847788017aa52866c
-  data.tar.gz: 7084bcf2ed640eb218d87161ba11ab98f08513e1
+  metadata.gz: 352d91f43143f540d4574637d8947567878edd3b
+  data.tar.gz: be678b9761b4652414433eb43848eaf807542e5b
 SHA512:
-  metadata.gz: 2f73422c127107fe46b5228cd1160bc177127daaeceb867faf6659f1f96dc96a5ded6189b42a31337674f212a84c162d686b51c20b34b0c89ab19fc7195eb3a9
-  data.tar.gz: 68d80847171e6fe8be394c6820adece959a5fe275f127d74c970cf2a718375466f8d6be2d2d8b72ae6854911f595a5277e6368cdb5ce1e70916d83eacc1d43e0
+  metadata.gz: 2da8fa606defb081abae519eda7d36c016a33eb01435b4c0c0a64b5add87d548d12cec3ba3d52923b464a13477464027a245c85aa8ddbb4110ed7b310366da19
+  data.tar.gz: 5c90a828b055619460d88f991c80f6c2d46f52608066ad03251b39c2e472ddd65c71feb4b4fd7bdddb74a69b8ebc760d5000b3c545fe0362cb1112109f4b837e

data/ext/context.c

@@ -45,7 +45,7 @@ fill_stack(debug_context_t *context, const rb_debug_inspector_t *inspector) {
   int i;
 
   locations = rb_debug_inspector_backtrace_locations(inspector);
-  stack_size = (int)RARRAY_LEN(locations);
+  stack_size = locations == Qnil ? 0 : (int)RARRAY_LEN(locations);
   context->stack_size = stack_size;
 
   for (i = 0; i < stack_size; i++) {
@@ -53,7 +53,7 @@ fill_stack(debug_context_t *context, const rb_debug_inspector_t *inspector) {
     location = rb_ary_entry(locations, i);
     path = rb_funcall(location, rb_intern("path"), 0);
     lineno = rb_funcall(location, rb_intern("lineno"), 0);
-    file = RSTRING_PTR(path);
+    file = path != Qnil ? RSTRING_PTR(path) : "";
     line = FIX2INT(lineno);
     fill_frame(frame, file, line, rb_debug_inspector_frame_binding_get(inspector, i), rb_debug_inspector_frame_self_get(inspector, i));
     frame->prev = context->stack;

data/ext/debase_internals.c

@@ -129,16 +129,30 @@ print_event(rb_trace_point_t *tp, debug_context_t *context)
   VALUE line;
   VALUE event;
   VALUE mid;
+  VALUE rb_cl;
+  VALUE rb_cl_name;
+  const char *defined_class;
 
   if (debug == Qtrue) {
     path = rb_tracearg_path(tp);
     line = rb_tracearg_lineno(tp);
     event = rb_tracearg_event(tp);
     mid = rb_tracearg_method_id(tp);
-    fprintf(stderr, "%s: file=%s, line=%d, mid=%s\n", symbol2str(event), RSTRING_PTR(path), FIX2INT(line), symbol2str(mid));
+    rb_cl = rb_tracearg_defined_class(tp);
+    rb_cl_name = NIL_P(rb_cl) ? rb_cl : rb_mod_name(rb_cl);
+    defined_class = NIL_P(rb_cl_name) ? "" : RSTRING_PTR(rb_cl_name);
+
+    fprintf(stderr, "[#%d] %s@%s:%d %s#%s\n",
+            context->thnum,
+            symbol2str(event),
+            path == Qnil ? "" : RSTRING_PTR(path),
+            FIX2INT(line),
+            defined_class,
+            mid == Qnil ? "(top level)" : symbol2str(mid)
+    );
     locations = rb_funcall(context->thread, rb_intern("backtrace_locations"), 1, INT2FIX(1));
-    fprintf(stderr, "    calced_stack_size=%d, stack_size=%d, thread=%d, real_stack_size=%d\n",
-            context->calced_stack_size, context->stack_size, context->thnum,
+    fprintf(stderr, "    calced_stack_size=%d, stack_size=%d, real_stack_size=%d\n",
+            context->calced_stack_size, context->stack_size,
             locations != Qnil ? (int)RARRAY_LEN(locations) : 0);
   }
 }
@@ -294,7 +308,7 @@ process_call_event(VALUE trace_point, void *data)
 
   ++context->calced_stack_size;
   update_stack_size(context);
-  print_event(TRACE_POINT, context); 
+  print_event(TRACE_POINT, context);
   cleanup(context);
 }
 

data/lib/debase/version.rb

@@ -1,3 +1,3 @@
 module Debase
-  VERSION = "0.1.4" unless defined? VERSION
+  VERSION = "0.1.5" unless defined? VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source