ruby_ext_backtrace 0.0.1 → 0.0.2

data/README.md

@@ -26,14 +26,17 @@ require 'pp'
 require 'ruby_ext_backtrace'
 
 def some_method2 param
-  pp caller(0); puts; pp caller_ext(0)
+  c1 = caller_ext(0); c2 = caller(0)
+  pp c1
+  puts "\n#Original caller for comparison:"
+  pp c2
 end
 
-def some_method param1, param2=nil, &blk
+def some_method param1, param2=nil, *splat, &blk
   yield "block_param0", "block_param1"
 end
 
-some_method(1111){|bp1,bp2|
+some_method(1111, nil, 1, 2, 3){|bp1,bp2|
   some_method2 "some_method2_param"
 }
 ```
@@ -42,36 +45,32 @@ this outputs:
 
 ```ruby
 
-["./test.rb:10:in `meth'",
- "./test.rb:17:in `some_method2'",
- "./test.rb:25:in `block in <main>'",
- "./test.rb:21:in `some_method'",
- "./test.rb:24:in `<main>'"]
-
-[{:file=>"./test.rb",
+[{:file=>"test.rb",
   :line=>10,
-  :method=>"meth",
-  :argc=>1,
-  0=>"default_meth_param"},
- {:file=>"./test.rb",
-  :line=>17,
   :method=>"some_method2",
   :argc=>1,
   0=>"some_method2_param"},
- {:file=>"./test.rb",
-  :line=>25,
+ {:file=>"test.rb",
+  :line=>21,
   :method=>"block in <main>",
   :argc=>2,
   0=>"block_param0",
   1=>"block_param1"},
- {:file=>"./test.rb",
-  :line=>21,
+ {:file=>"test.rb",
+  :line=>17,
   :method=>"some_method",
-  :argc=>3,
+  :argc=>4,
   0=>1111,
   1=>nil,
-  2=>#<Proc:0x007f8c5b02fff0@./test.rb:24>},
- {:file=>"./test.rb", :line=>24, :method=>"<main>", :argc=>0}]
+  2=>[1, 2, 3],
+  3=>#<Proc:0x007fc87c053290@test.rb:20>},
+ {:file=>"test.rb", :line=>20, :method=>"<main>", :argc=>0}]
+
+#Original caller for comparison:
+["test.rb:10:in `some_method2'",
+ "test.rb:21:in `block in <main>'",
+ "test.rb:17:in `some_method'",
+ "test.rb:20:in `<main>'"]
 ```
 
 Note that fetching parameters for CFUNCs with variable parameters (argc&lt;0) is not supported.

data/ext/ruby_ext_backtrace/extconf.rb

@@ -5,7 +5,13 @@ require 'mkmf'
 require 'debugger/ruby_core_source'
 
 hdrs = proc {
-  have_header("vm_core.h") # and have_header("iseq.h")
+  res = have_header("vm_core.h") # and have_header("iseq.h")
+
+  if RUBY_VERSION=='1.9.2'
+    # on 1.9.3 it fails to link in runtime, but still checks to be ok
+    have_var('ruby_current_thread', 'vm_core.h')
+  end
+  res
 }
 
 dir_config("ruby") # allow user to pass in non-standard core include directory

data/ext/ruby_ext_backtrace/ruby_ext_backtrace.c

@@ -10,6 +10,13 @@
 #error Need RubyVM, use another ruby
 #endif
 
+#ifdef HAVE_RUBY_CURRENT_THREAD
+extern VALUE ruby_engine_name;
+#else
+#define ruby_engine_name Qnil
+#define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
+#endif
+
 typedef int (rb_backtrace_iter_ext_func)(void *arg, VALUE file, int line, VALUE method_name, int argc, VALUE* argv);
 
 static int
@@ -49,7 +56,7 @@ vm_backtrace_each_ext(rb_thread_t *th, int lev, void (*init)(void *), rb_backtra
     } else
       if (RUBYVM_CFUNC_FRAME_P(cfp)) {
         ID id = cfp->me->def? cfp->me->def->original_id : cfp->me->called_id;
-        extern VALUE ruby_engine_name;
+
         if (NIL_P(file)) file = ruby_engine_name;
 
         if (id != ID_ALLOCATOR){

data/ext/ruby_ext_backtrace/test.rb

@@ -7,13 +7,16 @@ require 'pp'
 require 'ruby_ext_backtrace'
 
 def some_method2 param
-  pp caller(0); puts; pp caller_ext(0)
+  c1 = caller_ext(0); c2 = caller(0)
+  pp c1
+  puts "\n #Original caller for comparison:"
+  pp c2
 end
 
-def some_method param1, param2=nil, &blk
+def some_method param1, param2=nil, *splat, &blk
   yield "block_param0", "block_param1"
 end
 
-some_method(1111){|bp1,bp2|
+some_method(1111, nil, 1, 2, 3){|bp1,bp2|
   some_method2 "some_method2_param"
-}
+}

data/lib/ruby_ext_backtrace/version.rb

@@ -1,3 +1,3 @@
 module RubyExtBacktrace
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/ruby_ext_backtrace.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["vasilyfedoseyev@gmail.com"]
   gem.description   = %q{Extended backtrace for ruby}
   gem.summary       = %q{have you ever wanted to see method parameters in backtrace?}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/Vasfed/ruby_ext_backtrace"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ext_backtrace
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger-ruby_core_source
@@ -62,7 +62,7 @@ files:
 - lib/ruby_ext_backtrace.rb
 - lib/ruby_ext_backtrace/version.rb
 - ruby_ext_backtrace.gemspec
-homepage: ''
+homepage: https://github.com/Vasfed/ruby_ext_backtrace
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -835126318862271968
+      hash: -543521818031646013
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -835126318862271968
+      hash: -543521818031646013
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24