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

Refactored code for resources in livecheck command

Browse Source
This commit is contained in:
Mohammad Zain Abbas 2022-08-07 18:14:24 +02:00
parent 656b18b13a
commit 6055f78218
1 changed files with 167 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,9 +286,9 @@ module Homebrew
# Check current and latest resources (if "--resources" flag is given)
# Only check current and latest versions if we have resources to check against
if check_resources && formula_or_cask.is_a?(Formula) && formula_or_cask.resources.present?
current_resources = formula_or_cask.resources.map do |resource|
{ name: resource.name, version: resource.version, livecheckable: resource.livecheckable? }
end
# current_resources = formula_or_cask.resources.map do |resource|
# { name: resource.name, version: resource.version, livecheckable: resource.livecheckable? }
# end
resource_version_info = formula_or_cask.resources.map do |resource|
resource_info = resource_version(
@ -301,9 +301,11 @@ module Homebrew
resource_info
end
latest_resources = resource_version_info.map do |resource|
{ name: resource[:resource], version: resource[:version][:latest] }
end
# p "resource_version_info: #{resource_version_info}"
# latest_resources = resource_version_info.map do |resource|
# { name: resource[:resource], version: resource[:version][:latest] }
# end
end
if latest.blank?
@ -348,34 +350,36 @@ module Homebrew
info[:meta][:head_only] = true if formula&.head_only?
info[:meta].merge!(version_info[:meta]) if version_info.present? && version_info.key?(:meta)
if check_resources && formula_or_cask.is_a?(Formula) && formula_or_cask.resources.present?
resources_info = []
latest_resources_names = latest_resources.map { |r| r[:name] }
current_resources.each do |resource|
current = resource[:version]
current_str = current.to_s
latest = if latest_resources_names.include?(resource[:name].to_s)
res = latest_resources.find { |r| r[:name].to_s == resource[:name].to_s }
res[:version]
else
current
end
latest_str = latest.to_s
info[:resources] = resource_version_info
# resources_info = []
# latest_resources_names = latest_resources.map { |r| r[:name] }
# current_resources.each do |resource|
# current = resource[:version]
# current_str = current.to_s
# latest = if latest_resources_names.include?(resource[:name].to_s)
# res = latest_resources.find { |r| r[:name].to_s == resource[:name].to_s }
# res[:version]
# else
# current
# end
# latest_str = latest.to_s
is_newer_than_upstream = current > latest
is_outdated = (current != latest) && !is_newer_than_upstream
# is_newer_than_upstream = current > latest
# is_outdated = (current != latest) && !is_newer_than_upstream
res_info = {}
res_info[:resource] = resource[:name]
res_info[:version] = {
current: current_str,
latest: latest_str,
newer_than_upstream: is_newer_than_upstream,
outdated: is_outdated,
}
resources_info << res_info
end
info[:resources] = resources_info
# res_info = {}
# res_info[:resource] = resource[:name]
# res_info[:version] = {
# current: current_str,
# latest: latest_str,
# newer_than_upstream: is_newer_than_upstream,
# outdated: is_outdated,
# }
# resources_info << res_info
# end
# info[:resources] = resources_info
end
next if newer_only && !info[:version][:outdated]
@ -391,7 +395,7 @@ module Homebrew
print_latest_version(info, verbose: verbose, ambiguous_cask: ambiguous_casks.include?(formula_or_cask), resource: false)
if check_resources && formula_or_cask.resources.present?
resources_info.each do |r_info|
resource_version_info.each do |r_info|
print_latest_version(
r_info,
verbose: verbose,
@ -672,20 +676,13 @@ module Homebrew
puts "Livecheckable?: #{has_livecheckable ? "Yes" : "No"}"
end
resource_version_info = {
resource: resource_name(resource, full_name: full_name),
version: {
current: resource.version,
},
}
resource_version_info = {}
# Check resources with livecheck block (will be updated in the future)
if has_livecheckable
livecheck = resource.livecheck
livecheck_url = livecheck.url
livecheck_regex = livecheck.regex
livecheck_strategy = livecheck.strategy
livecheck_strategy_block = livecheck.strategy_block
livecheck_url = has_livecheckable ? livecheck.url : resource.url
livecheck_regex = livecheck&.regex
livecheck_strategy = livecheck&.strategy
livecheck_strategy_block = livecheck&.strategy_block
livecheck_url_string = livecheck_url_to_string(
livecheck_url,
@ -799,47 +796,52 @@ module Homebrew
end
end
resource_version_info[:version][:latest] = Version.new(match_version_map.values.max_by do |v|
LivecheckVersion.create(resource, v)
end)
next unless json
res_current = resource.version
res_latest = Version.new(match_version_map.values.max_by do |v| LivecheckVersion.create(resource, v) end)
is_newer_than_upstream = res_current > res_latest
is_outdated = (res_current != res_latest) && !is_newer_than_upstream
resource_version_info = {
resource: resource_name(resource, full_name: full_name),
version: {
current: res_current.to_s,
latest: res_latest.to_s,
newer_than_upstream: is_newer_than_upstream,
outdated: is_outdated,
},
}
if json && verbose
resource_version_info[:meta] = { livecheckable: has_livecheckable ? "Yes" : "No" }
if has_livecheckable
resource_version_info[:meta][:livecheck] = { url: {} }
res_livecheck = { url: {} }
if livecheck_url.is_a?(Symbol) && livecheck_url_string
resource_version_info[:meta][:livecheck][:url][:symbol] =
res_livecheck[:url][:symbol] =
livecheck_url
end
if strategy_data[:url].present? && strategy_data[:url] != url
resource_version_info[:meta][:livecheck][:url][:strategy] = strategy_data[:url]
res_livecheck[:url][:strategy] = strategy_data[:url]
end
if strategy_data[:final_url]
resource_version_info[:meta][:livecheck][:url][:final] =
res_livecheck[:url][:final] =
strategy_data[:final_url]
end
resource_version_info[:meta][:livecheck][:url][:homebrew_curl] = homebrew_curl if homebrew_curl.present?
resource_version_info[:meta][:livecheck][:strategy] = strategy.present? ? strategy_name : nil
res_livecheck[:url][:homebrew_curl] = homebrew_curl if homebrew_curl.present?
res_livecheck[:strategy] = strategy.present? ? strategy_name : nil
if strategies.present?
resource_version_info[:meta][:livecheck][:strategies] = strategies.map do |s|
res_livecheck[:strategies] = strategies.map do |s|
livecheck_strategy_names[s]
end
end
resource_version_info[:meta][:livecheck][:regex] = regex.inspect if regex.present?
resource_version_info[:meta][:livecheck][:cached] = true if strategy_data[:cached] == true
res_livecheck[:regex] = regex.inspect if regex.present?
res_livecheck[:cached] = true if strategy_data[:cached] == true
resource_version_info[:meta][:livecheck] = res_livecheck
end
resource_version_info[:meta][:url] = { original: original_url }
resource_version_info[:meta][:url][:processed] = url if url != original_url
end
else
# If there's no livecheck block in resource
resource_version_info[:version][:latest] = resource.version
resource_version_info[:meta] = { url: resource.url.to_s } if json && verbose
end
resource_version_info[:version][:newer_than_upstream] =
resource_version_info[:version][:current] > resource_version_info[:version][:latest]
resource_version_info[:version][:outdated] =
resource_version_info[:version][:current] < resource_version_info[:version][:latest]
resource_version_info
end