Merge branch 'master' into amomchilov-patch-1

.circleci/config.yml

@@ -46,29 +46,6 @@ rubocop_steps: &rubocop_steps
 
 jobs:
 
-  # Ruby 2.4
-  ruby-2.4-spec:
-    docker:
-      - image: circleci/ruby:2.4
-    environment:
-      <<: *common_env
-    steps:
-      *spec_steps
-  ruby-2.4-ascii_spec:
-    docker:
-      - image: circleci/ruby:2.4
-    environment:
-      <<: *common_env
-    steps:
-      *ascii_spec_steps
-  ruby-2.4-rubocop:
-    docker:
-      - image: circleci/ruby:2.4
-    environment:
-      <<: *common_env
-    steps:
-      *rubocop_steps
-
   # Ruby 2.5
   ruby-2.5-spec:
     docker:
@@ -242,7 +219,7 @@ jobs:
       - run:
           name: Upload coverage results to Code Climate
           command: |
-            ./tmp/cc-test-reporter sum-coverage tmp/codeclimate.*.json --parts 6 --output tmp/codeclimate.total.json
+            ./tmp/cc-test-reporter sum-coverage tmp/codeclimate.*.json --parts 5 --output tmp/codeclimate.total.json
             ./tmp/cc-test-reporter upload-coverage --input tmp/codeclimate.total.json
 
   # Miscellaneous tasks
@@ -264,11 +241,6 @@ workflows:
     jobs:
       - documentation-checks
       - cc-setup
-      - ruby-2.4-spec:
-          requires:
-            - cc-setup
-      - ruby-2.4-ascii_spec
-      - ruby-2.4-rubocop
       - ruby-2.5-spec:
           requires:
             - cc-setup
@@ -302,7 +274,6 @@ workflows:
 
       - cc-upload-coverage:
           requires:
-            - ruby-2.4-spec
             - ruby-2.5-spec
             - ruby-2.6-spec
             - ruby-2.7-spec

.github/ISSUE_TEMPLATE/bug_report.md

@@ -38,7 +38,7 @@ output by `rubocop -V`, include them as well. Here's an example:
 
 ```
 $ [bundle exec] rubocop -V
-1.12.0 (using Parser 2.7.2.0, rubocop-ast 1.1.1, running on ruby 2.7.2 x86_64-linux)
+1.17.0 (using Parser 2.7.2.0, rubocop-ast 1.1.1, running on ruby 2.7.2 x86_64-linux)
   - rubocop-performance 1.9.1
   - rubocop-rspec 2.0.0
 ```

.github/workflows/rubocop.yml

@@ -21,7 +21,7 @@ jobs:
       matrix:
         # [ ubuntu, macos, windows ]
         os: [ windows ]
-        ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0', 'head' ]
+        ruby: [ '2.5', '2.6', '2.7', '3.0', 'head' ]
         include:
           - { os: windows, ruby: mingw }
         exclude:

.mergify.yml

@@ -8,7 +8,6 @@ pull_request_rules:
       - label=auto-merge
       - "#review-requested=0"
       - "#changes-requested-reviews-by=0"
-      - "status-success=windows 2.4"
       - "status-success=windows 2.5"
       - "status-success=windows 2.6"
       - "status-success=windows 2.7"
@@ -20,9 +19,6 @@ pull_request_rules:
       - "status-success=ci/circleci: jruby-9.2-ascii_spec"
       - "status-success=ci/circleci: jruby-9.2-rubocop"
       - "status-success=ci/circleci: jruby-9.2-spec"
-      - "status-success=ci/circleci: ruby-2.4-ascii_spec"
-      - "status-success=ci/circleci: ruby-2.4-rubocop"
-      - "status-success=ci/circleci: ruby-2.4-spec"
       - "status-success=ci/circleci: ruby-2.5-ascii_spec"
       - "status-success=ci/circleci: ruby-2.5-rubocop"
       - "status-success=ci/circleci: ruby-2.5-spec"

.rubocop.yml

@@ -14,7 +14,7 @@ AllCops:
     - 'tmp/**/*'
     - '.git/**/*'
     - 'bin/*'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   SuggestExtensions: false
 
 Naming/PredicateName:
@@ -46,19 +46,9 @@ Layout/EndOfLine:
 
 Layout/ClassStructure:
   Enabled: true
-  Categories:
-    module_inclusion:
-      - include
-      - prepend
-      - extend
-  ExpectedOrder:
-      - module_inclusion
-      - constants
-      - public_class_methods
-      - initializer
-      - instance_methods
-      - protected_methods
-      - private_methods
+
+Layout/RedundantLineBreak:
+  Enabled: true
 
 Layout/TrailingWhitespace:
   AllowInHeredoc: false
@@ -129,6 +119,12 @@ Performance/CollectionLiteralInLoop:
     - 'Rakefile'
     - 'spec/**/*.rb'
 
+Performance/EndWith:
+  SafeMultiline: false
+
+Performance/StartWith:
+  SafeMultiline: false
+
 RSpec/StubbedMock:
   Enabled: false
 

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-02-14 15:55:26 UTC using RuboCop version 1.9.1.
+# on 2021-04-05 09:42:51 UTC using RuboCop version 1.12.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -10,20 +10,20 @@
 InternalAffairs/NodeDestructuring:
   Enabled: false
 
-# Offense count: 57
+# Offense count: 49
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 187
+  Max: 186
 
-# Offense count: 254
+# Offense count: 228
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Max: 14
 
 # Offense count: 5
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 135
+  Max: 129
 
 # Offense count: 10
 RSpec/AnyInstance:
@@ -33,13 +33,13 @@ RSpec/AnyInstance:
     - 'spec/rubocop/cop/team_spec.rb'
     - 'spec/rubocop/target_finder_spec.rb'
 
-# Offense count: 1119
+# Offense count: 1147
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 5579
+# Offense count: 5619
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Enabled: false
@@ -58,7 +58,7 @@ RSpec/ExpectOutput:
     - 'spec/rubocop/result_cache_spec.rb'
     - 'spec/rubocop/target_finder_spec.rb'
 
-# Offense count: 365
+# Offense count: 370
 RSpec/MultipleExpectations:
   Max: 25