From e40b1711279041a6bbc337f917db54ea92fb763a Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 17 Apr 2019 18:25:08 +0900
Subject: [PATCH] Rename cli_parser to cli/parser.

---
 Library/Homebrew/{cli_parser.rb => cli/parser.rb}               | 0
 Library/Homebrew/cmd/--cache.rb                                 | 2 +-
 Library/Homebrew/cmd/--cellar.rb                                | 2 +-
 Library/Homebrew/cmd/--env.rb                                   | 2 +-
 Library/Homebrew/cmd/--prefix.rb                                | 2 +-
 Library/Homebrew/cmd/--repository.rb                            | 2 +-
 Library/Homebrew/cmd/--version.rb                               | 2 +-
 Library/Homebrew/cmd/analytics.rb                               | 2 +-
 Library/Homebrew/cmd/cat.rb                                     | 2 +-
 Library/Homebrew/cmd/cleanup.rb                                 | 2 +-
 Library/Homebrew/cmd/command.rb                                 | 2 +-
 Library/Homebrew/cmd/commands.rb                                | 2 +-
 Library/Homebrew/cmd/config.rb                                  | 2 +-
 Library/Homebrew/cmd/deps.rb                                    | 2 +-
 Library/Homebrew/cmd/desc.rb                                    | 2 +-
 Library/Homebrew/cmd/diy.rb                                     | 2 +-
 Library/Homebrew/cmd/doctor.rb                                  | 2 +-
 Library/Homebrew/cmd/fetch.rb                                   | 2 +-
 Library/Homebrew/cmd/gist-logs.rb                               | 2 +-
 Library/Homebrew/cmd/home.rb                                    | 2 +-
 Library/Homebrew/cmd/info.rb                                    | 2 +-
 Library/Homebrew/cmd/install.rb                                 | 2 +-
 Library/Homebrew/cmd/leaves.rb                                  | 2 +-
 Library/Homebrew/cmd/link.rb                                    | 2 +-
 Library/Homebrew/cmd/list.rb                                    | 2 +-
 Library/Homebrew/cmd/log.rb                                     | 2 +-
 Library/Homebrew/cmd/migrate.rb                                 | 2 +-
 Library/Homebrew/cmd/missing.rb                                 | 2 +-
 Library/Homebrew/cmd/options.rb                                 | 2 +-
 Library/Homebrew/cmd/outdated.rb                                | 2 +-
 Library/Homebrew/cmd/pin.rb                                     | 2 +-
 Library/Homebrew/cmd/postinstall.rb                             | 2 +-
 Library/Homebrew/cmd/readall.rb                                 | 2 +-
 Library/Homebrew/cmd/reinstall.rb                               | 2 +-
 Library/Homebrew/cmd/search.rb                                  | 2 +-
 Library/Homebrew/cmd/sh.rb                                      | 2 +-
 Library/Homebrew/cmd/style.rb                                   | 2 +-
 Library/Homebrew/cmd/switch.rb                                  | 2 +-
 Library/Homebrew/cmd/tap-info.rb                                | 2 +-
 Library/Homebrew/cmd/tap-pin.rb                                 | 2 +-
 Library/Homebrew/cmd/tap-unpin.rb                               | 2 +-
 Library/Homebrew/cmd/tap.rb                                     | 2 +-
 Library/Homebrew/cmd/uninstall.rb                               | 2 +-
 Library/Homebrew/cmd/unlink.rb                                  | 2 +-
 Library/Homebrew/cmd/unpack.rb                                  | 2 +-
 Library/Homebrew/cmd/unpin.rb                                   | 2 +-
 Library/Homebrew/cmd/untap.rb                                   | 2 +-
 Library/Homebrew/cmd/update-report.rb                           | 2 +-
 Library/Homebrew/cmd/upgrade.rb                                 | 2 +-
 Library/Homebrew/cmd/uses.rb                                    | 2 +-
 Library/Homebrew/dev-cmd/audit.rb                               | 2 +-
 Library/Homebrew/dev-cmd/bottle.rb                              | 2 +-
 Library/Homebrew/dev-cmd/bump-formula-pr.rb                     | 2 +-
 Library/Homebrew/dev-cmd/create.rb                              | 2 +-
 Library/Homebrew/dev-cmd/edit.rb                                | 2 +-
 Library/Homebrew/dev-cmd/extract.rb                             | 2 +-
 Library/Homebrew/dev-cmd/formula.rb                             | 2 +-
 Library/Homebrew/dev-cmd/irb.rb                                 | 2 +-
 Library/Homebrew/dev-cmd/linkage.rb                             | 2 +-
 Library/Homebrew/dev-cmd/man.rb                                 | 2 +-
 Library/Homebrew/dev-cmd/mirror.rb                              | 2 +-
 Library/Homebrew/dev-cmd/prof.rb                                | 2 +-
 Library/Homebrew/dev-cmd/pull.rb                                | 2 +-
 Library/Homebrew/dev-cmd/release-notes.rb                       | 2 +-
 Library/Homebrew/dev-cmd/ruby.rb                                | 2 +-
 Library/Homebrew/dev-cmd/tap-new.rb                             | 2 +-
 Library/Homebrew/dev-cmd/test.rb                                | 2 +-
 Library/Homebrew/dev-cmd/tests.rb                               | 2 +-
 Library/Homebrew/dev-cmd/update-test.rb                         | 2 +-
 Library/Homebrew/dev-cmd/vendor-gems.rb                         | 2 +-
 Library/Homebrew/help.rb                                        | 2 +-
 Library/Homebrew/test/.rubocop_todo.yml                         | 2 +-
 .../Homebrew/test/{cli_parser_spec.rb => cli/parser_spec.rb}    | 2 +-
 73 files changed, 72 insertions(+), 72 deletions(-)
 rename Library/Homebrew/{cli_parser.rb => cli/parser.rb} (100%)
 rename Library/Homebrew/test/{cli_parser_spec.rb => cli/parser_spec.rb} (99%)

diff --git a/Library/Homebrew/cli_parser.rb b/Library/Homebrew/cli/parser.rb
similarity index 100%
rename from Library/Homebrew/cli_parser.rb
rename to Library/Homebrew/cli/parser.rb
diff --git a/Library/Homebrew/cmd/--cache.rb b/Library/Homebrew/cmd/--cache.rb
index 812a093319..a593af31dc 100644
--- a/Library/Homebrew/cmd/--cache.rb
+++ b/Library/Homebrew/cmd/--cache.rb
@@ -1,5 +1,5 @@
 require "fetch"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/--cellar.rb b/Library/Homebrew/cmd/--cellar.rb
index 8b6fa9b304..a9e7758fb5 100644
--- a/Library/Homebrew/cmd/--cellar.rb
+++ b/Library/Homebrew/cmd/--cellar.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb
index c0dc3c0dd3..7a8c39befa 100644
--- a/Library/Homebrew/cmd/--env.rb
+++ b/Library/Homebrew/cmd/--env.rb
@@ -1,7 +1,7 @@
 require "extend/ENV"
 require "build_environment"
 require "utils/shell"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/--prefix.rb b/Library/Homebrew/cmd/--prefix.rb
index fb98235dcf..86295cd2f4 100644
--- a/Library/Homebrew/cmd/--prefix.rb
+++ b/Library/Homebrew/cmd/--prefix.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/--repository.rb b/Library/Homebrew/cmd/--repository.rb
index 39eb60fe94..d283fbfedd 100644
--- a/Library/Homebrew/cmd/--repository.rb
+++ b/Library/Homebrew/cmd/--repository.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/--version.rb b/Library/Homebrew/cmd/--version.rb
index bd4a222821..b5c4283be6 100644
--- a/Library/Homebrew/cmd/--version.rb
+++ b/Library/Homebrew/cmd/--version.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/analytics.rb b/Library/Homebrew/cmd/analytics.rb
index a38bd8ce79..0b24527d9e 100644
--- a/Library/Homebrew/cmd/analytics.rb
+++ b/Library/Homebrew/cmd/analytics.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/cat.rb b/Library/Homebrew/cmd/cat.rb
index 89b5304c40..3214d3d2f4 100644
--- a/Library/Homebrew/cmd/cat.rb
+++ b/Library/Homebrew/cmd/cat.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/cleanup.rb b/Library/Homebrew/cmd/cleanup.rb
index 19bbef2e8a..dc714f0b50 100644
--- a/Library/Homebrew/cmd/cleanup.rb
+++ b/Library/Homebrew/cmd/cleanup.rb
@@ -1,5 +1,5 @@
 require "cleanup"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/command.rb b/Library/Homebrew/cmd/command.rb
index 08d5b51c80..9fad816fd1 100644
--- a/Library/Homebrew/cmd/command.rb
+++ b/Library/Homebrew/cmd/command.rb
@@ -1,5 +1,5 @@
 require "commands"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/commands.rb b/Library/Homebrew/cmd/commands.rb
index 66b4466331..8705db0944 100644
--- a/Library/Homebrew/cmd/commands.rb
+++ b/Library/Homebrew/cmd/commands.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/config.rb b/Library/Homebrew/cmd/config.rb
index e687aa281c..7f21c9c347 100644
--- a/Library/Homebrew/cmd/config.rb
+++ b/Library/Homebrew/cmd/config.rb
@@ -1,5 +1,5 @@
 require "system_config"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/deps.rb b/Library/Homebrew/cmd/deps.rb
index 8cc337bb36..ed4ed93918 100644
--- a/Library/Homebrew/cmd/deps.rb
+++ b/Library/Homebrew/cmd/deps.rb
@@ -1,6 +1,6 @@
 require "formula"
 require "ostruct"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/desc.rb b/Library/Homebrew/cmd/desc.rb
index 32538e0b47..27689bd476 100644
--- a/Library/Homebrew/cmd/desc.rb
+++ b/Library/Homebrew/cmd/desc.rb
@@ -1,7 +1,7 @@
 require "descriptions"
 require "search"
 require "description_cache_store"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/diy.rb b/Library/Homebrew/cmd/diy.rb
index 5b8c21f284..cda37e600d 100644
--- a/Library/Homebrew/cmd/diy.rb
+++ b/Library/Homebrew/cmd/diy.rb
@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index ceb838f7d0..6f05571250 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -1,5 +1,5 @@
 require "diagnostic"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb
index 07dc67e576..f98ad6d8a5 100644
--- a/Library/Homebrew/cmd/fetch.rb
+++ b/Library/Homebrew/cmd/fetch.rb
@@ -1,6 +1,6 @@
 require "formula"
 require "fetch"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/gist-logs.rb b/Library/Homebrew/cmd/gist-logs.rb
index ae59fc6ea9..a6329cc0ac 100644
--- a/Library/Homebrew/cmd/gist-logs.rb
+++ b/Library/Homebrew/cmd/gist-logs.rb
@@ -3,7 +3,7 @@ require "install"
 require "system_config"
 require "stringio"
 require "socket"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/home.rb b/Library/Homebrew/cmd/home.rb
index a9e1df4a86..a001762077 100644
--- a/Library/Homebrew/cmd/home.rb
+++ b/Library/Homebrew/cmd/home.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index 9fe8325ef0..0007af6fdf 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -1,6 +1,6 @@
 require "missing_formula"
 require "caveats"
-require "cli_parser"
+require "cli/parser"
 require "options"
 require "formula"
 require "keg"
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index 0a6b9717b1..9200344a5d 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -4,7 +4,7 @@ require "development_tools"
 require "install"
 require "search"
 require "cleanup"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/leaves.rb b/Library/Homebrew/cmd/leaves.rb
index 1971ff5da9..4583ec181f 100644
--- a/Library/Homebrew/cmd/leaves.rb
+++ b/Library/Homebrew/cmd/leaves.rb
@@ -1,6 +1,6 @@
 require "formula"
 require "tab"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/link.rb b/Library/Homebrew/cmd/link.rb
index 4f2cd4371e..2427f798d2 100644
--- a/Library/Homebrew/cmd/link.rb
+++ b/Library/Homebrew/cmd/link.rb
@@ -1,6 +1,6 @@
 require "ostruct"
 require "caveats"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
index a0540d25b4..cc590b090f 100644
--- a/Library/Homebrew/cmd/list.rb
+++ b/Library/Homebrew/cmd/list.rb
@@ -1,6 +1,6 @@
 require "metafiles"
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/log.rb b/Library/Homebrew/cmd/log.rb
index 8b0a526b25..6506fd929d 100644
--- a/Library/Homebrew/cmd/log.rb
+++ b/Library/Homebrew/cmd/log.rb
@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/migrate.rb b/Library/Homebrew/cmd/migrate.rb
index eede2c97f4..4c863b203d 100644
--- a/Library/Homebrew/cmd/migrate.rb
+++ b/Library/Homebrew/cmd/migrate.rb
@@ -1,5 +1,5 @@
 require "migrator"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/missing.rb b/Library/Homebrew/cmd/missing.rb
index d0229470ec..56d7a38807 100644
--- a/Library/Homebrew/cmd/missing.rb
+++ b/Library/Homebrew/cmd/missing.rb
@@ -1,7 +1,7 @@
 require "formula"
 require "tab"
 require "diagnostic"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/options.rb b/Library/Homebrew/cmd/options.rb
index e17f303ca6..340355cac8 100644
--- a/Library/Homebrew/cmd/options.rb
+++ b/Library/Homebrew/cmd/options.rb
@@ -1,6 +1,6 @@
 require "formula"
 require "options"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/outdated.rb b/Library/Homebrew/cmd/outdated.rb
index dd469eb4ce..b233612476 100644
--- a/Library/Homebrew/cmd/outdated.rb
+++ b/Library/Homebrew/cmd/outdated.rb
@@ -1,6 +1,6 @@
 require "formula"
 require "keg"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/pin.rb b/Library/Homebrew/cmd/pin.rb
index e28812b2ee..148f9f3953 100644
--- a/Library/Homebrew/cmd/pin.rb
+++ b/Library/Homebrew/cmd/pin.rb
@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/postinstall.rb b/Library/Homebrew/cmd/postinstall.rb
index 315b751428..8c62077602 100644
--- a/Library/Homebrew/cmd/postinstall.rb
+++ b/Library/Homebrew/cmd/postinstall.rb
@@ -1,6 +1,6 @@
 require "sandbox"
 require "formula_installer"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/readall.rb b/Library/Homebrew/cmd/readall.rb
index 124da2e18d..3303abe370 100644
--- a/Library/Homebrew/cmd/readall.rb
+++ b/Library/Homebrew/cmd/readall.rb
@@ -1,5 +1,5 @@
 require "readall"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index 19527ec3cd..3cab670733 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -2,7 +2,7 @@ require "formula_installer"
 require "development_tools"
 require "messages"
 require "reinstall"
-require "cli_parser"
+require "cli/parser"
 require "cleanup"
 
 module Homebrew
diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index 338d20ecb1..4007527f9d 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -1,7 +1,7 @@
 require "formula"
 require "missing_formula"
 require "descriptions"
-require "cli_parser"
+require "cli/parser"
 require "search"
 
 module Homebrew
diff --git a/Library/Homebrew/cmd/sh.rb b/Library/Homebrew/cmd/sh.rb
index 91fd2bffff..42137f0678 100644
--- a/Library/Homebrew/cmd/sh.rb
+++ b/Library/Homebrew/cmd/sh.rb
@@ -1,6 +1,6 @@
 require "extend/ENV"
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/style.rb b/Library/Homebrew/cmd/style.rb
index 0256fe2b0e..881b73bd5f 100644
--- a/Library/Homebrew/cmd/style.rb
+++ b/Library/Homebrew/cmd/style.rb
@@ -1,7 +1,7 @@
 require "json"
 require "open3"
 require "style"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/switch.rb b/Library/Homebrew/cmd/switch.rb
index 1122f68c01..99484f83eb 100644
--- a/Library/Homebrew/cmd/switch.rb
+++ b/Library/Homebrew/cmd/switch.rb
@@ -1,6 +1,6 @@
 require "formula"
 require "keg"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/tap-info.rb b/Library/Homebrew/cmd/tap-info.rb
index b359c31581..134b0bf7c4 100644
--- a/Library/Homebrew/cmd/tap-info.rb
+++ b/Library/Homebrew/cmd/tap-info.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/tap-pin.rb b/Library/Homebrew/cmd/tap-pin.rb
index c04bae48fc..3f0ddcb9ab 100644
--- a/Library/Homebrew/cmd/tap-pin.rb
+++ b/Library/Homebrew/cmd/tap-pin.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/tap-unpin.rb b/Library/Homebrew/cmd/tap-unpin.rb
index 25fc23bf59..64a320f222 100644
--- a/Library/Homebrew/cmd/tap-unpin.rb
+++ b/Library/Homebrew/cmd/tap-unpin.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb
index 917d5615c2..d3cce4549a 100644
--- a/Library/Homebrew/cmd/tap.rb
+++ b/Library/Homebrew/cmd/tap.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index 15dc992a32..aff746b818 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -2,7 +2,7 @@ require "keg"
 require "formula"
 require "diagnostic"
 require "migrator"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/unlink.rb b/Library/Homebrew/cmd/unlink.rb
index 9d52040586..b63b060f59 100644
--- a/Library/Homebrew/cmd/unlink.rb
+++ b/Library/Homebrew/cmd/unlink.rb
@@ -1,5 +1,5 @@
 require "ostruct"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/unpack.rb b/Library/Homebrew/cmd/unpack.rb
index 764362af62..e12b354c6f 100644
--- a/Library/Homebrew/cmd/unpack.rb
+++ b/Library/Homebrew/cmd/unpack.rb
@@ -1,6 +1,6 @@
 require "stringio"
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/unpin.rb b/Library/Homebrew/cmd/unpin.rb
index 9f75503499..0722418d1d 100644
--- a/Library/Homebrew/cmd/unpin.rb
+++ b/Library/Homebrew/cmd/unpin.rb
@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index 250484f3df..d86c80f37d 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 0de8847cd9..d8da2b0d4c 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -4,7 +4,7 @@ require "formulary"
 require "descriptions"
 require "cleanup"
 require "description_cache_store"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index b5696c64b0..cd71173a85 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -4,7 +4,7 @@ require "formula_installer"
 require "development_tools"
 require "messages"
 require "cleanup"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/cmd/uses.rb b/Library/Homebrew/cmd/uses.rb
index f25b3114a9..f8fd73b248 100644
--- a/Library/Homebrew/cmd/uses.rb
+++ b/Library/Homebrew/cmd/uses.rb
@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 # `brew uses foo bar` returns formulae that use both foo and bar
 # If you want the union, run the command twice and concatenate the results.
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index a50ee754e0..e578558cc0 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -8,7 +8,7 @@ require "style"
 require "date"
 require "missing_formula"
 require "digest"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index bb0a16d052..60d10efa4a 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -3,7 +3,7 @@ require "utils/bottles"
 require "tab"
 require "keg"
 require "formula_versions"
-require "cli_parser"
+require "cli/parser"
 require "utils/inreplace"
 require "erb"
 
diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
index 4728d381ed..f81211371f 100644
--- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/create.rb b/Library/Homebrew/dev-cmd/create.rb
index 6432fa2a26..308320459d 100644
--- a/Library/Homebrew/dev-cmd/create.rb
+++ b/Library/Homebrew/dev-cmd/create.rb
@@ -1,7 +1,7 @@
 require "formula"
 require "formula_creator"
 require "missing_formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/edit.rb b/Library/Homebrew/dev-cmd/edit.rb
index bfb79bbcaa..1b1b6f341d 100644
--- a/Library/Homebrew/dev-cmd/edit.rb
+++ b/Library/Homebrew/dev-cmd/edit.rb
@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/extract.rb b/Library/Homebrew/dev-cmd/extract.rb
index fb8aa976a6..c48e8722b9 100644
--- a/Library/Homebrew/dev-cmd/extract.rb
+++ b/Library/Homebrew/dev-cmd/extract.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 require "utils/git"
 require "formulary"
 require "tap"
diff --git a/Library/Homebrew/dev-cmd/formula.rb b/Library/Homebrew/dev-cmd/formula.rb
index 8fe5c008b7..673588fa91 100644
--- a/Library/Homebrew/dev-cmd/formula.rb
+++ b/Library/Homebrew/dev-cmd/formula.rb
@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/irb.rb b/Library/Homebrew/dev-cmd/irb.rb
index 358feda611..e0fa43c680 100644
--- a/Library/Homebrew/dev-cmd/irb.rb
+++ b/Library/Homebrew/dev-cmd/irb.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 class Symbol
   def f(*args)
diff --git a/Library/Homebrew/dev-cmd/linkage.rb b/Library/Homebrew/dev-cmd/linkage.rb
index 34f60718db..4da94cfdde 100644
--- a/Library/Homebrew/dev-cmd/linkage.rb
+++ b/Library/Homebrew/dev-cmd/linkage.rb
@@ -1,6 +1,6 @@
 require "cache_store"
 require "linkage_checker"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/man.rb b/Library/Homebrew/dev-cmd/man.rb
index 9f3fca4875..8d7058d7c8 100644
--- a/Library/Homebrew/dev-cmd/man.rb
+++ b/Library/Homebrew/dev-cmd/man.rb
@@ -1,7 +1,7 @@
 require "formula"
 require "erb"
 require "ostruct"
-require "cli_parser"
+require "cli/parser"
 # Require all commands
 Dir.glob("#{HOMEBREW_LIBRARY_PATH}/{dev-,}cmd/*.rb").each { |cmd| require cmd }
 
diff --git a/Library/Homebrew/dev-cmd/mirror.rb b/Library/Homebrew/dev-cmd/mirror.rb
index 1b1365315d..8662756db8 100644
--- a/Library/Homebrew/dev-cmd/mirror.rb
+++ b/Library/Homebrew/dev-cmd/mirror.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/prof.rb b/Library/Homebrew/dev-cmd/prof.rb
index ec3b206ca7..be85d0f98e 100644
--- a/Library/Homebrew/dev-cmd/prof.rb
+++ b/Library/Homebrew/dev-cmd/prof.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb
index 7961b1f5e7..9a2fcd6c81 100644
--- a/Library/Homebrew/dev-cmd/pull.rb
+++ b/Library/Homebrew/dev-cmd/pull.rb
@@ -1,7 +1,7 @@
 require "net/http"
 require "net/https"
 require "json"
-require "cli_parser"
+require "cli/parser"
 require "formula"
 require "formulary"
 require "version"
diff --git a/Library/Homebrew/dev-cmd/release-notes.rb b/Library/Homebrew/dev-cmd/release-notes.rb
index 7f783469e6..2b51ee960e 100644
--- a/Library/Homebrew/dev-cmd/release-notes.rb
+++ b/Library/Homebrew/dev-cmd/release-notes.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/ruby.rb b/Library/Homebrew/dev-cmd/ruby.rb
index a1c42f4d78..b7012a7d8e 100644
--- a/Library/Homebrew/dev-cmd/ruby.rb
+++ b/Library/Homebrew/dev-cmd/ruby.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb
index 6bea487729..9408a8d0e0 100644
--- a/Library/Homebrew/dev-cmd/tap-new.rb
+++ b/Library/Homebrew/dev-cmd/tap-new.rb
@@ -1,5 +1,5 @@
 require "tap"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/test.rb b/Library/Homebrew/dev-cmd/test.rb
index 8ddc98c494..5515c57f50 100644
--- a/Library/Homebrew/dev-cmd/test.rb
+++ b/Library/Homebrew/dev-cmd/test.rb
@@ -1,7 +1,7 @@
 require "extend/ENV"
 require "sandbox"
 require "timeout"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index 0f357588ed..fb44ee6605 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 require "fileutils"
 
 module Homebrew
diff --git a/Library/Homebrew/dev-cmd/update-test.rb b/Library/Homebrew/dev-cmd/update-test.rb
index 3c1416f059..84832cd235 100644
--- a/Library/Homebrew/dev-cmd/update-test.rb
+++ b/Library/Homebrew/dev-cmd/update-test.rb
@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/dev-cmd/vendor-gems.rb b/Library/Homebrew/dev-cmd/vendor-gems.rb
index 466ce4b14c..0188f9d7ba 100644
--- a/Library/Homebrew/dev-cmd/vendor-gems.rb
+++ b/Library/Homebrew/dev-cmd/vendor-gems.rb
@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/help.rb b/Library/Homebrew/help.rb
index ecf5e6fcc4..6593b1baac 100644
--- a/Library/Homebrew/help.rb
+++ b/Library/Homebrew/help.rb
@@ -31,7 +31,7 @@ EOS
 # NOTE Keep lines less than 80 characters! Wrapping is just not cricket.
 # NOTE The reason the string is at the top is so 25 lines is easy to measure!
 
-require "cli_parser"
+require "cli/parser"
 require "commands"
 
 module Homebrew
diff --git a/Library/Homebrew/test/.rubocop_todo.yml b/Library/Homebrew/test/.rubocop_todo.yml
index be9285ce50..5d4d426c9c 100644
--- a/Library/Homebrew/test/.rubocop_todo.yml
+++ b/Library/Homebrew/test/.rubocop_todo.yml
@@ -26,8 +26,8 @@ RSpec/FilePath:
     - 'cask/artifact/uninstall_no_zap_spec.rb'
     - 'cask/cask_loader/from__path_loader_spec.rb'
     - 'cask/macos_spec.rb'
+    - 'cli/parser_spec.rb'
     - 'checksum_verification_spec.rb'
-    - 'cli_parser_spec.rb'
     - 'cxxstdlib_spec.rb'
     - 'diagnostic_checks_spec.rb'
     - 'missing_formula_spec.rb'
diff --git a/Library/Homebrew/test/cli_parser_spec.rb b/Library/Homebrew/test/cli/parser_spec.rb
similarity index 99%
rename from Library/Homebrew/test/cli_parser_spec.rb
rename to Library/Homebrew/test/cli/parser_spec.rb
index c4b1dfe033..0f83f6268f 100644
--- a/Library/Homebrew/test/cli_parser_spec.rb
+++ b/Library/Homebrew/test/cli/parser_spec.rb
@@ -1,4 +1,4 @@
-require_relative "../cli_parser"
+require_relative "../../cli/parser"
 
 describe Homebrew::CLI::Parser do
   describe "test switch options" do