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

Merge pull request #16777 from reitermarkus/tap-sig-3

Browse Source 
Simplify `Tap#formula_files_by_name`.
This commit is contained in:
Mike McQuaid 2024-03-01 08:41:33 +00:00 committed by GitHub
commit 0e1c1e3435
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/formulary.rb
View File

@ -1201,7 +1201,6 @@ module Formulary
"#{name}.rb" "#{name}.rb"
end end
Tap.formula_files_by_name(tap) tap.formula_files_by_name.fetch(name, tap.formula_dir/filename)
.fetch(name, tap.formula_dir/filename)
end end
end end

14
Library/Homebrew/tap.rb
View File

@ -128,6 +128,7 @@ class Tap
@command_dir = nil @command_dir = nil
@formula_names = nil @formula_names = nil
@formula_files = nil @formula_files = nil
@formula_files_by_name = nil
@cask_files = nil @cask_files = nil
@cask_files_by_name = nil @cask_files_by_name = nil
@alias_dir = nil @alias_dir = nil
@ -561,19 +562,12 @@ class Tap
end end
end end
# A cached hash of {Formula} basenames to {Formula} file pathnames for a {Tap} # A mapping of {Formula} names to {Formula} file paths.
sig { params(tap: Tap).returns(T::Hash[String, Pathname]) } #
def self.formula_files_by_name(tap)
cache_key = "formula_files_by_name_#{tap}"
cache.fetch(cache_key) do |key|
cache[key] = tap.formula_files_by_name
end
end
# @private # @private
sig { returns(T::Hash[String, Pathname]) } sig { returns(T::Hash[String, Pathname]) }
def formula_files_by_name def formula_files_by_name
formula_files.each_with_object({}) do |file, hash| @formula_files_by_name ||= formula_files.each_with_object({}) do |file, hash|
# If there's more than one file with the same basename: use the longer one to prioritise more specific results. # If there's more than one file with the same basename: use the longer one to prioritise more specific results.
basename = file.basename(".rb").to_s basename = file.basename(".rb").to_s
existing_file = hash[basename] existing_file = hash[basename]