Resolve Cask::Cask.all todo

Now it takes the :eval_all parameter that means we can remove
ARGV handling inside Cask::Cask.all.
This commit is contained in:
apainintheneck 2023-12-21 21:55:16 -08:00
parent 5a674c232f
commit b79778229c
7 changed files with 17 additions and 10 deletions

View File

@ -24,9 +24,8 @@ module Cask
attr_predicate :loaded_from_api? attr_predicate :loaded_from_api?
# @api private # @api private
def self.all def self.all(eval_all: false)
# TODO: replace this ARGV and ENV logic with an argument, like how we do with formulae if !eval_all && !Homebrew::EnvConfig.eval_all?
if ARGV.exclude?("--eval-all") && !Homebrew::EnvConfig.eval_all?
raise ArgumentError, "Cask::Cask#all cannot be used without --eval-all or HOMEBREW_EVAL_ALL" raise ArgumentError, "Cask::Cask#all cannot be used without --eval-all or HOMEBREW_EVAL_ALL"
end end

View File

@ -131,8 +131,9 @@ module Homebrew
puts_deps_tree dependents, recursive: recursive, args: args puts_deps_tree dependents, recursive: recursive, args: args
return return
elsif all elsif all
puts_deps sorted_dependents(Formula.all(eval_all: args.eval_all?) + Cask::Cask.all), recursive: recursive, puts_deps sorted_dependents(
args: args Formula.all(eval_all: args.eval_all?) + Cask::Cask.all(eval_all: args.eval_all?),
), recursive: recursive, args: args
return return
elsif !args.no_named? && args.for_each? elsif !args.no_named? && args.for_each?
puts_deps sorted_dependents(args.named.to_formulae_and_casks), recursive: recursive, args: args puts_deps sorted_dependents(args.named.to_formulae_and_casks), recursive: recursive, args: args

View File

@ -207,7 +207,10 @@ module Homebrew
end end
when :v2 when :v2
formulae, casks = if all formulae, casks = if all
[Formula.all(eval_all: args.eval_all?).sort, Cask::Cask.all.sort_by(&:full_name)] [
Formula.all(eval_all: args.eval_all?).sort,
Cask::Cask.all(eval_all: args.eval_all?).sort_by(&:full_name),
]
elsif args.installed? elsif args.installed?
[Formula.installed.sort, Cask::Caskroom.casks.sort_by(&:full_name)] [Formula.installed.sort, Cask::Caskroom.casks.sort_by(&:full_name)]
else else

View File

@ -119,7 +119,7 @@ module Homebrew
deps += args.installed? ? Formula.installed : Formula.all(eval_all: args.eval_all?) deps += args.installed? ? Formula.installed : Formula.all(eval_all: args.eval_all?)
end end
if show_formulae_and_casks || args.cask? if show_formulae_and_casks || args.cask?
deps += args.installed? ? Cask::Caskroom.casks : Cask::Cask.all deps += args.installed? ? Cask::Caskroom.casks : Cask::Cask.all(eval_all: args.eval_all?)
end end
if args.missing? if args.missing?

View File

@ -100,7 +100,8 @@ class CaskDescriptionCacheStore < DescriptionCacheStore
return unless eval_all return unless eval_all
return unless database.empty? return unless database.empty?
Cask::Cask.all.each { |c| update!(c.full_name, [c.name.join(", "), c.desc.presence]) } Cask::Cask.all(eval_all: eval_all)
.each { |c| update!(c.full_name, [c.name.join(", "), c.desc.presence]) }
end end
# Use an update report to update the {CaskDescriptionCacheStore}. # Use an update report to update the {CaskDescriptionCacheStore}.

View File

@ -145,7 +145,10 @@ module Homebrew
"brew audit --eval-all or HOMEBREW_EVAL_ALL" "brew audit --eval-all or HOMEBREW_EVAL_ALL"
end end
no_named_args = true no_named_args = true
[Formula.all(eval_all: args.eval_all?), Cask::Cask.all] [
Formula.all(eval_all: args.eval_all?),
Cask::Cask.all(eval_all: args.eval_all?),
]
else else
if args.named.any? { |named_arg| named_arg.end_with?(".rb") } if args.named.any? { |named_arg| named_arg.end_with?(".rb") }
# This odisabled should probably stick around indefinitely, # This odisabled should probably stick around indefinitely,

View File

@ -87,7 +87,7 @@ module Homebrew
formulae + casks formulae + casks
elsif all elsif all
formulae = args.cask? ? [] : Formula.all(eval_all: args.eval_all?) formulae = args.cask? ? [] : Formula.all(eval_all: args.eval_all?)
casks = args.formula? ? [] : Cask::Cask.all casks = args.formula? ? [] : Cask::Cask.all(eval_all: args.eval_all?)
formulae + casks formulae + casks
elsif args.named.present? elsif args.named.present?
if args.formula? if args.formula?