daikon 0.8.8 → 0.8.9

data/Gemfile

@@ -6,7 +6,7 @@ gem "json_pure", "~> 1.4.6"
 gem "redis",     "~> 2.2"
 
 # dev dependencies, appraisal doesn't like #group :(
-gem "appraisal"
+gem "appraisal", "~> 0.3.5"
 gem "bourne"
 gem "cucumber"
 gem "rspec"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    appraisal (0.3.4)
+    appraisal (0.3.5)
       aruba (~> 0.3.6)
       bundler
       rake
@@ -23,8 +23,7 @@ GEM
     daemons (1.1.2)
     diff-lcs (1.1.2)
     excon (0.5.6)
-    ffi (1.0.7)
-      rake (>= 0.8.7)
+    ffi (1.0.9)
     gherkin (2.3.10)
       json (>= 1.4.6)
     json (1.5.1)
@@ -48,7 +47,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal
+  appraisal (~> 0.3.5)
   bourne
   cucumber
   daemons (~> 1.1.0)

data/daikon.gemspec

@@ -5,10 +5,10 @@ Gem::Specification.new do |s|
   s.version = Daikon::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Nick Quaranto}]
-  s.date = %q{2011-05-31}
+  s.authors = ['Nick Quaranto', 'thoughtbot']
+  s.date = %q{2011-06-01}
   s.description = %q{daikon, a radishapp.com client}
-  s.email = %q{nick@quaran.to}
+  s.email = %q{nick@thoughtbot.com}
   s.executables = [%q{daikon}]
   s.extra_rdoc_files = [
     "README.rdoc"

data/gemfiles/redis2-1.gemfile

@@ -2,13 +2,13 @@
 
 source "http://rubygems.org"
 
+gem "bourne"
+gem "timecop"
+gem "rspec"
 gem "daemons", "~> 1.1.0"
 gem "excon", "~> 0.5.6"
 gem "json_pure", "~> 1.4.6"
-gem "redis", "~> 2.1"
-gem "appraisal"
-gem "bourne"
 gem "cucumber"
-gem "rspec"
-gem "timecop"
+gem "redis", "~> 2.1"
+gem "appraisal", "~> 0.3.5"
 

data/gemfiles/redis2-1.gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    appraisal (0.3.4)
+    appraisal (0.3.5)
       aruba (~> 0.3.6)
       bundler
       rake
@@ -23,8 +23,7 @@ GEM
     daemons (1.1.2)
     diff-lcs (1.1.2)
     excon (0.5.6)
-    ffi (1.0.7)
-      rake (>= 0.8.7)
+    ffi (1.0.9)
     gherkin (2.3.10)
       json (>= 1.4.6)
     json (1.5.1)
@@ -48,7 +47,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal
+  appraisal (~> 0.3.5)
   bourne
   cucumber
   daemons (~> 1.1.0)

data/gemfiles/redis2-2.gemfile

@@ -2,13 +2,13 @@
 
 source "http://rubygems.org"
 
+gem "bourne"
+gem "timecop"
+gem "rspec"
 gem "daemons", "~> 1.1.0"
 gem "excon", "~> 0.5.6"
 gem "json_pure", "~> 1.4.6"
-gem "redis", "~> 2.2"
-gem "appraisal"
-gem "bourne"
 gem "cucumber"
-gem "rspec"
-gem "timecop"
+gem "redis", "~> 2.2"
+gem "appraisal", "~> 0.3.5"
 

data/gemfiles/redis2-2.gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    appraisal (0.3.4)
+    appraisal (0.3.5)
       aruba (~> 0.3.6)
       bundler
       rake
@@ -23,8 +23,7 @@ GEM
     daemons (1.1.2)
     diff-lcs (1.1.2)
     excon (0.5.6)
-    ffi (1.0.7)
-      rake (>= 0.8.7)
+    ffi (1.0.9)
     gherkin (2.3.10)
       json (>= 1.4.6)
     json (1.5.1)
@@ -48,7 +47,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal
+  appraisal (~> 0.3.5)
   bourne
   cucumber
   daemons (~> 1.1.0)

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+ "(.*)"$/i
+    NEW_FORMAT        = /^\+?\d+\.\d+ (?:\(db \d+\) )?"(.*)"$/i
     OLD_SINGLE_FORMAT = /^(#{NO_ARG_COMMANDS.join('|')})$/i
     OLD_MORE_FORMAT   = /^[A-Z]+ .*$/i
 

data/lib/daikon/version.rb

@@ -1,3 +1,3 @@
 module Daikon
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

data/spec/monitor_spec.rb

@@ -161,7 +161,18 @@ describe Daikon::Monitor, "#rotate that collects namespaces" do
   end
 end
 
+describe Daikon::Monitor, "#parse multiple database log" do
+  it "parses the data correctly" do
+    subject.parse('1304626114.869421 (db 2) "rpop" "shoppinshoppinshoppinshoppinshoppingggggshopping"')
+
+    data = subject.rotate
+    data["commands"].should == {"RPOP" => 1}
+    data["keys"].should     == {"shoppinshoppinshoppinshoppinshoppingggggshopping" => 1}
+  end
+end
+
 describe Daikon::Monitor, "#rotate with values that have spaces" do
+  let(:redis) { stub('redis', :monitor => true) }
   before do
     subject.parse("set g:2470920:mrn 11")
     subject.parse("Email Error")

metadata

@@ -1,16 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: daikon
 version: !ruby/object:Gem::Version 
+  hash: 45
   prerelease: 
-  version: 0.8.8
+  segments: 
+  - 0
+  - 8
+  - 9
+  version: 0.8.9
 platform: ruby
 authors: 
 - Nick Quaranto
+- thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 Z
+date: 2011-06-01 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -20,6 +27,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id001
@@ -31,6 +43,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 5
+        - 6
         version: 0.5.6
   type: :runtime
   version_requirements: *id002
@@ -42,6 +59,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
         version: 1.4.6
   type: :runtime
   version_requirements: *id003
@@ -53,6 +75,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
         version: "2.1"
   type: :runtime
   version_requirements: *id004
@@ -64,6 +90,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -75,6 +104,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -86,6 +118,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -97,6 +132,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -108,11 +146,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
 description: daikon, a radishapp.com client
-email: nick@quaran.to
+email: nick@thoughtbot.com
 executables: 
 - daikon
 extensions: []
@@ -147,6 +188,7 @@ files:
 - gemfiles/redis2-1.gemfile.lock
 - gemfiles/redis2-2.gemfile
 - gemfiles/redis2-2.gemfile.lock
+has_rdoc: true
 homepage: http://github.com/qrush/daikon
 licenses: 
 - MIT
@@ -160,17 +202,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.1
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: daikon, a radishapp.com client