From 540a5b9d30db995bde8cfa0c19986693bfd5346c Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Fri, 31 Mar 2023 18:01:34 -0400 Subject: [PATCH 1/7] temp --- Library/Homebrew/dev-cmd/bump-cask-pr.rb | 2 +- Library/Homebrew/env_config.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/bump-cask-pr.rb b/Library/Homebrew/dev-cmd/bump-cask-pr.rb index fe6303d764936..be951dadbde86 100644 --- a/Library/Homebrew/dev-cmd/bump-cask-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-cask-pr.rb @@ -84,7 +84,7 @@ def bump_cask_pr Cask::DSL::Version.new(new_version) end - new_hash = unless (new_hash = args.sha265).nil? + new_hash = unless (new_hash = args.sha256).nil? raise UsageError, "`--sha256` must not be empty." if new_hash.blank? ["no_check", ":no_check"].include?(new_hash) ? :no_check : new_hash diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index 3d0d0db091d42..54799a77d564e 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -239,6 +239,9 @@ module EnvConfig HOMEBREW_GITHUB_PACKAGES_USER: { description: "Use this username when accessing the GitHub Packages Registry (where bottles may be stored).", }, + HOMEBREW_GREEDY: { + description: "Pass this value to brew upgrade greedy.", + }, HOMEBREW_INSTALL_BADGE: { description: "Print this text before the installation summary of each successful build.", default_text: 'The "Beer Mug" emoji.', From dfa7a60038bf56f06494d6d9bdcd895150fac4b0 Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Fri, 31 Mar 2023 21:23:09 -0400 Subject: [PATCH 2/7] Feat --- Library/Homebrew/cask/upgrade.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/cask/upgrade.rb b/Library/Homebrew/cask/upgrade.rb index 17c38f43bee6e..cf20a9dd71a6f 100644 --- a/Library/Homebrew/cask/upgrade.rb +++ b/Library/Homebrew/cask/upgrade.rb @@ -40,6 +40,7 @@ def self.upgrade_casks( require_sha: nil ) + if quarantine = true if quarantine.nil? outdated_casks = if casks.empty? From 183fad82a651b2eb58a9739779aee1db441688e1 Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Wed, 5 Apr 2023 09:28:15 -0400 Subject: [PATCH 3/7] add greedy option --- Library/Homebrew/cask/upgrade.rb | 5 ++++- Library/Homebrew/env_config.rb | 4 ++++ Library/Homebrew/env_config.rbi | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cask/upgrade.rb b/Library/Homebrew/cask/upgrade.rb index cf20a9dd71a6f..d3068f219174b 100644 --- a/Library/Homebrew/cask/upgrade.rb +++ b/Library/Homebrew/cask/upgrade.rb @@ -40,9 +40,12 @@ def self.upgrade_casks( require_sha: nil ) - if quarantine = true if quarantine.nil? + if Homebrew::EnvConfig.upgrade_greedy? + greedy = true + end + outdated_casks = if casks.empty? Caskroom.casks(config: Config.from_args(args)).select do |cask| cask.outdated?(greedy: greedy, greedy_latest: greedy_latest, diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index 54799a77d564e..afc9731ccbce8 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -347,6 +347,10 @@ module EnvConfig description: "If set, use Pry for the `brew irb` command.", boolean: true, }, + HOMEBREW_UPGRADE_GREEDY: { + description: "If set, run `--greedy` with all upgrade commands", + boolean: true, + }, HOMEBREW_SIMULATE_MACOS_ON_LINUX: { description: "If set, running Homebrew on Linux will simulate certain macOS code paths. This is useful " \ "when auditing macOS formulae while on Linux.", diff --git a/Library/Homebrew/env_config.rbi b/Library/Homebrew/env_config.rbi index bf67f9c624f5c..f52d381c760ec 100644 --- a/Library/Homebrew/env_config.rbi +++ b/Library/Homebrew/env_config.rbi @@ -229,6 +229,9 @@ module Homebrew::EnvConfig sig { returns(T::Boolean) } def self.update_to_tag?; end + sig { returns(T::Boolean) } + def self.upgrade_greedy?; end + sig { returns(T::Boolean) } def self.verbose?; end From 28490626fdd7620471376dce6545e44a4fef4ea8 Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Wed, 5 Apr 2023 09:44:32 -0400 Subject: [PATCH 4/7] style fixes --- Library/Homebrew/cask/upgrade.rb | 4 +--- Library/Homebrew/dev-cmd/bump-cask-pr.rb | 2 +- Library/Homebrew/env_config.rb | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/cask/upgrade.rb b/Library/Homebrew/cask/upgrade.rb index d3068f219174b..41c52954f9960 100644 --- a/Library/Homebrew/cask/upgrade.rb +++ b/Library/Homebrew/cask/upgrade.rb @@ -42,9 +42,7 @@ def self.upgrade_casks( quarantine = true if quarantine.nil? - if Homebrew::EnvConfig.upgrade_greedy? - greedy = true - end + greedy = true if Homebrew::EnvConfig.upgrade_greedy? outdated_casks = if casks.empty? Caskroom.casks(config: Config.from_args(args)).select do |cask| diff --git a/Library/Homebrew/dev-cmd/bump-cask-pr.rb b/Library/Homebrew/dev-cmd/bump-cask-pr.rb index be951dadbde86..fe6303d764936 100644 --- a/Library/Homebrew/dev-cmd/bump-cask-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-cask-pr.rb @@ -84,7 +84,7 @@ def bump_cask_pr Cask::DSL::Version.new(new_version) end - new_hash = unless (new_hash = args.sha256).nil? + new_hash = unless (new_hash = args.sha265).nil? raise UsageError, "`--sha256` must not be empty." if new_hash.blank? ["no_check", ":no_check"].include?(new_hash) ? :no_check : new_hash diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index afc9731ccbce8..e3cfc9d7167e8 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -239,9 +239,6 @@ module EnvConfig HOMEBREW_GITHUB_PACKAGES_USER: { description: "Use this username when accessing the GitHub Packages Registry (where bottles may be stored).", }, - HOMEBREW_GREEDY: { - description: "Pass this value to brew upgrade greedy.", - }, HOMEBREW_INSTALL_BADGE: { description: "Print this text before the installation summary of each successful build.", default_text: 'The "Beer Mug" emoji.', @@ -347,7 +344,7 @@ module EnvConfig description: "If set, use Pry for the `brew irb` command.", boolean: true, }, - HOMEBREW_UPGRADE_GREEDY: { + HOMEBREW_UPGRADE_GREEDY: { description: "If set, run `--greedy` with all upgrade commands", boolean: true, }, From 87b4f1f396bbfcf59c8d264b30b825114ee7dbd6 Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Wed, 5 Apr 2023 19:26:20 -0400 Subject: [PATCH 5/7] Update env_config.rb --- Library/Homebrew/env_config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index e3cfc9d7167e8..a7e5720be00ff 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -345,7 +345,7 @@ module EnvConfig boolean: true, }, HOMEBREW_UPGRADE_GREEDY: { - description: "If set, run `--greedy` with all upgrade commands", + description: "If set, run `--greedy` with all upgrade commands.", boolean: true, }, HOMEBREW_SIMULATE_MACOS_ON_LINUX: { From acc598fdc935922929912329a0597585049fa30b Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Wed, 5 Apr 2023 19:29:57 -0400 Subject: [PATCH 6/7] Update env_config.rb Co-authored-by: Mike McQuaid --- Library/Homebrew/env_config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index a7e5720be00ff..b662859733845 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -345,7 +345,7 @@ module EnvConfig boolean: true, }, HOMEBREW_UPGRADE_GREEDY: { - description: "If set, run `--greedy` with all upgrade commands.", + description: ""If set, pass `--greedy` to all cask upgrade commands.", boolean: true, }, HOMEBREW_SIMULATE_MACOS_ON_LINUX: { From 22eb43ca373d64d2c31606b3a46dae908444f9c2 Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Wed, 5 Apr 2023 20:07:58 -0400 Subject: [PATCH 7/7] syntax fix --- Library/Homebrew/env_config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index b662859733845..94a3ca7f96ff2 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -345,7 +345,7 @@ module EnvConfig 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.", boolean: true, }, HOMEBREW_SIMULATE_MACOS_ON_LINUX: {