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

Merge pull request #19040 from Homebrew/resource-livecheck-formula-latest

Browse Source 
livecheck: allow parent formula reference in resources
This commit is contained in:
Nanda H Krishna 2025-01-07 13:13:12 +00:00 committed by GitHub
commit 175cd9e5d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 67 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/livecheck.rb
View File

@ -54,20 +54,20 @@ class Livecheck
end end
# Sets the `@referenced_formula_name` instance variable to the provided # Sets the `@referenced_formula_name` instance variable to the provided
# `String` or returns the `@referenced_formula_name` instance variable when # `String`/`Symbol` or returns the `@referenced_formula_name` instance
# no argument is provided. Inherited livecheck values from the referenced # variable when no argument is provided. Inherited livecheck values from the
# formula (e.g. regex) can be overridden in the `livecheck` block. # referenced formula (e.g. regex) can be overridden in the `livecheck` block.
sig { sig {
params( params(
# Name of formula to inherit livecheck info from. # Name of formula to inherit livecheck info from.
formula_name: String, formula_name: T.any(String, Symbol),
).returns(T.nilable(String)) ).returns(T.nilable(T.any(String, Symbol)))
} }
def formula(formula_name = T.unsafe(nil)) def formula(formula_name = T.unsafe(nil))
case formula_name case formula_name
when nil when nil
@referenced_formula_name @referenced_formula_name
when String when String, :parent
@referenced_formula_name = formula_name @referenced_formula_name = formula_name
end end
end end

100
Library/Homebrew/livecheck/livecheck.rb
View File

@ -283,6 +283,7 @@ module Homebrew
resource, resource,
latest.to_s, latest.to_s,
json:, json:,
full_name: use_full_name,
debug:, debug:,
quiet:, quiet:,
verbose:, verbose:,
@ -669,14 +670,14 @@ module Homebrew
if livecheck_url.is_a?(Symbol) if livecheck_url.is_a?(Symbol)
# This assumes the URL symbol will fit within the available space # This assumes the URL symbol will fit within the available space
puts "URL (#{livecheck_url}):".ljust(18, " ") + original_url puts "URL (#{livecheck_url}):".ljust(18, " ") + original_url
else elsif original_url.present? && original_url != "None"
puts "URL: #{original_url}" puts "URL: #{original_url}"
end end
puts "URL (processed): #{url}" if url != original_url puts "URL (processed): #{url}" if url != original_url
if strategies.present? && verbose if strategies.present? && verbose
puts "Strategies: #{strategies.map { |s| livecheck_strategy_names[s] }.join(", ")}" puts "Strategies: #{strategies.map { |s| livecheck_strategy_names[s] }.join(", ")}"
end end
puts "Strategy: #{strategy.blank? ? "None" : strategy_name}" puts "Strategy: #{strategy_name}" if strategy.present?
puts "Regex: #{livecheck_regex.inspect}" if livecheck_regex.present? puts "Regex: #{livecheck_regex.inspect}" if livecheck_regex.present?
end end
@ -797,17 +798,18 @@ module Homebrew
end end
end end
version_info[:meta][:url] = {} if url != "None"
version_info[:meta][:url][:symbol] = livecheck_url if livecheck_url.is_a?(Symbol) && livecheck_url_string version_info[:meta][:url] = {}
version_info[:meta][:url][:original] = original_url version_info[:meta][:url][:symbol] = livecheck_url if livecheck_url.is_a?(Symbol) && livecheck_url_string
version_info[:meta][:url][:processed] = url if url != original_url version_info[:meta][:url][:original] = original_url
if strategy_data[:url].present? && strategy_data[:url] != url version_info[:meta][:url][:processed] = url if url != original_url
version_info[:meta][:url][:strategy] = strategy_data[:url] if strategy_data[:url].present? && strategy_data[:url] != url
version_info[:meta][:url][:strategy] = strategy_data[:url]
end
version_info[:meta][:url][:final] = strategy_data[:final_url] if strategy_data[:final_url]
version_info[:meta][:url][:homebrew_curl] = homebrew_curl if homebrew_curl.present?
end end
version_info[:meta][:url][:final] = strategy_data[:final_url] if strategy_data[:final_url] version_info[:meta][:strategy] = strategy_name if strategy.present?
version_info[:meta][:url][:homebrew_curl] = homebrew_curl if homebrew_curl.present?
version_info[:meta][:strategy] = strategy.present? ? strategy_name : nil
version_info[:meta][:strategies] = strategies.map { |s| livecheck_strategy_names[s] } if strategies.present? version_info[:meta][:strategies] = strategies.map { |s| livecheck_strategy_names[s] } if strategies.present?
version_info[:meta][:regex] = regex.inspect if regex.present? version_info[:meta][:regex] = regex.inspect if regex.present?
version_info[:meta][:cached] = true if strategy_data[:cached] == true version_info[:meta][:cached] = true if strategy_data[:cached] == true
@ -826,6 +828,7 @@ module Homebrew
resource: Resource, resource: Resource,
formula_latest: String, formula_latest: String,
json: T::Boolean, json: T::Boolean,
full_name: T::Boolean,
debug: T::Boolean, debug: T::Boolean,
quiet: T::Boolean, quiet: T::Boolean,
verbose: T::Boolean, verbose: T::Boolean,
@ -835,6 +838,7 @@ module Homebrew
resource, resource,
formula_latest, formula_latest,
json: false, json: false,
full_name: false,
debug: false, debug: false,
quiet: false, quiet: false,
verbose: false verbose: false
@ -850,6 +854,7 @@ module Homebrew
resource_version_info = {} resource_version_info = {}
livecheck = resource.livecheck livecheck = resource.livecheck
livecheck_reference = livecheck.formula
livecheck_url = livecheck.url livecheck_url = livecheck.url
livecheck_regex = livecheck.regex livecheck_regex = livecheck.regex
livecheck_strategy = livecheck.strategy livecheck_strategy = livecheck.strategy
@ -858,6 +863,7 @@ module Homebrew
livecheck_url_string = livecheck_url_to_string(livecheck_url, resource) if livecheck_url livecheck_url_string = livecheck_url_to_string(livecheck_url, resource) if livecheck_url
urls = [livecheck_url_string] if livecheck_url_string urls = [livecheck_url_string] if livecheck_url_string
urls = ["None"] if livecheck_reference == :parent
urls ||= checkable_urls(resource) urls ||= checkable_urls(resource)
checked_urls = [] checked_urls = []
@ -884,15 +890,18 @@ module Homebrew
if livecheck_url.is_a?(Symbol) if livecheck_url.is_a?(Symbol)
# This assumes the URL symbol will fit within the available space # This assumes the URL symbol will fit within the available space
puts "URL (#{livecheck_url}):".ljust(18, " ") + original_url puts "URL (#{livecheck_url}):".ljust(18, " ") + original_url
else elsif original_url.present? && original_url != "None"
puts "URL: #{original_url}" puts "URL: #{original_url}"
end end
puts "URL (processed): #{url}" if url != original_url puts "URL (processed): #{url}" if url != original_url
if strategies.present? && verbose if strategies.present? && verbose
puts "Strategies: #{strategies.map { |s| livecheck_strategy_names[s] }.join(", ")}" puts "Strategies: #{strategies.map { |s| livecheck_strategy_names[s] }.join(", ")}"
end end
puts "Strategy: #{strategy.blank? ? "None" : strategy_name}" puts "Strategy: #{strategy_name}" if strategy.present?
puts "Regex: #{livecheck_regex.inspect}" if livecheck_regex.present? puts "Regex: #{livecheck_regex.inspect}" if livecheck_regex.present?
if livecheck_reference == :parent
puts "Formula Ref: #{full_name ? resource.owner.full_name : resource.owner.name} (parent)"
end
end end
if livecheck_strategy.present? if livecheck_strategy.present?
@ -904,19 +913,26 @@ module Homebrew
next next
end end
end end
puts if debug && strategy.blank? puts if debug && strategy.blank? && livecheck_reference != :parent
next if strategy.blank? next if strategy.blank? && livecheck_reference != :parent
strategy_args = { if livecheck_reference == :parent
url:, match_version_map = { formula_latest => Version.new(formula_latest) }
regex: livecheck_regex, cached = true
homebrew_curl: false, else
}.compact strategy_args = {
url:,
regex: livecheck_regex,
homebrew_curl: false,
}.compact
strategy_data = strategy.find_versions(**strategy_args, &livecheck_strategy_block)
match_version_map = strategy_data[:matches]
regex = strategy_data[:regex]
messages = strategy_data[:messages]
cached = strategy_data[:cached]
end
strategy_data = strategy.find_versions(**strategy_args, &livecheck_strategy_block)
match_version_map = strategy_data[:matches]
regex = strategy_data[:regex]
messages = strategy_data[:messages]
checked_urls << url checked_urls << url
if messages.is_a?(Array) && match_version_map.blank? if messages.is_a?(Array) && match_version_map.blank?
@ -927,14 +943,14 @@ module Homebrew
end end
if debug if debug
if strategy_data[:url].present? && strategy_data[:url] != url if strategy_data&.dig(:url).present? && strategy_data[:url] != url
puts "URL (strategy): #{strategy_data[:url]}" puts "URL (strategy): #{strategy_data[:url]}"
end end
puts "URL (final): #{strategy_data[:final_url]}" if strategy_data[:final_url].present? puts "URL (final): #{strategy_data[:final_url]}" if strategy_data&.dig(:final_url).present?
if strategy_data[:regex].present? && strategy_data[:regex] != livecheck_regex if strategy_data&.dig(:regex).present? && strategy_data[:regex] != livecheck_regex
puts "Regex (strategy): #{strategy_data[:regex].inspect}" puts "Regex (strategy): #{strategy_data[:regex].inspect}"
end end
puts "Cached?: Yes" if strategy_data[:cached] == true puts "Cached?: Yes" if cached == true
end end
match_version_map.delete_if do |_match, version| match_version_map.delete_if do |_match, version|
@ -980,23 +996,29 @@ module Homebrew
resource_version_info[:meta] = { resource_version_info[:meta] = {
livecheck_defined: livecheck_defined, livecheck_defined: livecheck_defined,
url: {},
} }
if livecheck_url.is_a?(Symbol) && livecheck_url_string if livecheck_reference == :parent
resource_version_info[:meta][:url][:symbol] = livecheck_url resource_version_info[:meta][:references] =
[{ formula: full_name ? resource.owner.full_name : resource.owner.name, symbol: :parent }]
end end
resource_version_info[:meta][:url][:original] = original_url if url != "None"
resource_version_info[:meta][:url][:processed] = url if url != original_url resource_version_info[:meta][:url] = {}
if strategy_data[:url].present? && strategy_data[:url] != url if livecheck_url.is_a?(Symbol) && livecheck_url_string
resource_version_info[:meta][:url][:strategy] = strategy_data[:url] resource_version_info[:meta][:url][:symbol] = livecheck_url
end
resource_version_info[:meta][:url][:original] = original_url
resource_version_info[:meta][:url][:processed] = url if url != original_url
if strategy_data&.dig(:url).present? && strategy_data[:url] != url
resource_version_info[:meta][:url][:strategy] = strategy_data[:url]
end
resource_version_info[:meta][:url][:final] = strategy_data[:final_url] if strategy_data&.dig(:final_url)
end end
resource_version_info[:meta][:url][:final] = strategy_data[:final_url] if strategy_data[:final_url] resource_version_info[:meta][:strategy] = strategy_name if strategy.present?
resource_version_info[:meta][:strategy] = strategy.present? ? strategy_name : nil
if strategies.present? if strategies.present?
resource_version_info[:meta][:strategies] = strategies.map { |s| livecheck_strategy_names[s] } resource_version_info[:meta][:strategies] = strategies.map { |s| livecheck_strategy_names[s] }
end end
resource_version_info[:meta][:regex] = regex.inspect if regex.present? resource_version_info[:meta][:regex] = regex.inspect if regex.present?
resource_version_info[:meta][:cached] = true if strategy_data[:cached] == true resource_version_info[:meta][:cached] = true if cached == true
rescue => e rescue => e
Homebrew.failed = true Homebrew.failed = true
if json if json