rollbar 2.26.0 → 3.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (85) hide show
  1. checksums.yaml +4 -4
  2. data/.github/pull_request_template.md +34 -0
  3. data/.github/workflows/ci.yml +104 -0
  4. data/.rubocop.yml +52 -36
  5. data/Gemfile +25 -29
  6. data/README.md +32 -8
  7. data/data/rollbar.snippet.js +1 -1
  8. data/docs/configuration.md +7 -0
  9. data/gemfiles/rails30.gemfile +17 -35
  10. data/gemfiles/rails31.gemfile +20 -37
  11. data/gemfiles/rails32.gemfile +13 -31
  12. data/gemfiles/rails40.gemfile +12 -32
  13. data/gemfiles/rails41.gemfile +11 -31
  14. data/gemfiles/rails42.gemfile +11 -35
  15. data/gemfiles/rails50.gemfile +14 -32
  16. data/gemfiles/rails51.gemfile +13 -31
  17. data/gemfiles/rails52.gemfile +10 -19
  18. data/gemfiles/rails60.gemfile +10 -25
  19. data/gemfiles/rails61.gemfile +52 -0
  20. data/gemfiles/rails70.gemfile +52 -0
  21. data/lib/generators/rollbar/rollbar_generator.rb +18 -14
  22. data/lib/rails/rollbar_runner.rb +8 -19
  23. data/lib/rollbar/capistrano.rb +17 -9
  24. data/lib/rollbar/capistrano3.rb +8 -2
  25. data/lib/rollbar/capistrano_tasks.rb +44 -8
  26. data/lib/rollbar/configuration.rb +122 -88
  27. data/lib/rollbar/delay/shoryuken.rb +4 -3
  28. data/lib/rollbar/delay/sidekiq.rb +3 -1
  29. data/lib/rollbar/delay/sucker_punch.rb +1 -2
  30. data/lib/rollbar/delay/thread.rb +3 -2
  31. data/lib/rollbar/deploy.rb +6 -7
  32. data/lib/rollbar/encoding/encoder.rb +7 -3
  33. data/lib/rollbar/encoding.rb +2 -7
  34. data/lib/rollbar/exception_reporter.rb +17 -8
  35. data/lib/rollbar/item/backtrace.rb +10 -8
  36. data/lib/rollbar/item/frame.rb +6 -5
  37. data/lib/rollbar/item/locals.rb +5 -2
  38. data/lib/rollbar/item.rb +60 -38
  39. data/lib/rollbar/json.rb +1 -1
  40. data/lib/rollbar/language_support.rb +0 -6
  41. data/lib/rollbar/lazy_store.rb +3 -7
  42. data/lib/rollbar/logger.rb +2 -0
  43. data/lib/rollbar/logger_proxy.rb +3 -1
  44. data/lib/rollbar/middleware/js/json_value.rb +15 -5
  45. data/lib/rollbar/middleware/js.rb +59 -37
  46. data/lib/rollbar/middleware/rack/builder.rb +3 -3
  47. data/lib/rollbar/middleware/rack/test_session.rb +3 -3
  48. data/lib/rollbar/middleware/rack.rb +4 -4
  49. data/lib/rollbar/middleware/rails/rollbar.rb +9 -6
  50. data/lib/rollbar/middleware/rails/show_exceptions.rb +8 -4
  51. data/lib/rollbar/notifier/trace_with_bindings.rb +13 -3
  52. data/lib/rollbar/notifier.rb +180 -136
  53. data/lib/rollbar/plugin.rb +8 -8
  54. data/lib/rollbar/plugins/active_job.rb +15 -2
  55. data/lib/rollbar/plugins/delayed_job/plugin.rb +14 -3
  56. data/lib/rollbar/plugins/goalie.rb +27 -16
  57. data/lib/rollbar/plugins/rails/controller_methods.rb +18 -14
  58. data/lib/rollbar/plugins/rails/railtie30.rb +2 -1
  59. data/lib/rollbar/plugins/rails/railtie32.rb +2 -1
  60. data/lib/rollbar/plugins/rails/railtie_mixin.rb +2 -2
  61. data/lib/rollbar/plugins/rails.rb +5 -2
  62. data/lib/rollbar/plugins/rake.rb +2 -1
  63. data/lib/rollbar/plugins/sidekiq/plugin.rb +39 -21
  64. data/lib/rollbar/plugins/sidekiq.rb +1 -1
  65. data/lib/rollbar/plugins/thread.rb +8 -7
  66. data/lib/rollbar/plugins/validations.rb +3 -1
  67. data/lib/rollbar/rake_tasks.rb +1 -2
  68. data/lib/rollbar/request_data_extractor.rb +48 -19
  69. data/lib/rollbar/rollbar_test.rb +9 -118
  70. data/lib/rollbar/scrubbers/params.rb +13 -7
  71. data/lib/rollbar/scrubbers/url.rb +56 -17
  72. data/lib/rollbar/scrubbers.rb +1 -1
  73. data/lib/rollbar/truncation/remove_any_key_strategy.rb +4 -1
  74. data/lib/rollbar/truncation/remove_extra_strategy.rb +3 -1
  75. data/lib/rollbar/util/hash.rb +14 -7
  76. data/lib/rollbar/util/ip_anonymizer.rb +1 -1
  77. data/lib/rollbar/util.rb +19 -13
  78. data/lib/rollbar/version.rb +1 -1
  79. data/lib/rollbar.rb +12 -7
  80. data/lib/tasks/benchmark.rake +2 -1
  81. data/rollbar.gemspec +5 -3
  82. metadata +17 -12
  83. data/.travis.yml +0 -284
  84. data/lib/rollbar/encoding/legacy_encoder.rb +0 -20
  85. /data/lib/generators/rollbar/templates/{initializer.rb → initializer.erb} +0 -0
@@ -2,19 +2,12 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- # Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
6
- # new process is created during tests. (Testing rake tasks, for example.)
7
- # This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
8
- # We use the ||= assignment because Travis loads the gemfile twice, the second time
9
- # with the wrong gemfile path.
10
- ENV['CURRENT_GEMFILE'] ||= __FILE__
11
-
12
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
13
-
14
- gem 'appraisal'
15
5
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
16
6
  gem 'jruby-openssl', :platform => :jruby
17
- gem 'rails', '3.2.22'
7
+ gem 'mixlib-shellout', '<= 2.0.0'
8
+ gem 'net-ssh', '<= 3.1.1'
9
+ gem 'public_suffix', '<= 2.0.5'
10
+ gem 'rails', '~> 3.2.22'
18
11
  gem 'rake'
19
12
  gem 'rspec-rails', '~> 3.4'
20
13
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
@@ -35,20 +28,15 @@ platforms :rbx do
35
28
  gem 'rubysl-test-unit'
36
29
  end
37
30
 
38
- if RUBY_VERSION.start_with?('1.9')
39
- gem 'capistrano', '<= 3.4.1', :require => false
40
- gem 'sucker_punch', '~> 1.0'
41
- gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
42
- elsif RUBY_VERSION.start_with?('2')
43
- gem 'capistrano', :require => false
44
- gem 'sucker_punch', '~> 2.0'
45
- gem 'shoryuken'
46
- gem 'codacy-coverage'
47
- gem 'simplecov'
48
- end
31
+ gem 'capistrano', :require => false
32
+ gem 'rexml', '<= 3.2.4'
33
+ gem 'shoryuken'
34
+ gem 'simplecov', '<= 0.17.1'
35
+ gem 'sucker_punch', '~> 2.0'
49
36
 
50
37
  gem 'delayed_job', :require => false
51
- gem 'redis'
38
+ gem 'redis', '<= 3.3.5'
39
+ gem 'redis-namespace', '<= 1.5.0'
52
40
  gem 'sinatra'
53
41
 
54
42
  gem 'database_cleaner', '~> 1.0.0'
@@ -56,15 +44,9 @@ gem 'generator_spec'
56
44
  gem 'girl_friday', '>= 0.11.1'
57
45
  gem 'rspec-command'
58
46
 
59
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
60
- gem 'mime-types', '< 3.0'
61
- gem 'public_suffix', '< 1.5'
62
- gem 'webmock', '< 2.3.0', :require => false
63
- else
64
- gem 'webmock', :require => false
65
- end
47
+ gem 'webmock', :require => false
66
48
 
67
- gem 'resque', '< 2.0.0'
68
49
  gem 'aws-sdk-sqs'
50
+ gem 'resque', '< 2.0.0'
69
51
 
70
52
  gemspec :path => '../'
@@ -2,19 +2,12 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- # Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
6
- # new process is created during tests. (Testing rake tasks, for example.)
7
- # This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
8
- # We use the ||= assignment because Travis loads the gemfile twice, the second time
9
- # with the wrong gemfile path.
10
- ENV['CURRENT_GEMFILE'] ||= __FILE__
11
-
12
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
13
-
14
- gem 'appraisal'
15
5
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
16
6
  gem 'jruby-openssl', :platform => :jruby
17
- gem 'rails', '4.0.13'
7
+ gem 'mixlib-shellout', '<= 2.0.0'
8
+ gem 'net-ssh', '<= 3.1.1'
9
+ gem 'public_suffix', '<= 2.0.5'
10
+ gem 'rails', '~> 4.0.13'
18
11
  gem 'rake'
19
12
  gem 'rspec-rails', '~> 3.4'
20
13
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
@@ -35,22 +28,15 @@ platforms :rbx do
35
28
  gem 'rubysl-test-unit'
36
29
  end
37
30
 
38
- if RUBY_VERSION.start_with?('1.9')
39
- gem 'capistrano', '<= 3.4.1', :require => false
40
- gem 'sucker_punch', '~> 1.0'
41
- gem 'json', '~> 1.8'
42
- gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
43
- elsif RUBY_VERSION.start_with?('2')
44
- gem 'capistrano', :require => false
45
- gem 'sucker_punch', '~> 2.0'
46
- gem 'json', '~> 2.0'
47
- gem 'shoryuken'
48
- gem 'codacy-coverage'
49
- gem 'simplecov'
50
- end
31
+ gem 'capistrano', :require => false
32
+ gem 'json', '~> 2.0'
33
+ gem 'shoryuken'
34
+ gem 'simplecov', '<= 0.17.1'
35
+ gem 'sucker_punch', '~> 2.0'
51
36
 
52
37
  gem 'delayed_job', :require => false
53
- gem 'redis'
38
+ gem 'redis', '<= 3.3.5'
39
+ gem 'redis-namespace', '<= 1.5.0'
54
40
  gem 'resque'
55
41
  gem 'sinatra'
56
42
 
@@ -59,13 +45,7 @@ gem 'generator_spec'
59
45
  gem 'girl_friday', '>= 0.11.1'
60
46
  gem 'rspec-command'
61
47
 
62
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
63
- gem 'mime-types', '< 3.0'
64
- gem 'public_suffix', '< 1.5'
65
- gem 'webmock', '< 2.3.0', :require => false
66
- else
67
- gem 'webmock', :require => false
68
- end
48
+ gem 'webmock', :require => false
69
49
 
70
50
  gem 'aws-sdk-sqs'
71
51
 
@@ -2,19 +2,12 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- # Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
6
- # new process is created during tests. (Testing rake tasks, for example.)
7
- # This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
8
- # We use the ||= assignment because Travis loads the gemfile twice, the second time
9
- # with the wrong gemfile path.
10
- ENV['CURRENT_GEMFILE'] ||= __FILE__
11
-
12
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
13
-
14
- gem 'appraisal'
15
5
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
16
6
  gem 'jruby-openssl', :platform => :jruby
17
- gem 'rails', '4.1.12'
7
+ gem 'mixlib-shellout', '<= 2.0.0'
8
+ gem 'net-ssh', '<= 3.1.1'
9
+ gem 'public_suffix', '<= 2.0.5'
10
+ gem 'rails', '~> 4.1.16'
18
11
  gem 'rake'
19
12
  gem 'rspec-rails', '~> 3.4'
20
13
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
@@ -32,20 +25,14 @@ platforms :rbx do
32
25
  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
33
26
  end
34
27
 
35
- if RUBY_VERSION.start_with?('1.9')
36
- gem 'capistrano', '<= 3.4.1', :require => false
37
- gem 'sucker_punch', '~> 1.0'
38
- gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
39
- elsif RUBY_VERSION.start_with?('2')
40
- gem 'capistrano', :require => false
41
- gem 'sucker_punch', '~> 2.0'
42
- gem 'shoryuken'
43
- gem 'codacy-coverage'
44
- gem 'simplecov'
45
- end
28
+ gem 'capistrano', :require => false
29
+ gem 'shoryuken'
30
+ gem 'simplecov', '<= 0.17.1'
31
+ gem 'sucker_punch', '~> 2.0'
46
32
 
47
33
  gem 'delayed_job', :require => false
48
- gem 'redis'
34
+ gem 'redis', '<= 3.3.5'
35
+ gem 'redis-namespace', '<= 1.5.0'
49
36
  gem 'resque'
50
37
  gem 'sinatra'
51
38
 
@@ -54,15 +41,8 @@ gem 'generator_spec'
54
41
  gem 'girl_friday', '>= 0.11.1'
55
42
  gem 'rspec-command'
56
43
 
57
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
58
- gem 'mime-types', '< 3.0'
59
- gem 'public_suffix', '< 1.5'
60
- gem 'webmock', '< 2.3.0', :require => false
61
- else
62
- gem 'webmock', :require => false
63
- end
44
+ gem 'webmock', :require => false
64
45
 
65
- gem 'resque'
66
46
  gem 'aws-sdk-sqs'
67
47
 
68
48
  gemspec :path => '../'
@@ -2,20 +2,11 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- # Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
6
- # new process is created during tests. (Testing rake tasks, for example.)
7
- # This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
8
- # We use the ||= assignment because Travis loads the gemfile twice, the second time
9
- # with the wrong gemfile path.
10
- ENV['CURRENT_GEMFILE'] ||= __FILE__
11
-
12
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
13
- is_not_jruby = !is_jruby
14
-
15
- gem 'appraisal'
16
5
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
17
6
  gem 'jruby-openssl', :platform => :jruby
18
- gem 'rails', '4.2.8'
7
+ gem 'net-ssh', '<= 3.1.1'
8
+ gem 'public_suffix', '<= 2.0.5'
9
+ gem 'rails', '~> 4.2.11'
19
10
  gem 'rake'
20
11
  gem 'rspec-rails', '~> 3.4'
21
12
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
@@ -27,9 +18,7 @@ platforms :rbx do
27
18
  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
28
19
  end
29
20
 
30
- if RUBY_VERSION < '2.0.0'
31
- gem 'json', '1.8.6'
32
- end
21
+ gem 'json', '1.8.6' if RUBY_VERSION < '2.0.0'
33
22
 
34
23
  if RUBY_VERSION < '2.2.2'
35
24
  gem 'sidekiq', '~> 2.13.0'
@@ -37,36 +26,23 @@ else
37
26
  gem 'sidekiq', '>= 2.13.0'
38
27
  end
39
28
 
40
- if RUBY_VERSION.start_with?('1.9')
41
- gem 'capistrano', '<= 3.4.1', :require => false
42
- gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
43
- elsif RUBY_VERSION.start_with?('2')
44
- gem 'capistrano', :require => false
45
- gem 'shoryuken'
46
- end
29
+ gem 'capistrano', :require => false
30
+ gem 'shoryuken'
47
31
 
48
32
  gem 'database_cleaner', '~> 1.0.0'
49
33
  gem 'delayed_job', :require => false
50
34
  gem 'generator_spec'
51
35
  gem 'girl_friday', '>= 0.11.1'
52
- gem 'rspec-command'
53
- gem 'redis'
36
+ gem 'redis', '<= 3.3.5'
54
37
  gem 'resque'
38
+ gem 'rspec-command'
55
39
  gem 'sinatra'
56
40
 
57
41
  gem 'nokogiri', '~> 1.6.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.0')
58
42
 
59
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
60
- gem 'mime-types', '< 3.0'
61
- gem 'public_suffix', '< 1.5'
62
- gem 'sucker_punch', '~> 1.0'
63
- gem 'webmock', '< 2.3.0', :require => false
64
- else
65
- gem 'sucker_punch', '~> 2.0'
66
- gem 'webmock', :require => false
67
- gem 'codacy-coverage'
68
- gem 'simplecov'
69
- end
43
+ gem 'simplecov', '<= 0.17.1'
44
+ gem 'sucker_punch', '~> 2.0'
45
+ gem 'webmock', :require => false
70
46
 
71
47
  gem 'aws-sdk-sqs'
72
48
 
@@ -2,26 +2,20 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- # Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
6
- # new process is created during tests. (Testing rake tasks, for example.)
7
- # This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
8
- # We use the ||= assignment because Travis loads the gemfile twice, the second time
9
- # with the wrong gemfile path.
10
- ENV['CURRENT_GEMFILE'] ||= __FILE__
5
+ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
11
6
 
12
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
13
-
14
- gem 'appraisal'
15
7
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
16
8
  gem 'jruby-openssl', :platform => :jruby
9
+ gem 'net-ssh', '<= 3.1.1'
10
+ gem 'public_suffix', '<= 3.1.1'
17
11
  gem 'rails', '~> 5.0.7'
18
12
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
19
13
 
20
14
  gem 'rspec-core', '~> 3.5.0.beta3'
21
- gem 'rspec-rails', '~> 3.5.0.beta3'
22
- gem 'rspec-support', '~> 3.5.0.beta3'
23
15
  gem 'rspec-expectations', '~> 3.5.0.beta3'
24
16
  gem 'rspec-mocks', '~> 3.5.0.beta3'
17
+ gem 'rspec-rails', '~> 3.5.0.beta3'
18
+ gem 'rspec-support', '~> 3.5.0.beta3'
25
19
 
26
20
  gem 'rake'
27
21
 
@@ -31,41 +25,29 @@ platforms :rbx do
31
25
  gem 'minitest'
32
26
  gem 'racc'
33
27
  gem 'rubinius-developer_tools'
34
- gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
28
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
35
29
  end
36
30
 
37
- if RUBY_VERSION.start_with?('1.9')
38
- gem 'capistrano', '<= 3.4.1', :require => false
39
- gem 'sucker_punch', '~> 1.0'
40
- elsif RUBY_VERSION.start_with?('2')
41
- gem 'capistrano', :require => false
42
- gem 'sucker_punch', '~> 2.0'
43
- gem 'codacy-coverage'
44
- gem 'simplecov'
45
- end
31
+ gem 'capistrano', :require => false
32
+ gem 'simplecov', '<= 0.17.1'
33
+ gem 'sucker_punch', '~> 2.0'
46
34
 
47
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
48
- gem 'rack', '2.1.2'
49
- end
35
+ gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
50
36
 
51
37
  # We need last sinatra that uses rack 2.1.x
52
- gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
53
- gem 'database_cleaner'
38
+ gem 'database_cleaner', '~> 1.8.4'
54
39
  gem 'delayed_job', :require => false
55
40
  gem 'generator_spec'
56
- gem 'girl_friday', '>= 0.11.1'
57
- gem 'redis'
41
+ gem 'redis', '<= 3.3.5'
58
42
  gem 'resque'
43
+ gem 'secure_headers', '~> 6.3.2', :require => false
44
+ gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
59
45
 
60
46
  unless is_jruby
61
47
  # JRuby doesn't support fork, which is required for this test helper.
62
48
  gem 'rspec-command'
63
49
  end
64
50
 
65
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
66
- gem 'mime-types', '< 3.0'
67
- end
68
-
69
51
  gem 'webmock', :require => false
70
52
 
71
53
  gem 'aws-sdk-sqs'
@@ -2,26 +2,20 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- # Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
6
- # new process is created during tests. (Testing rake tasks, for example.)
7
- # This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
8
- # We use the ||= assignment because Travis loads the gemfile twice, the second time
9
- # with the wrong gemfile path.
10
- ENV['CURRENT_GEMFILE'] ||= __FILE__
5
+ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
11
6
 
12
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
13
-
14
- gem 'appraisal'
15
7
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
16
8
  gem 'jruby-openssl', :platform => :jruby
9
+ gem 'net-ssh', '<= 3.1.1'
10
+ gem 'public_suffix', '<= 3.1.1'
17
11
  gem 'rails', '~> 5.1.7'
18
12
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
19
13
 
20
14
  gem 'rspec-core', '~> 3.5.0.beta3'
21
- gem 'rspec-rails', '~> 3.5.0.beta3'
22
- gem 'rspec-support', '~> 3.5.0.beta3'
23
15
  gem 'rspec-expectations', '~> 3.5.0.beta3'
24
16
  gem 'rspec-mocks', '~> 3.5.0.beta3'
17
+ gem 'rspec-rails', '~> 3.5.0.beta3'
18
+ gem 'rspec-support', '~> 3.5.0.beta3'
25
19
 
26
20
  gem 'rake'
27
21
 
@@ -31,42 +25,30 @@ platforms :rbx do
31
25
  gem 'minitest'
32
26
  gem 'racc'
33
27
  gem 'rubinius-developer_tools'
34
- gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
28
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
35
29
  end
36
30
 
37
- if RUBY_VERSION.start_with?('1.9')
38
- gem 'capistrano', '<= 3.4.1', :require => false
39
- gem 'sucker_punch', '~> 1.0'
40
- elsif RUBY_VERSION.start_with?('2')
41
- gem 'capistrano', :require => false
42
- gem 'sucker_punch', '~> 2.0'
43
- gem 'codacy-coverage'
44
- gem 'simplecov'
45
- end
31
+ gem 'capistrano', :require => false
32
+ gem 'simplecov', '<= 0.17.1'
33
+ gem 'sucker_punch', '~> 2.0'
46
34
 
47
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
48
- gem 'rack', '2.1.2'
49
- end
35
+ gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
50
36
 
51
37
  # We need last sinatra that uses rack 2.1.x
52
38
  gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
53
39
 
54
- gem 'database_cleaner'
40
+ gem 'database_cleaner', '~> 1.8.4'
55
41
  gem 'delayed_job', :require => false
56
42
  gem 'generator_spec'
57
- gem 'girl_friday', '>= 0.11.1'
58
- gem 'redis'
43
+ gem 'redis', '<= 3.3.5'
59
44
  gem 'resque'
45
+ gem 'secure_headers', '~> 6.3.2', :require => false
60
46
 
61
47
  unless is_jruby
62
48
  # JRuby doesn't support fork, which is required for this test helper.
63
49
  gem 'rspec-command'
64
50
  end
65
51
 
66
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
67
- gem 'mime-types', '< 3.0'
68
- end
69
-
70
52
  gem 'webmock', :require => false
71
53
 
72
54
  gem 'aws-sdk-sqs'
@@ -2,51 +2,42 @@ require 'rubygems/version'
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- # Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
6
- # new process is created during tests. (Testing rake tasks, for example.)
7
- # This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
8
- # We use the ||= assignment because Travis loads the gemfile twice, the second time
9
- # with the wrong gemfile path.
10
- ENV['CURRENT_GEMFILE'] ||= __FILE__
5
+ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
11
6
 
12
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
13
-
14
- gem 'appraisal'
15
7
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
16
8
  gem 'jruby-openssl', :platform => :jruby
17
9
  gem 'rails', '~> 5.2.3'
18
10
  gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
19
11
 
20
12
  gem 'rspec-core', '~> 3.8.0'
21
- gem 'rspec-rails', '~> 3.8.0'
22
- gem 'rspec-support', '~> 3.8.0'
23
13
  gem 'rspec-expectations', '~> 3.8.0'
24
14
  gem 'rspec-mocks', '~> 3.8.0'
15
+ gem 'rspec-rails', '~> 3.8.0'
16
+ gem 'rspec-support', '~> 3.8.0'
25
17
 
26
18
  gem 'rake'
27
19
 
28
- gem 'sidekiq', '>= 2.13.0'
20
+ gem 'sidekiq', '>= 6.4.0'
29
21
 
30
22
  platforms :rbx do
31
23
  gem 'minitest'
32
24
  gem 'racc'
33
25
  gem 'rubinius-developer_tools'
34
- gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
26
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
35
27
  end
36
28
 
37
29
  gem 'sucker_punch', '~> 2.0'
38
30
 
39
- # We need last sinatra that uses rack 2.x
40
- gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
31
+ # We need last sinatra that uses rack 2.x and ruby 2.5.x
32
+ gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
41
33
 
42
34
  gem 'database_cleaner'
43
- gem 'codacy-coverage'
44
35
  gem 'delayed_job', :require => false
45
36
  gem 'generator_spec'
46
- gem 'girl_friday', '>= 0.11.1'
47
- gem 'redis'
37
+ gem 'redis', '<= 4.8.0'
48
38
  gem 'resque'
49
- gem 'simplecov'
39
+ gem 'secure_headers', '~> 6.3.2', :require => false
40
+ gem 'simplecov', '<= 0.17.1'
50
41
 
51
42
  unless is_jruby
52
43
  # JRuby doesn't support fork, which is required for this test helper.
@@ -1,53 +1,38 @@
1
-
2
1
  require 'rubygems/version'
3
2
 
4
3
  source 'https://rubygems.org'
5
4
 
6
- # Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
7
- # new process is created during tests. (Testing rake tasks, for example.)
8
- # This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
9
- # We use the ||= assignment because Travis loads the gemfile twice, the second time
10
- # with the wrong gemfile path.
11
- ENV['CURRENT_GEMFILE'] ||= __FILE__
12
-
13
- is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
5
+ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
14
6
 
15
- gem 'appraisal'
16
7
  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
17
8
  gem 'jruby-openssl', :platform => :jruby
18
- gem 'rails', '6.0.2.1'
9
+ gem 'rails', '~> 6.0.2'
19
10
  gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
20
11
 
21
- gem 'rspec-core', '~> 3.8.0'
22
- gem 'rspec-support', '~> 3.8.0'
23
- gem 'rspec-expectations', '~> 3.8.0'
24
- gem 'rspec-mocks', '~> 3.8.0'
25
- # TODO: update this when 4.x becomes available on Rubygems
26
- gem 'rspec-rails', :git => 'https://github.com/rspec/rspec-rails', :ref => 'v4.0.0.beta2' # rubocop:disable Bundler/DuplicatedGem
12
+ gem 'rspec-rails', '~> 4.0.2'
27
13
 
28
14
  gem 'rake'
29
15
 
30
- gem 'sidekiq', '>= 2.13.0'
16
+ gem 'sidekiq', '>= 6.4.0'
31
17
 
32
18
  platforms :rbx do
33
19
  gem 'minitest'
34
20
  gem 'racc'
35
21
  gem 'rubinius-developer_tools'
36
- gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
22
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
37
23
  end
38
24
 
39
25
  gem 'sucker_punch', '~> 2.0'
40
26
 
41
- # We need last sinatra that uses rack 2.x
42
- gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
27
+ # We need last sinatra that uses rack 2.x and ruby 2.5.x
28
+ gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
43
29
 
44
30
  gem 'database_cleaner'
45
- gem 'codacy-coverage'
46
- gem 'delayed_job', '4.1.8.beta1', :require => false
31
+ gem 'delayed_job', '4.1.9', :require => false
47
32
  gem 'generator_spec'
48
- gem 'girl_friday', '>= 0.11.1'
49
- gem 'redis'
33
+ gem 'redis', '<= 4.8.0'
50
34
  gem 'resque'
35
+ gem 'secure_headers', '~> 6.3.2', :require => false
51
36
  gem 'simplecov'
52
37
 
53
38
  unless is_jruby
@@ -0,0 +1,52 @@
1
+ require 'rubygems/version'
2
+
3
+ source 'https://rubygems.org'
4
+
5
+ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
6
+
7
+ gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
8
+ gem 'jruby-openssl', :platform => :jruby
9
+ gem 'rails', '~> 6.1.5'
10
+ gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
11
+
12
+ gem 'rspec-rails', '~> 4.0.2'
13
+
14
+ gem 'rake'
15
+
16
+ gem 'sidekiq', '>= 6.4.0'
17
+
18
+ platforms :rbx do
19
+ gem 'minitest'
20
+ gem 'racc'
21
+ gem 'rubinius-developer_tools'
22
+ gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
23
+ end
24
+
25
+ gem 'sucker_punch', '~> 2.0'
26
+
27
+ # We need last sinatra that uses rack 2.x and ruby 2.5.x
28
+ gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
29
+
30
+ gem 'database_cleaner'
31
+ gem 'delayed_job', '4.1.9', :require => false
32
+ gem 'generator_spec'
33
+ gem 'redis', '<= 4.8.0'
34
+ gem 'resque'
35
+ gem 'secure_headers', '~> 6.3.2', :require => false
36
+ gem 'simplecov'
37
+
38
+ unless is_jruby
39
+ # JRuby doesn't support fork, which is required for this test helper.
40
+ gem 'rspec-command'
41
+ end
42
+
43
+ gem 'mime-types'
44
+
45
+ gem 'webmock', :require => false
46
+
47
+ gem 'aws-sdk-sqs'
48
+ gem 'shoryuken'
49
+
50
+ gem 'capistrano', :require => false
51
+
52
+ gemspec :path => '../'