From 5491f7b1bd1af1f394826225d2385c042f947bb6 Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Sat, 3 Sep 2022 16:01:55 +0900
Subject: [PATCH] share Install.print_dry_run_dependencies

---
 Library/Homebrew/install.rb |  8 +++-----
 Library/Homebrew/upgrade.rb | 25 ++++++++-----------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb
index 9b21b1029b..51cd1bf42a 100644
--- a/Library/Homebrew/install.rb
+++ b/Library/Homebrew/install.rb
@@ -326,7 +326,7 @@ module Homebrew
 
           formula_installers.each do |fi|
             f = fi.formula
-            print_dry_run_dependencies(f, fi.compute_dependencies)
+            print_dry_run_dependencies(f, fi.compute_dependencies, &:name)
           end
         end
         return
@@ -347,16 +347,14 @@ module Homebrew
     end
     private_class_method :install_formula
 
-    def print_dry_run_dependencies(formula, dependencies)
+    def print_dry_run_dependencies(formula, dependencies, &block)
       return if dependencies.empty?
 
       plural = "dependency".pluralize(dependencies.count)
       ohai "Would install #{dependencies.count} #{plural} for #{formula.name}:"
-      formula_names = dependencies.map(&:first).map(&:to_formula).map(&:name)
+      formula_names = dependencies.map(&:first).map(&:to_formula).map(&block)
       puts formula_names.join(" ")
     end
-
-    private_class_method :print_dry_run_dependencies
   end
 end
 
diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb
index 54e3223c18..48a1a363c9 100644
--- a/Library/Homebrew/upgrade.rb
+++ b/Library/Homebrew/upgrade.rb
@@ -94,22 +94,6 @@ module Homebrew
                                                 .map { |k| Keg.new(k.resolved_path) }
     end
 
-    def print_dry_run_dependencies(formula, fi_deps)
-      return if fi_deps.empty?
-
-      plural = "dependency".pluralize(fi_deps.count)
-      ohai "Would upgrade #{fi_deps.count} #{plural} for #{formula.full_specified_name}:"
-      formulae_upgrades = fi_deps.map(&:first).map(&:to_formula).map do |f|
-        name = f.full_specified_name
-        if f.optlinked?
-          "#{name} #{Keg.new(f.opt_prefix).version} -> #{f.pkg_version}"
-        else
-          "#{name} #{f.pkg_version}"
-        end
-      end
-      puts formulae_upgrades.join(", ")
-    end
-
     def print_upgrade_message(formula, fi_options)
       version_upgrade = if formula.optlinked?
         "#{Keg.new(formula.opt_prefix).version} -> #{formula.pkg_version}"
@@ -178,7 +162,14 @@ module Homebrew
       formula = formula_installer.formula
 
       if dry_run
-        print_dry_run_dependencies(formula, formula_installer.compute_dependencies)
+        Install.print_dry_run_dependencies(formula, formula_installer.compute_dependencies) do |f|
+          name = f.full_specified_name
+          if f.optlinked?
+            "#{name} #{Keg.new(f.opt_prefix).version} -> #{f.pkg_version}"
+          else
+            "#{name} #{f.pkg_version}"
+          end
+        end
         return
       end