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

Merge pull request #8175 from Rylan12/outdated-fix-args

Browse Source 
outdated: fix args
This commit is contained in:
Michka Popoff 2020-08-01 21:15:39 +02:00 committed by GitHub
commit b48d095a5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Library/Homebrew/cmd/outdated.rb
View File

@ -50,20 +50,20 @@ module Homebrew
# odeprecated "brew outdated --json#{json_version == :v1 ? "=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 args: args
else else
outdated_casks outdated_casks args: args
end end
puts JSON.generate(json_info(outdated, args: args)) puts JSON.generate(json_info(outdated, args: args))
when :v2 when :v2
formulae, casks = if args.formula? formulae, casks = if args.formula?
[outdated_formulae, []] [outdated_formulae(args: args), []]
elsif args.cask? elsif args.cask?
[[], outdated_casks] [[], outdated_casks(args: args)]
else else
outdated_formulae_casks outdated_formulae_casks args: args
end end
json = { json = {
@ -76,11 +76,11 @@ module Homebrew
else else
outdated = if args.formula? outdated = if args.formula?
outdated_formulae outdated_formulae args: args
elsif args.cask? elsif args.cask?
outdated_casks outdated_casks args: args
else else
outdated_formulae_casks.flatten outdated_formulae_casks(args: args).flatten
end end
print_outdated(outdated, args: args) print_outdated(outdated, args: args)
@ -94,7 +94,7 @@ module Homebrew
if formula_or_cask.is_a?(Formula) if formula_or_cask.is_a?(Formula)
f = formula_or_cask f = formula_or_cask
if verbose? if verbose? args: args
outdated_kegs = f.outdated_kegs(fetch_head: args.fetch_HEAD?) outdated_kegs = f.outdated_kegs(fetch_head: args.fetch_HEAD?)
current_version = if f.alias_changed? current_version = if f.alias_changed?
@ -122,7 +122,7 @@ module Homebrew
else else
c = formula_or_cask c = formula_or_cask
puts c.outdated_info(args.greedy?, verbose?, false) puts c.outdated_info(args.greedy?, verbose?(args: args), false)
end end
end end
end end
@ -147,12 +147,12 @@ module Homebrew
else else
c = formula_or_cask c = formula_or_cask
c.outdated_info(args.greedy?, verbose?, true) c.outdated_info(args.greedy?, verbose?(args: args), true)
end end
end end
end end
def verbose? def verbose?(args:)
($stdout.tty? || args.verbose?) && !args.quiet? ($stdout.tty? || args.verbose?) && !args.quiet?
end end
@ -169,19 +169,19 @@ module Homebrew
version_hash[version] version_hash[version]
end end
def outdated_formulae def outdated_formulae(args:)
select_outdated((args.resolved_formulae.presence || Formula.installed)).sort select_outdated((args.resolved_formulae.presence || Formula.installed), args: args).sort
end end
def outdated_casks def outdated_casks(args:)
if args.named.present? if args.named.present?
select_outdated(args.named.uniq.map(&Cask::CaskLoader.method(:load))) select_outdated(args.named.uniq.map(&Cask::CaskLoader.method(:load)), args: args)
else else
select_outdated(Cask::Caskroom.casks) select_outdated(Cask::Caskroom.casks, args: args)
end end
end end
def outdated_formulae_casks def outdated_formulae_casks(args:)
formulae, casks = args.resolved_formulae_casks formulae, casks = args.resolved_formulae_casks
if formulae.blank? && casks.blank? if formulae.blank? && casks.blank?
@ -189,10 +189,10 @@ module Homebrew
casks = Cask::Caskroom.casks casks = Cask::Caskroom.casks
end end
[select_outdated(formulae), select_outdated(casks)] [select_outdated(formulae, args: args), select_outdated(casks, args: args)]
end end
def select_outdated(formulae_or_casks) def select_outdated(formulae_or_casks, args:)
formulae_or_casks.select do |formula_or_cask| formulae_or_casks.select do |formula_or_cask|
if formula_or_cask.is_a?(Formula) if formula_or_cask.is_a?(Formula)
formula_or_cask.outdated?(fetch_head: args.fetch_HEAD?) formula_or_cask.outdated?(fetch_head: args.fetch_HEAD?)