Fix rubocop offenses across the codebase

Author: sferik

.rubocop.yml

@@ -19,24 +19,11 @@ AllCops:
   TargetRubyVersion: 2.7
   NewCops: enable
 
-Bundler/OrderedGems:
-  Description: Gems should be alphabetically sorted within groups.
-  Enabled: false
-
 Layout/AccessModifierIndentation:
   Description: Modifiers should be indented as deep as method definitions,
     or as deep as the class/module keyword, depending on configuration.
   EnforcedStyle: outdent
 
-# Open for revision would like table style but the impact
-# would probably be huge
-Layout/HashAlignment:
-  Enabled: false
-
-Layout/HeredocIndentation:
-  Description: Checks the indentation of the here document bodies.
-  Enabled: false
-
 Layout/LineLength:
   Description: Checks the length of lines in the source code.
   AllowURI: true
@@ -72,10 +59,6 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Max: 300
 
-Style/Next:
-  Description: Prefer `if` guards over `next` inside loops for readability.
-  Enabled: false
-
 Metrics/ModuleLength:
   Description: Avoid modules longer than 100 lines of code.
   Max: 300
@@ -138,22 +121,6 @@ Style/CollectionMethods:
     find: "detect"
     find_all: "select"
 
-Style/Documentation:
-  Description: Checks for missing top-level documentation of classes and modules.
-  Enabled: false
-
-Style/DoubleNegation:
-  Description: Checks for uses of double negation (!!).
-  StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-bang-bang
-  Enabled: false
-
-Style/EnvHome:
-  Enabled: false
-
-Style/ExplicitBlockArgument:
-  # capturing as a proc has a performance hit, so is a case by case choice
-  Enabled: false
-
 Style/FrozenStringLiteralComment:
   Description:
     Add the frozen_string_literal comment to the top of files to help transition
@@ -162,19 +129,10 @@ Style/FrozenStringLiteralComment:
   Exclude:
     - "spec/fixtures/**/*"
 
-Style/GuardClause:
-  Description: Use a guard clause instead of wrapping the code inside a conditional expression.
-  Enabled: false
-
 Style/HashSyntax:
   Description: Checks hash literal syntax.
   EnforcedStyle: ruby19
 
-Style/RegexpLiteral:
-  Description: Use / or %r around regular expressions.
-  StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#percent-r
-  Enabled: false
-
 Style/SpecialGlobalVars:
   Description: Looks for uses of Perl-style global variables.
   Exclude:

Gemfile

@@ -3,12 +3,12 @@
 source "https://rubygems.org"
 
 group :development do
-  gem "nokogiri"
-  gem "cuprite"
   gem "aruba", ">= 2.0"
   gem "capybara"
-  gem "rackup"
   gem "cucumber"
+  gem "cuprite"
+  gem "nokogiri"
+  gem "rackup"
   gem "rake"
   gem "rspec"
   if RUBY_VERSION > "3.2"

benchmarks/result.rb

@@ -9,6 +9,7 @@
 require_relative "../test_projects/faked_project/lib/faked_project"
 result = Coverage.result
 
+# Minimal formatter used by the benchmark to exercise SimpleCov::Result.
 class MyFormatter
   def format(result)
     result.files.map do |file|

features/step_definitions/html_steps.rb

@@ -86,7 +86,7 @@
   expect(count).to eq(expected_count.to_i)
 end
 
-Then /^I should see a (.+) coverage summary of (\d+)\/(\d+)( for the file)?$/ do |coverage_type, hit, total, for_file|
+Then %r{^I should see a (.+) coverage summary of (\d+)/(\d+)( for the file)?$} do |coverage_type, hit, total, for_file|
   missed = total - hit
 
   if for_file
@@ -116,7 +116,7 @@
     end
   end
 
-  expect(summary_text).to match(/#{hit}\/#{total}.*#{missed}|#{total} .+ #{hit} .+ #{missed}/)
+  expect(summary_text).to match(%r{#{hit}/#{total}.*#{missed}|#{total} .+ #{hit} .+ #{missed}})
 end
 
 When /^I open the detailed view for "(.+)"$/ do |file_path|

features/step_definitions/simplecov_steps.rb

@@ -8,7 +8,7 @@
     case framework
     when /RSpec/i
       "spec"
-    when /Test\/Unit/i
+    when %r{Test/Unit}i
       "test"
     when /Cucumber/i
       "features/support"

features/step_definitions/web_steps.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+# Cucumber world helpers for scoping Capybara assertions to a selector.
 module WithinHelpers
-  def with_scope(locator)
-    locator ? within(locator) { yield } : yield
+  def with_scope(locator, &block)
+    locator ? within(locator, &block) : yield
   end
 end
 World(WithinHelpers)
@@ -40,7 +41,7 @@ def with_scope(locator)
   end
 end
 
-Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+Then %r{^(?:|I )should see /([^/]*)/(?: within "([^"]*)")?$} do |regexp, selector|
   regexp = Regexp.new(regexp)
   with_scope(selector) do
     expect(page).to have_xpath("//*", text: regexp)
@@ -53,7 +54,7 @@ def with_scope(locator)
   end
 end
 
-Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+Then %r{^(?:|I )should not see /([^/]*)/(?: within "([^"]*)")?$} do |regexp, selector|
   regexp = Regexp.new(regexp)
   with_scope(selector) do
     expect(page).to have_no_xpath("//*", text: regexp)

lib/minitest/simplecov_plugin.rb

@@ -4,12 +4,12 @@
 # https://github.com/seattlerb/minitest#writing-extensions
 module Minitest
   def self.plugin_simplecov_init(_options)
-    if defined?(SimpleCov)
-      SimpleCov.external_at_exit = true
+    return unless defined?(SimpleCov)
 
-      Minitest.after_run do
-        SimpleCov.at_exit_behavior
-      end
+    SimpleCov.external_at_exit = true
+
+    Minitest.after_run do
+      SimpleCov.at_exit_behavior
     end
   end
 end

lib/simplecov.rb

@@ -248,10 +248,10 @@ def process_results_and_report_error
       exit_status = process_result(result)
 
       # Force exit with stored status (see github issue #5)
-      if exit_status.positive?
-        warn("SimpleCov failed with exit #{exit_status} due to a coverage related error") if print_error_status
-        Kernel.exit exit_status
-      end
+      return unless exit_status.positive?
+
+      warn("SimpleCov failed with exit #{exit_status} due to a coverage related error") if print_error_status
+      Kernel.exit exit_status
     end
 
     # @api private

lib/simplecov/command_guesser.rb

@@ -29,13 +29,13 @@ def parallel_data
       end
 
       COMMAND_LINE_FRAMEWORKS = {
-        %r{test/functional/}            => "Functional Tests",
-        %r{test/\{.*functional.*\}/}    => "Functional Tests",
-        %r{test/integration/}           => "Integration Tests",
-        %r{test/}                       => "Unit Tests",
-        /spec/                          => "RSpec",
-        /cucumber/                      => "Cucumber Features",
-        /features/                      => "Cucumber Features"
+        %r{test/functional/} => "Functional Tests",
+        %r{test/\{.*functional.*\}/} => "Functional Tests",
+        %r{test/integration/} => "Integration Tests",
+        %r{test/} => "Unit Tests",
+        /spec/ => "RSpec",
+        /cucumber/ => "Cucumber Features",
+        /features/ => "Cucumber Features"
       }.freeze
       private_constant :COMMAND_LINE_FRAMEWORKS
 

lib/simplecov/configuration.rb

@@ -518,19 +518,15 @@ def enable_coverage_for_eval
 
     def raise_if_criterion_disabled(criterion)
       raise_if_criterion_unsupported(criterion)
-      # rubocop:disable Style/IfUnlessModifier
-      unless coverage_criterion_enabled?(criterion)
-        raise "Coverage criterion #{criterion}, is disabled! Please enable it first through enable_coverage #{criterion} (if supported)"
-      end
-      # rubocop:enable Style/IfUnlessModifier
+      return if coverage_criterion_enabled?(criterion)
+
+      raise "Coverage criterion #{criterion}, is disabled! Please enable it first through enable_coverage #{criterion} (if supported)"
     end
 
     def raise_if_criterion_unsupported(criterion)
-      # rubocop:disable Style/IfUnlessModifier
-      unless SUPPORTED_COVERAGE_CRITERIA.member?(criterion)
-        raise "Unsupported coverage criterion #{criterion}, supported values are #{SUPPORTED_COVERAGE_CRITERIA}"
-      end
-      # rubocop:enable Style/IfUnlessModifier
+      return if SUPPORTED_COVERAGE_CRITERIA.member?(criterion)
+
+      raise "Unsupported coverage criterion #{criterion}, supported values are #{SUPPORTED_COVERAGE_CRITERIA}"
     end
 
     def minimum_possible_coverage_exceeded(coverage_option)
@@ -563,11 +559,9 @@ def restore_ivars(block_context, saved)
     def parse_filter(filter_argument = nil, &filter_proc)
       filter = filter_argument || filter_proc
 
-      if filter
-        SimpleCov::Filter.build_filter(filter)
-      else
-        raise ArgumentError, "Please specify either a filter or a block to filter with"
-      end
+      raise ArgumentError, "Please specify either a filter or a block to filter with" unless filter
+
+      SimpleCov::Filter.build_filter(filter)
     end
   end
 end