Pass Cask::Config to Caskroom.casks.

This commit is contained in:
Markus Reiter 2020-10-01 00:57:02 +02:00
parent 5f005f67cf
commit 90f145114c
9 changed files with 23 additions and 14 deletions

View File

@ -29,18 +29,18 @@ module Cask
SystemCommand.run("/usr/bin/chgrp", args: ["admin", path], sudo: sudo) SystemCommand.run("/usr/bin/chgrp", args: ["admin", path], sudo: sudo)
end end
def casks def casks(config: nil)
return [] unless path.exist? return [] unless path.exist?
Pathname.glob(path.join("*")).sort.select(&:directory?).map do |path| Pathname.glob(path.join("*")).sort.select(&:directory?).map do |path|
token = path.basename.to_s token = path.basename.to_s
if tap_path = CaskLoader.tap_paths(token).first if tap_path = CaskLoader.tap_paths(token).first
CaskLoader::FromTapPathLoader.new(tap_path).load(config: nil) CaskLoader::FromTapPathLoader.new(tap_path).load(config: config)
elsif caskroom_path = Pathname.glob(path.join(".metadata/*/*/*/*.rb")).first elsif caskroom_path = Pathname.glob(path.join(".metadata/*/*/*/*.rb")).first
CaskLoader::FromPathLoader.new(caskroom_path).load(config: nil) CaskLoader::FromPathLoader.new(caskroom_path).load(config: config)
else else
CaskLoader.load(token) CaskLoader.load(token, config: config)
end end
end end
end end

View File

@ -32,16 +32,17 @@ module Cask
one: args.public_send(:'1?'), one: args.public_send(:'1?'),
full_name: args.full_name?, full_name: args.full_name?,
versions: args.versions?, versions: args.versions?,
args: args,
) )
end end
def self.list_casks(*casks, json: false, one: false, full_name: false, versions: false) def self.list_casks(*casks, args:, json: false, one: false, full_name: false, versions: false)
output = if casks.any? output = if casks.any?
casks.each do |cask| casks.each do |cask|
raise CaskNotInstalledError, cask unless cask.installed? raise CaskNotInstalledError, cask unless cask.installed?
end end
else else
Caskroom.casks Caskroom.casks(config: Config.from_args(args))
end end
if json if json

View File

@ -20,7 +20,7 @@ module Cask
end end
def run def run
outdated_casks = casks(alternative: -> { Caskroom.casks }).select do |cask| outdated_casks = casks(alternative: -> { Caskroom.casks(config: Config.from_args(args)) }).select do |cask|
odebug "Checking update info of Cask #{cask}" odebug "Checking update info of Cask #{cask}"
cask.outdated?(greedy: args.greedy?) cask.outdated?(greedy: args.greedy?)
end end

View File

@ -38,11 +38,13 @@ module Cask
require_sha: args.require_sha?, require_sha: args.require_sha?,
skip_cask_deps: args.skip_cask_deps?, skip_cask_deps: args.skip_cask_deps?,
verbose: verbose, verbose: verbose,
args: args,
) )
end end
def self.upgrade_casks( def self.upgrade_casks(
*casks, *casks,
args:,
force: false, force: false,
greedy: false, greedy: false,
dry_run: false, dry_run: false,
@ -56,7 +58,7 @@ module Cask
quarantine = true if quarantine.nil? quarantine = true if quarantine.nil?
outdated_casks = if casks.empty? outdated_casks = if casks.empty?
Caskroom.casks.select do |cask| Caskroom.casks(config: Config.from_args(args)).select do |cask|
cask.outdated?(greedy: greedy) cask.outdated?(greedy: greedy)
end end
else else

View File

@ -78,7 +78,7 @@ module Homebrew
dependents = if args.named.present? dependents = if args.named.present?
sorted_dependents(args.named.to_formulae_and_casks) sorted_dependents(args.named.to_formulae_and_casks)
elsif args.installed? elsif args.installed?
sorted_dependents(Formula.installed + Cask::Caskroom.casks) sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
else else
raise FormulaUnspecifiedError raise FormulaUnspecifiedError
end end
@ -96,7 +96,8 @@ module Homebrew
if args.no_named? if args.no_named?
raise FormulaUnspecifiedError unless args.installed? raise FormulaUnspecifiedError unless args.installed?
puts_deps sorted_dependents(Formula.installed + Cask::Caskroom.casks), recursive: recursive, args: args puts_deps sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args))),
recursive: recursive, args: args
return return
end end

View File

@ -172,6 +172,7 @@ module Homebrew
one: args.public_send(:'1?'), one: args.public_send(:'1?'),
full_name: args.full_name?, full_name: args.full_name?,
versions: args.versions?, versions: args.versions?,
args: args,
) )
end end
end end

View File

@ -176,7 +176,7 @@ module Homebrew
if args.named.present? if args.named.present?
select_outdated(args.named.to_casks, args: args) select_outdated(args.named.to_casks, args: args)
else else
select_outdated(Cask::Caskroom.casks, args: args) select_outdated(Cask::Caskroom.casks(config: Cask::Config.from_args(args)), args: args)
end end
end end
@ -185,7 +185,7 @@ module Homebrew
if formulae.blank? && casks.blank? if formulae.blank? && casks.blank?
formulae = Formula.installed formulae = Formula.installed
casks = Cask::Caskroom.casks casks = Cask::Caskroom.casks(config: Cask::Config.from_args(args))
end end
[select_outdated(formulae, args: args).sort, select_outdated(casks, args: args)] [select_outdated(formulae, args: args).sort, select_outdated(casks, args: args)]

View File

@ -157,6 +157,7 @@ module Homebrew
require_sha: EnvConfig.cask_opts_require_sha?, require_sha: EnvConfig.cask_opts_require_sha?,
skip_cask_deps: args.skip_cask_deps?, skip_cask_deps: args.skip_cask_deps?,
verbose: args.verbose?, verbose: args.verbose?,
args: args,
) )
end end
end end

View File

@ -78,10 +78,13 @@ module Homebrew
used_formulae.map(&:runtime_installed_formula_dependents) used_formulae.map(&:runtime_installed_formula_dependents)
.reduce(&:&) .reduce(&:&)
.select(&:any_version_installed?) + .select(&:any_version_installed?) +
select_used_dependents(dependents(Cask::Caskroom.casks), used_formulae, recursive, includes, ignores) select_used_dependents(
dependents(Cask::Caskroom.casks(config: Cask::Config.from_args(args))),
used_formulae, recursive, includes, ignores
)
else else
deps = if args.installed? deps = if args.installed?
dependents(Formula.installed + Cask::Caskroom.casks) dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
else else
dependents(Formula.to_a + Cask::Cask.to_a) dependents(Formula.to_a + Cask::Cask.to_a)
end end