From 1d86d7a7c762e5ef236d63aed4b6ea395ae0f592 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 3 Sep 2018 20:17:29 +0100 Subject: [PATCH] cask: move cask/cli to cask/cmd. --- Library/Homebrew/cask/all.rb | 2 +- Library/Homebrew/cask/{cli.rb => cmd.rb} | 44 +++++++++---------- .../Homebrew/cask/{cli => cmd}/--version.rb | 0 .../cask/{cli => cmd}/abstract_command.rb | 0 .../{cli => cmd}/abstract_internal_command.rb | 0 Library/Homebrew/cask/{cli => cmd}/audit.rb | 0 Library/Homebrew/cask/{cli => cmd}/cat.rb | 0 Library/Homebrew/cask/{cli => cmd}/create.rb | 0 Library/Homebrew/cask/{cli => cmd}/doctor.rb | 0 Library/Homebrew/cask/{cli => cmd}/edit.rb | 0 Library/Homebrew/cask/{cli => cmd}/fetch.rb | 0 Library/Homebrew/cask/{cli => cmd}/home.rb | 0 Library/Homebrew/cask/{cli => cmd}/info.rb | 0 Library/Homebrew/cask/{cli => cmd}/install.rb | 0 .../cask/{cli => cmd}/internal_help.rb | 0 .../cask/{cli => cmd}/internal_stanza.rb | 0 Library/Homebrew/cask/{cli => cmd}/list.rb | 0 Library/Homebrew/cask/{cli => cmd}/options.rb | 0 .../Homebrew/cask/{cli => cmd}/outdated.rb | 0 .../Homebrew/cask/{cli => cmd}/reinstall.rb | 0 Library/Homebrew/cask/{cli => cmd}/style.rb | 0 .../Homebrew/cask/{cli => cmd}/uninstall.rb | 0 Library/Homebrew/cask/{cli => cmd}/upgrade.rb | 0 Library/Homebrew/cask/{cli => cmd}/zap.rb | 0 Library/Homebrew/compat/cask.rb | 4 +- .../compat/cask/{cli => cmd}/cleanup.rb | 2 +- .../compat/cask/{cli => cmd}/search.rb | 2 +- .../test/cask/{cli_spec.rb => cmd_spec.rb} | 0 28 files changed, 27 insertions(+), 27 deletions(-) rename Library/Homebrew/cask/{cli.rb => cmd.rb} (91%) rename Library/Homebrew/cask/{cli => cmd}/--version.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/abstract_command.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/abstract_internal_command.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/audit.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/cat.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/create.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/doctor.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/edit.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/fetch.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/home.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/info.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/install.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/internal_help.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/internal_stanza.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/list.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/options.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/outdated.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/reinstall.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/style.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/uninstall.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/upgrade.rb (100%) rename Library/Homebrew/cask/{cli => cmd}/zap.rb (100%) rename Library/Homebrew/compat/cask/{cli => cmd}/cleanup.rb (96%) rename Library/Homebrew/compat/cask/{cli => cmd}/search.rb (91%) rename Library/Homebrew/test/cask/{cli_spec.rb => cmd_spec.rb} (100%) diff --git a/Library/Homebrew/cask/all.rb b/Library/Homebrew/cask/all.rb index 1fe92d5ab2..b73ce4ae69 100644 --- a/Library/Homebrew/cask/all.rb +++ b/Library/Homebrew/cask/all.rb @@ -8,7 +8,7 @@ require "cask/cask" require "cask/cask_loader" require "cask/caskroom" require "cask/checkable" -require "cask/cli" +require "cask/cmd" require "cask/cask_dependencies" require "cask/exceptions" require "cask/installer" diff --git a/Library/Homebrew/cask/cli.rb b/Library/Homebrew/cask/cmd.rb similarity index 91% rename from Library/Homebrew/cask/cli.rb rename to Library/Homebrew/cask/cmd.rb index 4fafbcec97..8272d9e8a6 100644 --- a/Library/Homebrew/cask/cli.rb +++ b/Library/Homebrew/cask/cmd.rb @@ -5,30 +5,30 @@ require "extend/optparse" require "cask/config" -require "cask/cli/options" +require "cask/cmd/options" -require "cask/cli/abstract_command" -require "cask/cli/audit" -require "cask/cli/cat" -require "cask/cli/create" -require "cask/cli/doctor" -require "cask/cli/edit" -require "cask/cli/fetch" -require "cask/cli/home" -require "cask/cli/info" -require "cask/cli/install" -require "cask/cli/list" -require "cask/cli/outdated" -require "cask/cli/reinstall" -require "cask/cli/style" -require "cask/cli/uninstall" -require "cask/cli/upgrade" -require "cask/cli/--version" -require "cask/cli/zap" +require "cask/cmd/abstract_command" +require "cask/cmd/audit" +require "cask/cmd/cat" +require "cask/cmd/create" +require "cask/cmd/doctor" +require "cask/cmd/edit" +require "cask/cmd/fetch" +require "cask/cmd/home" +require "cask/cmd/info" +require "cask/cmd/install" +require "cask/cmd/list" +require "cask/cmd/outdated" +require "cask/cmd/reinstall" +require "cask/cmd/style" +require "cask/cmd/uninstall" +require "cask/cmd/upgrade" +require "cask/cmd/--version" +require "cask/cmd/zap" -require "cask/cli/abstract_internal_command" -require "cask/cli/internal_help" -require "cask/cli/internal_stanza" +require "cask/cmd/abstract_internal_command" +require "cask/cmd/internal_help" +require "cask/cmd/internal_stanza" module Hbc class CLI diff --git a/Library/Homebrew/cask/cli/--version.rb b/Library/Homebrew/cask/cmd/--version.rb similarity index 100% rename from Library/Homebrew/cask/cli/--version.rb rename to Library/Homebrew/cask/cmd/--version.rb diff --git a/Library/Homebrew/cask/cli/abstract_command.rb b/Library/Homebrew/cask/cmd/abstract_command.rb similarity index 100% rename from Library/Homebrew/cask/cli/abstract_command.rb rename to Library/Homebrew/cask/cmd/abstract_command.rb diff --git a/Library/Homebrew/cask/cli/abstract_internal_command.rb b/Library/Homebrew/cask/cmd/abstract_internal_command.rb similarity index 100% rename from Library/Homebrew/cask/cli/abstract_internal_command.rb rename to Library/Homebrew/cask/cmd/abstract_internal_command.rb diff --git a/Library/Homebrew/cask/cli/audit.rb b/Library/Homebrew/cask/cmd/audit.rb similarity index 100% rename from Library/Homebrew/cask/cli/audit.rb rename to Library/Homebrew/cask/cmd/audit.rb diff --git a/Library/Homebrew/cask/cli/cat.rb b/Library/Homebrew/cask/cmd/cat.rb similarity index 100% rename from Library/Homebrew/cask/cli/cat.rb rename to Library/Homebrew/cask/cmd/cat.rb diff --git a/Library/Homebrew/cask/cli/create.rb b/Library/Homebrew/cask/cmd/create.rb similarity index 100% rename from Library/Homebrew/cask/cli/create.rb rename to Library/Homebrew/cask/cmd/create.rb diff --git a/Library/Homebrew/cask/cli/doctor.rb b/Library/Homebrew/cask/cmd/doctor.rb similarity index 100% rename from Library/Homebrew/cask/cli/doctor.rb rename to Library/Homebrew/cask/cmd/doctor.rb diff --git a/Library/Homebrew/cask/cli/edit.rb b/Library/Homebrew/cask/cmd/edit.rb similarity index 100% rename from Library/Homebrew/cask/cli/edit.rb rename to Library/Homebrew/cask/cmd/edit.rb diff --git a/Library/Homebrew/cask/cli/fetch.rb b/Library/Homebrew/cask/cmd/fetch.rb similarity index 100% rename from Library/Homebrew/cask/cli/fetch.rb rename to Library/Homebrew/cask/cmd/fetch.rb diff --git a/Library/Homebrew/cask/cli/home.rb b/Library/Homebrew/cask/cmd/home.rb similarity index 100% rename from Library/Homebrew/cask/cli/home.rb rename to Library/Homebrew/cask/cmd/home.rb diff --git a/Library/Homebrew/cask/cli/info.rb b/Library/Homebrew/cask/cmd/info.rb similarity index 100% rename from Library/Homebrew/cask/cli/info.rb rename to Library/Homebrew/cask/cmd/info.rb diff --git a/Library/Homebrew/cask/cli/install.rb b/Library/Homebrew/cask/cmd/install.rb similarity index 100% rename from Library/Homebrew/cask/cli/install.rb rename to Library/Homebrew/cask/cmd/install.rb diff --git a/Library/Homebrew/cask/cli/internal_help.rb b/Library/Homebrew/cask/cmd/internal_help.rb similarity index 100% rename from Library/Homebrew/cask/cli/internal_help.rb rename to Library/Homebrew/cask/cmd/internal_help.rb diff --git a/Library/Homebrew/cask/cli/internal_stanza.rb b/Library/Homebrew/cask/cmd/internal_stanza.rb similarity index 100% rename from Library/Homebrew/cask/cli/internal_stanza.rb rename to Library/Homebrew/cask/cmd/internal_stanza.rb diff --git a/Library/Homebrew/cask/cli/list.rb b/Library/Homebrew/cask/cmd/list.rb similarity index 100% rename from Library/Homebrew/cask/cli/list.rb rename to Library/Homebrew/cask/cmd/list.rb diff --git a/Library/Homebrew/cask/cli/options.rb b/Library/Homebrew/cask/cmd/options.rb similarity index 100% rename from Library/Homebrew/cask/cli/options.rb rename to Library/Homebrew/cask/cmd/options.rb diff --git a/Library/Homebrew/cask/cli/outdated.rb b/Library/Homebrew/cask/cmd/outdated.rb similarity index 100% rename from Library/Homebrew/cask/cli/outdated.rb rename to Library/Homebrew/cask/cmd/outdated.rb diff --git a/Library/Homebrew/cask/cli/reinstall.rb b/Library/Homebrew/cask/cmd/reinstall.rb similarity index 100% rename from Library/Homebrew/cask/cli/reinstall.rb rename to Library/Homebrew/cask/cmd/reinstall.rb diff --git a/Library/Homebrew/cask/cli/style.rb b/Library/Homebrew/cask/cmd/style.rb similarity index 100% rename from Library/Homebrew/cask/cli/style.rb rename to Library/Homebrew/cask/cmd/style.rb diff --git a/Library/Homebrew/cask/cli/uninstall.rb b/Library/Homebrew/cask/cmd/uninstall.rb similarity index 100% rename from Library/Homebrew/cask/cli/uninstall.rb rename to Library/Homebrew/cask/cmd/uninstall.rb diff --git a/Library/Homebrew/cask/cli/upgrade.rb b/Library/Homebrew/cask/cmd/upgrade.rb similarity index 100% rename from Library/Homebrew/cask/cli/upgrade.rb rename to Library/Homebrew/cask/cmd/upgrade.rb diff --git a/Library/Homebrew/cask/cli/zap.rb b/Library/Homebrew/cask/cmd/zap.rb similarity index 100% rename from Library/Homebrew/cask/cli/zap.rb rename to Library/Homebrew/cask/cmd/zap.rb diff --git a/Library/Homebrew/compat/cask.rb b/Library/Homebrew/compat/cask.rb index 3a2c689733..cb0a05aa98 100644 --- a/Library/Homebrew/compat/cask.rb +++ b/Library/Homebrew/compat/cask.rb @@ -1,6 +1,6 @@ require "compat/cask/cask_loader" -require "compat/cask/cli/cleanup" -require "compat/cask/cli/search" +require "compat/cask/cmd/cleanup" +require "compat/cask/cmd/search" require "compat/cask/cache" require "compat/cask/caskroom" require "compat/cask/dsl" diff --git a/Library/Homebrew/compat/cask/cli/cleanup.rb b/Library/Homebrew/compat/cask/cmd/cleanup.rb similarity index 96% rename from Library/Homebrew/compat/cask/cli/cleanup.rb rename to Library/Homebrew/compat/cask/cmd/cleanup.rb index dccada465d..cc9ac24abd 100644 --- a/Library/Homebrew/compat/cask/cli/cleanup.rb +++ b/Library/Homebrew/compat/cask/cmd/cleanup.rb @@ -1,4 +1,4 @@ -require "cask/cli/abstract_command" +require "cask/cmd/abstract_command" require "cleanup" using CleanupRefinement diff --git a/Library/Homebrew/compat/cask/cli/search.rb b/Library/Homebrew/compat/cask/cmd/search.rb similarity index 91% rename from Library/Homebrew/compat/cask/cli/search.rb rename to Library/Homebrew/compat/cask/cmd/search.rb index cd46f59f53..142b9e8922 100644 --- a/Library/Homebrew/compat/cask/cli/search.rb +++ b/Library/Homebrew/compat/cask/cmd/search.rb @@ -1,4 +1,4 @@ -require "cask/cli/abstract_command" +require "cask/cmd/abstract_command" require "cmd/search" module Hbc diff --git a/Library/Homebrew/test/cask/cli_spec.rb b/Library/Homebrew/test/cask/cmd_spec.rb similarity index 100% rename from Library/Homebrew/test/cask/cli_spec.rb rename to Library/Homebrew/test/cask/cmd_spec.rb