rollbar 3.2.0 → 3.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (73) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +81 -34
  3. data/Gemfile +8 -8
  4. data/gemfiles/rails30.gemfile +10 -12
  5. data/gemfiles/rails31.gemfile +10 -12
  6. data/gemfiles/rails32.gemfile +3 -5
  7. data/gemfiles/rails40.gemfile +2 -4
  8. data/gemfiles/rails41.gemfile +2 -5
  9. data/gemfiles/rails42.gemfile +4 -9
  10. data/gemfiles/rails50.gemfile +7 -9
  11. data/gemfiles/rails51.gemfile +6 -8
  12. data/gemfiles/rails52.gemfile +5 -5
  13. data/gemfiles/rails60.gemfile +3 -4
  14. data/gemfiles/rails61.gemfile +3 -3
  15. data/lib/generators/rollbar/rollbar_generator.rb +18 -14
  16. data/lib/generators/rollbar/templates/{initializer.rb → initializer.erb} +0 -0
  17. data/lib/rails/rollbar_runner.rb +12 -5
  18. data/lib/rollbar/capistrano.rb +16 -8
  19. data/lib/rollbar/capistrano3.rb +8 -2
  20. data/lib/rollbar/capistrano_tasks.rb +16 -7
  21. data/lib/rollbar/configuration.rb +113 -91
  22. data/lib/rollbar/delay/shoryuken.rb +4 -3
  23. data/lib/rollbar/delay/sidekiq.rb +3 -1
  24. data/lib/rollbar/delay/sucker_punch.rb +1 -2
  25. data/lib/rollbar/delay/thread.rb +3 -2
  26. data/lib/rollbar/deploy.rb +6 -7
  27. data/lib/rollbar/encoding/encoder.rb +7 -3
  28. data/lib/rollbar/exception_reporter.rb +17 -8
  29. data/lib/rollbar/item/backtrace.rb +10 -8
  30. data/lib/rollbar/item/frame.rb +6 -5
  31. data/lib/rollbar/item/locals.rb +3 -1
  32. data/lib/rollbar/item.rb +47 -38
  33. data/lib/rollbar/json.rb +1 -1
  34. data/lib/rollbar/lazy_store.rb +1 -3
  35. data/lib/rollbar/logger.rb +2 -0
  36. data/lib/rollbar/logger_proxy.rb +3 -1
  37. data/lib/rollbar/middleware/js.rb +32 -20
  38. data/lib/rollbar/middleware/rack/builder.rb +3 -3
  39. data/lib/rollbar/middleware/rack/test_session.rb +3 -3
  40. data/lib/rollbar/middleware/rack.rb +4 -4
  41. data/lib/rollbar/middleware/rails/rollbar.rb +9 -6
  42. data/lib/rollbar/middleware/rails/show_exceptions.rb +8 -4
  43. data/lib/rollbar/notifier/trace_with_bindings.rb +4 -2
  44. data/lib/rollbar/notifier.rb +179 -133
  45. data/lib/rollbar/plugin.rb +8 -8
  46. data/lib/rollbar/plugins/active_job.rb +11 -2
  47. data/lib/rollbar/plugins/delayed_job/plugin.rb +10 -3
  48. data/lib/rollbar/plugins/goalie.rb +27 -16
  49. data/lib/rollbar/plugins/rails/controller_methods.rb +18 -14
  50. data/lib/rollbar/plugins/rails/railtie30.rb +2 -1
  51. data/lib/rollbar/plugins/rails/railtie32.rb +2 -1
  52. data/lib/rollbar/plugins/rails/railtie_mixin.rb +2 -2
  53. data/lib/rollbar/plugins/rails.rb +5 -2
  54. data/lib/rollbar/plugins/rake.rb +2 -1
  55. data/lib/rollbar/plugins/sidekiq/plugin.rb +5 -5
  56. data/lib/rollbar/plugins/thread.rb +1 -1
  57. data/lib/rollbar/plugins/validations.rb +3 -1
  58. data/lib/rollbar/rake_tasks.rb +0 -1
  59. data/lib/rollbar/request_data_extractor.rb +38 -17
  60. data/lib/rollbar/rollbar_test.rb +3 -1
  61. data/lib/rollbar/scrubbers/params.rb +13 -7
  62. data/lib/rollbar/scrubbers/url.rb +37 -17
  63. data/lib/rollbar/scrubbers.rb +1 -1
  64. data/lib/rollbar/truncation/remove_any_key_strategy.rb +4 -1
  65. data/lib/rollbar/truncation/remove_extra_strategy.rb +3 -1
  66. data/lib/rollbar/util/hash.rb +14 -7
  67. data/lib/rollbar/util/ip_anonymizer.rb +1 -1
  68. data/lib/rollbar/util.rb +19 -13
  69. data/lib/rollbar/version.rb +1 -1
  70. data/lib/rollbar.rb +12 -7
  71. data/lib/tasks/benchmark.rake +2 -1
  72. data/rollbar.gemspec +3 -1
  73. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 425ed5a051e9393cad69cf84b7d074daf3f2d07a57b28e64946f04254bb60cbe
4
- data.tar.gz: bcf8046e12ccff28c5dab1e32c40cf5d5fee74a7b02602bc4a4735ff21306480
3
+ metadata.gz: c88b1bd8659724cc0d0351d4efb1a458ec8af8e466ddaf6a453e6acaa6da6bd9
4
+ data.tar.gz: 7961e62c55a4f147644cd203ca279b188a7ec3061f15b7ce88943591ccf87e07
5
5
  SHA512:
6
- metadata.gz: 64480f75431290bd39ba433f6c692ec86c0a727c8f3d4a95998b129786c5d368463e18d0f62ba3b4425a0fd468d612e67be1df0655bd1f72cc3615efeec84ed6
7
- data.tar.gz: 8dfc0039125069aea04cb466a8de1674ffa16d9325d5fc54c3daea5265d62a2dbb29d227f9d48599c6233152b90ff60f4e015a5dd8a805c31c51222c96fcf3bc
6
+ metadata.gz: fce360ce571930f495008f786bbc41ed649a7ee9d0e1e23e81a5e050b9310dbf4fc50952f62236d23d5a27f8057efc4c030a321207357423526cffa38d07355c
7
+ data.tar.gz: 759e0e90848534ea09cbfd6ffe866f2d75e314fc56e2bdd7dbd6a48a428691ae5c42d2ec5a158638ba74148456674b01d5450f5cea1198e3148bc6dd69ce545a
data/.rubocop.yml CHANGED
@@ -4,51 +4,40 @@ AllCops:
4
4
  Exclude:
5
5
  - 'vendor/**/*'
6
6
  - 'gemfiles/vendor/**/*'
7
+ - 'spec/dummyapp/**/*'
8
+ - 'spec/tmp/**/*'
9
+ TargetRubyVersion: 2.5 # This is the minimum allowed for current rubocop
7
10
 
8
- Style/HashSyntax:
9
- EnforcedStyle: hash_rockets
10
- SupportedStyles:
11
- - hash_rockets
12
-
13
- Style/SymbolArray:
14
- Enabled: false # %i[] syntax isn't 1.9.x compatible
15
-
16
- Metrics/LineLength:
17
- Max: 1000
18
-
19
- Metrics/MethodLength:
20
- Max: 15 # Relax slightly from the default of 10
11
+ Gemspec/RequiredRubyVersion:
12
+ Enabled: false # rubocop compares to gemspec, yet won't allow 1.9 as minimum version
21
13
 
22
- Style/DoubleNegation:
14
+ Layout/HeredocIndentation:
15
+ # When enabled, forces either squiggly syntax (not available until 2.3),
16
+ # or external packages that we don't want as dependencies.
23
17
  Enabled: false
24
18
 
25
- Style/Lambda:
19
+ Layout/LineLength:
20
+ Max: 90
21
+
22
+ Lint/ConstantDefinitionInBlock:
23
+ # We routinely update existing class definitions in conditional blocks.
26
24
  Enabled: false
27
25
 
28
- Style/EachWithObject:
26
+ Lint/SendWithMixinArgument:
27
+ # Object#include is still a private method in Ruby 2.0.
29
28
  Enabled: false
30
29
 
31
30
  Metrics/BlockLength:
32
- ExcludedMethods: ['describe', 'context'] # RSpec DSL is expected to have long blocks.
33
-
34
- Style/ExpandPathArguments:
35
- Enabled: false # syntax requires Ruby >= 2.0
31
+ # RSpec DSL is expected to have long blocks.
32
+ IgnoredMethods: ['describe', 'context', 'it', 'shared_examples']
36
33
 
37
- Gemspec/RequiredRubyVersion:
38
- Enabled: false # rubocop compares to gemspec, yet won't allow 1.9 as minimum version
39
-
40
- Style/Encoding:
41
- Enabled: false # Ruby 1.9.3 needs these magic comments, e.g. # encoding: UTF-8
42
-
43
- Style/PercentLiteralDelimiters:
44
- PreferredDelimiters:
45
- # rubocop switched from () to [] at some past version.
46
- # Make sure we are consistent across all bundles/builds.
47
- default: '[]'
34
+ Metrics/MethodLength:
35
+ Max: 15 # Relax slightly from the default of 10
48
36
 
49
- Style/Documentation:
50
- # We can enabled this if/when we want to start doing consistent class documentation.
51
- # As is, we currently add :nodoc: if anything at all.
37
+ Metrics/ParameterLists:
38
+ # We currently don't have limits on the number of method arguments, except as
39
+ # they contribute to the complexity metric. If method complexity is in bounds,
40
+ # we allow any number of arguments.
52
41
  Enabled: false
53
42
 
54
43
  Naming/MethodParameterName:
@@ -64,15 +53,73 @@ Style/CaseEquality:
64
53
  # review and test each of these.
65
54
  Enabled: false
66
55
 
56
+ Style/Documentation:
57
+ # We can enabled this if/when we want to start doing consistent class documentation.
58
+ # As is, we currently add :nodoc: if anything at all.
59
+ Enabled: false
60
+
61
+ Style/DoubleNegation:
62
+ Enabled: false
63
+
64
+ Style/EachWithObject:
65
+ Enabled: false
66
+
67
+ Style/Encoding:
68
+ Enabled: false # Ruby 1.9.3 needs these magic comments, e.g. # encoding: UTF-8
69
+
70
+ Style/ExpandPathArguments:
71
+ Enabled: false # syntax requires Ruby >= 2.0
72
+
67
73
  Style/FrozenStringLiteralComment:
68
74
  # If we do this, it will be in its own PR. It requires adding these magic comments
69
75
  # throughout the project, in order to prepare for a future Ruby 3.x.
70
76
  Enabled: false
71
77
 
78
+ Style/HashSyntax:
79
+ EnforcedStyle: hash_rockets
80
+ SupportedStyles:
81
+ - hash_rockets
82
+
83
+ Style/HashTransformKeys:
84
+ # Hash#transform_keys isn't available until Ruby 2.5
85
+ Enabled: false
86
+
87
+ Style/Lambda:
88
+ Enabled: false
89
+
90
+ Style/NumericPredicate:
91
+ # Numbers used in comparison expressions are often more readable and consistent
92
+ # than using predicate methods. e.g.
93
+ # major > 0 && minor > 8
94
+ # is more readable than
95
+ # major.positive? && minor > 8
96
+ Enabled: false
97
+
98
+ Style/OptionalBooleanParameter:
99
+ # We don't yet generally use keyword arguments. Ruby < 2.1 doesn't support
100
+ # required kayword arguments. And satifying this rule would change the calling
101
+ # convention only for these specific optional boolean arguments.
102
+ # This rule should be enabled when the project is updated to use keyword
103
+ # arguments in general.
104
+ Enabled: false
105
+
106
+ Style/PercentLiteralDelimiters:
107
+ PreferredDelimiters:
108
+ # rubocop switched from () to [] at some past version.
109
+ # Make sure we are consistent across all bundles/builds.
110
+ default: '[]'
111
+
112
+ Style/RedundantBegin:
113
+ # Ruby < 2.5 needs begin/end inside blocks when using rescue
114
+ Enabled: false
115
+
72
116
  Style/SafeNavigation:
73
117
  # Not available in Ruby < 2.3.
74
118
  Enabled: false
75
119
 
120
+ Style/SymbolArray:
121
+ Enabled: false # %i[] syntax isn't 1.9.x compatible
122
+
76
123
  #
77
124
  # Performance cops are opt in, and `Enabled: true` is always required.
78
125
  # Full list is here: https://github.com/rubocop-hq/rubocop-performance/tree/master/lib/rubocop/cop/performance
data/Gemfile CHANGED
@@ -20,26 +20,26 @@ gem 'rake'
20
20
  if GEMFILE_RAILS_VERSION < '6.0'
21
21
  gem 'rspec-rails', '~> 3.4'
22
22
  else
23
- gem 'rspec-rails', '~> 4.0.2' # rubocop:disable Bundler/DuplicatedGem
23
+ gem 'rspec-rails', '~> 4.0.2'
24
24
  end
25
25
 
26
26
  if GEMFILE_RAILS_VERSION < '6.0'
27
27
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
28
28
  else
29
- gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw] # rubocop:disable Bundler/DuplicatedGem
29
+ gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
30
30
  end
31
31
 
32
32
  if RUBY_VERSION < '2.2.2'
33
33
  gem 'sidekiq', '~> 2.13.0'
34
34
  else
35
- gem 'sidekiq', '>= 2.13.0' # rubocop:disable Bundler/DuplicatedGem
35
+ gem 'sidekiq', '>= 2.13.0'
36
36
  end
37
37
 
38
38
  platforms :rbx do
39
39
  gem 'minitest'
40
40
  gem 'racc'
41
41
  gem 'rubinius-developer_tools'
42
- gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2') # rubysl doesn't yet support Ruby 3.x
42
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
43
43
  end
44
44
 
45
45
  gem 'capistrano', :require => false
@@ -58,21 +58,21 @@ gem 'aws-sdk-sqs'
58
58
  if GEMFILE_RAILS_VERSION >= '5.2'
59
59
  gem 'database_cleaner'
60
60
  elsif GEMFILE_RAILS_VERSION.between?('5.0', '5.2')
61
- gem 'database_cleaner', '~> 1.8.4' # rubocop:disable Bundler/DuplicatedGem
61
+ gem 'database_cleaner', '~> 1.8.4'
62
62
  elsif GEMFILE_RAILS_VERSION < '5.0'
63
- gem 'database_cleaner', '~> 1.0.0' # rubocop:disable Bundler/DuplicatedGem
63
+ gem 'database_cleaner', '~> 1.0.0'
64
64
  end
65
65
 
66
66
  if GEMFILE_RAILS_VERSION < '6.0'
67
67
  gem 'delayed_job', :require => false
68
68
  else
69
- gem 'delayed_job', '~> 4.1', :require => false # rubocop:disable Bundler/DuplicatedGem
69
+ gem 'delayed_job', '~> 4.1', :require => false
70
70
  end
71
71
  gem 'generator_spec'
72
72
  gem 'girl_friday', '>= 0.11.1'
73
73
  gem 'redis'
74
74
  gem 'resque', '< 2.0.0'
75
- gem 'rubocop', '~> 0.93.0', :require => false
75
+ gem 'rubocop', '1.15.0', :require => false # pin specific version, update manually
76
76
  gem 'rubocop-performance', :require => false
77
77
  gem 'secure_headers', '~> 6.3.2', :require => false
78
78
  gem 'sinatra'
@@ -2,18 +2,16 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
6
-
7
- gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
8
- gem 'jruby-openssl', :platform => :jruby
9
5
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
10
- gem 'rails', '~> 3.0.20'
11
6
  gem 'hitimes', '< 1.2.2'
7
+ gem 'jruby-openssl', :platform => :jruby
12
8
  gem 'mixlib-shellout', '<= 2.0.0'
13
9
  gem 'net-ssh', '<= 3.1.1'
14
10
  gem 'public_suffix', '<= 2.0.5'
11
+ gem 'rails', '~> 3.0.20'
15
12
  gem 'rake', '< 11'
16
13
  gem 'rspec-rails', '>= 2.14.0'
14
+ gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
17
15
 
18
16
  if RUBY_VERSION < '2.2.2'
19
17
  gem 'sidekiq', '~> 2.13.0'
@@ -30,24 +28,24 @@ platforms :rbx do
30
28
  end
31
29
 
32
30
  gem 'capistrano', :require => false
31
+ gem 'codacy-coverage'
33
32
  gem 'rexml', '<= 3.2.4'
34
- gem 'sucker_punch', '~> 2.0'
35
33
  gem 'shoryuken'
36
- gem 'codacy-coverage'
37
34
  gem 'simplecov', '<= 0.17.1'
35
+ gem 'sucker_punch', '~> 2.0'
38
36
 
39
- gem 'sinatra'
40
- gem 'delayed_job', :require => false
41
- gem 'redis', '<= 3.3.5'
42
- gem 'redis-namespace', '<= 1.5.0'
43
37
  gem 'database_cleaner', '~> 1.0.0'
38
+ gem 'delayed_job', :require => false
44
39
  gem 'genspec', '>= 0.2.8'
45
40
  gem 'girl_friday', '>= 0.11.1'
41
+ gem 'redis', '<= 3.3.5'
42
+ gem 'redis-namespace', '<= 1.5.0'
46
43
  gem 'rspec-command'
44
+ gem 'sinatra'
47
45
 
48
46
  gem 'webmock', :require => false
49
47
 
50
- gem 'resque', '< 2.0.0'
51
48
  gem 'aws-sdk-sqs'
49
+ gem 'resque', '< 2.0.0'
52
50
 
53
51
  gemspec :path => '../'
@@ -2,17 +2,15 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
6
-
7
- gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
8
- gem 'jruby-openssl', :platform => :jruby
9
5
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
6
+ gem 'jruby-openssl', :platform => :jruby
10
7
  gem 'mixlib-shellout', '<= 2.0.0'
11
8
  gem 'net-ssh', '<= 3.1.1'
12
9
  gem 'public_suffix', '<= 2.0.5'
13
10
  gem 'rails', '~> 3.1.12'
14
- gem 'rspec-rails', '~> 3.4'
15
11
  gem 'rake', '< 11'
12
+ gem 'rspec-rails', '~> 3.4'
13
+ gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
16
14
 
17
15
  if RUBY_VERSION < '2.2.2'
18
16
  gem 'sidekiq', '~> 2.13.0'
@@ -29,25 +27,25 @@ platforms :rbx do
29
27
  end
30
28
 
31
29
  gem 'capistrano', :require => false
30
+ gem 'codacy-coverage'
32
31
  gem 'rexml', '<= 3.2.4'
33
- gem 'sucker_punch'
34
32
  gem 'shoryuken'
35
- gem 'codacy-coverage'
36
33
  gem 'simplecov', '<= 0.17.1'
34
+ gem 'sucker_punch'
37
35
 
38
- gem 'sinatra'
36
+ gem 'database_cleaner'
39
37
  gem 'delayed_job', :require => false
38
+ gem 'generator_spec'
39
+ gem 'girl_friday'
40
40
  gem 'rack-cache', '<= 1.9.0'
41
41
  gem 'redis', '<= 3.3.5'
42
42
  gem 'redis-namespace', '<= 1.5.0'
43
- gem 'database_cleaner'
44
- gem 'girl_friday'
45
- gem 'generator_spec'
46
43
  gem 'rspec-command'
44
+ gem 'sinatra'
47
45
 
48
46
  gem 'webmock', :require => false
49
47
 
50
- gem 'resque', '< 2.0.0'
51
48
  gem 'aws-sdk-sqs'
49
+ gem 'resque', '< 2.0.0'
52
50
 
53
51
  gemspec :path => '../'
@@ -2,8 +2,6 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
6
-
7
5
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
8
6
  gem 'jruby-openssl', :platform => :jruby
9
7
  gem 'mixlib-shellout', '<= 2.0.0'
@@ -31,11 +29,11 @@ platforms :rbx do
31
29
  end
32
30
 
33
31
  gem 'capistrano', :require => false
32
+ gem 'codacy-coverage'
34
33
  gem 'rexml', '<= 3.2.4'
35
- gem 'sucker_punch', '~> 2.0'
36
34
  gem 'shoryuken'
37
- gem 'codacy-coverage'
38
35
  gem 'simplecov', '<= 0.17.1'
36
+ gem 'sucker_punch', '~> 2.0'
39
37
 
40
38
  gem 'delayed_job', :require => false
41
39
  gem 'redis', '<= 3.3.5'
@@ -49,7 +47,7 @@ gem 'rspec-command'
49
47
 
50
48
  gem 'webmock', :require => false
51
49
 
52
- gem 'resque', '< 2.0.0'
53
50
  gem 'aws-sdk-sqs'
51
+ gem 'resque', '< 2.0.0'
54
52
 
55
53
  gemspec :path => '../'
@@ -2,8 +2,6 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
6
-
7
5
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
8
6
  gem 'jruby-openssl', :platform => :jruby
9
7
  gem 'mixlib-shellout', '<= 2.0.0'
@@ -31,11 +29,11 @@ platforms :rbx do
31
29
  end
32
30
 
33
31
  gem 'capistrano', :require => false
34
- gem 'sucker_punch', '~> 2.0'
32
+ gem 'codacy-coverage'
35
33
  gem 'json', '~> 2.0'
36
34
  gem 'shoryuken'
37
- gem 'codacy-coverage'
38
35
  gem 'simplecov', '<= 0.17.1'
36
+ gem 'sucker_punch', '~> 2.0'
39
37
 
40
38
  gem 'delayed_job', :require => false
41
39
  gem 'redis', '<= 3.3.5'
@@ -2,8 +2,6 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
6
-
7
5
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
8
6
  gem 'jruby-openssl', :platform => :jruby
9
7
  gem 'mixlib-shellout', '<= 2.0.0'
@@ -28,10 +26,10 @@ platforms :rbx do
28
26
  end
29
27
 
30
28
  gem 'capistrano', :require => false
31
- gem 'sucker_punch', '~> 2.0'
32
- gem 'shoryuken'
33
29
  gem 'codacy-coverage'
30
+ gem 'shoryuken'
34
31
  gem 'simplecov', '<= 0.17.1'
32
+ gem 'sucker_punch', '~> 2.0'
35
33
 
36
34
  gem 'delayed_job', :require => false
37
35
  gem 'redis', '<= 3.3.5'
@@ -46,7 +44,6 @@ gem 'rspec-command'
46
44
 
47
45
  gem 'webmock', :require => false
48
46
 
49
- gem 'resque'
50
47
  gem 'aws-sdk-sqs'
51
48
 
52
49
  gemspec :path => '../'
@@ -2,9 +2,6 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
6
- is_not_jruby = !is_jruby
7
-
8
5
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
9
6
  gem 'jruby-openssl', :platform => :jruby
10
7
  gem 'net-ssh', '<= 3.1.1'
@@ -21,9 +18,7 @@ platforms :rbx do
21
18
  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
22
19
  end
23
20
 
24
- if RUBY_VERSION < '2.0.0'
25
- gem 'json', '1.8.6'
26
- end
21
+ gem 'json', '1.8.6' if RUBY_VERSION < '2.0.0'
27
22
 
28
23
  if RUBY_VERSION < '2.2.2'
29
24
  gem 'sidekiq', '~> 2.13.0'
@@ -38,17 +33,17 @@ gem 'database_cleaner', '~> 1.0.0'
38
33
  gem 'delayed_job', :require => false
39
34
  gem 'generator_spec'
40
35
  gem 'girl_friday', '>= 0.11.1'
41
- gem 'rspec-command'
42
36
  gem 'redis', '<= 3.3.5'
43
37
  gem 'resque'
38
+ gem 'rspec-command'
44
39
  gem 'sinatra'
45
40
 
46
41
  gem 'nokogiri', '~> 1.6.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.0')
47
42
 
48
- gem 'sucker_punch', '~> 2.0'
49
- gem 'webmock', :require => false
50
43
  gem 'codacy-coverage'
51
44
  gem 'simplecov', '<= 0.17.1'
45
+ gem 'sucker_punch', '~> 2.0'
46
+ gem 'webmock', :require => false
52
47
 
53
48
  gem 'aws-sdk-sqs'
54
49
 
@@ -2,7 +2,7 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
5
+ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
6
6
 
7
7
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
8
8
  gem 'jruby-openssl', :platform => :jruby
@@ -12,10 +12,10 @@ gem 'rails', '~> 5.0.7'
12
12
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
13
13
 
14
14
  gem 'rspec-core', '~> 3.5.0.beta3'
15
- gem 'rspec-rails', '~> 3.5.0.beta3'
16
- gem 'rspec-support', '~> 3.5.0.beta3'
17
15
  gem 'rspec-expectations', '~> 3.5.0.beta3'
18
16
  gem 'rspec-mocks', '~> 3.5.0.beta3'
17
+ gem 'rspec-rails', '~> 3.5.0.beta3'
18
+ gem 'rspec-support', '~> 3.5.0.beta3'
19
19
 
20
20
  gem 'rake'
21
21
 
@@ -25,20 +25,17 @@ platforms :rbx do
25
25
  gem 'minitest'
26
26
  gem 'racc'
27
27
  gem 'rubinius-developer_tools'
28
- gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2') # rubysl doesn't yet support Ruby 3.x
28
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
29
29
  end
30
30
 
31
31
  gem 'capistrano', :require => false
32
- gem 'sucker_punch', '~> 2.0'
33
32
  gem 'codacy-coverage'
34
33
  gem 'simplecov', '<= 0.17.1'
34
+ gem 'sucker_punch', '~> 2.0'
35
35
 
36
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
37
- gem 'rack', '2.1.2'
38
- end
36
+ gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
39
37
 
40
38
  # We need last sinatra that uses rack 2.1.x
41
- gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
42
39
  gem 'database_cleaner', '~> 1.8.4'
43
40
  gem 'delayed_job', :require => false
44
41
  gem 'generator_spec'
@@ -46,6 +43,7 @@ gem 'girl_friday', '>= 0.11.1'
46
43
  gem 'redis', '<= 3.3.5'
47
44
  gem 'resque'
48
45
  gem 'secure_headers', '~> 6.3.2', :require => false
46
+ gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
49
47
 
50
48
  unless is_jruby
51
49
  # JRuby doesn't support fork, which is required for this test helper.
@@ -2,7 +2,7 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
5
+ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
6
6
 
7
7
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
8
8
  gem 'jruby-openssl', :platform => :jruby
@@ -12,10 +12,10 @@ gem 'rails', '~> 5.1.7'
12
12
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
13
13
 
14
14
  gem 'rspec-core', '~> 3.5.0.beta3'
15
- gem 'rspec-rails', '~> 3.5.0.beta3'
16
- gem 'rspec-support', '~> 3.5.0.beta3'
17
15
  gem 'rspec-expectations', '~> 3.5.0.beta3'
18
16
  gem 'rspec-mocks', '~> 3.5.0.beta3'
17
+ gem 'rspec-rails', '~> 3.5.0.beta3'
18
+ gem 'rspec-support', '~> 3.5.0.beta3'
19
19
 
20
20
  gem 'rake'
21
21
 
@@ -25,17 +25,15 @@ platforms :rbx do
25
25
  gem 'minitest'
26
26
  gem 'racc'
27
27
  gem 'rubinius-developer_tools'
28
- gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2') # rubysl doesn't yet support Ruby 3.x
28
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
29
29
  end
30
30
 
31
31
  gem 'capistrano', :require => false
32
- gem 'sucker_punch', '~> 2.0'
33
32
  gem 'codacy-coverage'
34
33
  gem 'simplecov', '<= 0.17.1'
34
+ gem 'sucker_punch', '~> 2.0'
35
35
 
36
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
37
- gem 'rack', '2.1.2'
38
- end
36
+ gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
39
37
 
40
38
  # We need last sinatra that uses rack 2.1.x
41
39
  gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
@@ -2,7 +2,7 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
5
+ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
6
6
 
7
7
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
8
8
  gem 'jruby-openssl', :platform => :jruby
@@ -10,10 +10,10 @@ gem 'rails', '~> 5.2.3'
10
10
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
11
11
 
12
12
  gem 'rspec-core', '~> 3.8.0'
13
- gem 'rspec-rails', '~> 3.8.0'
14
- gem 'rspec-support', '~> 3.8.0'
15
13
  gem 'rspec-expectations', '~> 3.8.0'
16
14
  gem 'rspec-mocks', '~> 3.8.0'
15
+ gem 'rspec-rails', '~> 3.8.0'
16
+ gem 'rspec-support', '~> 3.8.0'
17
17
 
18
18
  gem 'rake'
19
19
 
@@ -23,7 +23,7 @@ platforms :rbx do
23
23
  gem 'minitest'
24
24
  gem 'racc'
25
25
  gem 'rubinius-developer_tools'
26
- gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2') # rubysl doesn't yet support Ruby 3.x
26
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
27
27
  end
28
28
 
29
29
  gem 'sucker_punch', '~> 2.0'
@@ -31,8 +31,8 @@ gem 'sucker_punch', '~> 2.0'
31
31
  # We need last sinatra that uses rack 2.x
32
32
  gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
33
33
 
34
- gem 'database_cleaner'
35
34
  gem 'codacy-coverage'
35
+ gem 'database_cleaner'
36
36
  gem 'delayed_job', :require => false
37
37
  gem 'generator_spec'
38
38
  gem 'girl_friday', '>= 0.11.1'
@@ -1,9 +1,8 @@
1
-
2
1
  require 'rubygems/version'
3
2
 
4
3
  source 'https://rubygems.org'
5
4
 
6
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
5
+ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
7
6
 
8
7
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
9
8
  gem 'jruby-openssl', :platform => :jruby
@@ -20,7 +19,7 @@ platforms :rbx do
20
19
  gem 'minitest'
21
20
  gem 'racc'
22
21
  gem 'rubinius-developer_tools'
23
- gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2') # rubysl doesn't yet support Ruby 3.x
22
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
24
23
  end
25
24
 
26
25
  gem 'sucker_punch', '~> 2.0'
@@ -28,8 +27,8 @@ gem 'sucker_punch', '~> 2.0'
28
27
  # We need last sinatra that uses rack 2.x
29
28
  gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
30
29
 
31
- gem 'database_cleaner'
32
30
  gem 'codacy-coverage'
31
+ gem 'database_cleaner'
33
32
  gem 'delayed_job', '4.1.9', :require => false
34
33
  gem 'generator_spec'
35
34
  gem 'girl_friday', '>= 0.11.1'
@@ -2,7 +2,7 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
5
+ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
6
6
 
7
7
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
8
8
  gem 'jruby-openssl', :platform => :jruby
@@ -19,7 +19,7 @@ platforms :rbx do
19
19
  gem 'minitest'
20
20
  gem 'racc'
21
21
  gem 'rubinius-developer_tools'
22
- gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2') # rubysl doesn't yet support Ruby 3.x
22
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
23
23
  end
24
24
 
25
25
  gem 'sucker_punch', '~> 2.0'
@@ -27,8 +27,8 @@ gem 'sucker_punch', '~> 2.0'
27
27
  # We need last sinatra that uses rack 2.x
28
28
  gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
29
29
 
30
- gem 'database_cleaner'
31
30
  gem 'codacy-coverage'
31
+ gem 'database_cleaner'
32
32
  gem 'delayed_job', '4.1.9', :require => false
33
33
  gem 'generator_spec'
34
34
  gem 'girl_friday', '>= 0.11.1'