Enable Layout/LineLength and break long lines at logical seams

sferik · sferik · commit 65f16878a896 · 2026-05-05T13:35:16.000-07:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -25,9 +25,7 @@ Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
 Layout/LineLength:
-  Description: Checks the length of lines in the source code.
   AllowURI: true
-  Enabled: false
 
 Layout/SpaceInsideHashLiteralBraces:
   Description: Use spaces inside hash literal braces - or don't.
diff --git a/features/step_definitions/html_steps.rb b/features/step_definitions/html_steps.rb
@@ -56,7 +56,8 @@
     coverage_data
   end
 
-  expect(files.sort_by { |coverage_data| coverage_data["name"] }).to eq(expected_files.sort_by { |coverage_data| coverage_data["name"] })
+  by_name = ->(coverage_data) { coverage_data["name"] }
+  expect(files.sort_by(&by_name)).to eq(expected_files.sort_by(&by_name))
 end
 
 Then /^there should be (\d+) skipped lines in the source files$/ do |expected_count|
@@ -91,7 +92,12 @@
 
   if for_file
     # File detail view: check the summary in the dialog (new) or source_table (old)
-    selector = page.has_css?("#source-dialog[open]", wait: 0) ? "#source-dialog .t-#{coverage_type}-summary" : ".source_table .t-#{coverage_type}-summary"
+    selector =
+      if page.has_css?("#source-dialog[open]", wait: 0)
+        "#source-dialog .t-#{coverage_type}-summary"
+      else
+        ".source_table .t-#{coverage_type}-summary"
+      end
     summary_text = find(selector, visible: false).text
   else
     # Try new format: sum data attributes from file rows
diff --git a/lib/simplecov.rb b/lib/simplecov.rb
@@ -235,7 +235,9 @@ def previous_error?(error_exit_status)
     #
     # Thinking: Move this behavior earlier so if there was an error we do nothing?
     def exit_and_report_previous_error(exit_status)
-      warn("Stopped processing SimpleCov as a previous error not related to SimpleCov has been detected") if print_error_status
+      if print_error_status
+        warn("Stopped processing SimpleCov as a previous error not related to SimpleCov has been detected")
+      end
       Kernel.exit(exit_status)
     end
 
@@ -266,7 +268,13 @@ def process_result(result)
     end
 
     # @api private
-    CoverageLimits = Struct.new(:minimum_coverage, :minimum_coverage_by_file, :minimum_coverage_by_group, :maximum_coverage_drop, keyword_init: true)
+    CoverageLimits = Struct.new(
+      :minimum_coverage,
+      :minimum_coverage_by_file,
+      :minimum_coverage_by_group,
+      :maximum_coverage_drop,
+      keyword_init: true
+    )
     def result_exit_status(result)
       coverage_limits = CoverageLimits.new(
         minimum_coverage: minimum_coverage, minimum_coverage_by_file: minimum_coverage_by_file,
@@ -468,7 +476,10 @@ def make_parallel_tests_available
 
       require "parallel_tests"
     rescue LoadError
-      warn("SimpleCov guessed you were running inside parallel tests but couldn't load it. Please file a bug report with us!")
+      warn(
+        "SimpleCov guessed you were running inside parallel tests but couldn't load it. " \
+        "Please file a bug report with us!"
+      )
     end
 
     def probably_running_parallel_tests?
diff --git a/lib/simplecov/combine/branches_combiner.rb b/lib/simplecov/combine/branches_combiner.rb
@@ -15,7 +15,8 @@ module BranchesCombiner
       # Branches inside files are always same if they exist, the difference only in coverage count.
       # Branch coverage report for any conditional case is built from hash, it's key is a condition and
       # it's body is a hash << keys from condition and value is coverage rate >>.
-      # ex: branches =>{ [:if, 3, 8, 6, 8, 36] => {[:then, 4, 8, 6, 8, 12] => 1, [:else, 5, 8, 6, 8, 36]=>2}, other conditions...}
+      # ex: branches => { [:if, 3, 8, 6, 8, 36] =>
+      #                     {[:then, 4, 8, 6, 8, 12] => 1, [:else, 5, 8, 6, 8, 36] => 2}, ... }
       # We create copy of result and update it values depending on the combined branches coverage values.
       #
       # @return [Hash]
diff --git a/lib/simplecov/combine/files_combiner.rb b/lib/simplecov/combine/files_combiner.rb
@@ -16,8 +16,13 @@ module FilesCombiner
       #
       def combine(coverage_a, coverage_b)
         combination = {"lines" => Combine.combine(LinesCombiner, coverage_a["lines"], coverage_b["lines"])}
-        combination["branches"] = Combine.combine(BranchesCombiner, coverage_a["branches"], coverage_b["branches"]) || {} if SimpleCov.branch_coverage?
-        combination["methods"] = Combine.combine(MethodsCombiner, coverage_a["methods"], coverage_b["methods"]) if SimpleCov.method_coverage?
+        if SimpleCov.branch_coverage?
+          combined_branches = Combine.combine(BranchesCombiner, coverage_a["branches"], coverage_b["branches"])
+          combination["branches"] = combined_branches || {}
+        end
+        if SimpleCov.method_coverage?
+          combination["methods"] = Combine.combine(MethodsCombiner, coverage_a["methods"], coverage_b["methods"])
+        end
         combination
       end
     end
diff --git a/lib/simplecov/command_guesser.rb b/lib/simplecov/command_guesser.rb
@@ -56,7 +56,10 @@ def from_defined_constants
         DEFINED_CONSTANT_FRAMEWORKS.each { |name, defined_check| return name if defined_check.call }
 
         # TODO: Provide link to docs/wiki article
-        warn "SimpleCov failed to recognize the test framework and/or suite used. Please specify manually using SimpleCov.command_name 'Unit Tests'."
+        warn(
+          "SimpleCov failed to recognize the test framework and/or suite used. " \
+          "Please specify manually using SimpleCov.command_name 'Unit Tests'."
+        )
         "Unknown Test Framework"
       end
     end
diff --git a/lib/simplecov/configuration.rb b/lib/simplecov/configuration.rb
@@ -98,7 +98,10 @@ def formatter(formatter = nil)
       return @formatter if defined?(@formatter) && formatter.nil?
 
       @formatter = formatter
-      raise "No formatter configured. Please specify a formatter using SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter" unless @formatter
+      unless @formatter
+        raise "No formatter configured. " \
+              "Please specify a formatter using SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter"
+      end
 
       @formatter
     end
@@ -243,7 +246,7 @@ def enabled_for_subprocesses?
     #       SimpleCov.start do
     #         # This needs a unique name so it won't be ovewritten
     #         SimpleCov.command_name "#{SimpleCov.command_name} (subprocess: #{pid})"
-    #         # be quiet, the parent process will be in charge of using the regular formatter and checking coverage totals
+    #         # be quiet — the parent process is in charge of using the regular formatter and checking coverage totals
     #         SimpleCov.print_error_status = false
     #         SimpleCov.formatter SimpleCov::Formatter::SimpleFormatter
     #         SimpleCov.minimum_coverage 0
@@ -520,7 +523,8 @@ def raise_if_criterion_disabled(criterion)
       raise_if_criterion_unsupported(criterion)
       return if coverage_criterion_enabled?(criterion)
 
-      raise "Coverage criterion #{criterion}, is disabled! Please enable it first through enable_coverage #{criterion} (if supported)"
+      raise "Coverage criterion #{criterion}, is disabled! " \
+            "Please enable it first through enable_coverage #{criterion} (if supported)"
     end
 
     def raise_if_criterion_unsupported(criterion)
diff --git a/lib/simplecov/coverage_statistics.rb b/lib/simplecov/coverage_statistics.rb
@@ -16,14 +16,14 @@ class CoverageStatistics
 
     def self.from(coverage_statistics)
       sum_covered, sum_missed, sum_omitted, sum_total_strength =
-        coverage_statistics.reduce([0, 0, 0, 0.0]) do |(covered, missed, omitted, total_strength), file_coverage_statistics|
+        coverage_statistics.reduce([0, 0, 0, 0.0]) do |(covered, missed, omitted, total_strength), stats|
           [
-            covered + file_coverage_statistics.covered,
-            missed + file_coverage_statistics.missed,
-            omitted + file_coverage_statistics.omitted,
+            covered + stats.covered,
+            missed + stats.missed,
+            omitted + stats.omitted,
             # gotta remultiply with loc because files have different strength and loc
             # giving them a different "weight" in total
-            total_strength + (file_coverage_statistics.strength * file_coverage_statistics.total)
+            total_strength + (stats.strength * stats.total)
           ]
         end
 
diff --git a/lib/simplecov/coverage_violations.rb b/lib/simplecov/coverage_violations.rb
@@ -67,7 +67,10 @@ def group_minimum_violations(group_name, group, minimums)
 
       def lookup_group(result, group_name)
         group = result.groups[group_name]
-        warn "minimum_coverage_by_group: no group named '#{group_name}' exists. Available groups: #{result.groups.keys.join(', ')}" unless group
+        unless group
+          warn "minimum_coverage_by_group: no group named '#{group_name}' exists. " \
+               "Available groups: #{result.groups.keys.join(', ')}"
+        end
         group
       end
 
diff --git a/lib/simplecov/exit_codes/maximum_coverage_drop_check.rb b/lib/simplecov/exit_codes/maximum_coverage_drop_check.rb
@@ -17,7 +17,8 @@ def failing?
       def report
         violations.each do |violation|
           $stderr.printf(
-            "%<criterion>s coverage has dropped by %<drop_percent>.2f%% since the last time (maximum allowed: %<max_drop>.2f%%).\n",
+            "%<criterion>s coverage has dropped by %<drop_percent>.2f%% since the last time " \
+            "(maximum allowed: %<max_drop>.2f%%).\n",
             criterion: violation.fetch(:criterion).capitalize,
             drop_percent: violation.fetch(:actual),
             max_drop: violation.fetch(:maximum)
diff --git a/lib/simplecov/exit_codes/minimum_coverage_by_file_check.rb b/lib/simplecov/exit_codes/minimum_coverage_by_file_check.rb
@@ -17,7 +17,8 @@ def failing?
       def report
         violations.each do |violation|
           $stderr.printf(
-            "%<criterion>s coverage by file (%<covered>.2f%%) is below the expected minimum coverage (%<minimum_coverage>.2f%%) in %<filename>s.\n",
+            "%<criterion>s coverage by file (%<covered>.2f%%) is below the expected minimum coverage " \
+            "(%<minimum_coverage>.2f%%) in %<filename>s.\n",
             covered: violation.fetch(:actual),
             minimum_coverage: violation.fetch(:expected),
             criterion: violation.fetch(:criterion).capitalize,
diff --git a/lib/simplecov/exit_codes/minimum_coverage_by_group_check.rb b/lib/simplecov/exit_codes/minimum_coverage_by_group_check.rb
@@ -17,7 +17,8 @@ def failing?
       def report
         violations.each do |violation|
           $stderr.printf(
-            "%<criterion>s coverage by group (%<covered>.2f%%) is below the expected minimum coverage (%<minimum_coverage>.2f%%) in %<group_name>s.\n",
+            "%<criterion>s coverage by group (%<covered>.2f%%) is below the expected minimum coverage " \
+            "(%<minimum_coverage>.2f%%) in %<group_name>s.\n",
             group_name: violation.fetch(:group_name),
             covered: violation.fetch(:actual),
             minimum_coverage: violation.fetch(:expected),
diff --git a/lib/simplecov/exit_codes/minimum_overall_coverage_check.rb b/lib/simplecov/exit_codes/minimum_overall_coverage_check.rb
@@ -17,7 +17,8 @@ def failing?
       def report
         violations.each do |violation|
           $stderr.printf(
-            "%<criterion>s coverage (%<covered>.2f%%) is below the expected minimum coverage (%<minimum_coverage>.2f%%).\n",
+            "%<criterion>s coverage (%<covered>.2f%%) is below the expected minimum coverage " \
+            "(%<minimum_coverage>.2f%%).\n",
             covered: violation.fetch(:actual),
             minimum_coverage: violation.fetch(:expected),
             criterion: violation.fetch(:criterion).capitalize
diff --git a/lib/simplecov/file_list.rb b/lib/simplecov/file_list.rb
@@ -133,8 +133,12 @@ def compute_coverage_statistics_by_file
 
     def compute_coverage_statistics
       coverage_statistics = {line: CoverageStatistics.from(coverage_statistics_by_file[:line])}
-      coverage_statistics[:branch] = CoverageStatistics.from(coverage_statistics_by_file[:branch]) if SimpleCov.branch_coverage?
-      coverage_statistics[:method] = CoverageStatistics.from(coverage_statistics_by_file[:method]) if SimpleCov.method_coverage?
+      if SimpleCov.branch_coverage?
+        coverage_statistics[:branch] = CoverageStatistics.from(coverage_statistics_by_file[:branch])
+      end
+      if SimpleCov.method_coverage?
+        coverage_statistics[:method] = CoverageStatistics.from(coverage_statistics_by_file[:method])
+      end
       coverage_statistics
     end
   end
diff --git a/lib/simplecov/formatter/json_formatter/result_hash_formatter.rb b/lib/simplecov/formatter/json_formatter/result_hash_formatter.rb
@@ -61,16 +61,19 @@ def format_minimum_coverage_errors
         end
 
         def format_minimum_coverage_by_file_errors
-          SimpleCov::CoverageViolations.minimum_by_file(@result, SimpleCov.minimum_coverage_by_file).each do |violation|
+          violations = SimpleCov::CoverageViolations.minimum_by_file(@result, SimpleCov.minimum_coverage_by_file)
+          violations.each do |violation|
             key = CRITERION_KEYS.fetch(violation.fetch(:criterion))
             bucket = formatted_result[:errors][:minimum_coverage_by_file] ||= {}
             criterion_errors = bucket[key] ||= {}
-            criterion_errors[violation.fetch(:project_filename)] = {expected: violation.fetch(:expected), actual: violation.fetch(:actual)}
+            criterion_errors[violation.fetch(:project_filename)] =
+              {expected: violation.fetch(:expected), actual: violation.fetch(:actual)}
           end
         end
 
         def format_minimum_coverage_by_group_errors
-          SimpleCov::CoverageViolations.minimum_by_group(@result, SimpleCov.minimum_coverage_by_group).each do |violation|
+          violations = SimpleCov::CoverageViolations.minimum_by_group(@result, SimpleCov.minimum_coverage_by_group)
+          violations.each do |violation|
             key = CRITERION_KEYS.fetch(violation.fetch(:criterion))
             bucket = formatted_result[:errors][:minimum_coverage_by_group] ||= {}
             group_errors = bucket[violation.fetch(:group_name)] ||= {}
@@ -178,8 +181,12 @@ def format_method(method)
 
         def format_coverage_statistics(statistics)
           result = {lines: format_line_statistic(statistics[:line])}
-          result[:branches] = format_single_statistic(statistics[:branch]) if SimpleCov.branch_coverage? && statistics[:branch]
-          result[:methods] = format_single_statistic(statistics[:method]) if SimpleCov.method_coverage? && statistics[:method]
+          if SimpleCov.branch_coverage? && statistics[:branch]
+            result[:branches] = format_single_statistic(statistics[:branch])
+          end
+          if SimpleCov.method_coverage? && statistics[:method]
+            result[:methods] = format_single_statistic(statistics[:method])
+          end
           result
         end
 
diff --git a/lib/simplecov/load_global_config.rb b/lib/simplecov/load_global_config.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require "etc"
-home_dir = (Dir.home && File.expand_path("~")) || Etc.getpwuid.dir || (ENV.fetch("USER", nil) && File.expand_path("~#{ENV.fetch('USER', nil)}"))
+home_dir =
+  (Dir.home && File.expand_path("~")) ||
+  Etc.getpwuid.dir ||
+  (ENV.fetch("USER", nil) && File.expand_path("~#{ENV.fetch('USER', nil)}"))
 if home_dir
   global_config_path = File.join(home_dir, ".simplecov")
   load global_config_path if File.exist?(global_config_path)
diff --git a/lib/simplecov/result.rb b/lib/simplecov/result.rb
@@ -13,7 +13,8 @@ class Result
 
     # Returns the original Coverage.result used for this instance of SimpleCov::Result
     attr_reader :original_result
-    # Returns all files that are applicable to this result (sans filters!) as instances of SimpleCov::SourceFile. Aliased as :source_files
+    # Returns all files that are applicable to this result (sans filters!) as instances of
+    # SimpleCov::SourceFile. Aliased as :source_files
     attr_reader :files
     alias source_files files
     # Explicitly set the Time this result has been created
diff --git a/lib/simplecov/source_file.rb b/lib/simplecov/source_file.rb
@@ -443,7 +443,9 @@ def line_coverage_statistics
     def branch_coverage_statistics
       # Files added via track_files but never loaded/required have no branch
       # data. Report 0% instead of misleading 100% (see #902).
-      return {branch: CoverageStatistics.new(covered: 0, missed: 0, percent: 0.0)} if not_loaded? && covered_branches.empty? && missed_branches.empty?
+      if not_loaded? && covered_branches.empty? && missed_branches.empty?
+        return {branch: CoverageStatistics.new(covered: 0, missed: 0, percent: 0.0)}
+      end
 
       {
         branch: CoverageStatistics.new(
@@ -474,7 +476,9 @@ def process_skipped_methods(methods)
     end
 
     def method_coverage_statistics
-      return {method: CoverageStatistics.new(covered: 0, missed: 0, percent: 0.0)} if not_loaded? && covered_methods.empty? && missed_methods.empty?
+      if not_loaded? && covered_methods.empty? && missed_methods.empty?
+        return {method: CoverageStatistics.new(covered: 0, missed: 0, percent: 0.0)}
+      end
 
       {
         method: CoverageStatistics.new(
diff --git a/lib/simplecov/source_file/line.rb b/lib/simplecov/source_file/line.rb
@@ -25,7 +25,9 @@ class Line
       def initialize(src, line_number, coverage)
         raise ArgumentError, "Only String accepted for source" unless src.is_a?(String)
         raise ArgumentError, "Only Integer accepted for line_number" unless line_number.is_a?(Integer)
-        raise ArgumentError, "Only Integer and nil accepted for coverage" unless coverage.is_a?(Integer) || coverage.nil?
+        unless coverage.is_a?(Integer) || coverage.nil?
+          raise ArgumentError, "Only Integer and nil accepted for coverage"
+        end
 
         @src         = src
         @line_number = line_number
diff --git a/simplecov.gemspec b/simplecov.gemspec
@@ -22,7 +22,8 @@ Gem::Specification.new do |gem|
   gem.email       = ["christoph at olszowka de", "pragtob@gmail.com"]
   gem.homepage    = "https://github.com/simplecov-ruby/simplecov"
   gem.summary     = "Code coverage for Ruby"
-  gem.description = %(Code coverage for Ruby with a powerful configuration library and automatic merging of coverage across test suites)
+  gem.description = "Code coverage for Ruby with a powerful configuration library " \
+                    "and automatic merging of coverage across test suites"
   gem.license     = "MIT"
   gem.metadata    = {
     "bug_tracker_uri" => "https://github.com/simplecov-ruby/simplecov/issues",
diff --git a/spec/combine/results_combiner_spec.rb b/spec/combine/results_combiner_spec.rb
@@ -29,7 +29,9 @@
           "lines" => [nil, 1, 5, 1, nil, nil, 1, 0, nil, nil],
           "branches" => {[:if, 3, 8, 6, 8, 36] => {[:then, 4, 8, 6, 8, 12] => 1, [:else, 5, 8, 6, 8, 36] => 2}}
         },
-        source_fixture("app/controllers/sample_controller.rb") => {"lines" => [nil, 3, 1, nil, nil, nil, 1, 0, nil, nil]},
+        source_fixture("app/controllers/sample_controller.rb") => {
+          "lines" => [nil, 3, 1, nil, nil, nil, 1, 0, nil, nil]
+        },
         source_fixture("resultset2.rb") => {"lines" => [nil, 1, 1, nil]},
         source_fixture("parallel_tests.rb") => {"lines" => [nil, nil, 0, 0]},
         source_fixture("conditionally_loaded_2.rb") => {"lines" => [nil, 0, 1]},  # loaded only in the second resultset
@@ -57,25 +59,25 @@
       it "has proper results for sample.rb" do
         expect(combined[source_fixture("sample.rb")]["lines"]).to eq([1, 1, 2, 2, nil, nil, 2, 2, nil, nil])
 
-        # gotta configure max line so it doesn't get ridiculous
-        # rubocop:disable Style/IfUnlessModifier
         if SimpleCov.branch_coverage_supported?
-          expect(combined[source_fixture("sample.rb")]["branches"][[:if, 3, 8, 6, 8, 36]][[:then, 4, 8, 6, 8, 12]]).to eq(47)
+          branches = combined[source_fixture("sample.rb")]["branches"]
+          expect(branches[[:if, 3, 8, 6, 8, 36]][[:then, 4, 8, 6, 8, 12]]).to eq(47)
         end
-        # rubocop:enable Style/IfUnlessModifier
       end
 
       it "has proper results for user.rb" do
         expect(combined[source_fixture("app/models/user.rb")]["lines"]).to eq([nil, 2, 6, 2, nil, nil, 2, 0, nil, nil])
 
         if SimpleCov.branch_coverage_supported?
-          expect(combined[source_fixture("app/models/user.rb")]["branches"][[:if, 3, 8, 6, 8, 36]][[:then, 4, 8, 6, 8, 12]]).to eq(48)
-          expect(combined[source_fixture("app/models/user.rb")]["branches"][[:if, 3, 8, 6, 8, 36]][[:else, 5, 8, 6, 8, 36]]).to eq(26)
+          branches = combined[source_fixture("app/models/user.rb")]["branches"]
+          expect(branches[[:if, 3, 8, 6, 8, 36]][[:then, 4, 8, 6, 8, 12]]).to eq(48)
+          expect(branches[[:if, 3, 8, 6, 8, 36]][[:else, 5, 8, 6, 8, 36]]).to eq(26)
         end
       end
 
       it "has proper results for sample_controller.rb" do
-        expect(combined[source_fixture("app/controllers/sample_controller.rb")]["lines"]).to eq([nil, 4, 2, 1, nil, nil, 2, 0, nil, nil])
+        lines = combined[source_fixture("app/controllers/sample_controller.rb")]["lines"]
+        expect(lines).to eq([nil, 4, 2, 1, nil, nil, 2, 0, nil, nil])
       end
 
       it "has proper results for resultset1.rb" do
diff --git a/spec/configuration_spec.rb b/spec/configuration_spec.rb
@@ -189,7 +189,8 @@
       it "warns you about your usage" do
         allow(config).to receive(:warn)
         config.minimum_coverage_by_group({"Test Group 1" => 100.01})
-        expect(config).to have_received(:warn).with("The coverage you set for minimum_coverage_by_group is greater than 100%")
+        expect(config).to have_received(:warn)
+          .with("The coverage you set for minimum_coverage_by_group is greater than 100%")
       end
 
       it "sets the right coverage value when called with a number" do
diff --git a/spec/directive_spec.rb b/spec/directive_spec.rb
diff --git a/spec/exit_codes/minimum_coverage_by_file_check_spec.rb b/spec/exit_codes/minimum_coverage_by_file_check_spec.rb
diff --git a/spec/result_adapter_spec.rb b/spec/result_adapter_spec.rb
diff --git a/spec/result_spec.rb b/spec/result_spec.rb
diff --git a/spec/return_codes_spec.rb b/spec/return_codes_spec.rb
diff --git a/spec/simplecov_spec.rb b/spec/simplecov_spec.rb
diff --git a/spec/support/coverage_fixtures.rb b/spec/support/coverage_fixtures.rb
