rbtrace 0.4.7 → 0.4.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a3761d428e8be7fe2d44989f4d649ddf58803273
+  data.tar.gz: 3b1c8033019f92df1dbe645d9b7525fa22190abf
+SHA512:
+  metadata.gz: 74bb3fdc12bac96869edb039d7c3299e140eab13a3e592dcb61afebce79df7905c5e652392ee620f36c78f1ddc7078060528cb83308e7bd31985969ae7e32a2e
+  data.tar.gz: 5afab515374aec50c19dc7c42c8df838b0993bd9999d21bd473bec907a6095c9762c0983c3c358e0afefaf4d8b250d5eaabfd6308265724cd2da9e007337fdf2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbtrace (0.4.4)
+    rbtrace (0.4.7)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)
@@ -9,9 +9,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ffi (1.9.3)
-    msgpack (0.5.8)
-    trollop (2.0)
+    ffi (1.9.8)
+    msgpack (0.6.0)
+    trollop (2.1.2)
 
 PLATFORMS
   ruby

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2011-2015 Aman Gupta
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/ext/extconf.rb

@@ -16,7 +16,7 @@ libdir = File.basename RbConfig::CONFIG['libdir']
 unless File.exists?("#{CWD}/dst/#{libdir}/libmsgpackc.a")
   Logging.message "Building msgpack\n"
 
-  msgpack = File.basename('msgpack-0.5.7.tar.gz')
+  msgpack = File.basename('msgpack-1.1.0.tar.gz')
   dir = File.basename(msgpack, '.tar.gz')
   cflags, ldflags = ENV['CFLAGS'], ENV['LDFLAGS']
   cc = ENV['CC']
@@ -38,6 +38,7 @@ unless File.exists?("#{CWD}/dst/#{libdir}/libmsgpackc.a")
       if RUBY_PLATFORM =~ /darwin/ and File.exist?("/usr/bin/gcc-4.2")
         ENV['CC'] = '/usr/bin/gcc-4.2'
       end
+      puts "  -- env CFLAGS=#{ENV['CFLAGS'].inspect} LDFLAGS=#{ENV['LDFLAGS'].inspect} CC=#{ENV['CC'].inspect}"
       sys("./configure --disable-dependency-tracking --disable-shared --with-pic --prefix=#{CWD}/dst/ --libdir=#{CWD}/dst/#{libdir}")
       sys("make install")
     end

data/ext/rbtrace.c

@@ -184,8 +184,8 @@ rbtrace__send_event(int nargs, const char *name, ...)
 
   msgpack_pack_array(pk, nargs+1);
 
-  msgpack_pack_raw(pk, strlen(name));
-  msgpack_pack_raw_body(pk, name, strlen(name));
+  msgpack_pack_bin(pk, strlen(name));
+  msgpack_pack_bin_body(pk, name, strlen(name));
 
   if (nargs > 0) {
     int type;
@@ -238,8 +238,8 @@ rbtrace__send_event(int nargs, const char *name, ...)
           if (!str)
             str = (char *)"";
 
-          msgpack_pack_raw(pk, strlen(str));
-          msgpack_pack_raw_body(pk, str, strlen(str));
+          msgpack_pack_bin(pk, strlen(str));
+          msgpack_pack_bin_body(pk, str, strlen(str));
           break;
 
         default:
@@ -260,7 +260,7 @@ rbtrace__send_event(int nargs, const char *name, ...)
 #else
       0,
 #endif
-      &rbtracer.mqo_addr, rbtracer.mqo_len
+      (const struct sockaddr *)&rbtracer.mqo_addr, rbtracer.mqo_len
     );
 
   if (ret == -1 && (errno == EINVAL || errno == ENOENT || errno == ECONNREFUSED || errno == EPIPE)) {
@@ -877,7 +877,7 @@ rbtrace__process_event(msgpack_object cmd)
   VALUE val = Qnil;
 
   msgpack_object_array ary;
-  msgpack_object_raw str;
+  msgpack_object_str str;
 
   /* fprintf(stderr, "GOT: ");*/
   /* msgpack_object_print(stderr, cmd);*/
@@ -886,10 +886,10 @@ rbtrace__process_event(msgpack_object cmd)
   ary = cmd.via.array;
 
   if (ary.size < 1 ||
-      ary.ptr[0].type != MSGPACK_OBJECT_RAW)
+      ary.ptr[0].type != MSGPACK_OBJECT_STR)
     return;
 
-  str = ary.ptr[0].via.raw;
+  str = ary.ptr[0].via.str;
 
   if (0 == strncmp("attach", str.ptr, str.size)) {
     if (ary.size != 2 ||
@@ -930,11 +930,11 @@ rbtrace__process_event(msgpack_object cmd)
 
   } else if (0 == strncmp("add", str.ptr, str.size)) {
     if (ary.size != 3 ||
-        ary.ptr[1].type != MSGPACK_OBJECT_RAW ||
+        ary.ptr[1].type != MSGPACK_OBJECT_STR ||
         ary.ptr[2].type != MSGPACK_OBJECT_BOOLEAN)
       return;
 
-    str = ary.ptr[1].via.raw;
+    str = ary.ptr[1].via.str;
     bool is_slow = ary.ptr[2].via.boolean;
 
     strncpy(query, str.ptr, str.size);
@@ -943,10 +943,10 @@ rbtrace__process_event(msgpack_object cmd)
 
   } else if (0 == strncmp("addexpr", str.ptr, str.size)) {
     if (ary.size != 2 ||
-        ary.ptr[1].type != MSGPACK_OBJECT_RAW)
+        ary.ptr[1].type != MSGPACK_OBJECT_STR)
       return;
 
-    str = ary.ptr[1].via.raw;
+    str = ary.ptr[1].via.str;
 
     strncpy(query, str.ptr, str.size);
     query[str.size] = 0;
@@ -1006,10 +1006,10 @@ rbtrace__process_event(msgpack_object cmd)
 
   } else if (0 == strncmp("eval", str.ptr, str.size)) {
     if (ary.size != 2 ||
-        ary.ptr[1].type != MSGPACK_OBJECT_RAW)
+        ary.ptr[1].type != MSGPACK_OBJECT_STR)
       return;
 
-    str = ary.ptr[1].via.raw;
+    str = ary.ptr[1].via.str;
 
     strncpy(query, str.ptr, str.size);
     query[str.size] = 0;
@@ -1074,8 +1074,9 @@ rbtrace_gc_mark()
   }
 }
 
-static VALUE gc_hook, signal_handler_proc;
+static VALUE gc_hook;
 
+#if defined(HAVE_RB_POSTPONED_JOB_REGISTER_ONE) || !defined(RUBY_VM)
 static void
 sigurg(int signal)
 {
@@ -1085,7 +1086,10 @@ sigurg(int signal)
   rbtrace__receive(0);
 #endif
 }
+#endif
 
+#if !defined(HAVE_RB_POSTPONED_JOB_REGISTER_ONE) && defined(RUBY_VM)
+static VALUE signal_handler_proc;
 static VALUE
 signal_handler_wrapper(VALUE arg, VALUE ctx)
 {
@@ -1098,6 +1102,7 @@ signal_handler_wrapper(VALUE arg, VALUE ctx)
 
   return Qnil;
 }
+#endif
 
 void
 Init_rbtrace()

data/lib/rbtrace/cli.rb

@@ -199,7 +199,7 @@ EOS
         :short => nil
 
       opt :timeout,
-        "seconds to wait before giving up on attach/detach",
+        "seconds to wait before giving up on attach/detach/eval",
         :default => 5
     end
 
@@ -248,7 +248,7 @@ EOS
       Array(opts[:config]).each do |config|
         file = [
           config,
-          File.expand_path("../../tracers/#{config}.tracer", __FILE__)
+          File.expand_path("../../../tracers/#{config}.tracer", __FILE__)
         ].find{ |f| File.exists?(f) }
 
         unless file
@@ -389,6 +389,10 @@ EOS
         parser.die :pid, "(#{e.message})"
       end
 
+      if opts[:timeout] > 0
+        tracer.timeout = opts[:timeout]
+      end
+
       if opts[:fork_given]
         pid = tracer.fork
         STDERR.puts "*** forked off a busy looping copy at #{pid} (make sure to kill -9 it when you're done)"

data/lib/rbtrace/rbtracer.rb

@@ -145,7 +145,7 @@ class RBTracer
 
     send_cmd(:eval, code)
 
-    if wait('for eval response', 15){ !!@eval_result }
+    if wait('for eval response', timeout){ !!@eval_result }
       res = @eval_result
       @eval_result = nil
       res

data/lib/rbtrace/version.rb

@@ -1,3 +1,3 @@
 class RBTracer
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end

data/test.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
 
+bundle check || bundle install
+
 cd ext
 [ -f Makefile ] && make clean
 ruby extconf.rb

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rbtrace
 version: !ruby/object:Gem::Version
-  version: 0.4.7
-  prerelease: 
+  version: 0.4.8
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.3
 description: rbtrace shows you method calls happening inside another ruby process
@@ -68,15 +61,16 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - bin/rbtrace
 - ext/.gitignore
 - ext/extconf.rb
 - ext/rbtrace.c
-- ext/src/msgpack-0.5.7.tar.gz
+- ext/src/msgpack-1.1.0.tar.gz
 - lib/rbtrace/cli.rb
 - lib/rbtrace/core_ext.rb
 - lib/rbtrace/msgq.rb
@@ -95,27 +89,25 @@ files:
 homepage: http://github.com/tmm1/rbtrace
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.3
 signing_key: 
-specification_version: 3
-summary: ! 'rbtrace: like strace but for ruby code'
+specification_version: 4
+summary: 'rbtrace: like strace but for ruby code'
 test_files: []
-has_rdoc: