admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Use API helper methods

Browse Source
This commit is contained in:
Rylan Polster 2025-08-12 17:04:15 -04:00
parent 20eb1e15b8
commit 0f9fb4f29a
No known key found for this signature in database
8 changed files with 105 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Library/Homebrew/api.rb
View File

@ -4,6 +4,7 @@
require "api/analytics"
require "api/cask"
require "api/formula"
require "api/internal"
require "base64"
module Homebrew
@ -216,6 +217,69 @@ module Homebrew
Tap.fetch(org, repo)
end
sig { returns(T::Array[String]) }
def self.formula_names
if ENV.fetch("HOMEBREW_USE_INTERNAL_API", false).present?
Homebrew::API::Internal.formula_arrays.keys
else
Homebrew::API::Formula.all_formulae.keys
end
end
sig { returns(T::Hash[String, String]) }
def self.formula_aliases
if ENV.fetch("HOMEBREW_USE_INTERNAL_API", false).present?
Homebrew::API::Internal.formula_aliases
else
Homebrew::API::Formula.all_aliases
end
end
sig { returns(T::Hash[String, String]) }
def self.formula_renames
if ENV.fetch("HOMEBREW_USE_INTERNAL_API", false).present?
Homebrew::API::Internal.formula_renames
else
Homebrew::API::Formula.all_renames
end
end
sig { returns(T::Hash[String, String]) }
def self.formula_tap_migrations
if ENV.fetch("HOMEBREW_USE_INTERNAL_API", false).present?
Homebrew::API::Internal.formula_tap_migrations
else
Homebrew::API::Formula.tap_migrations
end
end
sig { returns(T::Array[String]) }
def self.cask_tokens
if ENV.fetch("HOMEBREW_USE_INTERNAL_API", false).present?
Homebrew::API::Internal.cask_hashes.keys
else
Homebrew::API::Cask.all_casks.keys
end
end
sig { returns(T::Hash[String, String]) }
def self.cask_renames
if ENV.fetch("HOMEBREW_USE_INTERNAL_API", false).present?
Homebrew::API::Internal.cask_renames
else
Homebrew::API::Cask.all_renames
end
end
sig { returns(T::Hash[String, String]) }
def self.cask_tap_migrations
if ENV.fetch("HOMEBREW_USE_INTERNAL_API", false).present?
Homebrew::API::Internal.cask_tap_migrations
else
Homebrew::API::Cask.tap_migrations
end
end
end
sig { params(block: T.proc.returns(T.untyped)).returns(T.untyped) }

4
Library/Homebrew/cask/cask_loader.rb
View File

@ -306,8 +306,8 @@ module Cask
return if Homebrew::EnvConfig.no_install_from_api?
return unless ref.is_a?(String)
return unless (token = ref[HOMEBREW_DEFAULT_TAP_CASK_REGEX, :token])
if !Homebrew::API::Cask.all_casks.key?(token) &&
!Homebrew::API::Cask.all_renames.key?(token)
if Homebrew::API.cask_tokens.exclude?(token) &&
!Homebrew::API.cask_renames.key?(token)
return
end

4
Library/Homebrew/cli/named_args.rb
View File

@ -207,13 +207,13 @@ module Homebrew
if formula_path.exist? ||
(!Homebrew::EnvConfig.no_install_from_api? &&
!CoreTap.instance.installed? &&
Homebrew::API::Formula.all_formulae.key?(path.basename.to_s))
Homebrew::API.formula_names.include?(path.basename.to_s))
paths << formula_path
end
if cask_path.exist? ||
(!Homebrew::EnvConfig.no_install_from_api? &&
!CoreCaskTap.instance.installed? &&
Homebrew::API::Cask.all_casks.key?(path.basename.to_s))
Homebrew::API.cask_tokens.include?(path.basename.to_s))
paths << cask_path
end

4
Library/Homebrew/dev-cmd/edit.rb
View File

@ -110,7 +110,7 @@ module Homebrew
raise TapUnavailableError, "#{tap_match[:user]}/#{tap_match[:repo]}"
elsif cask || core_cask_path?(path)
if !CoreCaskTap.instance.installed? && Homebrew::API::Cask.all_casks.key?(name)
if !CoreCaskTap.instance.installed? && Homebrew::API.cask_tokens.include?(name)
command = "brew tap --force #{CoreCaskTap.instance.name}"
action = "tap #{CoreCaskTap.instance.name}"
else
@ -119,7 +119,7 @@ module Homebrew
end
elsif core_formula_path?(path) &&
!CoreTap.instance.installed? &&
Homebrew::API::Formula.all_formulae.key?(name)
Homebrew::API.formula_names.include?(name)
command = "brew tap --force #{CoreTap.instance.name}"
action = "tap #{CoreTap.instance.name}"
else

6
Library/Homebrew/formulary.rb
View File

@ -875,9 +875,9 @@ module Formulary
return if Homebrew::EnvConfig.no_install_from_api?
return unless ref.is_a?(String)
return unless (name = ref[HOMEBREW_DEFAULT_TAP_FORMULA_REGEX, :name])
if !Homebrew::API::Formula.all_formulae.key?(name) &&
!Homebrew::API::Formula.all_aliases.key?(name) &&
!Homebrew::API::Formula.all_renames.key?(name)
if Homebrew::API.formula_names.exclude?(name) &&
!Homebrew::API.formula_aliases.key?(name) &&
!Homebrew::API.formula_renames.key?(name)
return
end

51
Library/Homebrew/tap.rb
View File

@ -1345,13 +1345,18 @@ class CoreTap < AbstractCoreTap
end, T.nilable(Pathname))
end
sig { override.params(name: String).returns(Pathname) }
def new_formula_path(name)
formula_subdir = if name.start_with?("lib")
sig { params(name: String).returns(String) }
def new_formula_subdirectory(name)
if name.start_with?("lib")
"lib"
else
name[0].to_s
end
end
sig { override.params(name: String).returns(Pathname) }
def new_formula_path(name)
formula_subdir = new_formula_subdirectory(name)
return super unless (formula_dir/formula_subdir).directory?
@ -1373,7 +1378,7 @@ class CoreTap < AbstractCoreTap
ensure_installed!
super
else
Homebrew::API::Formula.all_renames
Homebrew::API.formula_renames
end,
T.nilable(T::Hash[String, String]),
)
@ -1386,7 +1391,7 @@ class CoreTap < AbstractCoreTap
ensure_installed!
super
else
Homebrew::API::Formula.tap_migrations
Homebrew::API.formula_tap_migrations
end,
T.nilable(T::Hash[String, T.untyped]),
)
@ -1443,7 +1448,7 @@ class CoreTap < AbstractCoreTap
if Homebrew::EnvConfig.no_install_from_api?
super
else
Homebrew::API::Formula.all_aliases
Homebrew::API.formula_aliases
end,
T.nilable(T::Hash[String, String]),
)
@ -1460,7 +1465,7 @@ class CoreTap < AbstractCoreTap
def formula_names
return super if Homebrew::EnvConfig.no_install_from_api?
Homebrew::API::Formula.all_formulae.keys
Homebrew::API.formula_names
end
sig { override.returns(T::Hash[String, Pathname]) }
@ -1469,13 +1474,12 @@ class CoreTap < AbstractCoreTap
@formula_files_by_name ||= T.let(
begin
tap_path = path.to_s
Homebrew::API::Formula.all_formulae.each_with_object({}) do |item, hash|
name, formula_hash = item
formula_directory_path = formula_dir.to_s
Homebrew::API.formula_names.each_with_object({}) do |name, hash|
# If there's more than one item with the same path: use the longer one to prioritise more specific results.
existing_path = hash[name]
# Pathname equivalent is slow in a tight loop
new_path = File.join(tap_path, formula_hash.fetch("ruby_source_path"))
new_path = File.join(formula_directory_path, new_formula_subdirectory(name), "#{name.downcase}.rb")
hash[name] = Pathname(new_path) if existing_path.nil? || existing_path.to_s.length < new_path.length
end
end,
@ -1500,14 +1504,18 @@ class CoreCaskTap < AbstractCoreTap
true
end
sig { override.params(token: String).returns(Pathname) }
def new_cask_path(token)
cask_subdir = if token.start_with?("font-")
sig { params(token: String).returns(String) }
def new_cask_subdirectory(token)
if token.start_with?("font-")
"font/font-#{token.delete_prefix("font-")[0]}"
else
token[0].to_s
end
cask_dir/cask_subdir/"#{token.downcase}.rb"
end
sig { override.params(token: String).returns(Pathname) }
def new_cask_path(token)
cask_dir/new_cask_subdirectory(token)/"#{token.downcase}.rb"
end
sig { override.returns(T::Array[Pathname]) }
@ -1521,7 +1529,7 @@ class CoreCaskTap < AbstractCoreTap
def cask_tokens
return super if Homebrew::EnvConfig.no_install_from_api?
Homebrew::API::Cask.all_casks.keys
Homebrew::API.cask_tokens
end
sig { override.returns(T::Hash[String, Pathname]) }
@ -1530,13 +1538,12 @@ class CoreCaskTap < AbstractCoreTap
@cask_files_by_name ||= T.let(
begin
tap_path = path.to_s
Homebrew::API::Cask.all_casks.each_with_object({}) do |item, hash|
name, cask_hash = item
cask_directory_path = cask_dir.to_s
Homebrew::API.cask_tokens.each_with_object({}) do |name, hash|
# If there's more than one item with the same path: use the longer one to prioritise more specific results.
existing_path = hash[name]
# Pathname equivalent is slow in a tight loop
new_path = File.join(tap_path, cask_hash.fetch("ruby_source_path"))
new_path = File.join(cask_directory_path, new_cask_subdirectory(name), "#{name.downcase}.rb")
hash[name] = Pathname(new_path) if existing_path.nil? || existing_path.to_s.length < new_path.length
end
end,
@ -1550,7 +1557,7 @@ class CoreCaskTap < AbstractCoreTap
if Homebrew::EnvConfig.no_install_from_api?
super
else
Homebrew::API::Cask.all_renames
Homebrew::API.cask_renames
end,
T.nilable(T::Hash[String, String]),
)
@ -1562,7 +1569,7 @@ class CoreCaskTap < AbstractCoreTap
if Homebrew::EnvConfig.no_install_from_api?
super
else
Homebrew::API::Cask.tap_migrations
Homebrew::API.cask_tap_migrations
end,
T.nilable(T::Hash[String, T.untyped]),
)

2
Library/Homebrew/uninstall.rb
View File

@ -68,7 +68,7 @@ module Homebrew
unversioned_name = f.name.gsub(/@.+$/, "")
maybe_paths = Dir.glob("#{f.etc}/#{unversioned_name}*")
excluded_names = Homebrew::API::Formula.all_formulae.keys
excluded_names = Homebrew::API.formula_names
maybe_paths = maybe_paths.reject do |path|
# Remove extension only if a file
# (e.g. directory with name "openssl@1.1" will be trimmed to "openssl@1")

4
Library/Homebrew/utils/analytics.rb
View File

@ -329,7 +329,7 @@ module Utils
require "api"
return unless Homebrew::API::Formula.all_formulae.key? formula.name
return unless Homebrew::API.formula_names.include? formula.name
json = Homebrew::API::Formula.formula_json formula.name
return if json.blank? || json["analytics"].blank?
@ -347,7 +347,7 @@ module Utils
require "api"
return unless Homebrew::API::Cask.all_casks.key? cask.token
return unless Homebrew::API.cask_tokens.include? cask.token
json = Homebrew::API::Cask.cask_json cask.token
return if json.blank? || json["analytics"].blank?