Skip to content
Snippets Groups Projects
Commit 90f14511 authored by Markus Reiter's avatar Markus Reiter
Browse files

Pass `Cask::Config` to `Caskroom.casks`.

parent 5f005f67
No related branches found
No related tags found
No related merge requests found
......@@ -29,18 +29,18 @@ module Cask
SystemCommand.run("/usr/bin/chgrp", args: ["admin", path], sudo: sudo)
end
def casks
def casks(config: nil)
return [] unless path.exist?
Pathname.glob(path.join("*")).sort.select(&:directory?).map do |path|
token = path.basename.to_s
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
CaskLoader::FromPathLoader.new(caskroom_path).load(config: nil)
CaskLoader::FromPathLoader.new(caskroom_path).load(config: config)
else
CaskLoader.load(token)
CaskLoader.load(token, config: config)
end
end
end
......
......@@ -32,16 +32,17 @@ module Cask
one: args.public_send(:'1?'),
full_name: args.full_name?,
versions: args.versions?,
args: args,
)
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?
casks.each do |cask|
raise CaskNotInstalledError, cask unless cask.installed?
end
else
Caskroom.casks
Caskroom.casks(config: Config.from_args(args))
end
if json
......
......@@ -20,7 +20,7 @@ module Cask
end
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}"
cask.outdated?(greedy: args.greedy?)
end
......
......@@ -38,11 +38,13 @@ module Cask
require_sha: args.require_sha?,
skip_cask_deps: args.skip_cask_deps?,
verbose: verbose,
args: args,
)
end
def self.upgrade_casks(
*casks,
args:,
force: false,
greedy: false,
dry_run: false,
......@@ -56,7 +58,7 @@ module Cask
quarantine = true if quarantine.nil?
outdated_casks = if casks.empty?
Caskroom.casks.select do |cask|
Caskroom.casks(config: Config.from_args(args)).select do |cask|
cask.outdated?(greedy: greedy)
end
else
......
......@@ -78,7 +78,7 @@ module Homebrew
dependents = if args.named.present?
sorted_dependents(args.named.to_formulae_and_casks)
elsif args.installed?
sorted_dependents(Formula.installed + Cask::Caskroom.casks)
sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
else
raise FormulaUnspecifiedError
end
......@@ -96,7 +96,8 @@ module Homebrew
if args.no_named?
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
end
......
......@@ -172,6 +172,7 @@ module Homebrew
one: args.public_send(:'1?'),
full_name: args.full_name?,
versions: args.versions?,
args: args,
)
end
end
......
......@@ -176,7 +176,7 @@ module Homebrew
if args.named.present?
select_outdated(args.named.to_casks, args: args)
else
select_outdated(Cask::Caskroom.casks, args: args)
select_outdated(Cask::Caskroom.casks(config: Cask::Config.from_args(args)), args: args)
end
end
......@@ -185,7 +185,7 @@ module Homebrew
if formulae.blank? && casks.blank?
formulae = Formula.installed
casks = Cask::Caskroom.casks
casks = Cask::Caskroom.casks(config: Cask::Config.from_args(args))
end
[select_outdated(formulae, args: args).sort, select_outdated(casks, args: args)]
......
......@@ -157,6 +157,7 @@ module Homebrew
require_sha: EnvConfig.cask_opts_require_sha?,
skip_cask_deps: args.skip_cask_deps?,
verbose: args.verbose?,
args: args,
)
end
end
......@@ -78,10 +78,13 @@ module Homebrew
used_formulae.map(&:runtime_installed_formula_dependents)
.reduce(&:&)
.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
deps = if args.installed?
dependents(Formula.installed + Cask::Caskroom.casks)
dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
else
dependents(Formula.to_a + Cask::Cask.to_a)
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment