From 23dd14d1c49d49ece33509ad5fc990061aa5548e Mon Sep 17 00:00:00 2001 From: Andrew Braxton Date: Tue, 9 Jul 2024 20:59:12 -0700 Subject: [PATCH 1/2] greedy outdated --- Library/Homebrew/cmd/outdated.rb | 8 +++++--- Library/Homebrew/env_config.rb | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/outdated.rb b/Library/Homebrew/cmd/outdated.rb index 72170324a6..acaac7b45f 100644 --- a/Library/Homebrew/cmd/outdated.rb +++ b/Library/Homebrew/cmd/outdated.rb @@ -48,6 +48,8 @@ module Homebrew sig { override.void } def run + @greedy = Homebrew::EnvConfig.upgrade_greedy? || args.greedy? + case json_version(args.json) when :v1 odie "`brew outdated --json=v1` is no longer supported. Use brew outdated --json=v2 instead." @@ -118,7 +120,7 @@ module Homebrew else c = formula_or_cask - puts c.outdated_info(args.greedy?, verbose?, false, args.greedy_latest?, args.greedy_auto_updates?) + puts c.outdated_info(@greedy, verbose?, false, args.greedy_latest?, args.greedy_auto_updates?) end end end @@ -143,7 +145,7 @@ module Homebrew else c = formula_or_cask - c.outdated_info(args.greedy?, verbose?, true, args.greedy_latest?, args.greedy_auto_updates?) + c.outdated_info(@greedy, verbose?, true, args.greedy_latest?, args.greedy_auto_updates?) end end end @@ -193,7 +195,7 @@ module Homebrew if formula_or_cask.is_a?(Formula) formula_or_cask.outdated?(fetch_head: args.fetch_HEAD?) else - formula_or_cask.outdated?(greedy: args.greedy?, greedy_latest: args.greedy_latest?, + formula_or_cask.outdated?(greedy: @greedy, greedy_latest: args.greedy_latest?, greedy_auto_updates: args.greedy_auto_updates?) end end diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index d77c1c5399..7a54f55fc1 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -436,7 +436,7 @@ module Homebrew boolean: true, }, HOMEBREW_UPGRADE_GREEDY: { - description: "If set, pass `--greedy` to all cask upgrade commands.", + description: "If set, pass `--greedy` to all cask upgrade commands and `brew outdated`.", boolean: true, }, HOMEBREW_VERBOSE: { From 0e0e3a4d0a0bb57f5a3f0d2c4f6406af78cd8ae5 Mon Sep 17 00:00:00 2001 From: Andrew Braxton Date: Wed, 10 Jul 2024 22:52:14 -0700 Subject: [PATCH 2/2] Use env argument to switch() --- Library/Homebrew/cmd/outdated.rb | 9 ++++----- Library/Homebrew/env_config.rb | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cmd/outdated.rb b/Library/Homebrew/cmd/outdated.rb index acaac7b45f..710e282c4a 100644 --- a/Library/Homebrew/cmd/outdated.rb +++ b/Library/Homebrew/cmd/outdated.rb @@ -32,6 +32,7 @@ module Homebrew "formula is outdated. Otherwise, the repository's HEAD will only be checked for " \ "updates when a new stable or development version has been released." switch "-g", "--greedy", + env: :upgrade_greedy, description: "Also include outdated casks with `auto_updates true` or `version :latest`." switch "--greedy-latest", @@ -48,8 +49,6 @@ module Homebrew sig { override.void } def run - @greedy = Homebrew::EnvConfig.upgrade_greedy? || args.greedy? - case json_version(args.json) when :v1 odie "`brew outdated --json=v1` is no longer supported. Use brew outdated --json=v2 instead." @@ -120,7 +119,7 @@ module Homebrew else c = formula_or_cask - puts c.outdated_info(@greedy, verbose?, false, args.greedy_latest?, args.greedy_auto_updates?) + puts c.outdated_info(args.greedy?, verbose?, false, args.greedy_latest?, args.greedy_auto_updates?) end end end @@ -145,7 +144,7 @@ module Homebrew else c = formula_or_cask - c.outdated_info(@greedy, verbose?, true, args.greedy_latest?, args.greedy_auto_updates?) + c.outdated_info(args.greedy?, verbose?, true, args.greedy_latest?, args.greedy_auto_updates?) end end end @@ -195,7 +194,7 @@ module Homebrew if formula_or_cask.is_a?(Formula) formula_or_cask.outdated?(fetch_head: args.fetch_HEAD?) else - formula_or_cask.outdated?(greedy: @greedy, greedy_latest: args.greedy_latest?, + formula_or_cask.outdated?(greedy: args.greedy?, greedy_latest: args.greedy_latest?, greedy_auto_updates: args.greedy_auto_updates?) end end diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index 7a54f55fc1..d77c1c5399 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -436,7 +436,7 @@ module Homebrew boolean: true, }, HOMEBREW_UPGRADE_GREEDY: { - description: "If set, pass `--greedy` to all cask upgrade commands and `brew outdated`.", + description: "If set, pass `--greedy` to all cask upgrade commands.", boolean: true, }, HOMEBREW_VERBOSE: {