admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

args: Migrate usage of args loading methods to args.named

Browse Source
This commit is contained in:
William Ma 2020-08-19 10:34:48 -04:00
parent 129fd33a62
commit fa7bd3bff6
47 changed files with 103 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/build.rb
View File

@ -220,7 +220,7 @@ begin
trap("INT", old_trap)
formula = args.formulae.first
formula = args.named.to_formulae.first
options = Options.create(args.flags_only)
build = Build.new(formula, options, args: args)
build.install

9
Library/Homebrew/cli/args.rb
View File

@ -57,38 +57,47 @@ module Homebrew
end
def formulae
odeprecated "args.formulae", "args.named.formulae"
named.to_formulae
end
def formulae_and_casks
odeprecated "args.formulae_and_casks", "args.named.to_formulae_and_casks"
named.to_formulae_and_casks
end
def resolved_formulae
odeprecated "args.resolved_formulae", "args.named.to_resolved_formulae"
named.to_resolved_formulae
end
def resolved_formulae_casks
odeprecated "args.resolved_formulae_casks", "args.named.to_resolved_formulae_to_casks"
named.to_resolved_formulae_to_casks
end
def formulae_paths
odeprecated "args.formulae_paths", "args.named.to_formulae_paths"
named.to_formulae_paths
end
def casks
odeprecated "args.casks", "args.named.homebrew_tap_cask_names"
named.homebrew_tap_cask_names
end
def loaded_casks
odeprecated "args.loaded_casks", "args.named.to_cask"
named.to_casks
end
def kegs
odeprecated "args.kegs", "args.named.to_kegs"
named.to_kegs
end
def kegs_casks
odeprecated "args.kegs", "args.named.to_kegs_to_casks"
named.to_kegs_to_casks
end

6
Library/Homebrew/cmd/--cache.rb
View File

@ -40,11 +40,11 @@ module Homebrew
end
formulae_or_casks = if args.formula?
args.formulae
args.named.to_formulae
elsif args.cask?
args.loaded_casks
args.named.to_casks
else
args.formulae_and_casks
args.named.to_formulae_and_casks
end
formulae_or_casks.each do |formula_or_cask|

4
Library/Homebrew/cmd/--caskroom.rb
View File

@ -19,10 +19,10 @@ module Homebrew
def __caskroom
args = __caskroom_args.parse
if args.loaded_casks.blank?
if args.named.to_casks.blank?
puts Cask::Caskroom.path
else
args.loaded_casks.each do |cask|
args.named.to_casks.each do |cask|
puts "#{Cask::Caskroom.path}/#{cask.token}"
end
end

2
Library/Homebrew/cmd/--cellar.rb
View File

@ -25,7 +25,7 @@ module Homebrew
if args.no_named?
puts HOMEBREW_CELLAR
else
puts args.resolved_formulae.map(&:rack)
puts args.named.to_resolved_formulae.map(&:rack)
end
end
end

2
Library/Homebrew/cmd/--env.rb
View File

@ -30,7 +30,7 @@ module Homebrew
args = __env_args.parse
ENV.activate_extensions!(env: args.env)
ENV.deps = args.formulae if superenv?(args.env)
ENV.deps = args.named.to_formulae if superenv?(args.env)
ENV.setup_build_environment
shell = if args.plain?

2
Library/Homebrew/cmd/--prefix.rb
View File

@ -25,7 +25,7 @@ module Homebrew
if args.no_named?
puts HOMEBREW_PREFIX
else
puts args.resolved_formulae.map { |f|
puts args.named.to_resolved_formulae.map { |f|
f.opt_prefix.exist? ? f.opt_prefix : f.installed_prefix
}
end

8
Library/Homebrew/cmd/deps.rb
View File

@ -65,7 +65,7 @@ module Homebrew
Formulary.enable_factory_cache!
recursive = !args.send("1?")
installed = args.installed? || dependents(args.formulae_and_casks).all?(&:any_version_installed?)
installed = args.installed? || dependents(args.named.to_formulae_and_casks).all?(&:any_version_installed?)
@use_runtime_dependencies = installed && recursive &&
!args.tree? &&
@ -76,7 +76,7 @@ module Homebrew
if args.tree?
dependents = if args.named.present?
sorted_dependents(args.formulae_and_casks)
sorted_dependents(args.named.to_formulae_and_casks)
elsif args.installed?
sorted_dependents(Formula.installed + Cask::Caskroom.casks)
else
@ -89,7 +89,7 @@ module Homebrew
puts_deps sorted_dependents(Formula.to_a + Cask::Cask.to_a), recursive: recursive, args: args
return
elsif !args.no_named? && args.for_each?
puts_deps sorted_dependents(args.formulae_and_casks), recursive: recursive, args: args
puts_deps sorted_dependents(args.named.to_formulae_and_casks), recursive: recursive, args: args
return
end
@ -100,7 +100,7 @@ module Homebrew
return
end
dependents = dependents(args.formulae_and_casks)
dependents = dependents(args.named.to_formulae_and_casks)
all_deps = deps_for_dependents(dependents, recursive: recursive, args: args, &(args.union? ? :| : :&))
condense_requirements(all_deps, args: args)

2
Library/Homebrew/cmd/desc.rb
View File

@ -47,7 +47,7 @@ module Homebrew
results = if search_type.nil?
desc = {}
args.formulae.each { |f| desc[f.full_name] = f.desc }
args.named.to_formulae.each { |f| desc[f.full_name] = f.desc }
Descriptions.new(desc)
else
query = args.named.join(" ")

4
Library/Homebrew/cmd/fetch.rb
View File

@ -50,13 +50,13 @@ module Homebrew
if args.deps?
bucket = []
args.formulae.each do |f|
args.named.to_formulae.each do |f|
bucket << f
bucket.concat f.recursive_dependencies.map(&:to_formula)
end
bucket.uniq!
else
bucket = args.formulae
bucket = args.named.to_formulae
end
puts "Fetching: #{bucket * ", "}" if bucket.size > 1

2
Library/Homebrew/cmd/gist-logs.rb
View File

@ -141,6 +141,6 @@ module Homebrew
Install.perform_preinstall_checks(all_fatal: true)
Install.perform_build_from_source_checks(all_fatal: true)
gistify_logs(args.resolved_formulae.first, args: args)
gistify_logs(args.named.to_resolved_formulae.first, args: args)
end
end

2
Library/Homebrew/cmd/home.rb
View File

@ -24,7 +24,7 @@ module Homebrew
return
end
homepages = args.formulae_and_casks.map do |formula_or_cask|
homepages = args.named.to_formulae_and_casks.map do |formula_or_cask|
puts "Opening homepage for #{name_of(formula_or_cask)}"
formula_or_cask.homepage
end

4
Library/Homebrew/cmd/info.rb
View File

@ -88,7 +88,7 @@ module Homebrew
elsif args.github?
raise FormulaUnspecifiedError if args.no_named?
exec_browser(*args.formulae.map { |f| github_info(f) })
exec_browser(*args.named.to_formulae.map { |f| github_info(f) })
else
print_info(args: args)
end
@ -133,7 +133,7 @@ module Homebrew
elsif args.installed?
Formula.installed.sort
else
args.formulae
args.named.to_formulae
end
json = ff.map(&:to_hash)
puts JSON.generate(json)

6
Library/Homebrew/cmd/install.rb
View File

@ -115,13 +115,13 @@ module Homebrew
formulae = []
unless args.casks.empty?
unless args.named.homebrew_tap_cask_names.empty?
cask_args = []
cask_args << "--force" if args.force?
cask_args << "--debug" if args.debug?
cask_args << "--verbose" if args.verbose?
args.casks.each do |c|
args.named.homebrew_tap_cask_names.each do |c|
ohai "brew cask install #{c} #{cask_args.join " "}"
system("#{HOMEBREW_PREFIX}/bin/brew", "cask", "install", c, *cask_args)
end
@ -131,7 +131,7 @@ module Homebrew
# developer tools are available, we need to stop them early on
FormulaInstaller.prevent_build_flags(args)
args.formulae.each do |f|
args.named.to_formulae.each do |f|
# head-only without --HEAD is an error
if !args.HEAD? && f.stable.nil? && f.devel.nil?
raise <<~EOS

2
Library/Homebrew/cmd/link.rb
View File

@ -37,7 +37,7 @@ module Homebrew
verbose: args.verbose?,
}
args.kegs.each do |keg|
args.named.to_kegs.each do |keg|
keg_only = Formulary.keg_only?(keg.rack)
if keg.linked?

6
Library/Homebrew/cmd/list.rb
View File

@ -89,9 +89,9 @@ module Homebrew
safe_system "ls", *ls_args, HOMEBREW_CELLAR
end
elsif args.verbose? || !$stdout.tty?
system_command! "find", args: args.kegs.map(&:to_s) + %w[-not -type d -print], print_stdout: true
system_command! "find", args: args.named.to_kegs.map(&:to_s) + %w[-not -type d -print], print_stdout: true
else
args.kegs.each { |keg| PrettyListing.new keg }
args.named.to_kegs.each { |keg| PrettyListing.new keg }
end
end
@ -168,7 +168,7 @@ module Homebrew
def list_casks(args:)
Cask::Cmd::List.list_casks(
*args.loaded_casks,
*args.named.to_casks,
one: args.public_send(:'1?'),
full_name: args.full_name?,
versions: args.versions?,

2
Library/Homebrew/cmd/migrate.rb
View File

@ -25,7 +25,7 @@ module Homebrew
def migrate
args = migrate_args.parse
args.resolved_formulae.each do |f|
args.named.to_resolved_formulae.each do |f|
if f.oldname
unless (rack = HOMEBREW_CELLAR/f.oldname).exist? && !rack.subdirs.empty?
raise NoSuchKegError, f.oldname

2
Library/Homebrew/cmd/missing.rb
View File

@ -31,7 +31,7 @@ module Homebrew
ff = if args.no_named?
Formula.installed.sort
else
args.resolved_formulae.sort
args.named.to_resolved_formulae.sort
end
ff.each do |f|

2
Library/Homebrew/cmd/options.rb
View File

@ -54,7 +54,7 @@ module Homebrew
elsif args.no_named?
raise FormulaUnspecifiedError
else
puts_options args.formulae, args: args
puts_options args.named.to_formulae, args: args
end
end

4
Library/Homebrew/cmd/outdated.rb
View File

@ -170,7 +170,7 @@ module Homebrew
end
def outdated_formulae(args:)
select_outdated((args.resolved_formulae.presence || Formula.installed), args: args).sort
select_outdated((args.named.to_resolved_formulae.presence || Formula.installed), args: args).sort
end
def outdated_casks(args:)
@ -182,7 +182,7 @@ module Homebrew
end
def outdated_formulae_casks(args:)
formulae, casks = args.resolved_formulae_casks
formulae, casks = args.named.to_resolved_formulae_to_casks
if formulae.blank? && casks.blank?
formulae = Formula.installed

2
Library/Homebrew/cmd/pin.rb
View File

@ -22,7 +22,7 @@ module Homebrew
def pin
args = pin_args.parse
args.resolved_formulae.each do |f|
args.named.to_resolved_formulae.each do |f|
if f.pinned?
opoo "#{f.name} already pinned"
elsif !f.pinnable?

2
Library/Homebrew/cmd/postinstall.rb
View File

@ -22,7 +22,7 @@ module Homebrew
def postinstall
args = postinstall_args.parse
args.resolved_formulae.each do |f|
args.named.to_resolved_formulae.each do |f|
ohai "Postinstalling #{f}"
fi = FormulaInstaller.new(f, debug: args.debug?, quiet: args.quiet?, verbose: args.verbose?)
fi.post_install

2
Library/Homebrew/cmd/reinstall.rb
View File

@ -61,7 +61,7 @@ module Homebrew
Install.perform_preinstall_checks
resolved_formulae, casks = args.resolved_formulae_casks
resolved_formulae, casks = args.named.to_resolved_formulae_to_casks
resolved_formulae.each do |f|
if f.pinned?
onoe "#{f.full_name} is pinned. You must unpin it to reinstall."

2
Library/Homebrew/cmd/uninstall.rb
View File

@ -49,7 +49,7 @@ module Homebrew
end
end
else
all_kegs, casks = args.kegs_casks
all_kegs, casks = args.named.to_kegs_to_casks
kegs_by_rack = all_kegs.group_by(&:rack)
end

2
Library/Homebrew/cmd/unlink.rb
View File

@ -28,7 +28,7 @@ module Homebrew
options = { dry_run: args.dry_run?, verbose: args.verbose? }
args.kegs.each do |keg|
args.named.to_kegs.each do |keg|
if args.dry_run?
puts "Would remove:"
keg.unlink(**options)

2
Library/Homebrew/cmd/unpin.rb
View File

@ -22,7 +22,7 @@ module Homebrew
def unpin
args = unpin_args.parse
args.resolved_formulae.each do |f|
args.named.to_resolved_formulae.each do |f|
if f.pinned?
f.unpin
elsif !f.pinnable?

2
Library/Homebrew/cmd/upgrade.rb
View File

@ -73,7 +73,7 @@ module Homebrew
def upgrade
args = upgrade_args.parse
formulae, casks = args.resolved_formulae_casks
formulae, casks = args.named.to_resolved_formulae_to_casks
# If one or more formulae are specified, but no casks were
# specified, we want to make note of that so we don't
# try to upgrade all outdated casks.

2
Library/Homebrew/cmd/uses.rb
View File

@ -56,7 +56,7 @@ module Homebrew
used_formulae_missing = false
used_formulae = begin
args.formulae
args.named.to_formulae
rescue FormulaUnavailableError => e
opoo e
used_formulae_missing = true

4
Library/Homebrew/dev-cmd/audit.rb
View File

@ -98,9 +98,9 @@ module Homebrew
elsif args.no_named?
Formula
else
args.resolved_formulae
args.named.to_resolved_formulae
end
style_files = args.formulae_paths unless skip_style
style_files = args.named.to_formulae_paths unless skip_style
only_cops = args.only_cops
except_cops = args.except_cops

2
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -88,7 +88,7 @@ module Homebrew
return merge(args: args) if args.merge?
ensure_relocation_formulae_installed! unless args.skip_relocation?
args.resolved_formulae.each do |f|
args.named.to_resolved_formulae.each do |f|
bottle_formula f, args: args
end
end

2
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -123,7 +123,7 @@ module Homebrew
# Use the user's browser, too.
ENV["BROWSER"] = Homebrew::EnvConfig.browser
formula = args.formulae.first
formula = args.named.to_formulae.first
new_url = args.url
formula ||= determine_formula_from_url(new_url) if new_url

2
Library/Homebrew/dev-cmd/bump-revision.rb
View File

@ -30,7 +30,7 @@ module Homebrew
# user path, too.
ENV["PATH"] = ENV["HOMEBREW_PATH"]
args.formulae.each do |formula|
args.named.to_formulae.each do |formula|
current_revision = formula.revision
if current_revision.zero?

2
Library/Homebrew/dev-cmd/bump.rb
View File

@ -23,7 +23,7 @@ module Homebrew
def bump
args = bump_args.parse
requested_formulae = args.formulae.map(&:name) if args.formulae.present?
requested_formulae = args.named.to_formulae.map(&:name) if args.named.to_formulae.present?
requested_limit = args.limit.to_i if args.limit.present?

2
Library/Homebrew/dev-cmd/cat.rb
View File

@ -26,6 +26,6 @@ module Homebrew
else
"cat"
end
safe_system pager, args.formulae_paths.first
safe_system pager, args.named.to_formulae_paths.first
end
end

2
Library/Homebrew/dev-cmd/edit.rb
View File

@ -28,7 +28,7 @@ module Homebrew
EOS
end
paths = args.formulae_paths.presence
paths = args.named.to_formulae_paths.presence
# If no brews are listed, open the project root in an editor.
paths ||= [HOMEBREW_REPOSITORY]

2
Library/Homebrew/dev-cmd/formula.rb
View File

@ -21,6 +21,6 @@ module Homebrew
def formula
args = formula_args.parse
args.formulae_paths.each(&method(:puts))
args.named.to_formulae_paths.each(&method(:puts))
end
end

4
Library/Homebrew/dev-cmd/linkage.rb
View File

@ -31,10 +31,10 @@ module Homebrew
args = linkage_args.parse
CacheStoreDatabase.use(:linkage) do |db|
kegs = if args.kegs.empty?
kegs = if args.named.to_kegs.empty?
Formula.installed.map(&:opt_or_installed_prefix_keg).reject(&:nil?)
else
args.kegs
args.named.to_kegs
end
kegs.each do |keg|
ohai "Checking #{keg.name} linkage" if kegs.size > 1

2
Library/Homebrew/dev-cmd/mirror.rb
View File

@ -33,7 +33,7 @@ module Homebrew
bintray = Bintray.new(org: bintray_org)
args.formulae.each do |formula|
args.named.to_formulae.each do |formula|
mirror_url = bintray.mirror_formula(formula, repo: bintray_repo, publish_package: !args.no_publish?)
ohai "Mirrored #{formula.full_name} to #{mirror_url}!"
end

2
Library/Homebrew/dev-cmd/style.rb
View File

@ -44,7 +44,7 @@ module Homebrew
elsif args.named.any? { |tap| tap.count("/") == 1 }
args.named.map { |tap| Tap.fetch(tap).path }
else
args.formulae_paths
args.named.to_formulae_paths
end
only_cops = args.only_cops

2
Library/Homebrew/dev-cmd/test.rb
View File

@ -39,7 +39,7 @@ module Homebrew
require "formula_assertions"
require "formula_free_port"
args.resolved_formulae.each do |f|
args.named.to_resolved_formulae.each do |f|
# Cannot test uninstalled formulae
unless f.latest_version_installed?
ofail "Testing requires the latest version of #{f.full_name}"

2
Library/Homebrew/dev-cmd/unpack.rb
View File

@ -33,7 +33,7 @@ module Homebrew
def unpack
args = unpack_args.parse
formulae = args.formulae
formulae = args.named.to_formulae
if dir = args.destdir
unpack_dir = Pathname.new(dir).expand_path

2
Library/Homebrew/dev-cmd/update-python-resources.rb
View File

@ -29,7 +29,7 @@ module Homebrew
def update_python_resources
args = update_python_resources_args.parse
args.formulae.each do |formula|
args.named.to_formulae.each do |formula|
PyPI.update_python_resources! formula, args.version, print_only: args.print_only?, silent: args.silent?,
ignore_non_pypi_packages: args.ignore_non_pypi_packages?
end

2
Library/Homebrew/formula_installer.rb
View File

@ -112,7 +112,7 @@ class FormulaInstaller
return if build_flags.empty?
all_bottled = args.formulae.all?(&:bottled?)
all_bottled = args.named.to_formulae.all?(&:bottled?)
raise BuildFlagsError.new(build_flags, bottled: all_bottled)
end

2
Library/Homebrew/postinstall.rb
View File

@ -16,7 +16,7 @@ begin
trap("INT", old_trap)
formula = args.resolved_formulae.first
formula = args.named.to_resolved_formulae.first
formula.extend(Debrew::Formula) if args.debug?
formula.run_post_install
rescue Exception => e # rubocop:disable Lint/RescueException

2
Library/Homebrew/test.rb
View File

@ -24,7 +24,7 @@ begin
trap("INT", old_trap)
formula = args.resolved_formulae.first
formula = args.named.to_resolved_formulae.first
formula.extend(Homebrew::Assertions)
formula.extend(Homebrew::FreePort)
formula.extend(Debrew::Formula) if args.debug?

57
Library/Homebrew/test/cli/named_args_spec.rb
View File

@ -10,12 +10,6 @@ describe Homebrew::CLI::NamedArgs do
end
end
let(:foo_keg) do
path = (HOMEBREW_CELLAR/"foo/1.0").resolved_path
mkdir_p path
Keg.new(path)
end
let(:bar) do
formula "bar" do
url "https://brew.sh"
@ -23,12 +17,6 @@ describe Homebrew::CLI::NamedArgs do
end
end
let(:bar_keg) do
path = (HOMEBREW_CELLAR/"bar/1.0").resolved_path
mkdir_p path
Keg.new(path)
end
let(:baz) do
Cask::CaskLoader.load(+<<~RUBY)
cask "baz" do
@ -44,6 +32,14 @@ describe Homebrew::CLI::NamedArgs do
expect(described_class.new("foo", "bar").to_formulae).to eq [foo, bar]
end
it "raises an error when a Formula is unavailable" do
expect { described_class.new("mxcl").to_formulae }.to raise_error FormulaUnavailableError
end
it "returns an empty array when there are no Formulae" do
expect(described_class.new.to_formulae).to be_empty
end
end
describe "#to_formulae_and_casks" do
@ -85,26 +81,43 @@ describe Homebrew::CLI::NamedArgs do
end
describe "#to_kegs" do
it "returns kegs" do
named_args = described_class.new("foo", "bar")
allow(named_args).to receive(:resolve_keg).with("foo").and_return foo_keg
allow(named_args).to receive(:resolve_keg).with("bar").and_return bar_keg
before do
(HOMEBREW_CELLAR/"foo/1.0").mkpath
(HOMEBREW_CELLAR/"bar/1.0").mkpath
end
expect(named_args.to_kegs).to eq [foo_keg, bar_keg]
it "resolves kegs with #resolve_kegs" do
expect(described_class.new("foo", "bar").to_kegs.map(&:name)).to eq ["foo", "bar"]
end
it "when there are no matching kegs returns an array of Kegs" do
expect(described_class.new.to_kegs).to be_empty
end
end
describe "#to_kegs_to_casks" do
before do
(HOMEBREW_CELLAR/"foo/1.0").mkpath
end
it "returns kegs, as well as casks" do
named_args = described_class.new("foo", "baz")
allow(named_args).to receive(:resolve_keg).and_call_original
allow(named_args).to receive(:resolve_keg).with("foo").and_return foo_keg
stub_cask_loader baz, call_original: true
kegs, casks = named_args.to_kegs_to_casks
kegs, casks = described_class.new("foo", "baz").to_kegs_to_casks
expect(kegs).to eq [foo_keg]
expect(kegs.map(&:name)).to eq ["foo"]
expect(casks).to eq [baz]
end
end
describe "#homebrew_tap_cask_names" do
it "returns an array of casks from homebrew-cask" do
expect(described_class.new("foo", "homebrew/cask/local-caffeine").homebrew_tap_cask_names)
.to eq ["homebrew/cask/local-caffeine"]
end
it "returns an empty array when there are no matching casks" do
expect(described_class.new("foo").homebrew_tap_cask_names).to be_empty
end
end
end

32
Library/Homebrew/test/cli/parser_spec.rb
View File

@ -270,38 +270,6 @@ describe Homebrew::CLI::Parser do
expect(args.flags_only).to eq %w[--verbose --foo --bar=value]
end
it "#formulae raises an error when a Formula is unavailable" do
args = parser.parse(["mxcl"])
expect { args.formulae }.to raise_error FormulaUnavailableError
end
it "#formulae returns an empty array when there are no Formulae" do
args = parser.parse([])
expect(args.formulae).to be_empty
end
it "#casks returns an empty array when there are no matching casks" do
args = parser.parse([])
expect(args.casks).to eq []
end
context "kegs" do
before do
keg = HOMEBREW_CELLAR/"mxcl/10.0"
keg.mkpath
end
it "when there are matching kegs returns an array of Kegs" do
args = parser.parse(["mxcl"])
expect(args.kegs.length).to eq 1
end
it "when there are no matching kegs returns an array of Kegs" do
args = parser.parse([])
expect(args.kegs).to be_empty
end
end
it "#named returns an array of non-option arguments" do
args = parser.parse(["foo", "-v", "-s"])
expect(args.named).to eq ["foo"]