From 7ad6dab28840a5eeb94d6d69614009854df0a700 Mon Sep 17 00:00:00 2001
From: Gautham G <gauthamg@Gauthams-MacBook-Pro.local>
Date: Tue, 24 Mar 2020 19:44:05 +0530
Subject: [PATCH] ARGV: Deprecate ARGV.collect_build_args

---
 Library/Homebrew/cli/args.rb          | 39 +++++++++++++++++++++++++--
 Library/Homebrew/extend/ARGV.rb       | 17 ------------
 Library/Homebrew/formula_installer.rb |  2 +-
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb
index cc3796db15..c6ff74f20a 100644
--- a/Library/Homebrew/cli/args.rb
+++ b/Library/Homebrew/cli/args.rb
@@ -68,6 +68,19 @@ module Homebrew
         named.blank?
       end
 
+      # If the user passes any flags that trigger building over installing from
+      # a bottle, they are collected here and returned as an Array for checking.
+      def collect_build_args
+        build_flags = []
+
+        build_flags << "--HEAD" if head
+        build_flags << "--universal" if build_universal
+        build_flags << "--build-bottle" if build_bottle
+        build_flags << "--build-from-source" if build_from_source
+
+        build_flags
+      end
+
       def formulae
         require "formula"
         @formulae ||= (downcased_unique_named - casks).map do |name|
@@ -160,11 +173,33 @@ module Homebrew
       end
 
       def head
-        (args_parsed && HEAD?) || cmdline_args.include?("--HEAD")
+        return true if args_parsed && HEAD?
+
+        cmdline_args.include?("--HEAD")
       end
 
       def devel
-        (args_parsed && devel?) || cmdline_args.include?("--devel")
+        return true if args_parsed && devel?
+
+        cmdline_args.include?("--devel")
+      end
+
+      def build_universal
+        return true if args_parsed && universal?
+
+        cmdline_args.include?("--universal")
+      end
+
+      def build_bottle
+        return true if args_parsed && build_bottle?
+
+        cmdline_args.include?("--build-bottle")
+      end
+
+      def build_from_source
+        return true if args_parsed && (build_from_source? || s?)
+
+        cmdline_args.include?("--build-from-source") || cmdline_args.include?("-s")
       end
 
       def spec(default = :stable)
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index ee59e9722e..ae9283add0 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -47,10 +47,6 @@ module HomebrewArgvExtension
     !(include?("--HEAD") || include?("--devel"))
   end
 
-  def build_universal?
-    include? "--universal"
-  end
-
   def build_bottle?
     include?("--build-bottle")
   end
@@ -84,19 +80,6 @@ module HomebrewArgvExtension
     value "env"
   end
 
-  # If the user passes any flags that trigger building over installing from
-  # a bottle, they are collected here and returned as an Array for checking.
-  def collect_build_flags
-    build_flags = []
-
-    build_flags << "--HEAD" if include?("--HEAD")
-    build_flags << "--universal" if build_universal?
-    build_flags << "--build-bottle" if build_bottle?
-    build_flags << "--build-from-source" if build_from_source?
-
-    build_flags
-  end
-
   private
 
   def options_only
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index e070a466c3..de418af649 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -80,7 +80,7 @@ class FormulaInstaller
   # it's necessary to interrupt the user before any sort of installation
   # can proceed. Only invoked when the user has no developer tools.
   def self.prevent_build_flags
-    build_flags = ARGV.collect_build_flags
+    build_flags = Homebrew.args.collect_build_args
     return if build_flags.empty?
 
     all_bottled = ARGV.formulae.all?(&:bottled?)