rollbar 3.2.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 425ed5a051e9393cad69cf84b7d074daf3f2d07a57b28e64946f04254bb60cbe
-  data.tar.gz: bcf8046e12ccff28c5dab1e32c40cf5d5fee74a7b02602bc4a4735ff21306480
+  metadata.gz: 898aba48030cbc9188c24d90690293f5059d06d21ea0761554f48b9ceb807874
+  data.tar.gz: 37c571e1b393777a03d11079c443a01b561391652b6a7e5fb1ed6064f0a69754
 SHA512:
-  metadata.gz: 64480f75431290bd39ba433f6c692ec86c0a727c8f3d4a95998b129786c5d368463e18d0f62ba3b4425a0fd468d612e67be1df0655bd1f72cc3615efeec84ed6
-  data.tar.gz: 8dfc0039125069aea04cb466a8de1674ffa16d9325d5fc54c3daea5265d62a2dbb29d227f9d48599c6233152b90ff60f4e015a5dd8a805c31c51222c96fcf3bc
+  metadata.gz: 92de62decca92c82e7db0f1c0d4ef525141e0e9e64418fa465a671c5571206312dcd5ed675b7c1e6a9c40cf714c684eabdfdd5648efd30d39ea0f9c073206dbb
+  data.tar.gz: cd5d1bd81a5514686ad7ae72cc2c1aca30a09580fb57dbbb518ec37353ad94a8719594b6fd53d1620bd742fab6e96772a3cd8106d98510f3fed249de838f5c01

data/.github/pull_request_template.md

@@ -1,14 +1,23 @@
 ## Description of the change
 
-> Description here
+> Please include a summary of the change and which issues are fixed.
+> Please also include relevant motivation and context.
+
 ## Type of change
+
 - [ ] Bug fix (non-breaking change that fixes an issue)
 - [ ] New feature (non-breaking change that adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Maintenance
+- [ ] New release
 
 ## Related issues
 
-> Fix [#1]() 
+> Shortcut stories and GitHub issues (delete irrelevant)
+
+- Fix [SC-]
+- Fix #1
+
 ## Checklists
 
 ### Development
@@ -17,9 +26,9 @@
 - [ ] The code changed/added as part of this pull request has been covered with tests
 - [ ] All tests related to the changed code pass in development
 
-### Code review 
+### Code review
 
-- [ ]  This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
-- [ ] "Ready for review" label attached to the PR and reviewers mentioned in a comment
+- [ ] This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
+- [ ] "Ready for review" label attached to the PR and reviewers assigned
+- [ ] Issue from task tracker has a link to this pull request
 - [ ] Changes have been reviewed by at least one other engineer
-- [ ] Issue from task tracker has a link to this pull request 

data/.github/workflows/ci.yml

@@ -11,42 +11,26 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        ruby-version: [2.2.10, 2.3.0, 2.3.8, 2.4.5, 2.5.3, 2.6.0, 2.6.6, 2.7.2]
+        ruby-version: [2.5.3, 2.6.0, 2.6.6, 2.7.2]
         gemfile:
-          - gemfiles/rails42.gemfile
           - gemfiles/rails50.gemfile
           - gemfiles/rails51.gemfile
           - gemfiles/rails52.gemfile
           - gemfiles/rails60.gemfile
           - gemfiles/rails61.gemfile
-        exclude:
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.7.2
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.6.0
+        include:
+          - gemfile: gemfiles/rails70.gemfile
+            ruby-version: 3.1.1
+          - gemfile: gemfiles/rails70.gemfile
+            ruby-version: 3.0.3
+          - gemfile: gemfiles/rails61.gemfile
+            ruby-version: 3.0.3
           - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.6.6
+            ruby-version: 2.4.5
           - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.7.2
-          - gemfile: gemfiles/rails52.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails60.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails60.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails60.gemfile
             ruby-version: 2.3.8
-          - gemfile: gemfiles/rails60.gemfile
-            ruby-version: 2.4.5
-          - gemfile: gemfiles/rails61.gemfile
+          - gemfile: gemfiles/rails42.gemfile
             ruby-version: 2.2.10
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 2.3.8
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 2.4.5
-        include:
           - gemfile: gemfiles/rails41.gemfile
             ruby-version: 2.3.0
           - gemfile: gemfiles/rails41.gemfile
@@ -67,8 +51,6 @@ jobs:
             ruby-version: 2.0.0
           - gemfile: gemfiles/rails30.gemfile
             ruby-version: 2.0.0
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 3.0.0
 
     steps:
       - uses: actions/checkout@v2
@@ -115,4 +97,8 @@ jobs:
           bundle install --jobs 4 --retry 3
 
       - name: Rspec
-        run: bundle exec rspec
+        run: |
+          export BUNDLE_GEMFILE=${{ matrix.gemfile }}
+          bundle config path vendor/bundle
+          bundle config gemfile ${{ matrix.gemfile }}
+          bundle exec rspec

data/.rubocop.yml

@@ -4,51 +4,40 @@ AllCops:
   Exclude:
     - 'vendor/**/*'
     - 'gemfiles/vendor/**/*'
+    - 'spec/dummyapp/**/*'
+    - 'spec/tmp/**/*'
+  TargetRubyVersion: 2.5 # This is the minimum allowed for current rubocop
 
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-  SupportedStyles:
-    - hash_rockets
-
-Style/SymbolArray:
-  Enabled: false # %i[] syntax isn't 1.9.x compatible
-
-Metrics/LineLength:
-  Max: 1000
-
-Metrics/MethodLength:
-  Max: 15 # Relax slightly from the default of 10
+Gemspec/RequiredRubyVersion:
+  Enabled: false # rubocop compares to gemspec, yet won't allow 1.9 as minimum version
 
-Style/DoubleNegation:
+Layout/HeredocIndentation:
+  # When enabled, forces either squiggly syntax (not available until 2.3),
+  # or external packages that we don't want as dependencies.
   Enabled: false
 
-Style/Lambda:
+Layout/LineLength:
+  Max: 90
+
+Lint/ConstantDefinitionInBlock:
+  # We routinely update existing class definitions in conditional blocks.
   Enabled: false
 
-Style/EachWithObject:
+Lint/SendWithMixinArgument:
+  # Object#include is still a private method in Ruby 2.0.
   Enabled: false
 
 Metrics/BlockLength:
-  ExcludedMethods: ['describe', 'context'] # RSpec DSL is expected to have long blocks.
-
-Style/ExpandPathArguments:
-  Enabled: false # syntax requires Ruby >= 2.0
+  # RSpec DSL is expected to have long blocks.
+  IgnoredMethods: ['describe', 'context', 'it', 'shared_examples']
 
-Gemspec/RequiredRubyVersion:
-  Enabled: false # rubocop compares to gemspec, yet won't allow 1.9 as minimum version
-
-Style/Encoding:
-  Enabled: false # Ruby 1.9.3 needs these magic comments, e.g. # encoding: UTF-8
-
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    # rubocop switched from () to [] at some past version.
-    # Make sure we are consistent across all bundles/builds.
-    default: '[]'
+Metrics/MethodLength:
+  Max: 15 # Relax slightly from the default of 10
 
-Style/Documentation:
-  # We can enabled this if/when we want to start doing consistent class documentation.
-  # As is, we currently add :nodoc: if anything at all.
+Metrics/ParameterLists:
+  # We currently don't have limits on the number of method arguments, except as
+  # they contribute to the complexity metric. If method complexity is in bounds,
+  # we allow any number of arguments.
   Enabled: false
 
 Naming/MethodParameterName:
@@ -57,6 +46,9 @@ Naming/MethodParameterName:
   # like `db` and `io`. So, short names really can be useful.
   Enabled: false
 
+Style/BracesAroundHashParameters:
+  EnforcedStyle: braces
+
 Style/CaseEquality:
   # The code uses `===` a lot to compare a regex to a string, but it's not clear that
   # switching to `=~` is always safe, because in some cases the value could be a regex
@@ -64,15 +56,73 @@ Style/CaseEquality:
   # review and test each of these.
   Enabled: false
 
+Style/Documentation:
+  # We can enabled this if/when we want to start doing consistent class documentation.
+  # As is, we currently add :nodoc: if anything at all.
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/EachWithObject:
+  Enabled: false
+
+Style/Encoding:
+  Enabled: false # Ruby 1.9.3 needs these magic comments, e.g. # encoding: UTF-8
+
+Style/ExpandPathArguments:
+  Enabled: false # syntax requires Ruby >= 2.0
+
 Style/FrozenStringLiteralComment:
   # If we do this, it will be in its own PR. It requires adding these magic comments
   # throughout the project, in order to prepare for a future Ruby 3.x.
   Enabled: false
 
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+  SupportedStyles:
+    - hash_rockets
+
+Style/HashTransformKeys:
+  # Hash#transform_keys isn't available until Ruby 2.5
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false
+
+Style/NumericPredicate:
+  # Numbers used in comparison expressions are often more readable and consistent
+  # than using predicate methods. e.g.
+  #   major > 0 && minor > 8
+  # is more readable than
+  #   major.positive? && minor > 8
+  Enabled: false
+
+Style/OptionalBooleanParameter:
+  # We don't yet generally use keyword arguments. Ruby < 2.1 doesn't support
+  # required kayword arguments. And satifying this rule would change the calling
+  # convention only for these specific optional boolean arguments.
+  # This rule should be enabled when the project is updated to use keyword
+  # arguments in general.
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    # rubocop switched from () to [] at some past version.
+    # Make sure we are consistent across all bundles/builds.
+    default: '[]'
+
+Style/RedundantBegin:
+  # Ruby < 2.5 needs begin/end inside blocks when using rescue
+  Enabled: false
+
 Style/SafeNavigation:
   # Not available in Ruby < 2.3.
   Enabled: false
 
+Style/SymbolArray:
+  Enabled: false # %i[] syntax isn't 1.9.x compatible
+
 #
 # Performance cops are opt in, and `Enabled: true` is always required.
 # Full list is here: https://github.com/rubocop-hq/rubocop-performance/tree/master/lib/rubocop/cop/performance

data/Gemfile

@@ -1,4 +1,6 @@
-# This file was generated by Appraisal
+# This Gemfile is compatible with Ruby 2.5.0 or greater. To test with
+# earlier Rubies, use the appropriate Gemfile from the ./gemfiles/ dir.
+ruby '>= 2.5.0'
 
 source 'https://rubygems.org'
 
@@ -11,7 +13,7 @@ ENV['CURRENT_GEMFILE'] ||= __FILE__
 
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
 
-GEMFILE_RAILS_VERSION = '~> 6.1.3'.freeze
+GEMFILE_RAILS_VERSION = '~> 6.1.5'.freeze
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'appraisal'
 gem 'jruby-openssl', :platform => :jruby
@@ -20,30 +22,25 @@ gem 'rake'
 if GEMFILE_RAILS_VERSION < '6.0'
   gem 'rspec-rails', '~> 3.4'
 else
-  gem 'rspec-rails', '~> 4.0.2' # rubocop:disable Bundler/DuplicatedGem
+  gem 'rspec-rails', '~> 4.0.2'
 end
 
 if GEMFILE_RAILS_VERSION < '6.0'
   gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 else
-  gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw] # rubocop:disable Bundler/DuplicatedGem
+  gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
 end
 
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0' # rubocop:disable Bundler/DuplicatedGem
-end
+gem 'sidekiq', '>= 6.4.0'
 
 platforms :rbx do
   gem 'minitest'
   gem 'racc'
   gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2') # rubysl doesn't yet support Ruby 3.x
+  gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
 end
 
 gem 'capistrano', :require => false
-gem 'codacy-coverage'
 gem 'shoryuken'
 gem 'simplecov'
 gem 'sucker_punch', '~> 2.0'
@@ -58,21 +55,20 @@ gem 'aws-sdk-sqs'
 if GEMFILE_RAILS_VERSION >= '5.2'
   gem 'database_cleaner'
 elsif GEMFILE_RAILS_VERSION.between?('5.0', '5.2')
-  gem 'database_cleaner', '~> 1.8.4' # rubocop:disable Bundler/DuplicatedGem
+  gem 'database_cleaner', '~> 1.8.4'
 elsif GEMFILE_RAILS_VERSION < '5.0'
-  gem 'database_cleaner', '~> 1.0.0' # rubocop:disable Bundler/DuplicatedGem
+  gem 'database_cleaner', '~> 1.0.0'
 end
 
 if GEMFILE_RAILS_VERSION < '6.0'
   gem 'delayed_job', :require => false
 else
-  gem 'delayed_job', '~> 4.1', :require => false # rubocop:disable Bundler/DuplicatedGem
+  gem 'delayed_job', '~> 4.1', :require => false
 end
 gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
 gem 'redis'
 gem 'resque', '< 2.0.0'
-gem 'rubocop', '~> 0.93.0', :require => false
+gem 'rubocop', '1.15.0', :require => false # pin specific version, update manually
 gem 'rubocop-performance', :require => false
 gem 'secure_headers', '~> 6.3.2', :require => false
 gem 'sinatra'

data/gemfiles/rails30.gemfile

@@ -2,18 +2,16 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
-
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-gem 'jruby-openssl', :platform => :jruby
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'rails', '~> 3.0.20'
 gem 'hitimes', '< 1.2.2'
+gem 'jruby-openssl', :platform => :jruby
 gem 'mixlib-shellout', '<= 2.0.0'
 gem 'net-ssh', '<= 3.1.1'
 gem 'public_suffix', '<= 2.0.5'
+gem 'rails', '~> 3.0.20'
 gem 'rake', '< 11'
 gem 'rspec-rails', '>= 2.14.0'
+gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
 if RUBY_VERSION < '2.2.2'
   gem 'sidekiq', '~> 2.13.0'
@@ -31,23 +29,22 @@ end
 
 gem 'capistrano', :require => false
 gem 'rexml', '<= 3.2.4'
-gem 'sucker_punch', '~> 2.0'
 gem 'shoryuken'
-gem 'codacy-coverage'
 gem 'simplecov', '<= 0.17.1'
+gem 'sucker_punch', '~> 2.0'
 
-gem 'sinatra'
-gem 'delayed_job', :require => false
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
 gem 'database_cleaner', '~> 1.0.0'
+gem 'delayed_job', :require => false
 gem 'genspec', '>= 0.2.8'
 gem 'girl_friday', '>= 0.11.1'
+gem 'redis', '<= 3.3.5'
+gem 'redis-namespace', '<= 1.5.0'
 gem 'rspec-command'
+gem 'sinatra'
 
 gem 'webmock', :require => false
 
-gem 'resque', '< 2.0.0'
 gem 'aws-sdk-sqs'
+gem 'resque', '< 2.0.0'
 
 gemspec :path => '../'

data/gemfiles/rails31.gemfile

@@ -2,17 +2,15 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
-
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-gem 'jruby-openssl', :platform => :jruby
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+gem 'jruby-openssl', :platform => :jruby
 gem 'mixlib-shellout', '<= 2.0.0'
 gem 'net-ssh', '<= 3.1.1'
 gem 'public_suffix', '<= 2.0.5'
 gem 'rails', '~> 3.1.12'
-gem 'rspec-rails', '~> 3.4'
 gem 'rake', '< 11'
+gem 'rspec-rails', '~> 3.4'
+gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
 if RUBY_VERSION < '2.2.2'
   gem 'sidekiq', '~> 2.13.0'
@@ -30,24 +28,23 @@ end
 
 gem 'capistrano', :require => false
 gem 'rexml', '<= 3.2.4'
-gem 'sucker_punch'
 gem 'shoryuken'
-gem 'codacy-coverage'
 gem 'simplecov', '<= 0.17.1'
+gem 'sucker_punch'
 
-gem 'sinatra'
+gem 'database_cleaner'
 gem 'delayed_job', :require => false
+gem 'generator_spec'
+gem 'girl_friday'
 gem 'rack-cache', '<= 1.9.0'
 gem 'redis', '<= 3.3.5'
 gem 'redis-namespace', '<= 1.5.0'
-gem 'database_cleaner'
-gem 'girl_friday'
-gem 'generator_spec'
 gem 'rspec-command'
+gem 'sinatra'
 
 gem 'webmock', :require => false
 
-gem 'resque', '< 2.0.0'
 gem 'aws-sdk-sqs'
+gem 'resque', '< 2.0.0'
 
 gemspec :path => '../'

data/gemfiles/rails32.gemfile

@@ -2,8 +2,6 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
-
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
 gem 'mixlib-shellout', '<= 2.0.0'
@@ -32,10 +30,9 @@ end
 
 gem 'capistrano', :require => false
 gem 'rexml', '<= 3.2.4'
-gem 'sucker_punch', '~> 2.0'
 gem 'shoryuken'
-gem 'codacy-coverage'
 gem 'simplecov', '<= 0.17.1'
+gem 'sucker_punch', '~> 2.0'
 
 gem 'delayed_job', :require => false
 gem 'redis', '<= 3.3.5'
@@ -49,7 +46,7 @@ gem 'rspec-command'
 
 gem 'webmock', :require => false
 
-gem 'resque', '< 2.0.0'
 gem 'aws-sdk-sqs'
+gem 'resque', '< 2.0.0'
 
 gemspec :path => '../'

data/gemfiles/rails40.gemfile

@@ -2,8 +2,6 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
-
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
 gem 'mixlib-shellout', '<= 2.0.0'
@@ -31,11 +29,10 @@ platforms :rbx do
 end
 
 gem 'capistrano', :require => false
-gem 'sucker_punch', '~> 2.0'
 gem 'json', '~> 2.0'
 gem 'shoryuken'
-gem 'codacy-coverage'
 gem 'simplecov', '<= 0.17.1'
+gem 'sucker_punch', '~> 2.0'
 
 gem 'delayed_job', :require => false
 gem 'redis', '<= 3.3.5'

data/gemfiles/rails41.gemfile

@@ -2,8 +2,6 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
-
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
 gem 'mixlib-shellout', '<= 2.0.0'
@@ -28,10 +26,9 @@ platforms :rbx do
 end
 
 gem 'capistrano', :require => false
-gem 'sucker_punch', '~> 2.0'
 gem 'shoryuken'
-gem 'codacy-coverage'
 gem 'simplecov', '<= 0.17.1'
+gem 'sucker_punch', '~> 2.0'
 
 gem 'delayed_job', :require => false
 gem 'redis', '<= 3.3.5'
@@ -46,7 +43,6 @@ gem 'rspec-command'
 
 gem 'webmock', :require => false
 
-gem 'resque'
 gem 'aws-sdk-sqs'
 
 gemspec :path => '../'

data/gemfiles/rails42.gemfile

@@ -2,9 +2,6 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
-is_not_jruby = !is_jruby
-
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
 gem 'net-ssh', '<= 3.1.1'
@@ -21,9 +18,7 @@ platforms :rbx do
   gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
 end
 
-if RUBY_VERSION < '2.0.0'
-  gem 'json', '1.8.6'
-end
+gem 'json', '1.8.6' if RUBY_VERSION < '2.0.0'
 
 if RUBY_VERSION < '2.2.2'
   gem 'sidekiq', '~> 2.13.0'
@@ -38,17 +33,16 @@ gem 'database_cleaner', '~> 1.0.0'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
-gem 'rspec-command'
 gem 'redis', '<= 3.3.5'
 gem 'resque'
+gem 'rspec-command'
 gem 'sinatra'
 
 gem 'nokogiri', '~> 1.6.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.0')
 
+gem 'simplecov', '<= 0.17.1'
 gem 'sucker_punch', '~> 2.0'
 gem 'webmock', :require => false
-gem 'codacy-coverage'
-gem 'simplecov', '<= 0.17.1'
 
 gem 'aws-sdk-sqs'
 

data/gemfiles/rails50.gemfile

@@ -2,7 +2,7 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
 
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
@@ -12,10 +12,10 @@ gem 'rails', '~> 5.0.7'
 gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
 gem 'rspec-core', '~> 3.5.0.beta3'
-gem 'rspec-rails', '~> 3.5.0.beta3'
-gem 'rspec-support', '~> 3.5.0.beta3'
 gem 'rspec-expectations', '~> 3.5.0.beta3'
 gem 'rspec-mocks', '~> 3.5.0.beta3'
+gem 'rspec-rails', '~> 3.5.0.beta3'
+gem 'rspec-support', '~> 3.5.0.beta3'
 
 gem 'rake'
 
@@ -25,27 +25,23 @@ platforms :rbx do
   gem 'minitest'
   gem 'racc'
   gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2') # rubysl doesn't yet support Ruby 3.x
+  gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
 end
 
 gem 'capistrano', :require => false
-gem 'sucker_punch', '~> 2.0'
-gem 'codacy-coverage'
 gem 'simplecov', '<= 0.17.1'
+gem 'sucker_punch', '~> 2.0'
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
-  gem 'rack', '2.1.2'
-end
+gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
 
 # We need last sinatra that uses rack 2.1.x
-gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
 gem 'database_cleaner', '~> 1.8.4'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
 gem 'redis', '<= 3.3.5'
 gem 'resque'
 gem 'secure_headers', '~> 6.3.2', :require => false
+gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
 
 unless is_jruby
   # JRuby doesn't support fork, which is required for this test helper.