From 66ac96acde01db8fe257adf2768195a7ac4287f9 Mon Sep 17 00:00:00 2001
From: Gautham G <gauthamg@Gauthams-MacBook-Pro.local>
Date: Sun, 3 May 2020 13:55:51 +0530
Subject: [PATCH] ARGV: Depercate ARGV.flags_only and replace with
 Homebrew.args.flags_only

---
 Library/Homebrew/extend/ARGV.rb        | 4 ----
 Library/Homebrew/software_spec.rb      | 3 ++-
 Library/Homebrew/test/ARGV_spec.rb     | 8 --------
 Library/Homebrew/test/messages_spec.rb | 3 ++-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 27f21a228f..c75c81b67c 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 module HomebrewArgvExtension
-  def flags_only
-    select { |arg| arg.start_with?("--") }
-  end
-
   def value(name)
     arg_prefix = "--#{name}="
     flag_with_value = find { |arg| arg.start_with?(arg_prefix) }
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 6258a18091..d3e6410cba 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -11,6 +11,7 @@ require "patch"
 require "compilers"
 require "global"
 require "os/mac/version"
+require "cli/parser"
 
 class SoftwareSpec
   extend Forwardable
@@ -41,7 +42,7 @@ class SoftwareSpec
     @bottle_specification = BottleSpecification.new
     @patches = []
     @options = Options.new
-    @flags = ARGV.flags_only
+    @flags = Homebrew.args.flags_only
     @deprecated_flags = []
     @deprecated_options = []
     @build = BuildOptions.new(Options.create(@flags), options)
diff --git a/Library/Homebrew/test/ARGV_spec.rb b/Library/Homebrew/test/ARGV_spec.rb
index 5b32127930..dd1699af31 100644
--- a/Library/Homebrew/test/ARGV_spec.rb
+++ b/Library/Homebrew/test/ARGV_spec.rb
@@ -31,14 +31,6 @@ describe HomebrewArgvExtension do
     end
   end
 
-  describe "#flags_only" do
-    let(:argv) { ["--foo", "-vds", "a", "b", "cdefg"] }
-
-    it "returns an array of flags" do
-      expect(subject.flags_only).to eq ["--foo"]
-    end
-  end
-
   describe "#empty?" do
     let(:argv) { [] }
 
diff --git a/Library/Homebrew/test/messages_spec.rb b/Library/Homebrew/test/messages_spec.rb
index 8b743b7bdf..c34dfbe141 100644
--- a/Library/Homebrew/test/messages_spec.rb
+++ b/Library/Homebrew/test/messages_spec.rb
@@ -76,7 +76,8 @@ describe Messages do
     # rubocop:disable RSpec/VerifiedDoubles
     context "when the --display-times argument is present" do
       before do
-        allow(Homebrew).to receive(:args).and_return(double(display_times?: true))
+        allow(Homebrew).to receive(:args)
+          .and_return(double(display_times?: true, flags_only: ["--display-times"]))
       end
 
       context "when install_times is empty" do