daikon 0.8.1 → 0.8.2

data/Rakefile

@@ -26,3 +26,31 @@ require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features)
 
 task :default => :spec
+
+def parse_monitor
+  monitor = Daikon::Monitor.new(nil, nil)
+
+  File.open("monitor.log", "r") do |f|
+    until f.eof?
+      monitor.parse(f.readline)
+    end
+  end
+end
+
+desc "benchmark monitor.log against the monitor parsing"
+task :bench do
+  require 'benchmark'
+  Benchmark.bm do |bm|
+    bm.report do
+      parse_monitor
+    end
+  end
+end
+
+desc "perf tools the monitor.log"
+task :perf do
+  require 'perftools'
+  PerfTools::CpuProfiler.start("daikon.profile") do
+    parse_monitor
+  end
+end

data/daikon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daikon}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Quaranto"]
-  s.date = %q{2011-03-17}
+  s.date = %q{2011-03-22}
   s.default_executable = %q{daikon}
   s.description = %q{daikon, a radishapp.com client}
   s.email = %q{nick@quaran.to}

data/lib/daikon.rb

@@ -27,5 +27,5 @@ require 'daikon/daemons_hacks'
 require 'daikon/redis_hacks'
 
 module Daikon
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/daikon/monitor.rb

@@ -8,7 +8,7 @@ module Daikon
     OTHER_COMMANDS  = ["AUTH", "BGREWRITEAOF", "BGSAVE", "CONFIG GET", "CONFIG SET", "CONFIG RESETSTAT", "DBSIZE", "DEBUG OBJECT", "DEBUG SEGFAULT", "DISCARD", "ECHO", "EXEC", "FLUSHALL", "FLUSHDB", "INFO", "LASTSAVE", "MONITOR", "MULTI", "PING", "PSUBSCRIBE", "PUBLISH", "PUNSUBSCRIBE", "QUIT", "RANDOMKEY", "SAVE", "SELECT", "SHUTDOWN", "SUBSCRIBE", "SYNC", "UNSUBSCRIBE", "UNWATCH", "WATCH"].to_set
     ALL_COMMANDS    = READ_COMMANDS + WRITE_COMMANDS + OTHER_COMMANDS
 
-    NEW_FORMAT        = /^\+?(\d+\.\d+)( "[A-Z]+".*)/i
+    NEW_FORMAT        = /^\+?\d+\.\d+ "(.*)"$/i
     OLD_SINGLE_FORMAT = /^(#{NO_ARG_COMMANDS.join('|')})$/i
     OLD_MORE_FORMAT   = /^[A-Z]+ .*$/i
 
@@ -50,14 +50,14 @@ module Daikon
 
     def parse(line)
       if line =~ NEW_FORMAT
-        push($2)
+        push($1.split('" "'))
       elsif line =~ OLD_SINGLE_FORMAT || line =~ OLD_MORE_FORMAT
-        push(line)
+        push(line.split)
       end
     end
 
-    def push(raw_command)
-      command, key, *rest = raw_command.strip.gsub('"', '').split
+    def push(split_command)
+      command, key, *rest = split_command
       command.upcase!
 
       return unless ALL_COMMANDS.member?(command)
@@ -66,6 +66,9 @@ module Daikon
         incr_command(command)
         incr_total(command)
         if key
+          key.gsub!(".", "{PERIOD}") if key.include?('.')
+          key.gsub!("$", "{DOLLAR}") if key.include?('$')
+
           incr_key(key)
           incr_namespace(key)
         else
@@ -75,9 +78,8 @@ module Daikon
     end
 
     def incr_namespace(key)
-      namespace, has_namespace = key.split(/(?::|-)/, 2)
-      if has_namespace
-        data["namespaces"][namespace] += 1
+      if marker = key =~ /:|-/
+        data["namespaces"][key[0...marker]] += 1
       else
         incr_global_namespace
       end
@@ -92,7 +94,7 @@ module Daikon
     end
 
     def incr_key(key)
-      data["keys"][key.gsub(".", "{PERIOD}").gsub("$", "{DOLLAR}")] += 1
+      data["keys"][key] += 1
     end
 
     def incr_total(command)

metadata

@@ -2,7 +2,7 @@
 name: daikon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -06:00
+date: 2011-03-22 00:00:00 -04:00
 default_executable: daikon
 dependencies: 
 - !ruby/object:Gem::Dependency