Rename cli_parser to cli/parser.

Library/Homebrew/cmd/--cache.rb

@@ -1,5 +1,5 @@
 require "fetch"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/--cellar.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

Library/Homebrew/cmd/--prefix.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/--repository.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/--version.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/analytics.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/cat.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/cleanup.rb

@@ -1,5 +1,5 @@
 require "cleanup"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/command.rb

@@ -1,5 +1,5 @@
 require "commands"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/commands.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/config.rb

@@ -1,5 +1,5 @@
 require "system_config"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/deps.rb

@@ -1,6 +1,6 @@
 require "formula"
 require "ostruct"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

Library/Homebrew/cmd/diy.rb

@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/doctor.rb

@@ -1,5 +1,5 @@
 require "diagnostic"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/fetch.rb

@@ -1,6 +1,6 @@
 require "formula"
 require "fetch"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

Library/Homebrew/cmd/home.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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"

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

Library/Homebrew/cmd/leaves.rb

@@ -1,6 +1,6 @@
 require "formula"
 require "tab"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/link.rb

@@ -1,6 +1,6 @@
 require "ostruct"
 require "caveats"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/list.rb

@@ -1,6 +1,6 @@
 require "metafiles"
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/log.rb

@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/migrate.rb

@@ -1,5 +1,5 @@
 require "migrator"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

Library/Homebrew/cmd/options.rb

@@ -1,6 +1,6 @@
 require "formula"
 require "options"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/outdated.rb

@@ -1,6 +1,6 @@
 require "formula"
 require "keg"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/pin.rb

@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/postinstall.rb

@@ -1,6 +1,6 @@
 require "sandbox"
 require "formula_installer"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/readall.rb

@@ -1,5 +1,5 @@
 require "readall"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

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

Library/Homebrew/cmd/sh.rb

@@ -1,6 +1,6 @@
 require "extend/ENV"
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

Library/Homebrew/cmd/switch.rb

@@ -1,6 +1,6 @@
 require "formula"
 require "keg"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/tap-info.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/tap-pin.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/tap-unpin.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/tap.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

Library/Homebrew/cmd/unlink.rb

@@ -1,5 +1,5 @@
 require "ostruct"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/unpack.rb

@@ -1,6 +1,6 @@
 require "stringio"
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/unpin.rb

@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/cmd/untap.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

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

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.

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

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"
 

Library/Homebrew/dev-cmd/bump-formula-pr.rb

@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

Library/Homebrew/dev-cmd/edit.rb

@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/dev-cmd/extract.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 require "utils/git"
 require "formulary"
 require "tap"

Library/Homebrew/dev-cmd/formula.rb

@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/dev-cmd/irb.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 class Symbol
   def f(*args)

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

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 }
 

Library/Homebrew/dev-cmd/mirror.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/dev-cmd/prof.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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"

Library/Homebrew/dev-cmd/release-notes.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/dev-cmd/ruby.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/dev-cmd/tap-new.rb

@@ -1,5 +1,5 @@
 require "tap"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

Library/Homebrew/dev-cmd/tests.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 require "fileutils"
 
 module Homebrew

Library/Homebrew/dev-cmd/update-test.rb

@@ -1,4 +1,4 @@
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

Library/Homebrew/dev-cmd/vendor-gems.rb

@@ -1,5 +1,5 @@
 require "formula"
-require "cli_parser"
+require "cli/parser"
 
 module Homebrew
   module_function

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

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'

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