Merge pull request #15934 from hyuraku/remove-ARGV-from-Formula.all
remove `ARGV` from `Formula#all`
This commit is contained in:
commit
f71e09251f
@ -124,7 +124,8 @@ 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 + Cask::Cask.all), recursive: recursive, args: args
|
puts_deps sorted_dependents(Formula.all(eval_all: args.eval_all?) + Cask::Cask.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
|
||||||
|
|||||||
@ -194,7 +194,7 @@ module Homebrew
|
|||||||
raise UsageError, "Cannot specify `--cask` when using `--json=v1`!" if args.cask?
|
raise UsageError, "Cannot specify `--cask` when using `--json=v1`!" if args.cask?
|
||||||
|
|
||||||
formulae = if all
|
formulae = if all
|
||||||
Formula.all.sort
|
Formula.all(eval_all: args.eval_all?).sort
|
||||||
elsif args.installed?
|
elsif args.installed?
|
||||||
Formula.installed.sort
|
Formula.installed.sort
|
||||||
else
|
else
|
||||||
@ -208,7 +208,7 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
when :v2
|
when :v2
|
||||||
formulae, casks = if all
|
formulae, casks = if all
|
||||||
[Formula.all.sort, Cask::Cask.all.sort_by(&:full_name)]
|
[Formula.all(eval_all: args.eval_all?).sort, Cask::Cask.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
|
||||||
|
|||||||
@ -35,7 +35,7 @@ module Homebrew
|
|||||||
all = args.eval_all?
|
all = args.eval_all?
|
||||||
|
|
||||||
if all
|
if all
|
||||||
puts_options Formula.all.sort, args: args
|
puts_options Formula.all(eval_all: args.eval_all?).sort, args: args
|
||||||
elsif args.installed?
|
elsif args.installed?
|
||||||
puts_options Formula.installed.sort, args: args
|
puts_options Formula.installed.sort, args: args
|
||||||
elsif args.command.present?
|
elsif args.command.present?
|
||||||
|
|||||||
@ -116,7 +116,7 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
|
|
||||||
if show_formulae_and_casks || args.formula?
|
if show_formulae_and_casks || args.formula?
|
||||||
deps += args.installed? ? Formula.installed : Formula.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
|
||||||
|
|||||||
@ -136,7 +136,7 @@ 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, Cask::Cask.all]
|
[Formula.all(eval_all: args.eval_all?), Cask::Cask.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") }
|
||||||
odisabled "brew audit [path ...]",
|
odisabled "brew audit [path ...]",
|
||||||
|
|||||||
@ -85,7 +85,7 @@ module Homebrew
|
|||||||
casks = args.formula? ? [] : Cask::Caskroom.casks
|
casks = args.formula? ? [] : Cask::Caskroom.casks
|
||||||
formulae + casks
|
formulae + casks
|
||||||
elsif all
|
elsif all
|
||||||
formulae = args.cask? ? [] : Formula.all
|
formulae = args.cask? ? [] : Formula.all(eval_all: args.eval_all?)
|
||||||
casks = args.formula? ? [] : Cask::Cask.all
|
casks = args.formula? ? [] : Cask::Cask.all
|
||||||
formulae + casks
|
formulae + casks
|
||||||
elsif args.named.present?
|
elsif args.named.present?
|
||||||
|
|||||||
@ -103,11 +103,11 @@ module Homebrew
|
|||||||
raise UsageError, "`brew unbottled --dependents` needs `--eval-all` passed or `HOMEBREW_EVAL_ALL` set!"
|
raise UsageError, "`brew unbottled --dependents` needs `--eval-all` passed or `HOMEBREW_EVAL_ALL` set!"
|
||||||
end
|
end
|
||||||
|
|
||||||
formulae = all_formulae = Formula.all
|
formulae = all_formulae = Formula.all(eval_all: args.eval_all?)
|
||||||
|
|
||||||
@sort = " (sorted by number of dependents)"
|
@sort = " (sorted by number of dependents)"
|
||||||
elsif all
|
elsif all
|
||||||
formulae = all_formulae = Formula.all
|
formulae = all_formulae = Formula.all(eval_all: args.eval_all?)
|
||||||
else
|
else
|
||||||
formula_installs = {}
|
formula_installs = {}
|
||||||
|
|
||||||
@ -134,7 +134,7 @@ module Homebrew
|
|||||||
end.compact
|
end.compact
|
||||||
@sort = " (sorted by installs in the last 90 days; top 10,000 only)"
|
@sort = " (sorted by installs in the last 90 days; top 10,000 only)"
|
||||||
|
|
||||||
all_formulae = Formula.all
|
all_formulae = Formula.all(eval_all: args.eval_all?)
|
||||||
end
|
end
|
||||||
|
|
||||||
[formulae, all_formulae, formula_installs]
|
[formulae, all_formulae, formula_installs]
|
||||||
|
|||||||
@ -31,6 +31,8 @@ require "utils/spdx"
|
|||||||
require "extend/on_system"
|
require "extend/on_system"
|
||||||
require "api"
|
require "api"
|
||||||
require "extend/api_hashable"
|
require "extend/api_hashable"
|
||||||
|
require "cli/parser"
|
||||||
|
require "commands"
|
||||||
|
|
||||||
# A formula provides instructions and metadata for Homebrew to install a piece
|
# A formula provides instructions and metadata for Homebrew to install a piece
|
||||||
# of software. Every Homebrew formula is a {Formula}.
|
# of software. Every Homebrew formula is a {Formula}.
|
||||||
@ -1945,11 +1947,8 @@ class Formula
|
|||||||
# an array of all {Formula}
|
# an array of all {Formula}
|
||||||
# this should only be used when users specify `--all` to a command
|
# this should only be used when users specify `--all` to a command
|
||||||
# @private
|
# @private
|
||||||
def self.all
|
def self.all(eval_all: false)
|
||||||
# TODO: ideally avoid using ARGV by moving to e.g. CLI::Parser
|
odisabled "Formula#all without --eval-all or HOMEBREW_EVAL_ALL" if !eval_all && !Homebrew::EnvConfig.eval_all?
|
||||||
if ARGV.exclude?("--eval-all") && !Homebrew::EnvConfig.eval_all?
|
|
||||||
odisabled "Formula#all without --eval-all or HOMEBREW_EVAL_ALL"
|
|
||||||
end
|
|
||||||
|
|
||||||
(core_names + tap_files).map do |name_or_file|
|
(core_names + tap_files).map do |name_or_file|
|
||||||
Formulary.factory(name_or_file)
|
Formulary.factory(name_or_file)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user