ts-resque-delta 1.2.3 → 1.2.4

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/.gitignore +1 -0
  2. data/Appraisals +3 -2
  3. data/README.markdown +1 -0
  4. data/features/thinking_sphinx/database.example.yml +3 -2
  5. data/gemfiles/activerecord2.gemfile +2 -1
  6. data/gemfiles/activerecord2.gemfile.lock +26 -31
  7. data/gemfiles/activerecord3.gemfile +1 -1
  8. data/gemfiles/activerecord3.gemfile.lock +34 -39
  9. data/lib/thinking_sphinx/deltas/resque_delta/version.rb +1 -1
  10. data/lib/ts-resque-delta.rb +1 -0
  11. metadata +2 -3
  12. data/Gemfile.lock +0 -134
data/.gitignore CHANGED
@@ -16,3 +16,4 @@ tmp
16
16
  /bin
17
17
  .rvmrc
18
18
  .rbenv-version
19
+ Gemfile.lock
data/Appraisals CHANGED
@@ -1,8 +1,9 @@
1
1
  appraise "activerecord2" do
2
- gem "activerecord", "2.3.14"
2
+ gem "activerecord", "~> 2.3.14"
3
+ gem "mysql2", "~> 0.2.7"
3
4
  end
4
5
 
5
6
  appraise "activerecord3" do
6
- gem "activerecord", "3.2.6"
7
+ gem "activerecord", "~> 3.2.9"
7
8
  gem "mysql2", "~> 0.3.11"
8
9
  end
data/README.markdown CHANGED
@@ -71,6 +71,7 @@ Contributors (for ts-resque-delta)
71
71
  * [Aaron Gibralter](https://github.com/agibralter)
72
72
  * [Ryan Schlesinger](https://github.com/ryansch) (Locking/`smart_index`)
73
73
  * [Pat Allan](https://github.com/freelancing-god) (FlyingSphinx support)
74
+ * [James Richard](https://github.com/ketzusaka)
74
75
 
75
76
  Original Contributors (for ts-delayed-delta)
76
77
  --------------------------------------------
data/features/thinking_sphinx/database.example.yml CHANGED
@@ -1,3 +1,4 @@
1
- username: root
2
- host: localhost
1
+ username: "root"
2
+ host: "localhost"
3
3
  password:
4
+ adapter: "mysql2"
data/gemfiles/activerecord2.gemfile CHANGED
@@ -2,6 +2,7 @@
2
2
 
3
3
  source "http://rubygems.org"
4
4
 
5
- gem "activerecord", "2.3.14"
5
+ gem "activerecord", "~> 2.3.14"
6
+ gem "mysql2", "~> 0.2.7"
6
7
 
7
8
  gemspec :path=>"../"
data/gemfiles/activerecord2.gemfile.lock CHANGED
@@ -1,9 +1,9 @@
1
1
  PATH
2
- remote: /Users/ryansch/dev/ts-resque-delta
2
+ remote: /Users/aarongibralter/Dropbox/Documents/source-code/ts-resque-delta
3
3
  specs:
4
- ts-resque-delta (1.2.2)
4
+ ts-resque-delta (1.2.3)
5
5
  resque (~> 1.10)
6
- resque-lock-timeout (~> 0.3.1)
6
+ resque-lock-timeout (~> 0.4)
7
7
  riddle (>= 1.5)
8
8
  thinking-sphinx (>= 1.4.1)
9
9
 
@@ -13,35 +13,31 @@ GEM
13
13
  activerecord (2.3.14)
14
14
  activesupport (= 2.3.14)
15
15
  activesupport (2.3.14)
16
- addressable (2.2.8)
17
16
  after_commit (1.0.10)
18
17
  activerecord (>= 1.15.6, < 3.0.0)
19
18
  appraisal (0.4.1)
20
19
  bundler
21
20
  rake
22
- builder (3.0.0)
21
+ builder (3.1.4)
23
22
  cucumber (1.2.1)
24
23
  builder (>= 2.1.2)
25
24
  diff-lcs (>= 1.1.3)
26
25
  gherkin (~> 2.11.0)
27
26
  json (>= 1.4.6)
28
- database_cleaner (0.8.0)
27
+ database_cleaner (0.9.1)
29
28
  diff-lcs (1.1.3)
30
- fakefs (0.4.0)
31
- faraday (0.7.6)
32
- addressable (~> 2.2)
29
+ fakefs (0.4.2)
30
+ faraday (0.8.4)
33
31
  multipart-post (~> 1.1)
34
- rack (~> 1.1)
35
- faraday_middleware (0.7.0)
36
- faraday (~> 0.7.3)
37
- flying-sphinx (0.6.5)
38
- faraday_middleware (~> 0.7.0)
32
+ faraday_middleware (0.9.0)
33
+ faraday (>= 0.7.4, < 0.9)
34
+ flying-sphinx (0.8.4)
35
+ faraday_middleware (~> 0.7)
39
36
  multi_json (>= 1.0.1)
40
- net-ssh (>= 2.0.23)
41
37
  rash (~> 0.3.0)
42
38
  riddle (>= 1.5.0)
43
39
  thinking-sphinx
44
- gherkin (2.11.0)
40
+ gherkin (2.11.5)
45
41
  json (>= 1.4.6)
46
42
  guard (0.8.8)
47
43
  thor (~> 0.14.6)
@@ -54,29 +50,28 @@ GEM
54
50
  guard-rspec (0.5.11)
55
51
  guard (>= 0.8.4)
56
52
  hashie (1.2.0)
57
- json (1.7.3)
53
+ json (1.7.5)
58
54
  mock_redis (0.3.0)
59
- multi_json (1.3.6)
55
+ multi_json (1.3.7)
60
56
  multipart-post (1.1.5)
61
57
  mysql2 (0.2.18)
62
- net-ssh (2.5.2)
63
58
  rack (1.4.1)
64
59
  rack-protection (1.2.0)
65
60
  rack
66
- rake (0.9.2.2)
61
+ rake (10.0.2)
67
62
  rash (0.3.2)
68
63
  hashie (~> 1.2.0)
69
- redis (2.2.2)
70
- redis-namespace (1.0.3)
71
- redis (< 3.0.0)
72
- resque (1.20.0)
64
+ redis (3.0.2)
65
+ redis-namespace (1.2.1)
66
+ redis (~> 3.0.0)
67
+ resque (1.23.0)
73
68
  multi_json (~> 1.0)
74
- redis-namespace (~> 1.0.2)
69
+ redis-namespace (~> 1.0)
75
70
  sinatra (>= 0.9.2)
76
71
  vegas (~> 0.1.2)
77
- resque-lock-timeout (0.3.3)
72
+ resque-lock-timeout (0.4.1)
78
73
  resque (>= 1.8.0)
79
- riddle (1.5.2)
74
+ riddle (1.5.3)
80
75
  rspec (2.10.0)
81
76
  rspec-core (~> 2.10.0)
82
77
  rspec-expectations (~> 2.10.0)
@@ -85,14 +80,14 @@ GEM
85
80
  rspec-expectations (2.10.0)
86
81
  diff-lcs (~> 1.1.3)
87
82
  rspec-mocks (2.10.1)
88
- sinatra (1.3.2)
83
+ sinatra (1.3.3)
89
84
  rack (~> 1.3, >= 1.3.6)
90
85
  rack-protection (~> 1.2)
91
86
  tilt (~> 1.3, >= 1.3.3)
92
- thinking-sphinx (1.4.12)
87
+ thinking-sphinx (1.4.13)
93
88
  activerecord (>= 1.15.6, < 3.0.0)
94
89
  after_commit (>= 1.0.7)
95
- riddle (>= 1.5.2)
90
+ riddle (>= 1.5.3)
96
91
  thor (0.14.6)
97
92
  tilt (1.3.3)
98
93
  vegas (0.1.11)
@@ -102,7 +97,7 @@ PLATFORMS
102
97
  ruby
103
98
 
104
99
  DEPENDENCIES
105
- activerecord (= 2.3.14)
100
+ activerecord (~> 2.3.14)
106
101
  appraisal (~> 0.4.1)
107
102
  cucumber
108
103
  database_cleaner (>= 0.5.2)
data/gemfiles/activerecord3.gemfile CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  source "http://rubygems.org"
4
4
 
5
- gem "activerecord", "3.2.6"
5
+ gem "activerecord", "~> 3.2.9"
6
6
  gem "mysql2", "~> 0.3.11"
7
7
 
8
8
  gemspec :path=>"../"
data/gemfiles/activerecord3.gemfile.lock CHANGED
@@ -1,54 +1,50 @@
1
1
  PATH
2
- remote: /Users/ryansch/dev/ts-resque-delta
2
+ remote: /Users/aarongibralter/Dropbox/Documents/source-code/ts-resque-delta
3
3
  specs:
4
- ts-resque-delta (1.2.2)
4
+ ts-resque-delta (1.2.3)
5
5
  resque (~> 1.10)
6
- resque-lock-timeout (~> 0.3.1)
6
+ resque-lock-timeout (~> 0.4)
7
7
  riddle (>= 1.5)
8
8
  thinking-sphinx (>= 1.4.1)
9
9
 
10
10
  GEM
11
11
  remote: http://rubygems.org/
12
12
  specs:
13
- activemodel (3.2.6)
14
- activesupport (= 3.2.6)
13
+ activemodel (3.2.9)
14
+ activesupport (= 3.2.9)
15
15
  builder (~> 3.0.0)
16
- activerecord (3.2.6)
17
- activemodel (= 3.2.6)
18
- activesupport (= 3.2.6)
16
+ activerecord (3.2.9)
17
+ activemodel (= 3.2.9)
18
+ activesupport (= 3.2.9)
19
19
  arel (~> 3.0.2)
20
20
  tzinfo (~> 0.3.29)
21
- activesupport (3.2.6)
21
+ activesupport (3.2.9)
22
22
  i18n (~> 0.6)
23
23
  multi_json (~> 1.0)
24
- addressable (2.2.8)
25
24
  appraisal (0.4.1)
26
25
  bundler
27
26
  rake
28
27
  arel (3.0.2)
29
- builder (3.0.0)
28
+ builder (3.0.4)
30
29
  cucumber (1.2.1)
31
30
  builder (>= 2.1.2)
32
31
  diff-lcs (>= 1.1.3)
33
32
  gherkin (~> 2.11.0)
34
33
  json (>= 1.4.6)
35
- database_cleaner (0.8.0)
34
+ database_cleaner (0.9.1)
36
35
  diff-lcs (1.1.3)
37
- fakefs (0.4.0)
38
- faraday (0.7.6)
39
- addressable (~> 2.2)
36
+ fakefs (0.4.2)
37
+ faraday (0.8.4)
40
38
  multipart-post (~> 1.1)
41
- rack (~> 1.1)
42
- faraday_middleware (0.7.0)
43
- faraday (~> 0.7.3)
44
- flying-sphinx (0.6.5)
45
- faraday_middleware (~> 0.7.0)
39
+ faraday_middleware (0.9.0)
40
+ faraday (>= 0.7.4, < 0.9)
41
+ flying-sphinx (0.8.4)
42
+ faraday_middleware (~> 0.7)
46
43
  multi_json (>= 1.0.1)
47
- net-ssh (>= 2.0.23)
48
44
  rash (~> 0.3.0)
49
45
  riddle (>= 1.5.0)
50
46
  thinking-sphinx
51
- gherkin (2.11.0)
47
+ gherkin (2.11.5)
52
48
  json (>= 1.4.6)
53
49
  guard (0.8.8)
54
50
  thor (~> 0.14.6)
@@ -61,30 +57,29 @@ GEM
61
57
  guard-rspec (0.5.11)
62
58
  guard (>= 0.8.4)
63
59
  hashie (1.2.0)
64
- i18n (0.6.0)
65
- json (1.7.3)
60
+ i18n (0.6.1)
61
+ json (1.7.5)
66
62
  mock_redis (0.3.0)
67
- multi_json (1.3.6)
63
+ multi_json (1.3.7)
68
64
  multipart-post (1.1.5)
69
65
  mysql2 (0.3.11)
70
- net-ssh (2.5.2)
71
66
  rack (1.4.1)
72
67
  rack-protection (1.2.0)
73
68
  rack
74
- rake (0.9.2.2)
69
+ rake (10.0.2)
75
70
  rash (0.3.2)
76
71
  hashie (~> 1.2.0)
77
- redis (2.2.2)
78
- redis-namespace (1.0.3)
79
- redis (< 3.0.0)
80
- resque (1.20.0)
72
+ redis (3.0.2)
73
+ redis-namespace (1.2.1)
74
+ redis (~> 3.0.0)
75
+ resque (1.23.0)
81
76
  multi_json (~> 1.0)
82
- redis-namespace (~> 1.0.2)
77
+ redis-namespace (~> 1.0)
83
78
  sinatra (>= 0.9.2)
84
79
  vegas (~> 0.1.2)
85
- resque-lock-timeout (0.3.3)
80
+ resque-lock-timeout (0.4.1)
86
81
  resque (>= 1.8.0)
87
- riddle (1.5.2)
82
+ riddle (1.5.3)
88
83
  rspec (2.10.0)
89
84
  rspec-core (~> 2.10.0)
90
85
  rspec-expectations (~> 2.10.0)
@@ -93,17 +88,17 @@ GEM
93
88
  rspec-expectations (2.10.0)
94
89
  diff-lcs (~> 1.1.3)
95
90
  rspec-mocks (2.10.1)
96
- sinatra (1.3.2)
91
+ sinatra (1.3.3)
97
92
  rack (~> 1.3, >= 1.3.6)
98
93
  rack-protection (~> 1.2)
99
94
  tilt (~> 1.3, >= 1.3.3)
100
- thinking-sphinx (2.0.12)
95
+ thinking-sphinx (2.0.13)
101
96
  activerecord (>= 3.0.3)
102
97
  builder (>= 2.1.2)
103
- riddle (>= 1.5.2)
98
+ riddle (>= 1.5.3)
104
99
  thor (0.14.6)
105
100
  tilt (1.3.3)
106
- tzinfo (0.3.33)
101
+ tzinfo (0.3.35)
107
102
  vegas (0.1.11)
108
103
  rack (>= 1.0.0)
109
104
 
@@ -111,7 +106,7 @@ PLATFORMS
111
106
  ruby
112
107
 
113
108
  DEPENDENCIES
114
- activerecord (= 3.2.6)
109
+ activerecord (~> 3.2.9)
115
110
  appraisal (~> 0.4.1)
116
111
  cucumber
117
112
  database_cleaner (>= 0.5.2)
data/lib/thinking_sphinx/deltas/resque_delta/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module ThinkingSphinx
2
2
  module Deltas
3
3
  class ResqueDeltaInfo
4
- VERSION = '1.2.3'
4
+ VERSION = '1.2.4'
5
5
  end
6
6
  end
7
7
  end
data/lib/ts-resque-delta.rb CHANGED
@@ -1,2 +1,3 @@
1
1
  require 'thinking_sphinx/deltas/resque_delta'
2
+ require 'flying_sphinx/resque_delta' if defined?(FlyingSphinx)
2
3
  require 'thinking_sphinx/deltas/resque_delta/railtie' if defined?(Rails::Railtie)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ts-resque-delta
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.3
4
+ version: 1.2.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-26 00:00:00.000000000 Z
12
+ date: 2013-02-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: thinking-sphinx
@@ -310,7 +310,6 @@ files:
310
310
  - .travis.yml
311
311
  - Appraisals
312
312
  - Gemfile
313
- - Gemfile.lock
314
313
  - Guardfile
315
314
  - LICENSE
316
315
  - README.markdown
data/Gemfile.lock DELETED
@@ -1,134 +0,0 @@
1
- PATH
2
- remote: .
3
- specs:
4
- ts-resque-delta (1.2.2)
5
- resque (~> 1.10)
6
- resque-lock-timeout (~> 0.4)
7
- riddle (>= 1.5)
8
- thinking-sphinx (>= 1.4.1)
9
-
10
- GEM
11
- remote: http://rubygems.org/
12
- specs:
13
- activemodel (3.2.9)
14
- activesupport (= 3.2.9)
15
- builder (~> 3.0.0)
16
- activerecord (3.2.9)
17
- activemodel (= 3.2.9)
18
- activesupport (= 3.2.9)
19
- arel (~> 3.0.2)
20
- tzinfo (~> 0.3.29)
21
- activesupport (3.2.9)
22
- i18n (~> 0.6)
23
- multi_json (~> 1.0)
24
- appraisal (0.4.1)
25
- bundler
26
- rake
27
- arel (3.0.2)
28
- builder (3.0.4)
29
- cucumber (1.2.1)
30
- builder (>= 2.1.2)
31
- diff-lcs (>= 1.1.3)
32
- gherkin (~> 2.11.0)
33
- json (>= 1.4.6)
34
- database_cleaner (0.9.1)
35
- diff-lcs (1.1.3)
36
- fakefs (0.4.2)
37
- faraday (0.8.4)
38
- multipart-post (~> 1.1)
39
- faraday_middleware (0.9.0)
40
- faraday (>= 0.7.4, < 0.9)
41
- ffi (1.2.0)
42
- flying-sphinx (0.8.4)
43
- faraday_middleware (~> 0.7)
44
- multi_json (>= 1.0.1)
45
- rash (~> 0.3.0)
46
- riddle (>= 1.5.0)
47
- thinking-sphinx
48
- gherkin (2.11.5)
49
- json (>= 1.4.6)
50
- guard (0.8.8)
51
- thor (~> 0.14.6)
52
- guard-bundler (0.1.3)
53
- bundler (>= 1.0.0)
54
- guard (>= 0.2.2)
55
- guard-cucumber (0.7.5)
56
- cucumber (>= 0.10)
57
- guard (>= 0.8.3)
58
- guard-rspec (0.5.11)
59
- guard (>= 0.8.4)
60
- hashie (1.2.0)
61
- i18n (0.6.1)
62
- json (1.7.5)
63
- libnotify (0.8.0)
64
- ffi (>= 1.0.11)
65
- mock_redis (0.3.0)
66
- multi_json (1.3.7)
67
- multipart-post (1.1.5)
68
- mysql2 (0.3.11)
69
- rack (1.4.1)
70
- rack-protection (1.2.0)
71
- rack
72
- rake (10.0.2)
73
- rash (0.3.2)
74
- hashie (~> 1.2.0)
75
- rb-fsevent (0.9.2)
76
- rb-inotify (0.8.8)
77
- ffi (>= 0.5.0)
78
- redis (3.0.2)
79
- redis-namespace (1.2.1)
80
- redis (~> 3.0.0)
81
- resque (1.23.0)
82
- multi_json (~> 1.0)
83
- redis-namespace (~> 1.0)
84
- sinatra (>= 0.9.2)
85
- vegas (~> 0.1.2)
86
- resque-lock-timeout (0.4.1)
87
- resque (>= 1.8.0)
88
- riddle (1.5.3)
89
- rspec (2.10.0)
90
- rspec-core (~> 2.10.0)
91
- rspec-expectations (~> 2.10.0)
92
- rspec-mocks (~> 2.10.0)
93
- rspec-core (2.10.1)
94
- rspec-expectations (2.10.0)
95
- diff-lcs (~> 1.1.3)
96
- rspec-mocks (2.10.1)
97
- ruby_gntp (0.3.4)
98
- sinatra (1.3.3)
99
- rack (~> 1.3, >= 1.3.6)
100
- rack-protection (~> 1.2)
101
- tilt (~> 1.3, >= 1.3.3)
102
- thinking-sphinx (2.0.13)
103
- activerecord (>= 3.0.3)
104
- builder (>= 2.1.2)
105
- riddle (>= 1.5.3)
106
- thor (0.14.6)
107
- tilt (1.3.3)
108
- tzinfo (0.3.35)
109
- vegas (0.1.11)
110
- rack (>= 1.0.0)
111
-
112
- PLATFORMS
113
- ruby
114
-
115
- DEPENDENCIES
116
- activerecord (~> 3.2.0)
117
- appraisal (~> 0.4.1)
118
- cucumber
119
- database_cleaner (>= 0.5.2)
120
- fakefs (~> 0.4.0)
121
- flying-sphinx (>= 0.5.1)
122
- guard (~> 0.8.8)
123
- guard-bundler (~> 0.1.3)
124
- guard-cucumber (~> 0.7.4)
125
- guard-rspec (~> 0.5.8)
126
- libnotify
127
- mock_redis (~> 0.3.0)
128
- mysql2 (~> 0.3.11)
129
- rake (>= 0.8.7)
130
- rb-fsevent
131
- rb-inotify
132
- rspec (~> 2.10.0)
133
- ruby_gntp
134
- ts-resque-delta!