rbtrace 0.4.3 → 0.4.4

data/Gemfile.lock

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

data/ext/extconf.rb

@@ -11,7 +11,9 @@ end
 require 'mkmf'
 require 'fileutils'
 
-unless File.exists?("#{CWD}/dst/lib/libmsgpackc.a")
+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')
@@ -49,7 +51,7 @@ unless File.exists?("#{CWD}/dst/lib/libmsgpackc.a")
   end
 end
 
-FileUtils.cp "#{CWD}/dst/lib/libmsgpackc.a", "#{CWD}/libmsgpackc_ext.a"
+FileUtils.cp "#{CWD}/dst/#{libdir}/libmsgpackc.a", "#{CWD}/libmsgpackc_ext.a"
 $INCFLAGS[0,0] = "-I#{CWD}/dst/include "
 
 unless have_library('msgpackc_ext') and have_header('msgpack.h')

data/lib/rbtrace/cli.rb

@@ -1,5 +1,6 @@
 require 'trollop'
 require 'rbtrace/rbtracer'
+require 'rbtrace/version'
 
 class RBTraceCLI
   # Suggest increasing the maximum number of bytes allowed on
@@ -54,7 +55,7 @@ class RBTraceCLI
     parser = Trollop::Parser.new do
       version <<-EOS
 rbtrace: like strace, but for ruby code
-  version 0.4.3
+  version #{RBTracer::VERSION}
   (c) 2013 Aman Gupta (tmm1)
   http://github.com/tmm1/rbtrace
 EOS

data/lib/rbtrace/rbtracer.rb

@@ -43,12 +43,11 @@ class RBTracer
       raise ArgumentError, 'could not signal process, are you running as root?'
     end
 
-    path = "/tmp/rbtrace-#{@pid}.sock"
     @sock = Socket.new Socket::AF_UNIX, Socket::SOCK_DGRAM, 0
-    @sockaddr = Socket.pack_sockaddr_un(path)
+    @sockaddr = Socket.pack_sockaddr_un(socket_path)
     @sock.bind(@sockaddr)
-    FileUtils.chmod 0666, path
-    at_exit{ FileUtils.rm(path) if File.exists?(path) }
+    FileUtils.chmod 0666, socket_path
+    at_exit { clean_socket_path }
 
     5.times do
       signal
@@ -92,6 +91,14 @@ class RBTracer
     attach
   end
 
+  def socket_path
+    "/tmp/rbtrace-#{@pid}.sock"
+  end
+
+  def clean_socket_path
+    FileUtils.rm(socket_path) if File.exists?(socket_path)
+  end
+
   # Watch for method calls slower than a threshold.
   #
   # msec - The Fixnum threshold in milliseconds
@@ -139,7 +146,9 @@ class RBTracer
     send_cmd(:eval, code)
 
     if wait('for eval response', 15){ !!@eval_result }
-      @eval_result
+      res = @eval_result
+      @eval_result = nil
+      res
     else
       STDERR.puts '*** timed out waiting for eval response'
     end
@@ -231,6 +240,8 @@ class RBTracer
     # STDERR.puts $!.backtrace.join("\n  ")
   rescue Interrupt, SignalException
     retry
+  ensure
+    clean_socket_path
   end
 
   # Process events from the traced process.

data/lib/rbtrace/version.rb

@@ -0,0 +1,3 @@
+class RBTracer
+  VERSION = '0.4.4'
+end

data/rbtrace.gemspec

@@ -1,6 +1,8 @@
+require File.expand_path('../lib/rbtrace/version', __FILE__)
+
 Gem::Specification.new do |s|
   s.name = 'rbtrace'
-  s.version = '0.4.3'
+  s.version = RBTracer::VERSION
   s.homepage = 'http://github.com/tmm1/rbtrace'
 
   s.authors = 'Aman Gupta'

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rbtrace
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
+  prerelease: 
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -74,6 +81,7 @@ files:
 - lib/rbtrace/core_ext.rb
 - lib/rbtrace/msgq.rb
 - lib/rbtrace/rbtracer.rb
+- lib/rbtrace/version.rb
 - rbtrace.gemspec
 - server.rb
 - test.sh
@@ -87,26 +95,27 @@ 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: 2.1.11
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ! 'rbtrace: like strace but for ruby code'
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2Y5ZDY3NmVmZWY1ODA5YWVjYzJmNmI2ZDI0NWM3OTMwYmM0M2VkMA==
-  data.tar.gz: !binary |-
-    NWVhZWRkOGJhNzE3NTE4ZjRiM2U1YTcyOGFiMzJiODE0ZDc0MmRlYQ==
-SHA512:
-  metadata.gz: !binary |-
-    YzM0Yjk4YjViNjgwNTk1N2Y5NzY5YzBiMjg3N2MzZGE5NjIwMjU3Zjg4NzQz
-    MGNmNjM0MzUzNGUwZWVlNDI1MGVkZTlkNDQwZmJjYzliMTlmZTY2OGNhYzdh
-    NjBiNmNjOWZjNmU4MjJjMTU5MTkwYTk0N2ExYzU0ZWFkNTBmNjM=
-  data.tar.gz: !binary |-
-    ODg5ZGI2NTEyZGM4Y2I1ZjcwYTQ2YzA5NWZkMTFhNDNlNWI2MTlkYWE3ZWU3
-    MGZhZTcxMWQyZmZkNDFkNmU3NGExZDAyMmU4NmNlNTU1OTIxYjIzNGRjNzUw
-    OTdlMmU5YTFjYjg1NGJmOTNiMjI0MTQ4ZjI5MDg1ZTBlODZkNGM=