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

Refactored a bit + brew style --fix

Browse Source
This commit is contained in:
Mohammad Zain Abbas 2022-08-02 00:27:53 +02:00
parent e718318eaf
commit 9c4b9b7e14
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,10 +293,10 @@ module Homebrew
resource_version_info = formula_or_cask.resources.map do |resource| resource_version_info = formula_or_cask.resources.map do |resource|
resource_info = resource_version( resource_info = resource_version(
resource, resource,
json: json, json: json,
full_name: use_full_name, full_name: use_full_name,
verbose: verbose, verbose: verbose,
debug: debug, debug: debug,
) )
resource_info resource_info
end end
@ -360,7 +360,8 @@ module Homebrew
next info next info
end end
print_latest_version(info, verbose: verbose, ambiguous_cask: ambiguous_casks.include?(formula_or_cask), check_resource: false) print_latest_version(info, verbose: verbose, ambiguous_cask: ambiguous_casks.include?(formula_or_cask),
check_resource: false)
if check_resources && formula_or_cask.resources.present? if check_resources && formula_or_cask.resources.present?
resources_info = [] resources_info = []
@ -381,7 +382,7 @@ module Homebrew
info = {} info = {}
info[:resource] = resource[:name] info[:resource] = resource[:name]
info[:meta] = { livecheckable: resource[:livecheckable], } info[:meta] = { livecheckable: resource[:livecheckable] }
info[:version] = { info[:version] = {
current: current_str, current: current_str,
latest: latest_str, latest: latest_str,
@ -390,10 +391,10 @@ module Homebrew
} }
resources_info << info resources_info << info
end end
resources_info.each do |info| resources_info.each do |r_info|
print_latest_version( print_latest_version(
info, r_info,
verbose: verbose, verbose: verbose,
ambiguous_cask: ambiguous_casks.include?(formula_or_cask), ambiguous_cask: ambiguous_casks.include?(formula_or_cask),
check_resource: true, check_resource: true,
) )
@ -538,7 +539,8 @@ module Homebrew
when :url when :url
package_or_resource.url&.to_s if package_or_resource.is_a?(Cask::Cask) || package_or_resource.is_a?(Resource) package_or_resource.url&.to_s if package_or_resource.is_a?(Cask::Cask) || package_or_resource.is_a?(Resource)
when :head, :stable when :head, :stable
# Since resource's "url" is considered "stable" by default. And some resources may contain in "head" block as well # Since resource's "url" is considered "stable" by default.
# And some resources may contain in "head" block as well
package_or_resource.send(:url)&.to_s if package_or_resource.is_a?(Resource) package_or_resource.send(:url)&.to_s if package_or_resource.is_a?(Resource)
package_or_resource.send(livecheck_url)&.url if package_or_resource.is_a?(Formula) package_or_resource.send(livecheck_url)&.url if package_or_resource.is_a?(Formula)
when :homepage when :homepage
@ -785,7 +787,6 @@ module Homebrew
version.to_s.include?(rejection) version.to_s.include?(rejection)
end end
end end
next if match_version_map.blank? next if match_version_map.blank?
if debug if debug
@ -804,14 +805,11 @@ module Homebrew
resource_version_info[:version][:latest] = Version.new(match_version_map.values.max_by do |v| resource_version_info[:version][:latest] = Version.new(match_version_map.values.max_by do |v|
LivecheckVersion.create(resource, v) LivecheckVersion.create(resource, v)
end) end)
next unless json next unless json
resource_version_info[:meta] = {} resource_version_info[:meta] = { livecheckable: has_livecheckable ? "Yes" : "No" }
resource_version_info[:meta][:livecheckable] = has_livecheckable ? "Yes" : "No"
if has_livecheckable if has_livecheckable
resource_version_info[:meta][:livecheck] = {} resource_version_info[:meta][:livecheck] = { url: {} }
resource_version_info[:meta][:livecheck][:url] = {}
if livecheck_url.is_a?(Symbol) && livecheck_url_string if livecheck_url.is_a?(Symbol) && livecheck_url_string
resource_version_info[:meta][:livecheck][:url][:symbol] = resource_version_info[:meta][:livecheck][:url][:symbol] =
livecheck_url livecheck_url
@ -823,10 +821,7 @@ module Homebrew
resource_version_info[:meta][:livecheck][:url][:final] = resource_version_info[:meta][:livecheck][:url][:final] =
strategy_data[:final_url] strategy_data[:final_url]
end end
if homebrew_curl.present? resource_version_info[:meta][:livecheck][:url][:homebrew_curl] = homebrew_curl if homebrew_curl.present?
resource_version_info[:meta][:livecheck][:url][:homebrew_curl] =
homebrew_curl
end
resource_version_info[:meta][:livecheck][:strategy] = strategy.present? ? strategy_name : nil resource_version_info[:meta][:livecheck][:strategy] = strategy.present? ? strategy_name : nil
if strategies.present? if strategies.present?
resource_version_info[:meta][:livecheck][:strategies] = strategies.map do |s| resource_version_info[:meta][:livecheck][:strategies] = strategies.map do |s|
@ -835,22 +830,19 @@ module Homebrew
end end
resource_version_info[:meta][:livecheck][:regex] = regex.inspect if regex.present? resource_version_info[:meta][:livecheck][:regex] = regex.inspect if regex.present?
resource_version_info[:meta][:livecheck][:cached] = true if strategy_data[:cached] == true resource_version_info[:meta][:livecheck][:cached] = true if strategy_data[:cached] == true
end end
resource_version_info[:meta][:url] = {} resource_version_info[:meta][:url] = { original: original_url }
resource_version_info[:meta][:url][:original] = original_url
resource_version_info[:meta][:url][:processed] = url if url != original_url resource_version_info[:meta][:url][:processed] = url if url != original_url
end end
else else
# If there's no livecheck block in resource # If there's no livecheck block in resource
resource_version_info[:version][:latest] = resource.version resource_version_info[:version][:latest] = resource.version
if json && verbose resource_version_info[:meta] = { url: resource.url.to_s } if json && verbose
resource_version_info[:meta] = {}
resource_version_info[:meta][:url] = resource.url.to_s
end
end end
resource_version_info[:version][:newer_than_upstream] = resource_version_info[:version][:current] > resource_version_info[:version][:latest] resource_version_info[:version][:newer_than_upstream] =
resource_version_info[:version][:outdated] = resource_version_info[:version][:current] < resource_version_info[:version][:latest] 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 resource_version_info
end end