Add shared method for upgrading casks.
This commit is contained in:
parent
0e8962f816
commit
b1ca2f7e3c
@ -1,5 +1,6 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require "env_config"
|
||||||
require "cask/config"
|
require "cask/config"
|
||||||
|
|
||||||
module Cask
|
module Cask
|
||||||
@ -17,14 +18,38 @@ module Cask
|
|||||||
end
|
end
|
||||||
|
|
||||||
def run
|
def run
|
||||||
outdated_casks = casks(alternative: lambda {
|
self.class.upgrade_casks(
|
||||||
Caskroom.casks.select do |cask|
|
*casks,
|
||||||
cask.outdated?(greedy?)
|
force: force?,
|
||||||
end
|
greedy: greedy?,
|
||||||
}).select do |cask|
|
dry_run: dry_run?,
|
||||||
raise CaskNotInstalledError, cask unless cask.installed? || force?
|
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
|
end
|
||||||
|
|
||||||
if outdated_casks.empty?
|
if outdated_casks.empty?
|
||||||
@ -32,9 +57,11 @@ module Cask
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
ohai "Casks with `auto_updates` or `version :latest` will not be upgraded" if args.empty? && !greedy?
|
ohai "Casks with `auto_updates` or `version :latest` will not be upgraded" if casks.empty? && !greedy
|
||||||
verb = dry_run? ? "Would upgrade" : "Upgrading"
|
|
||||||
|
verb = dry_run ? "Would upgrade" : "Upgrading"
|
||||||
oh1 "#{verb} #{outdated_casks.count} #{"outdated package".pluralize(outdated_casks.count)}:"
|
oh1 "#{verb} #{outdated_casks.count} #{"outdated package".pluralize(outdated_casks.count)}:"
|
||||||
|
|
||||||
caught_exceptions = []
|
caught_exceptions = []
|
||||||
|
|
||||||
upgradable_casks = outdated_casks.map { |c| [CaskLoader.load(c.installed_caskfile), c] }
|
upgradable_casks = outdated_casks.map { |c| [CaskLoader.load(c.installed_caskfile), c] }
|
||||||
@ -42,10 +69,14 @@ module Cask
|
|||||||
puts upgradable_casks
|
puts upgradable_casks
|
||||||
.map { |(old_cask, new_cask)| "#{new_cask.full_name} #{old_cask.version} -> #{new_cask.version}" }
|
.map { |(old_cask, new_cask)| "#{new_cask.full_name} #{old_cask.version} -> #{new_cask.version}" }
|
||||||
.join(", ")
|
.join(", ")
|
||||||
return if dry_run?
|
return if dry_run
|
||||||
|
|
||||||
upgradable_casks.each do |(old_cask, new_cask)|
|
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
|
rescue => e
|
||||||
caught_exceptions << e.exception("#{new_cask.full_name}: #{e}")
|
caught_exceptions << e.exception("#{new_cask.full_name}: #{e}")
|
||||||
next
|
next
|
||||||
@ -56,26 +87,29 @@ module Cask
|
|||||||
raise caught_exceptions.first if caught_exceptions.count == 1
|
raise caught_exceptions.first if caught_exceptions.count == 1
|
||||||
end
|
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}"
|
odebug "Started upgrade process for Cask #{old_cask}"
|
||||||
old_config = old_cask.config
|
old_config = old_cask.config
|
||||||
|
|
||||||
old_cask_installer =
|
old_cask_installer =
|
||||||
Installer.new(old_cask, binaries: binaries?,
|
Installer.new(old_cask, binaries: binaries,
|
||||||
verbose: verbose?,
|
verbose: verbose,
|
||||||
force: force?,
|
force: force,
|
||||||
upgrade: true)
|
upgrade: true)
|
||||||
|
|
||||||
new_cask.config = Config.global.merge(old_config)
|
new_cask.config = Config.global.merge(old_config)
|
||||||
|
|
||||||
new_cask_installer =
|
new_cask_installer =
|
||||||
Installer.new(new_cask, binaries: binaries?,
|
Installer.new(new_cask, binaries: binaries,
|
||||||
verbose: verbose?,
|
verbose: verbose,
|
||||||
force: force?,
|
force: force,
|
||||||
skip_cask_deps: skip_cask_deps?,
|
skip_cask_deps: skip_cask_deps,
|
||||||
require_sha: require_sha?,
|
require_sha: require_sha,
|
||||||
upgrade: true,
|
upgrade: true,
|
||||||
quarantine: quarantine?)
|
quarantine: quarantine)
|
||||||
|
|
||||||
started_upgrade = false
|
started_upgrade = false
|
||||||
new_artifacts_installed = false
|
new_artifacts_installed = false
|
||||||
|
|||||||
@ -133,10 +133,16 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
|
|
||||||
def upgrade_outdated_casks(casks, args:)
|
def upgrade_outdated_casks(casks, args:)
|
||||||
cask_upgrade = Cask::Cmd::Upgrade.new(casks)
|
Cask::Cmd::Upgrade.upgrade_casks(
|
||||||
cask_upgrade.force = args.force?
|
*casks,
|
||||||
cask_upgrade.dry_run = args.dry_run?
|
force: args.force?,
|
||||||
cask_upgrade.greedy = args.greedy?
|
greedy: args.greedy?,
|
||||||
cask_upgrade.run
|
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
|
||||||
end
|
end
|
||||||
|
|||||||
@ -54,6 +54,9 @@ module Homebrew
|
|||||||
"Linux: `$XDG_CACHE_HOME/Homebrew` or `$HOME/.cache/Homebrew`.",
|
"Linux: `$XDG_CACHE_HOME/Homebrew` or `$HOME/.cache/Homebrew`.",
|
||||||
default: HOMEBREW_DEFAULT_CACHE,
|
default: HOMEBREW_DEFAULT_CACHE,
|
||||||
},
|
},
|
||||||
|
HOMEBREW_CASK_OPTS: {
|
||||||
|
description: "Options which should be used for all `cask` commands.",
|
||||||
|
},
|
||||||
HOMEBREW_CLEANUP_MAX_AGE_DAYS: {
|
HOMEBREW_CLEANUP_MAX_AGE_DAYS: {
|
||||||
description: "Cleanup all cached files older than this many days.",
|
description: "Cleanup all cached files older than this many days.",
|
||||||
default: 120,
|
default: 120,
|
||||||
@ -293,7 +296,7 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
elsif hash[:default].present?
|
elsif hash[:default].present?
|
||||||
# Needs a custom implementation.
|
# 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
|
define_method(method_name) do
|
||||||
ENV[env].presence || hash.fetch(:default).to_s
|
ENV[env].presence || hash.fetch(:default).to_s
|
||||||
@ -315,5 +318,22 @@ module Homebrew
|
|||||||
.call
|
.call
|
||||||
.to_s
|
.to_s
|
||||||
end
|
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
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user