From d63a0ebd7b2121ae72671ab89da15735619b0c4a Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Tue, 6 Apr 2021 22:53:05 +0900
Subject: [PATCH 1/3] .simplecov: delete private method

---
 Library/Homebrew/.simplecov | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Library/Homebrew/.simplecov b/Library/Homebrew/.simplecov
index a18bd3501c..be9aad12f1 100755
--- a/Library/Homebrew/.simplecov
+++ b/Library/Homebrew/.simplecov
@@ -21,6 +21,11 @@ SimpleCov.start do
     # be quiet, the parent process will be in charge of output and checking coverage totals
     SimpleCov.print_error_status = false
   end
+  excludes = ["test", "vendor"]
+  subdirs = Dir.chdir(SimpleCov.root) { Dir.glob("*") }
+               .reject { |d| d.end_with?(".rb") || excludes.include?(d) }
+               .map { |d| "#{d}/**/*.rb" }.join(",")
+  files = "#{SimpleCov.root}/{#{subdirs},*.rb}"
 
   if ENV["HOMEBREW_INTEGRATION_TEST"]
     # This needs a unique name so it won't be ovewritten
@@ -32,8 +37,12 @@ SimpleCov.start do
     SimpleCov.at_exit do
       # Just save result, but don't write formatted output.
       coverage_result = Coverage.result
-      # TODO: this method is private, find a better way.
-      SimpleCov.send(:add_not_loaded_files, coverage_result)
+      coverage_result_dup = coverage_result.dup
+      Dir[files].each do |file|
+        absolute_path = File.expand_path(file)
+        coverage_result_dup[absolute_path] ||= SimpleCov::SimulateCoverage.call(absolute_path)
+      end
+      coverage_result = coverage_result_dup
       simplecov_result = SimpleCov::Result.new(coverage_result)
       SimpleCov::ResultMerger.store_result(simplecov_result)
 
@@ -45,14 +54,9 @@ SimpleCov.start do
   else
     command_name "#{command_name} (#{$PROCESS_ID})"
 
-    excludes = ["test", "vendor"]
-    subdirs = Dir.chdir(SimpleCov.root) { Dir.glob("*") }
-                 .reject { |d| d.end_with?(".rb") || excludes.include?(d) }
-                 .map { |d| "#{d}/**/*.rb" }.join(",")
-
     # Not using this during integration tests makes the tests 4x times faster
     # without changing the coverage.
-    track_files "#{SimpleCov.root}/{#{subdirs},*.rb}"
+    track_files files
   end
 
   add_filter %r{^/build.rb$}

From ee511e4c0ce94714283b53f7a63a5e9868b1d153 Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Thu, 8 Apr 2021 23:03:28 +0900
Subject: [PATCH 2/3] delete useless variable

---
 Library/Homebrew/.simplecov | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/.simplecov b/Library/Homebrew/.simplecov
index be9aad12f1..3afda22f26 100755
--- a/Library/Homebrew/.simplecov
+++ b/Library/Homebrew/.simplecov
@@ -36,13 +36,11 @@ SimpleCov.start do
 
     SimpleCov.at_exit do
       # Just save result, but don't write formatted output.
-      coverage_result = Coverage.result
-      coverage_result_dup = coverage_result.dup
+      coverage_result = Coverage.result.dup
       Dir[files].each do |file|
         absolute_path = File.expand_path(file)
-        coverage_result_dup[absolute_path] ||= SimpleCov::SimulateCoverage.call(absolute_path)
+        coverage_result[absolute_path] ||= SimpleCov::SimulateCoverage.call(absolute_path)
       end
-      coverage_result = coverage_result_dup
       simplecov_result = SimpleCov::Result.new(coverage_result)
       SimpleCov::ResultMerger.store_result(simplecov_result)
 

From 705995c1c326457c8f4d727e488d85bc4c538ccb Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Mon, 12 Apr 2021 22:43:56 +0900
Subject: [PATCH 3/3] repair variables

---
 Library/Homebrew/.simplecov | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/.simplecov b/Library/Homebrew/.simplecov
index 3afda22f26..bced53cc60 100755
--- a/Library/Homebrew/.simplecov
+++ b/Library/Homebrew/.simplecov
@@ -22,9 +22,9 @@ SimpleCov.start do
     SimpleCov.print_error_status = false
   end
   excludes = ["test", "vendor"]
-  subdirs = Dir.chdir(SimpleCov.root) { Dir.glob("*") }
-               .reject { |d| d.end_with?(".rb") || excludes.include?(d) }
-               .map { |d| "#{d}/**/*.rb" }.join(",")
+  subdirs = Dir.chdir(SimpleCov.root) { Pathname.glob("*") }
+               .reject { |p| p.extname == ".rb" || excludes.include?(p.to_s) }
+               .map { |p| "#{p}/**/*.rb" }.join(",")
   files = "#{SimpleCov.root}/{#{subdirs},*.rb}"
 
   if ENV["HOMEBREW_INTEGRATION_TEST"]