Refactor code to find dependents of kegs

Library/Homebrew/keg.rb

@@ -137,18 +137,19 @@ class Keg
   LIBTOOL_EXTENSIONS = %w[.la .lai].freeze
 
   # Given an array of kegs, this method will try to find some other kegs
-  # that depend on them. If it does, it returns:
+  # or casks that depend on them. If it does, it returns:
   #
   # - some kegs in the passed array that have installed dependents
   # - some installed dependents of those kegs.
   #
   # If it doesn't, it returns nil.
   #
-  # Note that nil will be returned if the only installed dependents
+  # Note that nil will be returned if the only installed dependents of the
-  # in the passed kegs are other kegs in the array.
+  # passed kegs are other kegs in the array or casks present in the casks
+  # parameter.
   #
   # For efficiency, we don't bother trying to get complete data.
-  def self.find_some_installed_dependents(kegs)
+  def self.find_some_installed_dependents(kegs, casks: [])
     keg_names = kegs.select(&:optlinked?).map(&:name)
     keg_formulae = []
     kegs_by_source = kegs.group_by do |keg|
@@ -167,10 +168,16 @@ class Keg
     all_dependents = []
 
     # Don't include dependencies of kegs that were in the given array.
-    formulae_to_check = Formula.installed - keg_formulae
+    dependents_to_check = (Formula.installed - keg_formulae) + (Cask::Caskroom.casks - casks)
+
+    dependents_to_check.each do |dependent|
+      required = case dependent
+      when Formula
+        dependent.missing_dependencies(hide: keg_names)
+      when Cask::Cask
+        CaskDependent.new(dependent).runtime_dependencies.map(&:to_formula)
+      end
 
-    formulae_to_check.each do |dependent|
-      required = dependent.missing_dependencies(hide: keg_names)
       required_kegs = required.map do |f|
         f_kegs = kegs_by_source[[f.name, f.tap]]
         next unless f_kegs
@@ -190,57 +197,6 @@ class Keg
     [all_required_kegs.to_a, all_dependents.sort]
   end
 
-  # Given an array of kegs, this method finds casks dependent on them
-  # except those included in the `casks` array. If it does, it returns:
-  #
-  # - kegs in the passed array that have dependent casks
-  # - installed casks dependent on them.
-  #
-  # If it doesn't, it returns nil.
-  #
-  # If all dependent casks are included in the `casks` array, the value
-  # returned is nil.
-  def self.find_cask_dependents(kegs, casks)
-    return if kegs.blank?
-
-    casks_to_check = Cask::Caskroom.casks - casks
-    return if casks_to_check.blank?
-
-    kegs_by_source = kegs.group_by do |keg|
-      f = keg.to_formula
-      [f.name, f.tap]
-    rescue
-      [keg.name, keg.tab.tap]
-    end
-
-    all_required_kegs = Set.new
-    all_dependents = []
-
-    casks_to_check.each do |dependent|
-      dependencies = CaskDependent.new(dependent).runtime_dependencies
-      next if dependencies.blank?
-
-      required = dependencies.map(&:to_formula)
-
-      required_kegs = required.map do |f|
-        f_kegs = kegs_by_source[[f.name, f.tap]]
-        next unless f_kegs
-
-        f_kegs.max_by(&:version)
-      end.compact
-
-      next if required_kegs.blank?
-
-      all_required_kegs += required_kegs
-      all_dependents << dependent.to_s
-    end
-
-    return if all_required_kegs.blank?
-    return if all_dependents.blank?
-
-    [all_required_kegs.to_a, all_dependents.sort]
-  end
-
   # @param path if this is a file in a keg, returns the containing {Keg} object.
   def self.for(path)
     original_path = path

Library/Homebrew/uninstall.rb

@@ -108,16 +108,7 @@ module Homebrew
     end
 
     def check_for_dependents(kegs, casks: [], named_args: [])
-      result_kegs = Keg.find_some_installed_dependents(kegs)
+      return false unless result = Keg.find_some_installed_dependents(kegs, casks: casks)
-      result_casks = Keg.find_cask_dependents(kegs, casks)
-
-      return false if result_kegs.blank? && result_casks.blank?
-
-      result = if result_kegs.present? && result_casks.present?
-        [(result_kegs[0] + result_casks[0]).uniq, result_kegs[1] + result_casks[1]]
-      else
-        result_kegs || result_casks
-      end
 
       if Homebrew::EnvConfig.developer?
         DeveloperDependentsMessage.new(*result, named_args: named_args).output