diff --git a/Library/Homebrew/cask/cmd/upgrade.rb b/Library/Homebrew/cask/cmd/upgrade.rb index 6532f26c3a..a2fe3b8c13 100644 --- a/Library/Homebrew/cask/cmd/upgrade.rb +++ b/Library/Homebrew/cask/cmd/upgrade.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require "env_config" require "cask/config" module Cask @@ -17,14 +18,38 @@ module Cask end def run - outdated_casks = casks(alternative: lambda { - Caskroom.casks.select do |cask| - cask.outdated?(greedy?) - end - }).select do |cask| - raise CaskNotInstalledError, cask unless cask.installed? || force? + self.class.upgrade_casks( + *casks, + force: force?, + greedy: greedy?, + dry_run: dry_run?, + binaries: binaries?, + quarantine: quarantine?, + require_sha: require_sha?, + skip_cask_deps: skip_cask_deps?, + verbose: verbose?, + ) + end - cask.outdated?(true) + def self.upgrade_casks( + *casks, + force: false, greedy: false, dry_run: false, binaries: true, skip_cask_deps: false, verbose: false, + quarantine: nil, require_sha: nil + ) + # TODO: Handle this in `CLI::Parser`. + quarantine = Homebrew::EnvConfig.cask_opts_quarantine? if quarantine.nil? + require_sha = Homebrew::EnvConfig.cask_opts_require_sha? if require_sha.nil? + + outdated_casks = if casks.empty? + Caskroom.casks.select do |cask| + cask.outdated?(greedy) + end + else + casks.select do |cask| + raise CaskNotInstalledError, cask unless cask.installed? || force + + cask.outdated?(true) + end end if outdated_casks.empty? @@ -32,9 +57,11 @@ module Cask return end - ohai "Casks with `auto_updates` or `version :latest` will not be upgraded" if args.empty? && !greedy? - verb = dry_run? ? "Would upgrade" : "Upgrading" + ohai "Casks with `auto_updates` or `version :latest` will not be upgraded" if casks.empty? && !greedy + + verb = dry_run ? "Would upgrade" : "Upgrading" oh1 "#{verb} #{outdated_casks.count} #{"outdated package".pluralize(outdated_casks.count)}:" + caught_exceptions = [] upgradable_casks = outdated_casks.map { |c| [CaskLoader.load(c.installed_caskfile), c] } @@ -42,10 +69,14 @@ module Cask puts upgradable_casks .map { |(old_cask, new_cask)| "#{new_cask.full_name} #{old_cask.version} -> #{new_cask.version}" } .join(", ") - return if dry_run? + return if dry_run upgradable_casks.each do |(old_cask, new_cask)| - upgrade_cask(old_cask, new_cask) + upgrade_cask( + old_cask, new_cask, + binaries: binaries, force: force, skip_cask_deps: skip_cask_deps, verbose: verbose, + quarantine: quarantine, require_sha: require_sha + ) rescue => e caught_exceptions << e.exception("#{new_cask.full_name}: #{e}") next @@ -56,26 +87,29 @@ module Cask raise caught_exceptions.first if caught_exceptions.count == 1 end - def upgrade_cask(old_cask, new_cask) + def self.upgrade_cask( + old_cask, new_cask, + binaries:, force:, quarantine:, require_sha:, skip_cask_deps:, verbose: + ) odebug "Started upgrade process for Cask #{old_cask}" old_config = old_cask.config old_cask_installer = - Installer.new(old_cask, binaries: binaries?, - verbose: verbose?, - force: force?, + Installer.new(old_cask, binaries: binaries, + verbose: verbose, + force: force, upgrade: true) new_cask.config = Config.global.merge(old_config) new_cask_installer = - Installer.new(new_cask, binaries: binaries?, - verbose: verbose?, - force: force?, - skip_cask_deps: skip_cask_deps?, - require_sha: require_sha?, + Installer.new(new_cask, binaries: binaries, + verbose: verbose, + force: force, + skip_cask_deps: skip_cask_deps, + require_sha: require_sha, upgrade: true, - quarantine: quarantine?) + quarantine: quarantine) started_upgrade = false new_artifacts_installed = false diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index aeaac8669b..dc52efbdc0 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -133,10 +133,16 @@ module Homebrew end def upgrade_outdated_casks(casks, args:) - cask_upgrade = Cask::Cmd::Upgrade.new(casks) - cask_upgrade.force = args.force? - cask_upgrade.dry_run = args.dry_run? - cask_upgrade.greedy = args.greedy? - cask_upgrade.run + Cask::Cmd::Upgrade.upgrade_casks( + *casks, + force: args.force?, + greedy: args.greedy?, + dry_run: args.dry_run?, + binaries: args.binaries?, + quarantine: args.quarantine?, + require_sha: args.require_sha?, + skip_cask_deps: args.skip_cask_deps?, + verbose: args.verbose?, + ) end end diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index e47f1ab848..86940d7b32 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -54,6 +54,9 @@ module Homebrew "Linux: `$XDG_CACHE_HOME/Homebrew` or `$HOME/.cache/Homebrew`.", default: HOMEBREW_DEFAULT_CACHE, }, + HOMEBREW_CASK_OPTS: { + description: "Options which should be used for all `cask` commands.", + }, HOMEBREW_CLEANUP_MAX_AGE_DAYS: { description: "Cleanup all cached files older than this many days.", default: 120, @@ -293,7 +296,7 @@ module Homebrew end elsif hash[:default].present? # Needs a custom implementation. - next if env == "HOMEBREW_MAKE_JOBS" + next if ["HOMEBREW_MAKE_JOBS", "HOMEBREW_CASK_OPTS"].include?(env) define_method(method_name) do ENV[env].presence || hash.fetch(:default).to_s @@ -315,5 +318,22 @@ module Homebrew .call .to_s end + + def cask_opts + Shellwords.shellsplit(ENV.fetch("HOMEBREW_CASK_OPTS", "")) + end + + def cask_opts_quarantine? + cask_opts.reverse_each do |opt| + return true if opt == "--quarantine" + return false if opt == "--no-quarantine" + end + + true + end + + def cask_opts_require_sha? + cask_opts.include?("--require-sha") + end end end