Merge pull request #16710 from reitermarkus/tap-each-clear-cache

Make `Tap::each` respect the API and clear all tap caches before each test.

Library/Homebrew/cmd/tap.rb

@@ -55,8 +55,10 @@ module Homebrew
     args = tap_args.parse
 
     if args.repair?
-      Tap.each(&:link_completions_and_manpages)
+      Tap.select(&:installed?).each do |tap|
-      Tap.each(&:fix_remote_configuration)
+        tap.link_completions_and_manpages
+        tap.fix_remote_configuration
+      end
     elsif args.no_named?
       puts Tap.names
     else

Library/Homebrew/cmd/update-report.rb

@@ -146,7 +146,7 @@ module Homebrew
     hub = ReporterHub.new
 
     updated_taps = []
-    Tap.each do |tap|
+    Tap.select(&:installed?).each do |tap|
       next if !tap.git? || tap.git_repo.origin_url.nil?
       next if (tap.core_tap? || tap.core_cask_tap?) && !Homebrew::EnvConfig.no_install_from_api?
 
@@ -254,7 +254,7 @@ module Homebrew
 
     Commands.rebuild_commands_completion_list
     link_completions_manpages_and_docs
-    Tap.each(&:link_completions_and_manpages)
+    Tap.select(&:installed?).each(&:link_completions_and_manpages)
 
     failed_fetch_dirs = ENV["HOMEBREW_MISSING_REMOTE_REF_DIRS"]&.split("\n")
     if failed_fetch_dirs.present?

Library/Homebrew/completions.rb

@@ -72,7 +72,7 @@ module Homebrew
     sig { void }
     def self.link!
       Settings.write :linkcompletions, true
-      Tap.each do |tap|
+      Tap.select(&:installed?).each do |tap|
         Utils::Link.link_completions tap.path, "brew completions link"
       end
     end
@@ -80,7 +80,7 @@ module Homebrew
     sig { void }
     def self.unlink!
       Settings.write :linkcompletions, false
-      Tap.each do |tap|
+      Tap.select(&:installed?).each do |tap|
         next if tap.official?
 
         Utils::Link.unlink_completions tap.path
@@ -94,7 +94,7 @@ module Homebrew
 
     sig { returns(T::Boolean) }
     def self.completions_to_link?
-      Tap.each do |tap|
+      Tap.select(&:installed?).each do |tap|
         next if tap.official?
 
         SHELLS.each do |shell|

Library/Homebrew/dev-cmd/audit.rb

@@ -189,7 +189,7 @@ module Homebrew
 
     # Run tap audits first
     named_arg_taps = [*audit_formulae, *audit_casks].map(&:tap).uniq if !args.tap && !no_named_args
-    tap_problems = Tap.each_with_object({}) do |tap, problems|
+    tap_problems = Tap.select(&:installed?).each_with_object({}) do |tap, problems|
       next if args.tap && tap != args.tap
       next if named_arg_taps&.exclude?(tap)
 

Library/Homebrew/diagnostic.rb

@@ -545,7 +545,7 @@ module Homebrew
         return if ENV["CI"]
         return unless Utils::Git.available?
 
-        commands = Tap.map do |tap|
+        commands = Tap.select(&:installed?).map do |tap|
           next if tap.git_repo.default_origin_branch?
 
           "git -C $(brew --repo #{tap.name}) checkout #{tap.git_repo.origin_branch_name}"
@@ -795,7 +795,7 @@ module Homebrew
 
       def check_for_tap_ruby_files_locations
         bad_tap_files = {}
-        Tap.each do |tap|
+        Tap.select(&:installed?).each do |tap|
           unused_formula_dirs = tap.potential_formula_dirs - [tap.formula_dir]
           unused_formula_dirs.each do |dir|
             next unless dir.exist?

Library/Homebrew/formulary.rb

@@ -1025,7 +1025,7 @@ module Formulary
 
   def self.tap_paths(name)
     name = name.to_s.downcase
-    Tap.map do |tap|
+    Tap.select(&:installed?).map do |tap|
       formula_path = find_formula_in_tap(name, tap)
 
       alias_path = tap.alias_dir/name

Library/Homebrew/tap.rb

@@ -842,15 +842,25 @@ class Tap
   end
 
   def self.each(&block)
-    return unless TAP_DIRECTORY.directory?
-
     return to_enum unless block
 
-    TAP_DIRECTORY.subdirs.each do |user|
+    installed_taps = if TAP_DIRECTORY.directory?
-      user.subdirs.each do |repo|
+      TAP_DIRECTORY.subdirs
-        yield fetch(user.basename.to_s, repo.basename.to_s)
+                   .flat_map(&:subdirs)
-      end
+                   .map(&method(:from_path))
+    else
+      []
     end
+
+    available_taps = if Homebrew::EnvConfig.no_install_from_api?
+      installed_taps
+    else
+      default_taps = T.let([CoreTap.instance], T::Array[Tap])
+      default_taps << CoreCaskTap.instance if OS.mac? # rubocop:disable Homebrew/MoveToExtendOS
+      installed_taps + default_taps
+    end.sort_by(&:name).uniq
+
+    available_taps.each(&block)
   end
 
   # An array of all installed {Tap} names.

Library/Homebrew/test/cask/cask_loader/from_tap_loader_spec.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 RSpec.describe Cask::CaskLoader::FromTapLoader do
+  let(:tap) { CoreCaskTap.instance }
   let(:cask_name) { "testball" }
   let(:cask_full_name) { "homebrew/cask/#{cask_name}" }
-  let(:cask_path) { CoreCaskTap.instance.cask_dir/"#{cask_name}.rb" }
+  let(:cask_path) { tap.cask_dir/"#{cask_name}.rb" }
 
   describe "#load" do
     before do
-      CoreCaskTap.instance.clear_cache
       cask_path.parent.mkpath
       cask_path.write <<~RUBY
         cask '#{cask_name}' do
@@ -25,7 +25,7 @@ RSpec.describe Cask::CaskLoader::FromTapLoader do
     end
 
     context "with sharded Cask directory" do
-      let(:cask_path) { CoreCaskTap.instance.cask_dir/cask_name[0]/"#{cask_name}.rb" }
+      let(:cask_path) { tap.cask_dir/cask_name[0]/"#{cask_name}.rb" }
 
       it "returns a Cask" do
         expect(described_class.new(cask_full_name).load(config: nil)).to be_a(Cask::Cask)

Library/Homebrew/test/cask/cask_loader_spec.rb

@@ -84,8 +84,6 @@ RSpec.describe Cask::CaskLoader, :cask do
 
         before do
           (old_tap.path/"tap_migrations.json").write tap_migrations.to_json
-          old_tap.clear_cache
-          default_tap.clear_cache
         end
 
         it "does not warn when loading the short token" do
@@ -112,7 +110,6 @@ RSpec.describe Cask::CaskLoader, :cask do
         #     (default_tap.path/"tap_migrations.json").write({
         #       token => old_tap.name,
         #     }.to_json)
-        #     default_tap.clear_cache
         #   end
         #
         #   it "stops recursing" do

Library/Homebrew/test/formulary_spec.rb

@@ -547,8 +547,6 @@ RSpec.describe Formulary do
         before do
           old_tap.path.mkpath
           (old_tap.path/"tap_migrations.json").write tap_migrations.to_json
-          old_tap.clear_cache
-          default_tap.clear_cache
         end
 
         it "does not warn when loading the short token" do
@@ -575,7 +573,6 @@ RSpec.describe Formulary do
         #     (default_tap.path/"tap_migrations.json").write({
         #       token => old_tap.name,
         #     }.to_json)
-        #     default_tap.clear_cache
         #   end
         #
         #   it "stops recursing" do

Library/Homebrew/test/spec_helper.rb

@@ -203,6 +203,7 @@ RSpec.configure do |config|
     Homebrew.raise_deprecation_exceptions = true
 
     Formulary.clear_cache
+    Tap.each(&:clear_cache)
     Tap.clear_cache
     DependencyCollector.clear_cache
     Formula.clear_cache
@@ -249,6 +250,9 @@ RSpec.configure do |config|
     rescue SystemExit => e
       example.example.set_exception(e)
     ensure
+      # This depends on `HOMEBREW_NO_INSTALL_FROM_API`.
+      Tap.each(&:clear_cache)
+
       ENV.replace(@__env)
       Context.current = Context::ContextStruct.new