Merge pull request #20296 from Homebrew/upgrade_reinstall_download_queue

Optionally use DownloadQueue for reinstall, upgrade.

Author: MikeMcQuaid

Library/Homebrew/cask/audit.rb

@@ -585,13 +585,15 @@ def extract_artifacts
         }.compact
 
         Homebrew::Install.perform_preinstall_checks_once
+        valid_formula_installers = Homebrew::Install.fetch_formulae(primary_container.dependencies)
+
         primary_container.dependencies.each do |dep|
+          next unless valid_formula_installers.include?(dep)
+
           fi = FormulaInstaller.new(
             dep,
             **install_options,
           )
-          fi.prelude
-          fi.fetch
           fi.install
           fi.finish
         end

Library/Homebrew/cask/installer.rb

@@ -426,14 +426,17 @@ def satisfy_cask_and_formula_dependencies
       end
 
       ohai "Installing dependencies: #{missing_formulae_and_casks.map(&:to_s).join(", ")}"
+      cask_installers = T.let([], T::Array[Installer])
+      formula_installers = T.let([], T::Array[FormulaInstaller])
+
       missing_formulae_and_casks.each do |cask_or_formula|
         if cask_or_formula.is_a?(Cask)
           if skip_cask_deps?
             opoo "`--skip-cask-deps` is set; skipping installation of #{cask_or_formula}."
             next
           end
 
-          Installer.new(
+          cask_installers << Installer.new(
             cask_or_formula,
             adopt:                   adopt?,
             binaries:                binaries?,
@@ -444,10 +447,9 @@ def satisfy_cask_and_formula_dependencies
             quiet:                   quiet?,
             require_sha:             require_sha?,
             verbose:                 verbose?,
-          ).install
+          )
         else
-          Homebrew::Install.perform_preinstall_checks_once
-          fi = FormulaInstaller.new(
+          formula_installers << FormulaInstaller.new(
             cask_or_formula,
             **{
               show_header:             true,
@@ -456,12 +458,18 @@ def satisfy_cask_and_formula_dependencies
               verbose:                 verbose?,
             }.compact,
           )
-          fi.prelude
-          fi.fetch
-          fi.install
-          fi.finish
         end
       end
+
+      cask_installers.each(&:install)
+      return if formula_installers.blank?
+
+      Homebrew::Install.perform_preinstall_checks_once
+      valid_formula_installers = Homebrew::Install.fetch_formulae(formula_installers)
+      valid_formula_installers.each do |formula_installer|
+        formula_installer.install
+        formula_installer.finish
+      end
     end
 
     def caveats

Library/Homebrew/cmd/reinstall.rb

@@ -130,7 +130,7 @@ def run
         unless formulae.empty?
           Install.perform_preinstall_checks_once
 
-          install_context = formulae.map do |formula|
+          reinstall_contexts = formulae.filter_map do |formula|
             if formula.pinned?
               onoe "#{formula.full_name} is pinned. You must unpin it to reinstall."
               next
@@ -167,27 +167,18 @@ def run
             verbose:                    args.verbose?,
           )
 
-          formulae_installer = install_context.map(&:formula_installer)
+          formulae_installers = reinstall_contexts.map(&:formula_installer)
 
           # Main block: if asking the user is enabled, show dependency and size information.
-          Install.ask_formulae(formulae_installer, dependants, args: args) if args.ask?
+          Install.ask_formulae(formulae_installers, dependants, args: args) if args.ask?
 
-          install_context.each do |f|
-            Homebrew::Reinstall.reinstall_formula(
-              f,
-              flags:                      args.flags_only,
-              force_bottle:               args.force_bottle?,
-              build_from_source_formulae: args.build_from_source_formulae,
-              interactive:                args.interactive?,
-              keep_tmp:                   args.keep_tmp?,
-              debug_symbols:              args.debug_symbols?,
-              force:                      args.force?,
-              debug:                      args.debug?,
-              quiet:                      args.quiet?,
-              verbose:                    args.verbose?,
-              git:                        args.git?,
-            )
-            Cleanup.install_formula_clean!(f.formula)
+          valid_formula_installers = Install.fetch_formulae(formulae_installers)
+
+          reinstall_contexts.each do |reinstall_context|
+            next unless valid_formula_installers.include?(reinstall_context.formula_installer)
+
+            Homebrew::Reinstall.reinstall_formula(reinstall_context)
+            Cleanup.install_formula_clean!(reinstall_context.formula)
           end
 
           Upgrade.upgrade_dependents(

Library/Homebrew/extend/os/linux/install.rb

@@ -1,4 +1,4 @@
-# typed: true # rubocop:todo Sorbet/StrictSigil
+# typed: strict
 # frozen_string_literal: true
 
 module OS
@@ -30,18 +30,21 @@ module ClassMethods
           libstdc++.so.6
         ].freeze
 
+        sig { params(all_fatal: T::Boolean).void }
         def perform_preinstall_checks(all_fatal: false)
           super
           symlink_ld_so
           setup_preferred_gcc_libs
         end
 
+        sig { void }
         def global_post_install
           super
           symlink_ld_so
           setup_preferred_gcc_libs
         end
 
+        sig { void }
         def check_cpu
           return if ::Hardware::CPU.intel? && ::Hardware::CPU.is_64_bit?
           return if ::Hardware::CPU.arm?
@@ -56,6 +59,7 @@ def check_cpu
           ::Kernel.abort message
         end
 
+        sig { void }
         def symlink_ld_so
           brew_ld_so = HOMEBREW_PREFIX/"lib/ld.so"
 
@@ -75,6 +79,7 @@ def symlink_ld_so
           FileUtils.ln_sf ld_so, brew_ld_so
         end
 
+        sig { void }
         def setup_preferred_gcc_libs
           gcc_opt_prefix = HOMEBREW_PREFIX/"opt/#{OS::LINUX_PREFERRED_GCC_RUNTIME_FORMULA}"
           glibc_installed = (HOMEBREW_PREFIX/"opt/glibc/bin/ld.so").readable?

Library/Homebrew/formula_installer.rb

@@ -13,7 +13,6 @@
 require "development_tools"
 require "cache_store"
 require "linkage_checker"
-require "install"
 require "messages"
 require "cask/cask_loader"
 require "cmd/install"
@@ -61,8 +60,8 @@ class FormulaInstaller
       bottle_arch:                T.nilable(String),
       ignore_deps:                T::Boolean,
       only_deps:                  T::Boolean,
-      include_test_formulae:      T::Array[Formula],
-      build_from_source_formulae: T::Array[Formula],
+      include_test_formulae:      T::Array[String],
+      build_from_source_formulae: T::Array[String],
       env:                        T.nilable(String),
       git:                        T::Boolean,
       interactive:                T::Boolean,
@@ -507,7 +506,10 @@ def install
     lock
 
     start_time = Time.now
-    Homebrew::Install.perform_build_from_source_checks if !pour_bottle? && DevelopmentTools.installed?
+    if !pour_bottle? && DevelopmentTools.installed?
+      require "install"
+      Homebrew::Install.perform_build_from_source_checks
+    end
 
     # Warn if a more recent version of this formula is available in the tap.
     begin
@@ -896,6 +898,7 @@ def install_dependency(dep, inherited_options)
       verbose:                    verbose?,
     )
     oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}"
+    # prelude only needed to populate bottle_tab_runtime_dependencies, fetching has already been done.
     fi.prelude
     fi.install
     fi.finish
@@ -955,6 +958,7 @@ def finish
 
     fix_dynamic_linkage(keg) if !@poured_bottle || !formula.bottle_specification.skip_relocation?
 
+    require "install"
     Homebrew::Install.global_post_install
 
     if build_bottle? || skip_post_install?