ddtrace 0.12.0 → 0.12.1

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 (41) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +456 -0
  3. data/.circleci/images/primary/Dockerfile-1.9.3 +69 -0
  4. data/.circleci/images/primary/Dockerfile-2.0.0 +69 -0
  5. data/.circleci/images/primary/Dockerfile-2.1.10 +69 -0
  6. data/.circleci/images/primary/Dockerfile-2.2.10 +69 -0
  7. data/.circleci/images/primary/Dockerfile-2.3.7 +73 -0
  8. data/.circleci/images/primary/Dockerfile-2.4.4 +73 -0
  9. data/.env +21 -11
  10. data/.rubocop.yml +4 -1
  11. data/Appraisals +439 -66
  12. data/CHANGELOG.md +25 -2
  13. data/Rakefile +256 -75
  14. data/ddtrace.gemspec +6 -6
  15. data/docker-compose.yml +222 -37
  16. data/docs/GettingStarted.md +13 -1
  17. data/gemfiles/contrib_old.gemfile +1 -0
  18. data/gemfiles/rails30_postgres.gemfile +1 -0
  19. data/gemfiles/rails30_postgres_sidekiq.gemfile +1 -0
  20. data/gemfiles/rails32_mysql2.gemfile +1 -0
  21. data/gemfiles/rails32_postgres.gemfile +1 -0
  22. data/gemfiles/rails32_postgres_redis.gemfile +1 -0
  23. data/gemfiles/rails32_postgres_sidekiq.gemfile +1 -0
  24. data/gemfiles/rails5_mysql2.gemfile +1 -1
  25. data/gemfiles/rails5_postgres.gemfile +1 -1
  26. data/gemfiles/rails5_postgres_redis.gemfile +1 -1
  27. data/gemfiles/rails5_postgres_sidekiq.gemfile +1 -1
  28. data/lib/ddtrace/configuration.rb +2 -2
  29. data/lib/ddtrace/contrib/active_record/patcher.rb +10 -10
  30. data/lib/ddtrace/contrib/aws/instrumentation.rb +2 -2
  31. data/lib/ddtrace/contrib/elasticsearch/patcher.rb +2 -2
  32. data/lib/ddtrace/contrib/http/patcher.rb +18 -16
  33. data/lib/ddtrace/contrib/rails/action_controller_patch.rb +77 -0
  34. data/lib/ddtrace/contrib/rails/action_view.rb +0 -65
  35. data/lib/ddtrace/contrib/rails/active_support.rb +9 -8
  36. data/lib/ddtrace/contrib/rails/core_extensions.rb +74 -115
  37. data/lib/ddtrace/tracer.rb +4 -1
  38. data/lib/ddtrace/utils.rb +10 -2
  39. data/lib/ddtrace/version.rb +1 -1
  40. metadata +11 -4
  41. data/circle.yml +0 -69
data/.rubocop.yml CHANGED
@@ -38,6 +38,9 @@ Metrics/ClassLength:
38
38
 
39
39
  Metrics/BlockLength:
40
40
  Max: 42
41
+ Exclude:
42
+ - test/**/*
43
+ - spec/**/*
41
44
 
42
45
  Metrics/ParameterLists:
43
46
  Enabled: false
@@ -49,7 +52,7 @@ Metrics/PerceivedComplexity:
49
52
  Max: 15
50
53
 
51
54
  Lint/UnusedMethodArgument:
52
- Enabled: false
55
+ Enabled: false
53
56
 
54
57
  # Disabling advices that would lead to incompatible Ruby 1.9 code
55
58
  Style/SymbolArray:
data/Appraisals CHANGED
@@ -1,30 +1,106 @@
1
- if RUBY_VERSION < '2.4.0' && RUBY_PLATFORM != 'java'
2
- if RUBY_VERSION >= '1.9.1'
1
+ if RUBY_VERSION < '1.9.3'
2
+ raise NotImplementedError, 'Ruby versions < 1.9.3 are not supported!'
3
+ elsif '1.9.3' <= RUBY_VERSION && RUBY_VERSION < '2.0.0'
4
+ if RUBY_PLATFORM != 'java'
5
+ appraise 'rails30-postgres' do
6
+ gem 'test-unit'
7
+ gem 'rails', '3.0.20'
8
+ gem 'pg', '0.15.1', platform: :ruby
9
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
10
+ gem 'rack-cache', '1.7.1'
11
+ end
12
+
13
+ appraise 'rails30-postgres-sidekiq' do
14
+ gem 'test-unit'
15
+ gem 'rails', '3.0.20'
16
+ gem 'pg', '0.15.1', platform: :ruby
17
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
18
+ gem 'sidekiq', '4.0.0'
19
+ gem 'rack-cache', '1.7.1'
20
+ end
21
+
3
22
  appraise 'rails32-mysql2' do
4
23
  gem 'test-unit'
5
24
  gem 'rails', '3.2.22.5'
6
25
  gem 'mysql2', '0.3.21', platform: :ruby
7
26
  gem 'activerecord-mysql-adapter', platform: :ruby
8
27
  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
28
+ gem 'rack-cache', '1.7.1'
29
+ end
30
+
31
+ appraise 'rails32-postgres' do
32
+ gem 'test-unit'
33
+ gem 'rails', '3.2.22.5'
34
+ gem 'pg', '0.15.1', platform: :ruby
35
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
36
+ gem 'rack-cache', '1.7.1'
37
+ end
38
+
39
+ appraise 'rails32-postgres-redis' do
40
+ gem 'test-unit'
41
+ gem 'rails', '3.2.22.5'
42
+ gem 'pg', '0.15.1', platform: :ruby
43
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
44
+ gem 'redis-rails'
45
+ gem 'redis', '< 4.0'
46
+ gem 'rack-cache', '1.7.1'
47
+ end
48
+
49
+ appraise 'rails32-postgres-sidekiq' do
50
+ gem 'test-unit'
51
+ gem 'rails', '3.2.22.5'
52
+ gem 'pg', '0.15.1', platform: :ruby
53
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
54
+ gem 'sidekiq', '4.0.0'
55
+ gem 'rack-cache', '1.7.1'
9
56
  end
10
- end
11
57
 
12
- if RUBY_VERSION >= '1.9.1'
58
+ appraise 'contrib-old' do
59
+ gem 'elasticsearch-transport'
60
+ gem 'mongo', '< 2.5'
61
+ gem 'redis', '< 4.0'
62
+ gem 'hiredis'
63
+ gem 'rack', '1.4.7'
64
+ gem 'rack-test', '0.7.0'
65
+ gem 'rack-cache', '1.7.1'
66
+ gem 'sinatra', '1.4.5'
67
+ gem 'sqlite3'
68
+ gem 'activerecord', '3.2.22.5'
69
+ gem 'sidekiq', '4.0.0'
70
+ gem 'aws-sdk', '~> 2.0'
71
+ gem 'sucker_punch'
72
+ gem 'dalli'
73
+ gem 'resque', '< 2.0'
74
+ gem 'mysql2', '0.3.21', platform: :ruby
75
+ gem 'activerecord-mysql-adapter', platform: :ruby
76
+ end
77
+ end
78
+ elsif '2.0.0' <= RUBY_VERSION && RUBY_VERSION < '2.1.0'
79
+ if RUBY_PLATFORM != 'java'
13
80
  appraise 'rails30-postgres' do
14
81
  gem 'test-unit'
15
82
  gem 'rails', '3.0.20'
16
83
  gem 'pg', '0.15.1', platform: :ruby
17
84
  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
85
+ gem 'rack-cache', '1.7.1'
86
+ end
87
+
88
+ appraise 'rails30-postgres-sidekiq' do
89
+ gem 'test-unit'
90
+ gem 'rails', '3.0.20'
91
+ gem 'pg', '0.15.1', platform: :ruby
92
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
93
+ gem 'sidekiq', '4.0.0'
94
+ gem 'rack-cache', '1.7.1'
18
95
  end
19
96
 
20
- if RUBY_VERSION < '2.2.2'
21
- appraise 'rails30-postgres-sidekiq' do
22
- gem 'test-unit'
23
- gem 'rails', '3.0.20'
24
- gem 'pg', '0.15.1', platform: :ruby
25
- gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
26
- gem 'sidekiq', '4.0.0'
27
- end
97
+ appraise 'rails32-mysql2' do
98
+ gem 'test-unit'
99
+ gem 'rails', '3.2.22.5'
100
+ gem 'mysql2', '0.3.21', platform: :ruby
101
+ gem 'activerecord-mysql-adapter', platform: :ruby
102
+ gem 'activerecord-jdbcmysql-adapter', platform: :jruby
103
+ gem 'rack-cache', '1.7.1'
28
104
  end
29
105
 
30
106
  appraise 'rails32-postgres' do
@@ -32,6 +108,7 @@ if RUBY_VERSION < '2.4.0' && RUBY_PLATFORM != 'java'
32
108
  gem 'rails', '3.2.22.5'
33
109
  gem 'pg', '0.15.1', platform: :ruby
34
110
  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
111
+ gem 'rack-cache', '1.7.1'
35
112
  end
36
113
 
37
114
  appraise 'rails32-postgres-redis' do
@@ -41,20 +118,93 @@ if RUBY_VERSION < '2.4.0' && RUBY_PLATFORM != 'java'
41
118
  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
42
119
  gem 'redis-rails'
43
120
  gem 'redis', '< 4.0'
121
+ gem 'rack-cache', '1.7.1'
44
122
  end
45
123
 
46
- if RUBY_VERSION < '2.2.2'
47
- appraise 'rails32-postgres-sidekiq' do
48
- gem 'test-unit'
49
- gem 'rails', '3.2.22.5'
50
- gem 'pg', '0.15.1', platform: :ruby
51
- gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
52
- gem 'sidekiq', '4.0.0'
53
- end
124
+ appraise 'rails32-postgres-sidekiq' do
125
+ gem 'test-unit'
126
+ gem 'rails', '3.2.22.5'
127
+ gem 'pg', '0.15.1', platform: :ruby
128
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
129
+ gem 'sidekiq', '4.0.0'
130
+ gem 'rack-cache', '1.7.1'
131
+ end
132
+
133
+ appraise 'contrib-old' do
134
+ gem 'elasticsearch-transport'
135
+ gem 'mongo', '< 2.5'
136
+ gem 'redis', '< 4.0'
137
+ gem 'hiredis'
138
+ gem 'rack', '1.4.7'
139
+ gem 'rack-test', '0.7.0'
140
+ gem 'rack-cache', '1.7.1'
141
+ gem 'sinatra', '1.4.5'
142
+ gem 'sqlite3'
143
+ gem 'activerecord', '3.2.22.5'
144
+ gem 'sidekiq', '4.0.0'
145
+ gem 'aws-sdk', '~> 2.0'
146
+ gem 'sucker_punch'
147
+ gem 'dalli'
148
+ gem 'resque', '< 2.0'
149
+ gem 'mysql2', '0.3.21', platform: :ruby
150
+ gem 'activerecord-mysql-adapter', platform: :ruby
54
151
  end
55
152
  end
153
+ elsif '2.1.0' <= RUBY_VERSION && RUBY_VERSION < '2.2.0'
154
+ if RUBY_PLATFORM != 'java'
155
+ appraise 'rails30-postgres' do
156
+ gem 'test-unit'
157
+ gem 'rails', '3.0.20'
158
+ gem 'pg', '0.15.1', platform: :ruby
159
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
160
+ gem 'rack-cache', '1.7.1'
161
+ end
162
+
163
+ appraise 'rails30-postgres-sidekiq' do
164
+ gem 'test-unit'
165
+ gem 'rails', '3.0.20'
166
+ gem 'pg', '0.15.1', platform: :ruby
167
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
168
+ gem 'sidekiq', '4.0.0'
169
+ gem 'rack-cache', '1.7.1'
170
+ end
171
+
172
+ appraise 'rails32-mysql2' do
173
+ gem 'test-unit'
174
+ gem 'rails', '3.2.22.5'
175
+ gem 'mysql2', '0.3.21', platform: :ruby
176
+ gem 'activerecord-mysql-adapter', platform: :ruby
177
+ gem 'activerecord-jdbcmysql-adapter', platform: :jruby
178
+ gem 'rack-cache', '1.7.1'
179
+ end
180
+
181
+ appraise 'rails32-postgres' do
182
+ gem 'test-unit'
183
+ gem 'rails', '3.2.22.5'
184
+ gem 'pg', '0.15.1', platform: :ruby
185
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
186
+ gem 'rack-cache', '1.7.1'
187
+ end
188
+
189
+ appraise 'rails32-postgres-redis' do
190
+ gem 'test-unit'
191
+ gem 'rails', '3.2.22.5'
192
+ gem 'pg', '0.15.1', platform: :ruby
193
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
194
+ gem 'redis-rails'
195
+ gem 'redis', '< 4.0'
196
+ gem 'rack-cache', '1.7.1'
197
+ end
198
+
199
+ appraise 'rails32-postgres-sidekiq' do
200
+ gem 'test-unit'
201
+ gem 'rails', '3.2.22.5'
202
+ gem 'pg', '0.15.1', platform: :ruby
203
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
204
+ gem 'sidekiq', '4.0.0'
205
+ gem 'rack-cache', '1.7.1'
206
+ end
56
207
 
57
- if RUBY_VERSION >= '2.1.10'
58
208
  appraise 'rails4-mysql2' do
59
209
  gem 'rails', '4.2.7.1'
60
210
  gem 'mysql2', '< 0.5', platform: :ruby
@@ -74,33 +224,230 @@ if RUBY_VERSION < '2.4.0' && RUBY_PLATFORM != 'java'
74
224
  gem 'redis-rails'
75
225
  gem 'redis', '< 4.0'
76
226
  end
227
+
228
+ appraise 'contrib-old' do
229
+ gem 'elasticsearch-transport'
230
+ gem 'mongo', '< 2.5'
231
+ gem 'redis', '< 4.0'
232
+ gem 'hiredis'
233
+ gem 'rack', '1.4.7'
234
+ gem 'rack-test', '0.7.0'
235
+ gem 'rack-cache', '1.7.1'
236
+ gem 'sinatra', '1.4.5'
237
+ gem 'sqlite3'
238
+ gem 'activerecord', '3.2.22.5'
239
+ gem 'sidekiq', '4.0.0'
240
+ gem 'aws-sdk', '~> 2.0'
241
+ gem 'sucker_punch'
242
+ gem 'dalli'
243
+ gem 'resque', '< 2.0'
244
+ gem 'mysql2', '0.3.21', platform: :ruby
245
+ gem 'activerecord-mysql-adapter', platform: :ruby
246
+ end
77
247
  end
248
+ elsif '2.2.0' <= RUBY_VERSION && RUBY_VERSION < '2.3.0'
249
+ if RUBY_PLATFORM != 'java'
250
+ appraise 'rails30-postgres' do
251
+ gem 'test-unit'
252
+ gem 'rails', '3.0.20'
253
+ gem 'pg', '0.15.1', platform: :ruby
254
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
255
+ gem 'rack-cache', '1.7.1'
256
+ end
257
+
258
+ appraise 'rails30-postgres-sidekiq' do
259
+ gem 'test-unit'
260
+ gem 'rails', '3.0.20'
261
+ gem 'pg', '0.15.1', platform: :ruby
262
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
263
+ gem 'sidekiq', '4.0.0'
264
+ gem 'rack-cache', '1.7.1'
265
+ end
266
+
267
+ appraise 'rails32-mysql2' do
268
+ gem 'test-unit'
269
+ gem 'rails', '3.2.22.5'
270
+ gem 'mysql2', '0.3.21', platform: :ruby
271
+ gem 'activerecord-mysql-adapter', platform: :ruby
272
+ gem 'activerecord-jdbcmysql-adapter', platform: :jruby
273
+ gem 'rack-cache', '1.7.1'
274
+ end
275
+
276
+ appraise 'rails32-postgres' do
277
+ gem 'test-unit'
278
+ gem 'rails', '3.2.22.5'
279
+ gem 'pg', '0.15.1', platform: :ruby
280
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
281
+ gem 'rack-cache', '1.7.1'
282
+ end
283
+
284
+ appraise 'rails32-postgres-redis' do
285
+ gem 'test-unit'
286
+ gem 'rails', '3.2.22.5'
287
+ gem 'pg', '0.15.1', platform: :ruby
288
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
289
+ gem 'redis-rails'
290
+ gem 'redis', '< 4.0'
291
+ gem 'rack-cache', '1.7.1'
292
+ end
293
+
294
+ appraise 'rails32-postgres-sidekiq' do
295
+ gem 'test-unit'
296
+ gem 'rails', '3.2.22.5'
297
+ gem 'pg', '0.15.1', platform: :ruby
298
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
299
+ gem 'sidekiq', '4.0.0'
300
+ gem 'rack-cache', '1.7.1'
301
+ end
302
+
303
+ appraise 'rails4-mysql2' do
304
+ gem 'rails', '4.2.7.1'
305
+ gem 'mysql2', '< 0.5', platform: :ruby
306
+ gem 'activerecord-jdbcmysql-adapter', platform: :jruby
307
+ end
308
+
309
+ appraise 'rails4-postgres' do
310
+ gem 'rails', '4.2.7.1'
311
+ gem 'pg', '< 1.0', platform: :ruby
312
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
313
+ end
314
+
315
+ appraise 'rails4-postgres-redis' do
316
+ gem 'rails', '4.2.7.1'
317
+ gem 'pg', '< 1.0', platform: :ruby
318
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
319
+ gem 'redis-rails'
320
+ gem 'redis', '< 4.0'
321
+ end
322
+
323
+ appraise 'rails4-postgres-sidekiq' do
324
+ gem 'rails', '4.2.7.1'
325
+ gem 'pg', '< 1.0', platform: :ruby
326
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
327
+ gem 'sidekiq'
328
+ gem 'activejob'
329
+ end
78
330
 
79
- if RUBY_VERSION >= '2.2.2'
80
331
  appraise 'rails5-mysql2' do
81
- gem 'rails', '5.1.5'
332
+ gem 'rails', '~> 5.1.6'
82
333
  gem 'mysql2', '< 0.5', platform: :ruby
83
334
  end
84
335
 
85
336
  appraise 'rails5-postgres' do
86
- gem 'rails', '5.1.5'
337
+ gem 'rails', '~> 5.1.6'
87
338
  gem 'pg', '< 1.0', platform: :ruby
88
339
  end
89
340
 
90
341
  appraise 'rails5-postgres-redis' do
91
- gem 'rails', '5.1.5'
342
+ gem 'rails', '~> 5.1.6'
92
343
  gem 'pg', '< 1.0', platform: :ruby
93
344
  gem 'redis-rails'
94
345
  gem 'redis'
95
346
  end
96
347
 
97
348
  appraise 'rails5-postgres-sidekiq' do
98
- gem 'rails', '5.1.5'
349
+ gem 'rails', '~> 5.1.6'
99
350
  gem 'pg', '< 1.0', platform: :ruby
100
351
  gem 'sidekiq'
101
352
  gem 'activejob'
102
353
  end
103
354
 
355
+ appraise 'contrib' do
356
+ gem 'elasticsearch-transport'
357
+ gem 'mongo', '< 2.5'
358
+ gem 'graphql'
359
+ gem 'grape'
360
+ gem 'rack'
361
+ gem 'rack-test'
362
+ gem 'redis', '< 4.0'
363
+ gem 'hiredis'
364
+ gem 'sinatra'
365
+ gem 'sqlite3'
366
+ gem 'activerecord', '< 5.1.5'
367
+ gem 'sidekiq'
368
+ gem 'aws-sdk'
369
+ gem 'sucker_punch'
370
+ gem 'dalli'
371
+ gem 'resque', '< 2.0'
372
+ gem 'racecar', '>= 0.3.5'
373
+ gem 'mysql2', '< 0.5', platform: :ruby
374
+ end
375
+ end
376
+ elsif '2.3.0' <= RUBY_VERSION && RUBY_VERSION < '2.4.0'
377
+ if RUBY_PLATFORM != 'java'
378
+ appraise 'rails30-postgres' do
379
+ gem 'test-unit'
380
+ gem 'rails', '3.0.20'
381
+ gem 'pg', '0.15.1', platform: :ruby
382
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
383
+ gem 'rack-cache', '1.7.1'
384
+ end
385
+
386
+ appraise 'rails30-postgres-sidekiq' do
387
+ gem 'test-unit'
388
+ gem 'rails', '3.0.20'
389
+ gem 'pg', '0.15.1', platform: :ruby
390
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
391
+ gem 'sidekiq', '4.0.0'
392
+ gem 'rack-cache', '1.7.1'
393
+ end
394
+
395
+ appraise 'rails32-mysql2' do
396
+ gem 'test-unit'
397
+ gem 'rails', '3.2.22.5'
398
+ gem 'mysql2', '0.3.21', platform: :ruby
399
+ gem 'activerecord-mysql-adapter', platform: :ruby
400
+ gem 'activerecord-jdbcmysql-adapter', platform: :jruby
401
+ gem 'rack-cache', '1.7.1'
402
+ end
403
+
404
+ appraise 'rails32-postgres' do
405
+ gem 'test-unit'
406
+ gem 'rails', '3.2.22.5'
407
+ gem 'pg', '0.15.1', platform: :ruby
408
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
409
+ gem 'rack-cache', '1.7.1'
410
+ end
411
+
412
+ appraise 'rails32-postgres-redis' do
413
+ gem 'test-unit'
414
+ gem 'rails', '3.2.22.5'
415
+ gem 'pg', '0.15.1', platform: :ruby
416
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
417
+ gem 'redis-rails'
418
+ gem 'redis', '< 4.0'
419
+ gem 'rack-cache', '1.7.1'
420
+ end
421
+
422
+ appraise 'rails32-postgres-sidekiq' do
423
+ gem 'test-unit'
424
+ gem 'rails', '3.2.22.5'
425
+ gem 'pg', '0.15.1', platform: :ruby
426
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
427
+ gem 'sidekiq', '4.0.0'
428
+ gem 'rack-cache', '1.7.1'
429
+ end
430
+
431
+ appraise 'rails4-mysql2' do
432
+ gem 'rails', '4.2.7.1'
433
+ gem 'mysql2', '< 0.5', platform: :ruby
434
+ gem 'activerecord-jdbcmysql-adapter', platform: :jruby
435
+ end
436
+
437
+ appraise 'rails4-postgres' do
438
+ gem 'rails', '4.2.7.1'
439
+ gem 'pg', '< 1.0', platform: :ruby
440
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
441
+ end
442
+
443
+ appraise 'rails4-postgres-redis' do
444
+ gem 'rails', '4.2.7.1'
445
+ gem 'pg', '< 1.0', platform: :ruby
446
+ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
447
+ gem 'redis-rails'
448
+ gem 'redis', '< 4.0'
449
+ end
450
+
104
451
  appraise 'rails4-postgres-sidekiq' do
105
452
  gem 'rails', '4.2.7.1'
106
453
  gem 'pg', '< 1.0', platform: :ruby
@@ -108,47 +455,73 @@ if RUBY_VERSION < '2.4.0' && RUBY_PLATFORM != 'java'
108
455
  gem 'sidekiq'
109
456
  gem 'activejob'
110
457
  end
111
- end
112
- end
113
458
 
114
- if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
115
- appraise 'contrib' do
116
- gem 'elasticsearch-transport'
117
- gem 'mongo', '< 2.5'
118
- gem 'graphql'
119
- gem 'grape'
120
- gem 'rack'
121
- gem 'rack-test'
122
- gem 'redis', '< 4.0'
123
- gem 'hiredis'
124
- gem 'sinatra'
125
- gem 'sqlite3'
126
- gem 'activerecord', '< 5.1.5'
127
- gem 'sidekiq'
128
- gem 'aws-sdk'
129
- gem 'sucker_punch'
130
- gem 'dalli'
131
- gem 'resque', '< 2.0'
132
- gem 'racecar', '>= 0.3.5'
133
- gem 'mysql2', '< 0.5', platform: :ruby
459
+ appraise 'rails5-mysql2' do
460
+ gem 'rails', '~> 5.1.6'
461
+ gem 'mysql2', '< 0.5', platform: :ruby
462
+ end
463
+
464
+ appraise 'rails5-postgres' do
465
+ gem 'rails', '~> 5.1.6'
466
+ gem 'pg', '< 1.0', platform: :ruby
467
+ end
468
+
469
+ appraise 'rails5-postgres-redis' do
470
+ gem 'rails', '~> 5.1.6'
471
+ gem 'pg', '< 1.0', platform: :ruby
472
+ gem 'redis-rails'
473
+ gem 'redis'
474
+ end
475
+
476
+ appraise 'rails5-postgres-sidekiq' do
477
+ gem 'rails', '~> 5.1.6'
478
+ gem 'pg', '< 1.0', platform: :ruby
479
+ gem 'sidekiq'
480
+ gem 'activejob'
481
+ end
482
+
483
+ appraise 'contrib' do
484
+ gem 'elasticsearch-transport'
485
+ gem 'mongo', '< 2.5'
486
+ gem 'graphql'
487
+ gem 'grape'
488
+ gem 'rack'
489
+ gem 'rack-test'
490
+ gem 'redis', '< 4.0'
491
+ gem 'hiredis'
492
+ gem 'sinatra'
493
+ gem 'sqlite3'
494
+ gem 'activerecord', '< 5.1.5'
495
+ gem 'sidekiq'
496
+ gem 'aws-sdk'
497
+ gem 'sucker_punch'
498
+ gem 'dalli'
499
+ gem 'resque', '< 2.0'
500
+ gem 'racecar', '>= 0.3.5'
501
+ gem 'mysql2', '< 0.5', platform: :ruby
502
+ end
134
503
  end
135
- else
136
- appraise 'contrib-old' do
137
- gem 'elasticsearch-transport'
138
- gem 'mongo', '< 2.5'
139
- gem 'redis', '< 4.0'
140
- gem 'hiredis'
141
- gem 'rack', '1.4.7'
142
- gem 'rack-test', '0.7.0'
143
- gem 'sinatra', '1.4.5'
144
- gem 'sqlite3'
145
- gem 'activerecord', '3.2.22.5'
146
- gem 'sidekiq', '4.0.0'
147
- gem 'aws-sdk', '~> 2.0'
148
- gem 'sucker_punch'
149
- gem 'dalli'
150
- gem 'resque', '< 2.0'
151
- gem 'mysql2', '0.3.21', platform: :ruby
152
- gem 'activerecord-mysql-adapter', platform: :ruby
504
+ elsif '2.4.0' <= RUBY_VERSION
505
+ if RUBY_PLATFORM != 'java'
506
+ appraise 'contrib' do
507
+ gem 'elasticsearch-transport'
508
+ gem 'mongo', '< 2.5'
509
+ gem 'graphql'
510
+ gem 'grape'
511
+ gem 'rack'
512
+ gem 'rack-test'
513
+ gem 'redis', '< 4.0'
514
+ gem 'hiredis'
515
+ gem 'sinatra'
516
+ gem 'sqlite3'
517
+ gem 'activerecord', '< 5.1.5'
518
+ gem 'sidekiq'
519
+ gem 'aws-sdk'
520
+ gem 'sucker_punch'
521
+ gem 'dalli'
522
+ gem 'resque', '< 2.0'
523
+ gem 'racecar', '>= 0.3.5'
524
+ gem 'mysql2', '< 0.5', platform: :ruby
525
+ end
153
526
  end
154
527
  end