rbtrace 0.2.5 → 0.2.6

data/README.md

@@ -157,7 +157,6 @@ rbtrace works on ruby 1.8 and 1.9, running on linux or mac osx.
 * switch ipc to [msgpack](https://github.com/dhotson/msgpack/tree/master/c) instead of csv
 * add triggers to start tracing slow methods only inside another method
 * optimize local variable lookup to avoid instance_eval
-* let bin/rbtrace read methods selectors and expressions from a config file
 * use shared memory region for symbol table to avoid lookup on every event
 * use another shm for class name lookup, and wipe on every GC
 * investigate mach_msg on osx since msgget(2) has hard kernel limits

data/bin/rbtrace

@@ -178,7 +178,7 @@ class RBTracer
     Array(methods).each do |func|
       func = func.strip
 
-      if func =~ /^(.+)\((.+?)\)$/
+      if func =~ /^(.+)\((.+)\)$/
         func, args = $1, $2
         args = args.split(',').map{ |a| a.strip }
       end
@@ -373,10 +373,13 @@ class RBTracer
   end
 
   def self.run
-    opts = Trollop.options do
+    check_msgmnb
+    cleanup_queues
+
+    parser = Trollop::Parser.new do
       version <<-EOS
 rbtrace: like strace, but for ruby code
-  version 0.2.5
+  version 0.2.6
   (c) 2011 Aman Gupta (tmm1)
   http://github.com/tmm1/rbtrace
 EOS
@@ -459,23 +462,61 @@ EOS
         "prefix nested method calls with N spaces",
         :default => 1,
         :short => '-r'
+
+      opt :config,
+        "config file",
+        :type => String,
+        :short => '-c'
+    end
+
+    opts = Trollop.with_standard_exception_handling(parser) do
+      raise Trollop::HelpNeeded if ARGV.empty?
+      parser.parse(ARGV)
     end
 
-    RBTracer.check_msgmnb
-    RBTracer.cleanup_queues
+    slow = nil
+    firehose = nil
+    methods = nil
+
+    if opts[:slow_given]
+      slow = opts[:slow]
+
+    elsif opts[:firehose]
+      firehose = true
+
+    elsif opts[:methods]
+      methods = opts[:methods]
+
+    elsif opts[:config_given]
+      if File.exists?(config = opts[:config])
+        methods = []
+        File.readlines(config).each do |line|
+          next if line =~ /^#/
+          methods << line.strip
+        end
+
+      else
+        parser.die :config, "invalid config file"
+      end
+
+    else
+      $stderr.puts "Error: --slow, --firehose, --methods or --config required."
+      $stderr.puts "Try --help for help."
+      exit(-1)
+    end
 
     begin
       begin
         tracer = RBTracer.new(opts[:pid])
       rescue ArgumentError => e
-        Trollop.die :pid, "invalid (#{e.message})"
+        parser.die :pid, "invalid (#{e.message})"
       end
 
-      if opts[:slow_given]
-        tracer.watch(opts[:slow])
-      elsif opts[:firehose]
+      if slow
+        tracer.watch(slow)
+      elsif firehose
         tracer.firehose
-      elsif methods = opts[:methods]
+      elsif methods
         tracer.add(methods)
       end
 

data/ext/rbtrace.c

@@ -259,7 +259,7 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             snprintf(buffer, len+150, "\"%s:%d\"", rb_sourcefile(), rb_sourceline());
             result = buffer;
 
-          } else if (len > 1 && expr[0] == '@') {
+          } else if (len > 2 && expr[0] == '@' && expr[1] != '@') {
             val = rb_inspect(rb_ivar_get(self, rb_intern(expr)));
 
           } else if (event == RUBY_EVENT_CALL) {

data/rbtrace.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rbtrace'
-  s.version = '0.2.5'
+  s.version = '0.2.6'
   s.homepage = 'http://github.com/tmm1/rbtrace'
 
   s.authors = "Aman Gupta"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbtrace
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -08:00
+date: 2011-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency