From e70df22acd43cea2f065d3a8497d9e966dda4579 Mon Sep 17 00:00:00 2001
From: Gautham Goli <goligautham@gmail.com>
Date: Sun, 11 Nov 2018 18:35:55 +0530
Subject: [PATCH] untap: Use CLI::Parser to parse args

---
 Library/Homebrew/cmd/untap.rb | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index fb2c77668f..1dbeaf0621 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -1,11 +1,26 @@
 #:  * `untap` <tap>:
 #:    Remove a tapped repository.
 
+require "cli_parser"
+
 module Homebrew
   module_function
 
+  def untap_args
+    Homebrew::CLI::Parser.new do
+      usage_banner <<~EOS
+        `untap` <tap>
+
+        Remove a tapped repository.
+      EOS
+      switch :debug
+    end
+  end
+
   def untap
-    raise "Usage is `brew untap <tap-name>`" if ARGV.empty?
+    untap_args.parse
+
+    raise "Usage is `brew untap <tap-name>`" if args.remaining.empty?
 
     ARGV.named.each do |tapname|
       tap = Tap.fetch(tapname)