Merge pull request #16714 from reitermarkus/tap-cask-files

Support `Tap#cask_files` when using API.
This commit is contained in:
Mike McQuaid 2024-02-22 08:47:18 +00:00 committed by GitHub
commit 689b76cbad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 17 deletions

View File

@ -936,25 +936,19 @@ module Homebrew
end end
def check_cask_taps def check_cask_taps
default_cask_tap = CoreCaskTap.instance
taps = Tap.select { |t| t.cask_dir.exist? && t != default_cask_tap }
taps.prepend(default_cask_tap) if EnvConfig.no_install_from_api?
error_tap_paths = [] error_tap_paths = []
add_info "Homebrew Cask Taps:", (taps.map do |tap| taps = (Tap.to_a + [CoreCaskTap.instance]).uniq
if tap.path.blank?
none_string
else
cask_count = begin
tap.cask_files.count
rescue
error_tap_paths << tap.path
0
end
"#{tap.path} (#{Utils.pluralize("cask", cask_count, include_count: true)})" add_info "Homebrew Cask Taps:", (taps.map do |tap|
cask_count = begin
tap.cask_files.count
rescue
error_tap_paths << tap.path
0
end end
"#{tap.path} (#{Utils.pluralize("cask", cask_count, include_count: true)})"
end) end)
taps_string = Utils.pluralize("tap", error_tap_paths.count) taps_string = Utils.pluralize("tap", error_tap_paths.count)

View File

@ -1198,9 +1198,9 @@ class CoreCaskTap < AbstractCoreTap
sig { override.returns(T::Array[Pathname]) } sig { override.returns(T::Array[Pathname]) }
def cask_files def cask_files
return super if Homebrew::EnvConfig.no_install_from_api? || installed? return super if Homebrew::EnvConfig.no_install_from_api?
raise TapUnavailableError, name cask_files_by_name.values
end end
sig { override.returns(T::Array[String]) } sig { override.returns(T::Array[String]) }