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

livecheck: reinstate previous order of hashes

Browse Source
This commit is contained in:
Sam Ford 2020-12-12 11:00:02 -05:00
parent c1e5eec826
commit 704ec8abf0
No known key found for this signature in database
GPG Key ID: 95209E46C7FFDEFE
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,19 +153,18 @@ module Homebrew
is_newer_than_upstream = (formula&.stable? || cask) && (current > latest)
info = {
version: {
current: current.to_s,
latest: latest.to_s,
outdated: is_outdated,
newer_than_upstream: is_newer_than_upstream,
},
meta: {
livecheckable: formula_or_cask.livecheckable?,
},
}
info = {}
info[:formula] = formula_name(formula, args: args) if formula
info[:cask] = cask_name(cask, args: args) if cask
info[:version] = {
current: current.to_s,
latest: latest.to_s,
outdated: is_outdated,
newer_than_upstream: is_newer_than_upstream,
}
info[:meta] = {
livecheckable: formula_or_cask.livecheckable?,
}
info[:meta][:head_only] = true if formula&.head_only?
info[:meta].merge!(version_info[:meta]) if version_info.present? && version_info.key?(:meta)
@ -231,16 +230,14 @@ module Homebrew
def status_hash(formula_or_cask, status_str, messages = nil, args:)
formula = formula_or_cask if formula_or_cask.is_a?(Formula)
status_hash = {
status: status_str,
}
status_hash[:messages] = messages if messages.is_a?(Array)
status_hash = {}
if formula
status_hash[:formula] = formula_name(formula, args: args)
else
status_hash[:cask] = cask_name(formula_or_cask, args: args)
end
status_hash[:status] = status_str
status_hash[:messages] = messages if messages.is_a?(Array)
if args.verbose?
status_hash[:meta] = {