From fe9a9bb24ce9dbaceb15c23a6989f5993ba9670c Mon Sep 17 00:00:00 2001 From: Connor Mann Date: Wed, 19 May 2021 09:34:18 -0400 Subject: [PATCH] Rename `to_keg` to `to_default_kegs` --- Library/Homebrew/cli/named_args.rb | 4 ++-- Library/Homebrew/cmd/link.rb | 2 +- Library/Homebrew/cmd/list.rb | 4 ++-- Library/Homebrew/cmd/unlink.rb | 2 +- Library/Homebrew/test/cli/named_args_spec.rb | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/cli/named_args.rb b/Library/Homebrew/cli/named_args.rb index 8d032b737d..9b1f3553b8 100644 --- a/Library/Homebrew/cli/named_args.rb +++ b/Library/Homebrew/cli/named_args.rb @@ -209,8 +209,8 @@ module Homebrew end sig { returns(T::Array[Keg]) } - def to_keg - @to_keg ||= begin + def to_default_kegs + @to_default_kegs ||= begin to_formulae_and_casks(only: :formula, method: :keg).freeze rescue NoSuchKegError => e if (reason = MissingFormula.suggest_command(e.name, "uninstall")) diff --git a/Library/Homebrew/cmd/link.rb b/Library/Homebrew/cmd/link.rb index a003ad6d8b..e32213418c 100644 --- a/Library/Homebrew/cmd/link.rb +++ b/Library/Homebrew/cmd/link.rb @@ -45,7 +45,7 @@ module Homebrew kegs = if args.HEAD? args.named.to_kegs.filter { |keg| keg.version.head? } else - args.named.to_keg + args.named.to_default_kegs end kegs.freeze.each do |keg| diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb index 60e4d8af5b..05e1ff71d6 100644 --- a/Library/Homebrew/cmd/list.rb +++ b/Library/Homebrew/cmd/list.rb @@ -129,9 +129,9 @@ module Homebrew safe_system "ls", *ls_args, Cask::Caskroom.path end elsif args.verbose? || !$stdout.tty? - system_command! "find", args: args.named.to_keg.map(&:to_s) + %w[-not -type d -print], print_stdout: true + system_command! "find", args: args.named.to_default_kegs.map(&:to_s) + %w[-not -type d -print], print_stdout: true else - args.named.to_keg.each { |keg| PrettyListing.new keg } + args.named.to_default_kegs.each { |keg| PrettyListing.new keg } end end diff --git a/Library/Homebrew/cmd/unlink.rb b/Library/Homebrew/cmd/unlink.rb index 71258007ea..173e0d66fe 100644 --- a/Library/Homebrew/cmd/unlink.rb +++ b/Library/Homebrew/cmd/unlink.rb @@ -31,7 +31,7 @@ module Homebrew options = { dry_run: args.dry_run?, verbose: args.verbose? } - args.named.to_keg.each do |keg| + args.named.to_default_kegs.each do |keg| if args.dry_run? puts "Would remove:" keg.unlink(**options) diff --git a/Library/Homebrew/test/cli/named_args_spec.rb b/Library/Homebrew/test/cli/named_args_spec.rb index 874585fdae..5e993103aa 100644 --- a/Library/Homebrew/test/cli/named_args_spec.rb +++ b/Library/Homebrew/test/cli/named_args_spec.rb @@ -176,18 +176,18 @@ describe Homebrew::CLI::NamedArgs do end end - describe "#to_keg" do + describe "#to_default_kegs" do before do (HOMEBREW_CELLAR/"foo/1.0").mkpath (HOMEBREW_CELLAR/"bar/1.0").mkpath end it "resolves kegs with #resolve_keg" do - expect(described_class.new("foo", "bar").to_keg.map(&:name)).to eq ["foo", "bar"] + expect(described_class.new("foo", "bar").to_default_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_keg).to be_empty + expect(described_class.new.to_default_kegs).to be_empty end end