outdated: vary deprecated message depending on flag

This commit is contained in:
William Ma 2020-07-27 09:34:52 -04:00
parent f8708ae80c
commit fa60d99265

View File

@ -45,9 +45,9 @@ module Homebrew
outdated_args.parse outdated_args.parse
case json_version case json_version
when :v1 when :v1, :default
# TODO: enable for next major/minor release # TODO: enable for next major/minor release
# odeprecated "brew outdated --json=v1", "brew outdated --json=v2" # odeprecated "brew outdated --json#{json_version == :v1 ? "=v1" : ""}", "brew outdated --json=v2"
outdated = if args.formula? || !args.cask? outdated = if args.formula? || !args.cask?
outdated_formulae outdated_formulae
@ -66,10 +66,11 @@ module Homebrew
outdated_formulae_casks outdated_formulae_casks
end end
puts JSON.generate({ json = {
"formulae" => json_info(formulae), "formulae" => json_info(formulae),
"casks" => json_info(casks), "casks" => json_info(casks),
}) }
puts JSON.generate(json)
outdated = formulae + casks outdated = formulae + casks
@ -106,8 +107,7 @@ module Homebrew
f.pkg_version.to_s f.pkg_version.to_s
end end
outdated_versions = outdated_kegs outdated_versions = outdated_kegs.group_by { |keg| Formulary.from_keg(keg).full_name }
.group_by { |keg| Formulary.from_keg(keg).full_name }
.sort_by { |full_name, _kegs| full_name } .sort_by { |full_name, _kegs| full_name }
.map do |full_name, kegs| .map do |full_name, kegs|
"#{full_name} (#{kegs.map(&:version).join(", ")})" "#{full_name} (#{kegs.map(&:version).join(", ")})"
@ -159,7 +159,7 @@ module Homebrew
def json_version def json_version
version_hash = { version_hash = {
nil => nil, nil => nil,
true => :v1, true => :default,
"v1" => :v1, "v1" => :v1,
"v2" => :v2, "v2" => :v2,
} }