daikon 0.4.0 → 0.5.0

data/Gemfile

@@ -7,9 +7,10 @@ gem "redis",               "~> 2.1.1"
 gem "SystemTimer",         "~> 1.2.1"
 
 group :development do
-  gem "rspec"
+  gem "bourne"
   gem "cucumber"
   gem "jeweler"
-  gem "bourne"
+  gem "rspec"
+  gem "timecop"
   gem "webmock"
 end

data/Gemfile.lock

@@ -39,6 +39,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.1.0)
     term-ansicolor (1.0.5)
+    timecop (0.3.5)
     webmock (1.6.1)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
@@ -56,4 +57,5 @@ DEPENDENCIES
   net-http-persistent (~> 1.4.1)
   redis (~> 2.1.1)
   rspec
+  timecop
   webmock

data/daikon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daikon}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Quaranto"]
-  s.date = %q{2010-12-06}
+  s.date = %q{2010-12-12}
   s.default_executable = %q{daikon}
   s.description = %q{daikon, a radishapp.com client}
   s.email = %q{nick@quaran.to}
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
     "MIT-LICENSE",
     "README.rdoc",
     "Rakefile",
-    "VERSION",
     "bin/daikon",
     "daikon.gemspec",
     "features/daikon.feature",
@@ -35,12 +34,14 @@ Gem::Specification.new do |s|
     "lib/daikon/client.rb",
     "lib/daikon/configuration.rb",
     "lib/daikon/daemon.rb",
+    "lib/daikon/monitor.rb",
     "lib/daikon/namespace_tools.rb",
     "lib/daikon/redis_hacks.rb",
     "spec/client_spec.rb",
     "spec/configuration_spec.rb",
     "spec/daemon_spec.rb",
     "spec/daikon_spec.rb",
+    "spec/monitor_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/qrush/daikon}
@@ -53,6 +54,7 @@ Gem::Specification.new do |s|
     "spec/configuration_spec.rb",
     "spec/daemon_spec.rb",
     "spec/daikon_spec.rb",
+    "spec/monitor_spec.rb",
     "spec/spec_helper.rb"
   ]
 
@@ -66,10 +68,11 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<net-http-persistent>, ["~> 1.4.1"])
       s.add_runtime_dependency(%q<redis>, ["~> 2.1.1"])
       s.add_runtime_dependency(%q<SystemTimer>, ["~> 1.2.1"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bourne>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<bourne>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<timecop>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
     else
       s.add_dependency(%q<daemons>, ["~> 1.1.0"])
@@ -77,10 +80,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<net-http-persistent>, ["~> 1.4.1"])
       s.add_dependency(%q<redis>, ["~> 2.1.1"])
       s.add_dependency(%q<SystemTimer>, ["~> 1.2.1"])
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bourne>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<bourne>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<timecop>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
     end
   else
@@ -89,10 +93,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<net-http-persistent>, ["~> 1.4.1"])
     s.add_dependency(%q<redis>, ["~> 2.1.1"])
     s.add_dependency(%q<SystemTimer>, ["~> 1.2.1"])
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bourne>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<bourne>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<timecop>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
   end
 end

data/lib/daikon.rb

@@ -22,8 +22,9 @@ require 'daikon/namespace_tools'
 require 'daikon/configuration'
 require 'daikon/client'
 require 'daikon/daemon'
+require 'daikon/monitor'
 require 'daikon/redis_hacks'
 
 module Daikon
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/daikon/client.rb

@@ -15,10 +15,11 @@ module Daikon
     attr_accessor :redis, :logger, :config, :http, :monitor
 
     def setup(config, logger = nil)
-      self.config = config
-      self.logger = logger
-      self.redis  = connect
-      self.http   = Net::HTTP::Persistent.new
+      self.config  = config
+      self.logger  = logger
+      self.redis   = connect
+      self.http    = Net::HTTP::Persistent.new
+      self.monitor = Monitor.new(connect, logger)
       http.headers['Authorization'] = config.api_key
 
       log "Started Daikon v#{VERSION}"
@@ -29,12 +30,7 @@ module Daikon
     end
 
     def start_monitor
-      self.monitor = StringIO.new
-      Thread.new do
-        connect.monitor do |line|
-          monitor.puts line
-        end
-      end
+      monitor.start
     end
 
     def log(message)
@@ -82,13 +78,12 @@ module Daikon
     end
 
     def rotate_monitor
-      monitor_data = monitor.string
-      monitor.reopen(StringIO.new)
+      lines = monitor.rotate
 
-      http_request(:post, "api/v1/monitor") do |request|
-        request.body = Gem.gzip(monitor_data)
+      http_request(:post, "api/v1/monitor.json") do |request|
+        request.body = {"lines" => lines}.to_json
         request.add_field "Content-Length", request.body.size.to_s
-        request.add_field "Content-Type",   "application/x-gzip"
+        request.add_field "Content-Type",   "application/json"
       end
     rescue *EXCEPTIONS => ex
       log ex.to_s

data/lib/daikon/monitor.rb

@@ -0,0 +1,37 @@
+module Daikon
+  class Monitor
+    attr_accessor :queue
+
+    NEW_FORMAT        = /^(\d+\.\d+)( "[A-Z]+".*)/i
+    OLD_SINGLE_FORMAT = /^(QUIT|RANDOMKEY|DBSIZE|EXPIRE|TTL|SAVE|BGSAVE|SHUTDOWN|BGREWRITEAOF|INFO|MONITOR|SLAVEOF)$/i
+    OLD_MORE_FORMAT   = /^[A-Z]+ .*$/i
+
+    def initialize(redis = nil, logger = nil)
+      @queue  = []
+      @redis  = redis
+      @logger = logger
+    end
+
+    def start
+      Thread.new do
+        @redis.monitor do |line|
+          parse(line)
+        end
+      end
+    end
+
+    def rotate
+      @queue.shift(@queue.size)
+    end
+
+    def parse(line)
+      if line =~ NEW_FORMAT
+        timestamp = $1
+        line      = $2.strip
+        @queue.push({:at => Time.at(*timestamp.split('.').map(&:to_i)), :command => line})
+      elsif line =~ OLD_SINGLE_FORMAT || line =~ OLD_MORE_FORMAT
+        @queue.push({:at => Time.now, :command => line.strip})
+      end
+    end
+  end
+end

data/spec/client_spec.rb

@@ -18,7 +18,7 @@ describe Daikon::Client, "setup" do
     end
 
     it "sets redis to listen on the given port" do
-      Redis.should have_received(:new).with(:host => "8.8.8.8", :port => "1234")
+      Redis.should have_received(:new).with(:host => "8.8.8.8", :port => "1234").twice
       subject.should have_received(:redis=).with(redis)
     end
   end
@@ -31,7 +31,7 @@ describe Daikon::Client, "setup" do
     end
 
     it "sets redis to listen on the given port" do
-      Redis.should have_received(:new).with(:host => "127.0.0.1", :port => "6379")
+      Redis.should have_received(:new).with(:host => "127.0.0.1", :port => "6379").twice
       subject.should have_received(:redis=).with(redis)
     end
   end
@@ -168,16 +168,16 @@ end
 
 shared_examples_for "a monitor api consumer" do
   it "shoots the results back to radish" do
-    zipped_data = Gem.gzip(results)
+    payload = {"lines" => lines}
 
     headers = {
       "Authorization"  => api_key,
-      "Content-Length" => zipped_data.size,
-      "Content-Type"   => "application/x-gzip"
+      "Content-Length" => payload.to_json.size,
+      "Content-Type"   => "application/json"
     }
 
-    WebMock.should have_requested(:post, "#{server}/api/v1/monitor").
-      with(:body => zipped_data, :headers => headers)
+    WebMock.should have_requested(:post, "#{server}/api/v1/monitor.json").
+      with(:body => payload.to_json, :headers => headers)
   end
 end
 
@@ -185,11 +185,15 @@ describe Daikon::Client, "rotate monitor" do
   subject       { Daikon::Client.new }
   let(:results) { %{1290289048.96581 "info"\n1290289053.568815 "info"} }
   let(:redis)   { stub("redis instance", :info => results) }
+  let(:lines) do
+    [{"at" => Time.at(1290289048, 96581),  "command" => "info"},
+     {"at" => Time.at(1290289053, 568815), "command" => "info"}]
+  end
 
   before do
-    stub_request(:post, "#{server}/api/v1/monitor")
-    subject.monitor = StringIO.new(results)
+    stub_request(:post, "#{server}/api/v1/monitor.json")
     subject.setup(config)
+    subject.monitor = stub("monitor", :rotate => lines)
     subject.rotate_monitor
   end
 

data/spec/monitor_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+describe Daikon::Monitor, "#rotate" do
+  it "pops off what is on the queue" do
+    subject.parse("INCR foo")
+    subject.parse("DECR foo")
+
+    data = subject.rotate
+    data.first[:command].should == "INCR foo"
+    data.last[:command].should  == "DECR foo"
+    data.size.should == 2
+    subject.queue.size.should be_zero
+  end
+end
+
+describe Daikon::Monitor, "#parse with new format" do
+  subject    { Daikon::Monitor.new }
+  let(:line) { '1291699658.994073 "decrby" "fooz" "2000"' }
+
+  it "parses the log into json" do
+    subject.parse(line)
+    subject.queue.should include({:at => Time.at(1291699658, 994073), :command => '"decrby" "fooz" "2000"'})
+  end
+end
+
+describe Daikon::Monitor, "#parse with multiple inputs" do
+  subject { Daikon::Monitor.new }
+  before  { Timecop.freeze }
+  after   { Timecop.return }
+
+  it "queues up multiple lines" do
+    subject.parse("+OK")
+    subject.parse("INCR foo")
+    subject.parse("INCR fooz")
+    subject.parse("info")
+
+    subject.queue.size.should == 3
+    subject.queue.should include({:at => Time.now, :command => 'INCR foo'})
+    subject.queue.should include({:at => Time.now, :command => 'INCR fooz'})
+    subject.queue.should include({:at => Time.now, :command => 'info'})
+  end
+end
+
+describe Daikon::Monitor, "#parse with old multi line input" do
+  subject { Daikon::Monitor.new }
+  before  { Timecop.freeze }
+  after   { Timecop.return }
+
+  it "parses gzipped logs into raws" do
+    subject.parse("incr foo")
+    subject.parse("sismember project-13897-global-error-classes 17")
+    subject.parse("incrApiParameterError")
+    subject.parse("decr foo")
+
+    subject.queue.size.should == 3
+    subject.queue.should include({:at => Time.now, :command => 'incr foo'})
+    subject.queue.should include({:at => Time.now, :command => 'sismember project-13897-global-error-classes 17'})
+    subject.queue.should include({:at => Time.now, :command => 'decr foo'})
+  end
+end
+
+describe Daikon::Monitor, "#parse with multi line input with numbers" do
+  subject { Daikon::Monitor.new }
+  before  { Timecop.freeze }
+  after   { Timecop.return }
+
+  it "parses gzipped logs into raws" do
+    subject.parse("incr foo")
+    subject.parse("set g:2470920:mrn 9")
+    subject.parse("554079885")
+    subject.parse("decr foo")
+
+    subject.queue.size.should == 3
+    subject.queue.should include({:at => Time.now, :command => 'incr foo'})
+    subject.queue.should include({:at => Time.now, :command => 'set g:2470920:mrn 9'})
+    subject.queue.should include({:at => Time.now, :command => 'decr foo'})
+  end
+end
+
+describe Daikon::Monitor, "#parse with strings that may to_i to a number" do
+  subject { Daikon::Monitor.new }
+  before  { Timecop.freeze }
+  after   { Timecop.return }
+
+  it "parses gzipped logs into raws" do
+    subject.parse("incr foo")
+    subject.parse("set g:2470920:mrn 9")
+    subject.parse("46fdcf77c1bb2108e6191602c2f5f9ae")
+    subject.parse("decr foo")
+
+    subject.queue.size.should == 3
+    subject.queue.should include({:at => Time.now, :command => 'incr foo'})
+    subject.queue.should include({:at => Time.now, :command => 'set g:2470920:mrn 9'})
+    subject.queue.should include({:at => Time.now, :command => 'decr foo'})
+  end
+end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'daikon'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+require 'timecop'
 require 'bourne'
 
 require 'webmock/rspec'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daikon
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -05:00
+date: 2010-12-12 00:00:00 -05:00
 default_executable: daikon
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: rspec
+  name: bourne
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,7 +143,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: bourne
+  name: rspec
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -157,7 +157,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: webmock
+  name: timecop
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -168,6 +168,20 @@ dependencies:
         - 0
         version: "0"
   requirement: *id010
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: webmock
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id011
 description: daikon, a radishapp.com client
 email: nick@quaran.to
 executables: 
@@ -184,7 +198,6 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/daikon
 - daikon.gemspec
 - features/daikon.feature
@@ -194,12 +207,14 @@ files:
 - lib/daikon/client.rb
 - lib/daikon/configuration.rb
 - lib/daikon/daemon.rb
+- lib/daikon/monitor.rb
 - lib/daikon/namespace_tools.rb
 - lib/daikon/redis_hacks.rb
 - spec/client_spec.rb
 - spec/configuration_spec.rb
 - spec/daemon_spec.rb
 - spec/daikon_spec.rb
+- spec/monitor_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/qrush/daikon
@@ -240,4 +255,5 @@ test_files:
 - spec/configuration_spec.rb
 - spec/daemon_spec.rb
 - spec/daikon_spec.rb
+- spec/monitor_spec.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.0