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

Fixed issue with --json flag for resources

Browse Source
This commit is contained in:
Mohammad Zain Abbas 2022-08-07 17:13:17 +02:00
parent 7855e18042
commit 81a7d6edd7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,7 +285,7 @@ module Homebrew
# Check current and latest resources (if "--resources" flag is given) # Check current and latest resources (if "--resources" flag is given)
# Only check current and latest versions if we have resources to check against # Only check current and latest versions if we have resources to check against
if check_resources && formula_or_cask.resources.present? if check_resources && formula_or_cask.is_a?(Formula) && formula_or_cask.resources.present?
current_resources = formula_or_cask.resources.map do |resource| current_resources = formula_or_cask.resources.map do |resource|
{ name: resource.name, version: resource.version, livecheckable: resource.livecheckable? } { name: resource.name, version: resource.version, livecheckable: resource.livecheckable? }
end end
@ -348,7 +348,7 @@ module Homebrew
info[:meta][:head_only] = true if formula&.head_only? info[:meta][:head_only] = true if formula&.head_only?
info[:meta].merge!(version_info[:meta]) if version_info.present? && version_info.key?(:meta) info[:meta].merge!(version_info[:meta]) if version_info.present? && version_info.key?(:meta)
if check_resources && formula_or_cask.resources.present? if check_resources && formula_or_cask.is_a?(Formula) && formula_or_cask.resources.present?
resources_info = [] resources_info = []
latest_resources_names = latest_resources.map { |r| r[:name] } latest_resources_names = latest_resources.map { |r| r[:name] }
current_resources.each do |resource| current_resources.each do |resource|
@ -365,16 +365,16 @@ module Homebrew
is_newer_than_upstream = current > latest is_newer_than_upstream = current > latest
is_outdated = (current != latest) && !is_newer_than_upstream is_outdated = (current != latest) && !is_newer_than_upstream
info = {} res_info = {}
info[:resource] = resource[:name] res_info[:resource] = resource[:name]
info[:meta] = { livecheckable: resource[:livecheckable] } res_info[:meta] = { livecheckable: resource[:livecheckable] }
info[:version] = { res_info[:version] = {
current: current_str, current: current_str,
latest: latest_str, latest: latest_str,
newer_than_upstream: is_newer_than_upstream, newer_than_upstream: is_newer_than_upstream,
outdated: is_outdated, outdated: is_outdated,
} }
resources_info << info resources_info << res_info
end end
info[:resources] = resources_info info[:resources] = resources_info
end end