mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16715 from reitermarkus/tap-ensure-installed

Browse Source 
Clean up `Tap#ensure_installed!` usage.
This commit is contained in:
Mike McQuaid 2024-02-22 08:47:48 +00:00 committed by GitHub
commit 89fd6964f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/cmd/update-report.rb
View File

@ -304,9 +304,11 @@ module Homebrew
if Homebrew::EnvConfig.no_install_from_api? if Homebrew::EnvConfig.no_install_from_api?
return if Homebrew::EnvConfig.automatically_set_no_install_from_api? return if Homebrew::EnvConfig.automatically_set_no_install_from_api?
return if CoreTap.instance.installed?
CoreTap.ensure_installed! core_tap = CoreTap.instance
return if core_tap.installed?
core_tap.ensure_installed!
revision = CoreTap.instance.git_head revision = CoreTap.instance.git_head
ENV["HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_CORE"] = revision ENV["HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_CORE"] = revision
ENV["HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_CORE"] = revision ENV["HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_CORE"] = revision

14
Library/Homebrew/diagnostic.rb
View File

@ -523,21 +523,21 @@ module Homebrew
end end
def check_coretap_integrity def check_coretap_integrity
coretap = CoreTap.instance core_tap = CoreTap.instance
unless coretap.installed? unless core_tap.installed?
return unless EnvConfig.no_install_from_api? return unless EnvConfig.no_install_from_api?
CoreTap.ensure_installed! core_tap.ensure_installed!
end end
broken_tap(coretap) || examine_git_origin(coretap.git_repo, Homebrew::EnvConfig.core_git_remote) broken_tap(core_tap) || examine_git_origin(core_tap.git_repo, Homebrew::EnvConfig.core_git_remote)
end end
def check_casktap_integrity def check_casktap_integrity
default_cask_tap = CoreCaskTap.instance core_cask_tap = CoreCaskTap.instance
return unless default_cask_tap.installed? return unless core_cask_tap.installed?
broken_tap(default_cask_tap) || examine_git_origin(default_cask_tap.git_repo, default_cask_tap.remote) broken_tap(core_cask_tap) || examine_git_origin(core_cask_tap.git_repo, core_cask_tap.remote)
end end
sig { returns(T.nilable(String)) } sig { returns(T.nilable(String)) }

20
Library/Homebrew/tap.rb
View File

@ -67,14 +67,14 @@ class Tap
sig { returns(CoreCaskTap) } sig { returns(CoreCaskTap) }
def self.default_cask_tap def self.default_cask_tap
odisabled "Tap.default_cask_tap", "CoreCaskTap.instance" odisabled "`Tap.default_cask_tap`", "`CoreCaskTap.instance`"
CoreCaskTap.instance CoreCaskTap.instance
end end
sig { params(force: T::Boolean).returns(T::Boolean) } sig { params(force: T::Boolean).returns(T::Boolean) }
def self.install_default_cask_tap_if_necessary(force: false) def self.install_default_cask_tap_if_necessary(force: false)
odisabled "Tap.install_default_cask_tap_if_necessary", "CoreCaskTap.ensure_installed!" odisabled "`Tap.install_default_cask_tap_if_necessary`", "`CoreCaskTap.instance.ensure_installed!`"
false false
end end
@ -968,6 +968,8 @@ class AbstractCoreTap < Tap
sig { void } sig { void }
def self.ensure_installed! def self.ensure_installed!
# odeprecated "`#{self}.ensure_installed!`", "`#{self}.instance.ensure_installed!`"
instance.ensure_installed! instance.ensure_installed!
end end
@ -1043,7 +1045,7 @@ class CoreTap < AbstractCoreTap
sig { returns(Pathname) } sig { returns(Pathname) }
def formula_dir def formula_dir
@formula_dir ||= begin @formula_dir ||= begin
self.class.ensure_installed! ensure_installed!
super super
end end
end end
@ -1065,7 +1067,7 @@ class CoreTap < AbstractCoreTap
sig { returns(Pathname) } sig { returns(Pathname) }
def alias_dir def alias_dir
@alias_dir ||= begin @alias_dir ||= begin
self.class.ensure_installed! ensure_installed!
super super
end end
end end
@ -1074,7 +1076,7 @@ class CoreTap < AbstractCoreTap
sig { returns(T::Hash[String, String]) } sig { returns(T::Hash[String, String]) }
def formula_renames def formula_renames
@formula_renames ||= if Homebrew::EnvConfig.no_install_from_api? @formula_renames ||= if Homebrew::EnvConfig.no_install_from_api?
self.class.ensure_installed! ensure_installed!
super super
else else
Homebrew::API::Formula.all_renames Homebrew::API::Formula.all_renames
@ -1085,7 +1087,7 @@ class CoreTap < AbstractCoreTap
sig { returns(Hash) } sig { returns(Hash) }
def tap_migrations def tap_migrations
@tap_migrations ||= if Homebrew::EnvConfig.no_install_from_api? @tap_migrations ||= if Homebrew::EnvConfig.no_install_from_api?
self.class.ensure_installed! ensure_installed!
super super
else else
migrations, = Homebrew::API.fetch_json_api_file "formula_tap_migrations.jws.json", migrations, = Homebrew::API.fetch_json_api_file "formula_tap_migrations.jws.json",
@ -1098,7 +1100,7 @@ class CoreTap < AbstractCoreTap
sig { returns(Hash) } sig { returns(Hash) }
def audit_exceptions def audit_exceptions
@audit_exceptions ||= begin @audit_exceptions ||= begin
self.class.ensure_installed! ensure_installed!
super super
end end
end end
@ -1107,7 +1109,7 @@ class CoreTap < AbstractCoreTap
sig { returns(Hash) } sig { returns(Hash) }
def style_exceptions def style_exceptions
@style_exceptions ||= begin @style_exceptions ||= begin
self.class.ensure_installed! ensure_installed!
super super
end end
end end
@ -1116,7 +1118,7 @@ class CoreTap < AbstractCoreTap
sig { returns(Hash) } sig { returns(Hash) }
def pypi_formula_mappings def pypi_formula_mappings
@pypi_formula_mappings ||= begin @pypi_formula_mappings ||= begin
self.class.ensure_installed! ensure_installed!
super super
end end
end end