daikon 0.8.8 → 0.8.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. data/Gemfile +1 -1
  2. data/Gemfile.lock +3 -4
  3. data/daikon.gemspec +3 -3
  4. data/gemfiles/redis2-1.gemfile +5 -5
  5. data/gemfiles/redis2-1.gemfile.lock +3 -4
  6. data/gemfiles/redis2-2.gemfile +5 -5
  7. data/gemfiles/redis2-2.gemfile.lock +3 -4
  8. data/lib/daikon/monitor.rb +1 -1
  9. data/lib/daikon/version.rb +1 -1
  10. data/spec/monitor_spec.rb +11 -0
  11. metadata +54 -4
data/Gemfile CHANGED
@@ -6,7 +6,7 @@ gem "json_pure", "~> 1.4.6"
6
6
  gem "redis", "~> 2.2"
7
7
 
8
8
  # dev dependencies, appraisal doesn't like #group :(
9
- gem "appraisal"
9
+ gem "appraisal", "~> 0.3.5"
10
10
  gem "bourne"
11
11
  gem "cucumber"
12
12
  gem "rspec"
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- appraisal (0.3.4)
4
+ appraisal (0.3.5)
5
5
  aruba (~> 0.3.6)
6
6
  bundler
7
7
  rake
@@ -23,8 +23,7 @@ GEM
23
23
  daemons (1.1.2)
24
24
  diff-lcs (1.1.2)
25
25
  excon (0.5.6)
26
- ffi (1.0.7)
27
- rake (>= 0.8.7)
26
+ ffi (1.0.9)
28
27
  gherkin (2.3.10)
29
28
  json (>= 1.4.6)
30
29
  json (1.5.1)
@@ -48,7 +47,7 @@ PLATFORMS
48
47
  ruby
49
48
 
50
49
  DEPENDENCIES
51
- appraisal
50
+ appraisal (~> 0.3.5)
52
51
  bourne
53
52
  cucumber
54
53
  daemons (~> 1.1.0)
data/daikon.gemspec CHANGED
@@ -5,10 +5,10 @@ Gem::Specification.new do |s|
5
5
  s.version = Daikon::VERSION
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
- s.authors = [%q{Nick Quaranto}]
9
- s.date = %q{2011-05-31}
8
+ s.authors = ['Nick Quaranto', 'thoughtbot']
9
+ s.date = %q{2011-06-01}
10
10
  s.description = %q{daikon, a radishapp.com client}
11
- s.email = %q{nick@quaran.to}
11
+ s.email = %q{nick@thoughtbot.com}
12
12
  s.executables = [%q{daikon}]
13
13
  s.extra_rdoc_files = [
14
14
  "README.rdoc"
data/gemfiles/redis2-1.gemfile CHANGED
@@ -2,13 +2,13 @@
2
2
 
3
3
  source "http://rubygems.org"
4
4
 
5
+ gem "bourne"
6
+ gem "timecop"
7
+ gem "rspec"
5
8
  gem "daemons", "~> 1.1.0"
6
9
  gem "excon", "~> 0.5.6"
7
10
  gem "json_pure", "~> 1.4.6"
8
- gem "redis", "~> 2.1"
9
- gem "appraisal"
10
- gem "bourne"
11
11
  gem "cucumber"
12
- gem "rspec"
13
- gem "timecop"
12
+ gem "redis", "~> 2.1"
13
+ gem "appraisal", "~> 0.3.5"
14
14
 
data/gemfiles/redis2-1.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- appraisal (0.3.4)
4
+ appraisal (0.3.5)
5
5
  aruba (~> 0.3.6)
6
6
  bundler
7
7
  rake
@@ -23,8 +23,7 @@ GEM
23
23
  daemons (1.1.2)
24
24
  diff-lcs (1.1.2)
25
25
  excon (0.5.6)
26
- ffi (1.0.7)
27
- rake (>= 0.8.7)
26
+ ffi (1.0.9)
28
27
  gherkin (2.3.10)
29
28
  json (>= 1.4.6)
30
29
  json (1.5.1)
@@ -48,7 +47,7 @@ PLATFORMS
48
47
  ruby
49
48
 
50
49
  DEPENDENCIES
51
- appraisal
50
+ appraisal (~> 0.3.5)
52
51
  bourne
53
52
  cucumber
54
53
  daemons (~> 1.1.0)
data/gemfiles/redis2-2.gemfile CHANGED
@@ -2,13 +2,13 @@
2
2
 
3
3
  source "http://rubygems.org"
4
4
 
5
+ gem "bourne"
6
+ gem "timecop"
7
+ gem "rspec"
5
8
  gem "daemons", "~> 1.1.0"
6
9
  gem "excon", "~> 0.5.6"
7
10
  gem "json_pure", "~> 1.4.6"
8
- gem "redis", "~> 2.2"
9
- gem "appraisal"
10
- gem "bourne"
11
11
  gem "cucumber"
12
- gem "rspec"
13
- gem "timecop"
12
+ gem "redis", "~> 2.2"
13
+ gem "appraisal", "~> 0.3.5"
14
14
 
data/gemfiles/redis2-2.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- appraisal (0.3.4)
4
+ appraisal (0.3.5)
5
5
  aruba (~> 0.3.6)
6
6
  bundler
7
7
  rake
@@ -23,8 +23,7 @@ GEM
23
23
  daemons (1.1.2)
24
24
  diff-lcs (1.1.2)
25
25
  excon (0.5.6)
26
- ffi (1.0.7)
27
- rake (>= 0.8.7)
26
+ ffi (1.0.9)
28
27
  gherkin (2.3.10)
29
28
  json (>= 1.4.6)
30
29
  json (1.5.1)
@@ -48,7 +47,7 @@ PLATFORMS
48
47
  ruby
49
48
 
50
49
  DEPENDENCIES
51
- appraisal
50
+ appraisal (~> 0.3.5)
52
51
  bourne
53
52
  cucumber
54
53
  daemons (~> 1.1.0)
data/lib/daikon/monitor.rb CHANGED
@@ -8,7 +8,7 @@ module Daikon
8
8
  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
9
9
  ALL_COMMANDS = READ_COMMANDS + WRITE_COMMANDS + OTHER_COMMANDS
10
10
 
11
- NEW_FORMAT = /^\+?\d+\.\d+ "(.*)"$/i
11
+ NEW_FORMAT = /^\+?\d+\.\d+ (?:\(db \d+\) )?"(.*)"$/i
12
12
  OLD_SINGLE_FORMAT = /^(#{NO_ARG_COMMANDS.join('|')})$/i
13
13
  OLD_MORE_FORMAT = /^[A-Z]+ .*$/i
14
14
 
data/lib/daikon/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Daikon
2
- VERSION = "0.8.8"
2
+ VERSION = "0.8.9"
3
3
  end
data/spec/monitor_spec.rb CHANGED
@@ -161,7 +161,18 @@ describe Daikon::Monitor, "#rotate that collects namespaces" do
161
161
  end
162
162
  end
163
163
 
164
+ describe Daikon::Monitor, "#parse multiple database log" do
165
+ it "parses the data correctly" do
166
+ subject.parse('1304626114.869421 (db 2) "rpop" "shoppinshoppinshoppinshoppinshoppingggggshopping"')
167
+
168
+ data = subject.rotate
169
+ data["commands"].should == {"RPOP" => 1}
170
+ data["keys"].should == {"shoppinshoppinshoppinshoppinshoppingggggshopping" => 1}
171
+ end
172
+ end
173
+
164
174
  describe Daikon::Monitor, "#rotate with values that have spaces" do
175
+ let(:redis) { stub('redis', :monitor => true) }
165
176
  before do
166
177
  subject.parse("set g:2470920:mrn 11")
167
178
  subject.parse("Email Error")
metadata CHANGED
@@ -1,16 +1,23 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: daikon
3
3
  version: !ruby/object:Gem::Version
4
+ hash: 45
4
5
  prerelease:
5
- version: 0.8.8
6
+ segments:
7
+ - 0
8
+ - 8
9
+ - 9
10
+ version: 0.8.9
6
11
  platform: ruby
7
12
  authors:
8
13
  - Nick Quaranto
14
+ - thoughtbot
9
15
  autorequire:
10
16
  bindir: bin
11
17
  cert_chain: []
12
18
 
13
- date: 2011-05-31 00:00:00 Z
19
+ date: 2011-06-01 00:00:00 -04:00
20
+ default_executable:
14
21
  dependencies:
15
22
  - !ruby/object:Gem::Dependency
16
23
  name: daemons
@@ -20,6 +27,11 @@ dependencies:
20
27
  requirements:
21
28
  - - ~>
22
29
  - !ruby/object:Gem::Version
30
+ hash: 19
31
+ segments:
32
+ - 1
33
+ - 1
34
+ - 0
23
35
  version: 1.1.0
24
36
  type: :runtime
25
37
  version_requirements: *id001
@@ -31,6 +43,11 @@ dependencies:
31
43
  requirements:
32
44
  - - ~>
33
45
  - !ruby/object:Gem::Version
46
+ hash: 7
47
+ segments:
48
+ - 0
49
+ - 5
50
+ - 6
34
51
  version: 0.5.6
35
52
  type: :runtime
36
53
  version_requirements: *id002
@@ -42,6 +59,11 @@ dependencies:
42
59
  requirements:
43
60
  - - ~>
44
61
  - !ruby/object:Gem::Version
62
+ hash: 11
63
+ segments:
64
+ - 1
65
+ - 4
66
+ - 6
45
67
  version: 1.4.6
46
68
  type: :runtime
47
69
  version_requirements: *id003
@@ -53,6 +75,10 @@ dependencies:
53
75
  requirements:
54
76
  - - ~>
55
77
  - !ruby/object:Gem::Version
78
+ hash: 1
79
+ segments:
80
+ - 2
81
+ - 1
56
82
  version: "2.1"
57
83
  type: :runtime
58
84
  version_requirements: *id004
@@ -64,6 +90,9 @@ dependencies:
64
90
  requirements:
65
91
  - - ">="
66
92
  - !ruby/object:Gem::Version
93
+ hash: 3
94
+ segments:
95
+ - 0
67
96
  version: "0"
68
97
  type: :development
69
98
  version_requirements: *id005
@@ -75,6 +104,9 @@ dependencies:
75
104
  requirements:
76
105
  - - ">="
77
106
  - !ruby/object:Gem::Version
107
+ hash: 3
108
+ segments:
109
+ - 0
78
110
  version: "0"
79
111
  type: :development
80
112
  version_requirements: *id006
@@ -86,6 +118,9 @@ dependencies:
86
118
  requirements:
87
119
  - - ">="
88
120
  - !ruby/object:Gem::Version
121
+ hash: 3
122
+ segments:
123
+ - 0
89
124
  version: "0"
90
125
  type: :development
91
126
  version_requirements: *id007
@@ -97,6 +132,9 @@ dependencies:
97
132
  requirements:
98
133
  - - ">="
99
134
  - !ruby/object:Gem::Version
135
+ hash: 3
136
+ segments:
137
+ - 0
100
138
  version: "0"
101
139
  type: :development
102
140
  version_requirements: *id008
@@ -108,11 +146,14 @@ dependencies:
108
146
  requirements:
109
147
  - - ">="
110
148
  - !ruby/object:Gem::Version
149
+ hash: 3
150
+ segments:
151
+ - 0
111
152
  version: "0"
112
153
  type: :development
113
154
  version_requirements: *id009
114
155
  description: daikon, a radishapp.com client
115
- email: nick@quaran.to
156
+ email: nick@thoughtbot.com
116
157
  executables:
117
158
  - daikon
118
159
  extensions: []
@@ -147,6 +188,7 @@ files:
147
188
  - gemfiles/redis2-1.gemfile.lock
148
189
  - gemfiles/redis2-2.gemfile
149
190
  - gemfiles/redis2-2.gemfile.lock
191
+ has_rdoc: true
150
192
  homepage: http://github.com/qrush/daikon
151
193
  licenses:
152
194
  - MIT
@@ -160,17 +202,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
160
202
  requirements:
161
203
  - - ">="
162
204
  - !ruby/object:Gem::Version
205
+ hash: 57
206
+ segments:
207
+ - 1
208
+ - 8
209
+ - 7
163
210
  version: 1.8.7
164
211
  required_rubygems_version: !ruby/object:Gem::Requirement
165
212
  none: false
166
213
  requirements:
167
214
  - - ">="
168
215
  - !ruby/object:Gem::Version
216
+ hash: 3
217
+ segments:
218
+ - 0
169
219
  version: "0"
170
220
  requirements: []
171
221
 
172
222
  rubyforge_project:
173
- rubygems_version: 1.8.1
223
+ rubygems_version: 1.4.1
174
224
  signing_key:
175
225
  specification_version: 3
176
226
  summary: daikon, a radishapp.com client