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

After running brew style --fix

Browse Source
This commit is contained in:
Mohammad Zain Abbas 2022-08-07 19:14:13 +02:00
parent 3d83e18142
commit 53b0d60f75
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,7 +353,8 @@ module Homebrew
next info next info
end end
puts if debug puts if debug
print_latest_version(info, verbose: verbose, ambiguous_cask: ambiguous_casks.include?(formula_or_cask), resource: false) print_latest_version(info, verbose: verbose, ambiguous_cask: ambiguous_casks.include?(formula_or_cask),
resource: false)
if check_for_resources if check_for_resources
resource_version_info.each do |r_info| resource_version_info.each do |r_info|
@ -758,47 +759,44 @@ module Homebrew
end end
res_current = resource.version res_current = resource.version
res_latest = Version.new(match_version_map.values.max_by do |v| LivecheckVersion.create(resource, v) end) res_latest = Version.new(match_version_map.values.max_by { |v| LivecheckVersion.create(resource, v) })
is_newer_than_upstream = res_current > res_latest is_newer_than_upstream = res_current > res_latest
is_outdated = (res_current != res_latest) && !is_newer_than_upstream is_outdated = (res_current != res_latest) && !is_newer_than_upstream
resource_version_info = { resource_version_info = {
resource: resource_name(resource, full_name: full_name), resource: resource_name(resource, full_name: full_name),
version: { version: {
current: res_current.to_s, current: res_current.to_s,
latest: res_latest.to_s, latest: res_latest.to_s,
newer_than_upstream: is_newer_than_upstream, newer_than_upstream: is_newer_than_upstream,
outdated: is_outdated, outdated: is_outdated,
}, },
} }
if json && verbose next unless json
resource_version_info[:meta] = { url: { original: original_url } } next unless verbose
resource_version_info[:meta][:url][:processed] = url if url != original_url
resource_version_info[:meta][:livecheckable] = has_livecheckable ? "Yes" : "No" resource_version_info[:meta] = { url: { original: original_url } }
if has_livecheckable resource_version_info[:meta][:url][:processed] = url if url != original_url
res_livecheck = { url: { original: livecheck_url } } resource_version_info[:meta][:livecheckable] = has_livecheckable ? "Yes" : "No"
if livecheck_url.is_a?(Symbol) && livecheck_url_string next unless has_livecheckable
res_livecheck[:url][:symbol] = livecheck_url
end res_livecheck = { url: { original: livecheck_url } }
if strategy_data[:url].present? && strategy_data[:url] != url res_livecheck[:url][:symbol] = livecheck_url if livecheck_url.is_a?(Symbol) && livecheck_url_string
res_livecheck[:url][:strategy] = strategy_data[:url] if strategy_data[:url].present? && strategy_data[:url] != url
end res_livecheck[:url][:strategy] = strategy_data[:url]
if strategy_data[:final_url] end
res_livecheck[:url][:final] = strategy_data[:final_url] res_livecheck[:url][:final] = strategy_data[:final_url] if strategy_data[:final_url]
end res_livecheck[:url][:homebrew_curl] = homebrew_curl if homebrew_curl.present?
res_livecheck[:url][:homebrew_curl] = homebrew_curl if homebrew_curl.present? res_livecheck[:strategy] = strategy.present? ? strategy_name : nil
res_livecheck[:strategy] = strategy.present? ? strategy_name : nil if strategies.present?
if strategies.present? res_livecheck[:strategies] = strategies.map do |s|
res_livecheck[:strategies] = strategies.map do |s| livecheck_strategy_names[s]
livecheck_strategy_names[s]
end
end
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 end
end end
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 end
resource_version_info resource_version_info
end end