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

livecheck: Selectively pass args to #find_versions

Browse Source 
The existing way of passing values to `#find_versions` methods in
strategies leads to type issues when the Sorbet runtime is enabled.
We've also recently talked about moving away from nilable args when
we can specify a default value but this doesn't work if we pass in a
`nil` value (like we're currently doing).

This commit aims to address both of those areas by better controlling
which arguments we're passing to `#find_versions`. This approach
naively handles `cask`/`url` arguments by special-casing
`ExtractPlist`.

However, we should be checking the strategy's `#find_versions`
method for a `cask` or `url` keyword parameter. The issue is that
`strategy.method(:find_versions).parameters` is returning
`[[:rest, :args], [:block, :blk]]` instead of the actual parameters
like `[[:keyreq, :url], [:key, :regex], [:keyrest, :unused],
[:block, :block]]`.
This commit is contained in:
Sam Ford 2023-04-28 17:23:30 -04:00
parent cd683aefa8
commit a28e1aa422
No known key found for this signature in database
GPG Key ID: 7AF5CBEE1DD6F76D
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -733,13 +733,22 @@ module Homebrew
end end
puts "Homebrew curl?: Yes" if debug && homebrew_curl.present? puts "Homebrew curl?: Yes" if debug && homebrew_curl.present?
strategy_data = strategy.find_versions( strategy_args = {
url: url,
regex: livecheck_regex, regex: livecheck_regex,
homebrew_curl: homebrew_curl, homebrew_curl: homebrew_curl,
cask: cask, }
&livecheck_strategy_block # TODO: Set `cask`/`url` args based on the presence of the keyword arg
) # in the strategy's `#find_versions` method once we figure out why
# `strategy.method(:find_versions).parameters` isn't working as
# expected.
if strategy_name == "ExtractPlist"
strategy_args[:cask] = cask if cask.present?
else
strategy_args[:url] = url
end
strategy_args.compact!
strategy_data = strategy.find_versions(**strategy_args, &livecheck_strategy_block)
match_version_map = strategy_data[:matches] match_version_map = strategy_data[:matches]
regex = strategy_data[:regex] regex = strategy_data[:regex]
messages = strategy_data[:messages] messages = strategy_data[:messages]
@ -912,12 +921,13 @@ module Homebrew
puts if debug && strategy.blank? puts if debug && strategy.blank?
next if strategy.blank? next if strategy.blank?
strategy_data = strategy.find_versions( strategy_args = {
url: url, url: url,
regex: livecheck_regex, regex: livecheck_regex,
homebrew_curl: false, homebrew_curl: false,
&livecheck_strategy_block }.compact
)
strategy_data = strategy.find_versions(**strategy_args, &livecheck_strategy_block)
match_version_map = strategy_data[:matches] match_version_map = strategy_data[:matches]
regex = strategy_data[:regex] regex = strategy_data[:regex]
messages = strategy_data[:messages] messages = strategy_data[:messages]