From 38c24d134cac6db0f27587b5a0e49aca7a1c5cce Mon Sep 17 00:00:00 2001 From: Gautham G Date: Sat, 2 May 2020 13:21:16 +0530 Subject: [PATCH] ARGV: Deprecate ARGV.casks and replace with Homebrew.args.casks --- Library/Homebrew/cmd/install.rb | 4 ++-- Library/Homebrew/extend/ARGV.rb | 5 ----- Library/Homebrew/test/ARGV_spec.rb | 6 ------ 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 7245c5690f..644dd6039e 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -114,13 +114,13 @@ module Homebrew formulae = [] - unless ARGV.casks.empty? + unless Homebrew.args.casks.empty? cask_args = [] cask_args << "--force" if args.force? cask_args << "--debug" if args.debug? cask_args << "--verbose" if args.verbose? - ARGV.casks.each do |c| + Homebrew.args.casks.each do |c| ohai "brew cask install #{c} #{cask_args.join " "}" system("#{HOMEBREW_PREFIX}/bin/brew", "cask", "install", c, *cask_args) end diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 7155889126..27f21a228f 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -5,11 +5,6 @@ module HomebrewArgvExtension select { |arg| arg.start_with?("--") } end - def casks - # TODO: use @instance variable to ||= cache when moving to CLI::Parser - downcased_unique_named.grep HOMEBREW_CASK_TAP_CASK_REGEX - end - def value(name) arg_prefix = "--#{name}=" flag_with_value = find { |arg| arg.start_with?(arg_prefix) } diff --git a/Library/Homebrew/test/ARGV_spec.rb b/Library/Homebrew/test/ARGV_spec.rb index 640de294ba..5b32127930 100644 --- a/Library/Homebrew/test/ARGV_spec.rb +++ b/Library/Homebrew/test/ARGV_spec.rb @@ -7,12 +7,6 @@ describe HomebrewArgvExtension do let(:argv) { ["mxcl"] } - describe "#casks" do - it "returns an empty array if there is no match" do - expect(subject.casks).to eq [] - end - end - describe "#named" do let(:argv) { ["foo", "--debug", "-v"] }