daikon 0.8.7 → 0.8.8

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 (12) hide show
  1. data/Appraisals +7 -0
  2. data/Gemfile +10 -11
  3. data/Gemfile.lock +35 -29
  4. data/Rakefile +9 -0
  5. data/daikon.gemspec +3 -15
  6. data/gemfiles/redis2-1.gemfile +14 -0
  7. data/gemfiles/redis2-1.gemfile.lock +59 -0
  8. data/gemfiles/redis2-2.gemfile +14 -0
  9. data/gemfiles/redis2-2.gemfile.lock +59 -0
  10. data/lib/daikon/redis_hacks.rb +11 -1
  11. data/lib/daikon/version.rb +1 -1
  12. metadata +7 -2
data/Appraisals ADDED
@@ -0,0 +1,7 @@
1
+ appraise "redis2-1" do
2
+ gem "redis", "~> 2.1"
3
+ end
4
+
5
+ appraise "redis2-2" do
6
+ gem "redis", "~> 2.2"
7
+ end
data/Gemfile CHANGED
@@ -1,14 +1,13 @@
1
1
  source "http://rubygems.org"
2
2
 
3
- gem "daemons", "1.1.0"
4
- gem "excon", "0.5.6"
5
- gem "json_pure", "1.4.6"
6
- gem "redis", "2.1.1"
3
+ gem "daemons", "~> 1.1.0"
4
+ gem "excon", "~> 0.5.6"
5
+ gem "json_pure", "~> 1.4.6"
6
+ gem "redis", "~> 2.2"
7
7
 
8
- group :development do
9
- gem "bourne"
10
- gem "cucumber"
11
- gem "jeweler"
12
- gem "rspec"
13
- gem "timecop"
14
- end
8
+ # dev dependencies, appraisal doesn't like #group :(
9
+ gem "appraisal"
10
+ gem "bourne"
11
+ gem "cucumber"
12
+ gem "rspec"
13
+ gem "timecop"
data/Gemfile.lock CHANGED
@@ -1,40 +1,46 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
+ appraisal (0.3.4)
5
+ aruba (~> 0.3.6)
6
+ bundler
7
+ rake
8
+ aruba (0.3.6)
9
+ childprocess (>= 0.1.7)
10
+ cucumber (>= 0.10.0)
11
+ rspec (>= 2.5.0)
4
12
  bourne (1.0)
5
13
  mocha (= 0.9.8)
6
14
  builder (2.1.2)
7
- cucumber (0.9.4)
8
- builder (~> 2.1.2)
9
- diff-lcs (~> 1.1.2)
10
- gherkin (~> 2.2.9)
11
- json (~> 1.4.6)
12
- term-ansicolor (~> 1.0.5)
13
- daemons (1.1.0)
15
+ childprocess (0.1.8)
16
+ ffi (~> 1.0.6)
17
+ cucumber (0.10.2)
18
+ builder (>= 2.1.2)
19
+ diff-lcs (>= 1.1.2)
20
+ gherkin (>= 2.3.5)
21
+ json (>= 1.4.6)
22
+ term-ansicolor (>= 1.0.5)
23
+ daemons (1.1.2)
14
24
  diff-lcs (1.1.2)
15
25
  excon (0.5.6)
16
- gherkin (2.2.9)
17
- json (~> 1.4.6)
18
- term-ansicolor (~> 1.0.5)
19
- git (1.2.5)
20
- jeweler (1.5.1)
21
- bundler (~> 1.0.0)
22
- git (>= 1.2.5)
23
- rake
24
- json (1.4.6)
26
+ ffi (1.0.7)
27
+ rake (>= 0.8.7)
28
+ gherkin (2.3.10)
29
+ json (>= 1.4.6)
30
+ json (1.5.1)
25
31
  json_pure (1.4.6)
26
32
  mocha (0.9.8)
27
33
  rake
28
34
  rake (0.8.7)
29
- redis (2.1.1)
30
- rspec (2.1.0)
31
- rspec-core (~> 2.1.0)
32
- rspec-expectations (~> 2.1.0)
33
- rspec-mocks (~> 2.1.0)
34
- rspec-core (2.1.0)
35
- rspec-expectations (2.1.0)
35
+ redis (2.2.0)
36
+ rspec (2.6.0)
37
+ rspec-core (~> 2.6.0)
38
+ rspec-expectations (~> 2.6.0)
39
+ rspec-mocks (~> 2.6.0)
40
+ rspec-core (2.6.3)
41
+ rspec-expectations (2.6.0)
36
42
  diff-lcs (~> 1.1.2)
37
- rspec-mocks (2.1.0)
43
+ rspec-mocks (2.6.0)
38
44
  term-ansicolor (1.0.5)
39
45
  timecop (0.3.5)
40
46
 
@@ -42,12 +48,12 @@ PLATFORMS
42
48
  ruby
43
49
 
44
50
  DEPENDENCIES
51
+ appraisal
45
52
  bourne
46
53
  cucumber
47
- daemons (= 1.1.0)
48
- excon (= 0.5.6)
49
- jeweler
50
- json_pure (= 1.4.6)
51
- redis (= 2.1.1)
54
+ daemons (~> 1.1.0)
55
+ excon (~> 0.5.6)
56
+ json_pure (~> 1.4.6)
57
+ redis (~> 2.2)
52
58
  rspec
53
59
  timecop
data/Rakefile CHANGED
@@ -1,3 +1,5 @@
1
+ require 'appraisal'
2
+
1
3
  require 'rspec/core'
2
4
  require 'rspec/core/rake_task'
3
5
  RSpec::Core::RakeTask.new(:spec) do |spec|
@@ -8,6 +10,13 @@ end
8
10
  desc "run tests"
9
11
  task :default => :spec
10
12
 
13
+ desc "test all appraisals"
14
+ task :all do
15
+ sh("bundle exec rake appraisal:install") &&
16
+ sh("bundle exec rake appraisal:redis2-1") &&
17
+ sh("bundle exec rake appraisal:redis2-2")
18
+ end
19
+
11
20
  def parse_monitor
12
21
  monitor = Daikon::Monitor.new(nil, nil)
13
22
 
data/daikon.gemspec CHANGED
@@ -16,27 +16,15 @@ Gem::Specification.new do |s|
16
16
  s.files = [
17
17
  ".document",
18
18
  ".rspec",
19
+ "Appraisals",
19
20
  "Gemfile",
20
21
  "Gemfile.lock",
21
22
  "MIT-LICENSE",
22
23
  "README.rdoc",
23
24
  "Rakefile",
24
25
  "bin/daikon",
25
- "daikon.gemspec",
26
- "lib/daikon.rb",
27
- "lib/daikon/client.rb",
28
- "lib/daikon/configuration.rb",
29
- "lib/daikon/daemon.rb",
30
- "lib/daikon/daemons_hacks.rb",
31
- "lib/daikon/monitor.rb",
32
- "lib/daikon/redis_hacks.rb",
33
- "lib/daikon/version.rb",
34
- "spec/client_spec.rb",
35
- "spec/configuration_spec.rb",
36
- "spec/daemon_spec.rb",
37
- "spec/monitor_spec.rb",
38
- "spec/spec_helper.rb"
39
- ]
26
+ "daikon.gemspec"
27
+ ] + Dir["lib/**/*.rb"] + Dir["spec/*.rb"] + Dir["gemfiles/*"]
40
28
  s.homepage = %q{http://github.com/qrush/daikon}
41
29
  s.licenses = [%q{MIT}]
42
30
  s.require_paths = [%q{lib}]
data/gemfiles/redis2-1.gemfile ADDED
@@ -0,0 +1,14 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "http://rubygems.org"
4
+
5
+ gem "daemons", "~> 1.1.0"
6
+ gem "excon", "~> 0.5.6"
7
+ gem "json_pure", "~> 1.4.6"
8
+ gem "redis", "~> 2.1"
9
+ gem "appraisal"
10
+ gem "bourne"
11
+ gem "cucumber"
12
+ gem "rspec"
13
+ gem "timecop"
14
+
data/gemfiles/redis2-1.gemfile.lock ADDED
@@ -0,0 +1,59 @@
1
+ GEM
2
+ remote: http://rubygems.org/
3
+ specs:
4
+ appraisal (0.3.4)
5
+ aruba (~> 0.3.6)
6
+ bundler
7
+ rake
8
+ aruba (0.3.6)
9
+ childprocess (>= 0.1.7)
10
+ cucumber (>= 0.10.0)
11
+ rspec (>= 2.5.0)
12
+ bourne (1.0)
13
+ mocha (= 0.9.8)
14
+ builder (2.1.2)
15
+ childprocess (0.1.8)
16
+ ffi (~> 1.0.6)
17
+ cucumber (0.10.2)
18
+ builder (>= 2.1.2)
19
+ diff-lcs (>= 1.1.2)
20
+ gherkin (>= 2.3.5)
21
+ json (>= 1.4.6)
22
+ term-ansicolor (>= 1.0.5)
23
+ daemons (1.1.2)
24
+ diff-lcs (1.1.2)
25
+ excon (0.5.6)
26
+ ffi (1.0.7)
27
+ rake (>= 0.8.7)
28
+ gherkin (2.3.10)
29
+ json (>= 1.4.6)
30
+ json (1.5.1)
31
+ json_pure (1.4.6)
32
+ mocha (0.9.8)
33
+ rake
34
+ rake (0.9.0)
35
+ redis (2.2.0)
36
+ rspec (2.6.0)
37
+ rspec-core (~> 2.6.0)
38
+ rspec-expectations (~> 2.6.0)
39
+ rspec-mocks (~> 2.6.0)
40
+ rspec-core (2.6.3)
41
+ rspec-expectations (2.6.0)
42
+ diff-lcs (~> 1.1.2)
43
+ rspec-mocks (2.6.0)
44
+ term-ansicolor (1.0.5)
45
+ timecop (0.3.5)
46
+
47
+ PLATFORMS
48
+ ruby
49
+
50
+ DEPENDENCIES
51
+ appraisal
52
+ bourne
53
+ cucumber
54
+ daemons (~> 1.1.0)
55
+ excon (~> 0.5.6)
56
+ json_pure (~> 1.4.6)
57
+ redis (~> 2.1)
58
+ rspec
59
+ timecop
data/gemfiles/redis2-2.gemfile ADDED
@@ -0,0 +1,14 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "http://rubygems.org"
4
+
5
+ gem "daemons", "~> 1.1.0"
6
+ gem "excon", "~> 0.5.6"
7
+ gem "json_pure", "~> 1.4.6"
8
+ gem "redis", "~> 2.2"
9
+ gem "appraisal"
10
+ gem "bourne"
11
+ gem "cucumber"
12
+ gem "rspec"
13
+ gem "timecop"
14
+
data/gemfiles/redis2-2.gemfile.lock ADDED
@@ -0,0 +1,59 @@
1
+ GEM
2
+ remote: http://rubygems.org/
3
+ specs:
4
+ appraisal (0.3.4)
5
+ aruba (~> 0.3.6)
6
+ bundler
7
+ rake
8
+ aruba (0.3.6)
9
+ childprocess (>= 0.1.7)
10
+ cucumber (>= 0.10.0)
11
+ rspec (>= 2.5.0)
12
+ bourne (1.0)
13
+ mocha (= 0.9.8)
14
+ builder (2.1.2)
15
+ childprocess (0.1.8)
16
+ ffi (~> 1.0.6)
17
+ cucumber (0.10.2)
18
+ builder (>= 2.1.2)
19
+ diff-lcs (>= 1.1.2)
20
+ gherkin (>= 2.3.5)
21
+ json (>= 1.4.6)
22
+ term-ansicolor (>= 1.0.5)
23
+ daemons (1.1.2)
24
+ diff-lcs (1.1.2)
25
+ excon (0.5.6)
26
+ ffi (1.0.7)
27
+ rake (>= 0.8.7)
28
+ gherkin (2.3.10)
29
+ json (>= 1.4.6)
30
+ json (1.5.1)
31
+ json_pure (1.4.6)
32
+ mocha (0.9.8)
33
+ rake
34
+ rake (0.9.0)
35
+ redis (2.2.0)
36
+ rspec (2.6.0)
37
+ rspec-core (~> 2.6.0)
38
+ rspec-expectations (~> 2.6.0)
39
+ rspec-mocks (~> 2.6.0)
40
+ rspec-core (2.6.3)
41
+ rspec-expectations (2.6.0)
42
+ diff-lcs (~> 1.1.2)
43
+ rspec-mocks (2.6.0)
44
+ term-ansicolor (1.0.5)
45
+ timecop (0.3.5)
46
+
47
+ PLATFORMS
48
+ ruby
49
+
50
+ DEPENDENCIES
51
+ appraisal
52
+ bourne
53
+ cucumber
54
+ daemons (~> 1.1.0)
55
+ excon (~> 0.5.6)
56
+ json_pure (~> 1.4.6)
57
+ redis (~> 2.2)
58
+ rspec
59
+ timecop
data/lib/daikon/redis_hacks.rb CHANGED
@@ -33,11 +33,21 @@ class Redis
33
33
  end
34
34
  end
35
35
 
36
- class Connection
36
+ module ConnectionHacks
37
37
  def read_with_old_protocol
38
38
  reply_type = @sock.gets
39
39
  raise Errno::ECONNRESET unless reply_type
40
40
  reply_type
41
41
  end
42
42
  end
43
+
44
+ if VERSION < "2.1.0"
45
+ class Connection
46
+ include ConnectionHacks
47
+ end
48
+ else
49
+ class Connection::Ruby
50
+ include ConnectionHacks
51
+ end
52
+ end
43
53
  end
data/lib/daikon/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Daikon
2
- VERSION = "0.8.7"
2
+ VERSION = "0.8.8"
3
3
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: daikon
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.8.7
5
+ version: 0.8.8
6
6
  platform: ruby
7
7
  authors:
8
8
  - Nick Quaranto
@@ -122,6 +122,7 @@ extra_rdoc_files:
122
122
  files:
123
123
  - .document
124
124
  - .rspec
125
+ - Appraisals
125
126
  - Gemfile
126
127
  - Gemfile.lock
127
128
  - MIT-LICENSE
@@ -129,7 +130,6 @@ files:
129
130
  - Rakefile
130
131
  - bin/daikon
131
132
  - daikon.gemspec
132
- - lib/daikon.rb
133
133
  - lib/daikon/client.rb
134
134
  - lib/daikon/configuration.rb
135
135
  - lib/daikon/daemon.rb
@@ -137,11 +137,16 @@ files:
137
137
  - lib/daikon/monitor.rb
138
138
  - lib/daikon/redis_hacks.rb
139
139
  - lib/daikon/version.rb
140
+ - lib/daikon.rb
140
141
  - spec/client_spec.rb
141
142
  - spec/configuration_spec.rb
142
143
  - spec/daemon_spec.rb
143
144
  - spec/monitor_spec.rb
144
145
  - spec/spec_helper.rb
146
+ - gemfiles/redis2-1.gemfile
147
+ - gemfiles/redis2-1.gemfile.lock
148
+ - gemfiles/redis2-2.gemfile
149
+ - gemfiles/redis2-2.gemfile.lock
145
150
  homepage: http://github.com/qrush/daikon
146
151
  licenses:
147
152
  - MIT