From 90b3a139092b5a24bf54715c09c46d7c838ddedf Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 3 Sep 2018 19:39:07 +0100 Subject: [PATCH 1/6] cask: move cask/lib/hbc/* to cask/*. Fix the load path, requires and some filenames accordingly. --- Library/Homebrew/cask/all.rb | 21 +++++++++ Library/Homebrew/cask/artifact.rb | 28 +++++++++++ .../hbc => }/artifact/abstract_artifact.rb | 0 .../artifact/abstract_flight_block.rb | 2 +- .../hbc => }/artifact/abstract_uninstall.rb | 2 +- .../cask/{lib/hbc => }/artifact/app.rb | 2 +- .../cask/{lib/hbc => }/artifact/artifact.rb | 2 +- .../hbc => }/artifact/audio_unit_plugin.rb | 2 +- .../cask/{lib/hbc => }/artifact/binary.rb | 2 +- .../{lib/hbc => }/artifact/colorpicker.rb | 2 +- .../cask/{lib/hbc => }/artifact/dictionary.rb | 2 +- .../cask/{lib/hbc => }/artifact/font.rb | 2 +- .../{lib/hbc => }/artifact/input_method.rb | 2 +- .../cask/{lib/hbc => }/artifact/installer.rb | 2 +- .../{lib/hbc => }/artifact/internet_plugin.rb | 2 +- .../cask/{lib/hbc => }/artifact/moved.rb | 2 +- .../cask/{lib/hbc => }/artifact/pkg.rb | 2 +- .../hbc => }/artifact/postflight_block.rb | 2 +- .../{lib/hbc => }/artifact/preflight_block.rb | 2 +- .../cask/{lib/hbc => }/artifact/prefpane.rb | 2 +- .../cask/{lib/hbc => }/artifact/qlplugin.rb | 2 +- .../cask/{lib/hbc => }/artifact/relocated.rb | 2 +- .../{lib/hbc => }/artifact/screen_saver.rb | 2 +- .../cask/{lib/hbc => }/artifact/service.rb | 2 +- .../cask/{lib/hbc => }/artifact/stage_only.rb | 2 +- .../cask/{lib/hbc => }/artifact/suite.rb | 2 +- .../cask/{lib/hbc => }/artifact/symlinked.rb | 2 +- .../cask/{lib/hbc => }/artifact/uninstall.rb | 2 +- .../{lib/hbc => }/artifact/vst3_plugin.rb | 2 +- .../cask/{lib/hbc => }/artifact/vst_plugin.rb | 2 +- .../cask/{lib/hbc => }/artifact/zap.rb | 2 +- Library/Homebrew/cask/{lib/hbc => }/audit.rb | 4 +- .../Homebrew/cask/{lib/hbc => }/auditor.rb | 2 +- Library/Homebrew/cask/{lib/hbc => }/cache.rb | 0 Library/Homebrew/cask/{lib/hbc => }/cask.rb | 8 ++-- .../cask/{lib/hbc => }/cask_dependencies.rb | 2 +- .../cask/{lib/hbc => }/cask_loader.rb | 2 +- .../Homebrew/cask/{lib/hbc => }/caskroom.rb | 0 .../Homebrew/cask/{lib/hbc => }/checkable.rb | 0 Library/Homebrew/cask/{lib/hbc => }/cli.rb | 46 +++++++++---------- .../cask/{lib/hbc => }/cli/--version.rb | 0 .../{lib/hbc => }/cli/abstract_command.rb | 0 .../hbc => }/cli/abstract_internal_command.rb | 0 .../Homebrew/cask/{lib/hbc => }/cli/audit.rb | 0 .../Homebrew/cask/{lib/hbc => }/cli/cat.rb | 0 .../Homebrew/cask/{lib/hbc => }/cli/create.rb | 0 .../Homebrew/cask/{lib/hbc => }/cli/doctor.rb | 2 +- .../Homebrew/cask/{lib/hbc => }/cli/edit.rb | 0 .../Homebrew/cask/{lib/hbc => }/cli/fetch.rb | 2 +- .../Homebrew/cask/{lib/hbc => }/cli/home.rb | 0 .../Homebrew/cask/{lib/hbc => }/cli/info.rb | 0 .../cask/{lib/hbc => }/cli/install.rb | 0 .../cask/{lib/hbc => }/cli/internal_help.rb | 0 .../cask/{lib/hbc => }/cli/internal_stanza.rb | 0 .../Homebrew/cask/{lib/hbc => }/cli/list.rb | 0 .../cask/{lib/hbc => }/cli/options.rb | 0 .../cask/{lib/hbc => }/cli/outdated.rb | 0 .../cask/{lib/hbc => }/cli/reinstall.rb | 0 .../Homebrew/cask/{lib/hbc => }/cli/style.rb | 0 .../cask/{lib/hbc => }/cli/uninstall.rb | 0 .../cask/{lib/hbc => }/cli/upgrade.rb | 0 .../Homebrew/cask/{lib/hbc => }/cli/zap.rb | 0 Library/Homebrew/cask/{lib/hbc => }/config.rb | 0 .../Homebrew/cask/{lib/hbc => }/download.rb | 6 +-- Library/Homebrew/cask/{lib/hbc => }/dsl.rb | 30 ++++++------ .../cask/{lib/hbc => }/dsl/appcast.rb | 0 .../Homebrew/cask/{lib/hbc => }/dsl/base.rb | 0 .../cask/{lib/hbc => }/dsl/caveats.rb | 0 .../cask/{lib/hbc => }/dsl/conflicts_with.rb | 0 .../cask/{lib/hbc => }/dsl/container.rb | 0 .../cask/{lib/hbc => }/dsl/depends_on.rb | 0 .../cask/{lib/hbc => }/dsl/postflight.rb | 2 +- .../cask/{lib/hbc => }/dsl/preflight.rb | 0 .../{lib/hbc => }/dsl/uninstall_postflight.rb | 0 .../{lib/hbc => }/dsl/uninstall_preflight.rb | 2 +- .../cask/{lib/hbc => }/dsl/version.rb | 0 .../Homebrew/cask/{lib/hbc => }/exceptions.rb | 0 .../Homebrew/cask/{lib/hbc => }/installer.rb | 10 ++-- Library/Homebrew/cask/lib/hbc.rb | 21 --------- Library/Homebrew/cask/lib/hbc/artifact.rb | 28 ----------- Library/Homebrew/cask/{lib/hbc => }/macos.rb | 0 .../Homebrew/cask/{lib/hbc => }/metadata.rb | 0 Library/Homebrew/cask/{lib/hbc => }/pkg.rb | 0 .../Homebrew/cask/{lib/hbc => }/quarantine.rb | 2 +- Library/Homebrew/cask/{lib/hbc => }/staged.rb | 0 .../cask/{lib/hbc => }/topological_hash.rb | 0 Library/Homebrew/cask/{lib/hbc => }/url.rb | 0 Library/Homebrew/cask/{lib/hbc => }/utils.rb | 0 .../cask/{lib/hbc => }/utils/quarantine.swift | 0 Library/Homebrew/cask/{lib/hbc => }/verify.rb | 2 +- .../cask/{lib/hbc => }/verify/checksum.rb | 0 .../Homebrew/cask/{lib/hbc => }/version.rb | 0 Library/Homebrew/cleanup.rb | 2 +- Library/Homebrew/cmd/cask.rb | 2 +- Library/Homebrew/compat.rb | 2 +- Library/Homebrew/compat/{hbc.rb => cask.rb} | 12 ++--- .../Homebrew/compat/{hbc => cask}/cache.rb | 0 .../compat/{hbc => cask}/cask_loader.rb | 0 .../Homebrew/compat/{hbc => cask}/caskroom.rb | 0 .../compat/{hbc => cask}/cli/cleanup.rb | 2 +- .../compat/{hbc => cask}/cli/search.rb | 2 +- Library/Homebrew/compat/{hbc => cask}/dsl.rb | 0 Library/Homebrew/dev-cmd/irb.rb | 3 +- Library/Homebrew/extend/os/mac/search.rb | 4 +- Library/Homebrew/global.rb | 4 -- .../Homebrew/test/cask/dsl/caveats_spec.rb | 2 +- .../Homebrew/test/cask/dsl/postflight_spec.rb | 4 +- .../Homebrew/test/cask/dsl/preflight_spec.rb | 4 +- .../cask/dsl/uninstall_postflight_spec.rb | 2 +- .../test/cask/dsl/uninstall_preflight_spec.rb | 4 +- Library/Homebrew/test/cleanup_spec.rb | 2 +- .../spec/shared_context/homebrew_cask.rb | 2 +- .../{hbc_dsl_base.rb => cask_dsl_base.rb} | 2 +- .../{hbc_staged.rb => cask_staged.rb} | 2 +- Library/Homebrew/update_migrator.rb | 4 +- 115 files changed, 166 insertions(+), 171 deletions(-) create mode 100644 Library/Homebrew/cask/all.rb create mode 100644 Library/Homebrew/cask/artifact.rb rename Library/Homebrew/cask/{lib/hbc => }/artifact/abstract_artifact.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/abstract_flight_block.rb (96%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/abstract_uninstall.rb (99%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/app.rb (70%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/artifact.rb (96%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/audio_unit_plugin.rb (73%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/binary.rb (91%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/colorpicker.rb (72%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/dictionary.rb (71%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/font.rb (70%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/input_method.rb (72%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/installer.rb (98%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/internet_plugin.rb (72%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/moved.rb (98%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/pkg.rb (98%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/postflight_block.rb (67%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/preflight_block.rb (67%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/prefpane.rb (82%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/qlplugin.rb (94%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/relocated.rb (98%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/screen_saver.rb (72%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/service.rb (71%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/stage_only.rb (90%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/suite.rb (85%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/symlinked.rb (98%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/uninstall.rb (81%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/vst3_plugin.rb (71%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/vst_plugin.rb (71%) rename Library/Homebrew/cask/{lib/hbc => }/artifact/zap.rb (80%) rename Library/Homebrew/cask/{lib/hbc => }/audit.rb (99%) rename Library/Homebrew/cask/{lib/hbc => }/auditor.rb (98%) rename Library/Homebrew/cask/{lib/hbc => }/cache.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cask.rb (97%) rename Library/Homebrew/cask/{lib/hbc => }/cask_dependencies.rb (96%) rename Library/Homebrew/cask/{lib/hbc => }/cask_loader.rb (99%) rename Library/Homebrew/cask/{lib/hbc => }/caskroom.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/checkable.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli.rb (91%) rename Library/Homebrew/cask/{lib/hbc => }/cli/--version.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/abstract_command.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/abstract_internal_command.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/audit.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/cat.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/create.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/doctor.rb (99%) rename Library/Homebrew/cask/{lib/hbc => }/cli/edit.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/fetch.rb (96%) rename Library/Homebrew/cask/{lib/hbc => }/cli/home.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/info.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/install.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/internal_help.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/internal_stanza.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/list.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/options.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/outdated.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/reinstall.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/style.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/uninstall.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/upgrade.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/cli/zap.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/config.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/download.rb (94%) rename Library/Homebrew/cask/{lib/hbc => }/dsl.rb (94%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/appcast.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/base.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/caveats.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/conflicts_with.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/container.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/depends_on.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/postflight.rb (91%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/preflight.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/uninstall_postflight.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/uninstall_preflight.rb (81%) rename Library/Homebrew/cask/{lib/hbc => }/dsl/version.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/exceptions.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/installer.rb (99%) delete mode 100644 Library/Homebrew/cask/lib/hbc.rb delete mode 100644 Library/Homebrew/cask/lib/hbc/artifact.rb rename Library/Homebrew/cask/{lib/hbc => }/macos.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/metadata.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/pkg.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/quarantine.rb (95%) rename Library/Homebrew/cask/{lib/hbc => }/staged.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/topological_hash.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/url.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/utils.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/utils/quarantine.swift (100%) rename Library/Homebrew/cask/{lib/hbc => }/verify.rb (96%) rename Library/Homebrew/cask/{lib/hbc => }/verify/checksum.rb (100%) rename Library/Homebrew/cask/{lib/hbc => }/version.rb (100%) rename Library/Homebrew/compat/{hbc.rb => cask.rb} (57%) rename Library/Homebrew/compat/{hbc => cask}/cache.rb (100%) rename Library/Homebrew/compat/{hbc => cask}/cask_loader.rb (100%) rename Library/Homebrew/compat/{hbc => cask}/caskroom.rb (100%) rename Library/Homebrew/compat/{hbc => cask}/cli/cleanup.rb (96%) rename Library/Homebrew/compat/{hbc => cask}/cli/search.rb (91%) rename Library/Homebrew/compat/{hbc => cask}/dsl.rb (100%) rename Library/Homebrew/test/support/helper/spec/shared_examples/{hbc_dsl_base.rb => cask_dsl_base.rb} (95%) rename Library/Homebrew/test/support/helper/spec/shared_examples/{hbc_staged.rb => cask_staged.rb} (99%) diff --git a/Library/Homebrew/cask/all.rb b/Library/Homebrew/cask/all.rb new file mode 100644 index 0000000000..1fe92d5ab2 --- /dev/null +++ b/Library/Homebrew/cask/all.rb @@ -0,0 +1,21 @@ +require "hardware" + +require "cask/artifact" +require "cask/audit" +require "cask/auditor" +require "cask/cache" +require "cask/cask" +require "cask/cask_loader" +require "cask/caskroom" +require "cask/checkable" +require "cask/cli" +require "cask/cask_dependencies" +require "cask/exceptions" +require "cask/installer" +require "cask/macos" +require "cask/pkg" +require "cask/staged" +require "cask/topological_hash" +require "cask/utils" +require "cask/verify" +require "cask/version" diff --git a/Library/Homebrew/cask/artifact.rb b/Library/Homebrew/cask/artifact.rb new file mode 100644 index 0000000000..f50249116a --- /dev/null +++ b/Library/Homebrew/cask/artifact.rb @@ -0,0 +1,28 @@ +require "cask/artifact/app" +require "cask/artifact/artifact" # generic 'artifact' stanza +require "cask/artifact/binary" +require "cask/artifact/colorpicker" +require "cask/artifact/dictionary" +require "cask/artifact/font" +require "cask/artifact/input_method" +require "cask/artifact/installer" +require "cask/artifact/internet_plugin" +require "cask/artifact/audio_unit_plugin" +require "cask/artifact/vst_plugin" +require "cask/artifact/vst3_plugin" +require "cask/artifact/pkg" +require "cask/artifact/postflight_block" +require "cask/artifact/preflight_block" +require "cask/artifact/prefpane" +require "cask/artifact/qlplugin" +require "cask/artifact/screen_saver" +require "cask/artifact/service" +require "cask/artifact/stage_only" +require "cask/artifact/suite" +require "cask/artifact/uninstall" +require "cask/artifact/zap" + +module Hbc + module Artifact + end +end diff --git a/Library/Homebrew/cask/lib/hbc/artifact/abstract_artifact.rb b/Library/Homebrew/cask/artifact/abstract_artifact.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/artifact/abstract_artifact.rb rename to Library/Homebrew/cask/artifact/abstract_artifact.rb diff --git a/Library/Homebrew/cask/lib/hbc/artifact/abstract_flight_block.rb b/Library/Homebrew/cask/artifact/abstract_flight_block.rb similarity index 96% rename from Library/Homebrew/cask/lib/hbc/artifact/abstract_flight_block.rb rename to Library/Homebrew/cask/artifact/abstract_flight_block.rb index aa5b959401..ae4d1451ca 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/abstract_flight_block.rb +++ b/Library/Homebrew/cask/artifact/abstract_flight_block.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/abstract_artifact" +require "cask/artifact/abstract_artifact" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb b/Library/Homebrew/cask/artifact/abstract_uninstall.rb similarity index 99% rename from Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb rename to Library/Homebrew/cask/artifact/abstract_uninstall.rb index 6e03d62a75..d15f078262 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb +++ b/Library/Homebrew/cask/artifact/abstract_uninstall.rb @@ -1,6 +1,6 @@ require "timeout" -require "hbc/artifact/abstract_artifact" +require "cask/artifact/abstract_artifact" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/app.rb b/Library/Homebrew/cask/artifact/app.rb similarity index 70% rename from Library/Homebrew/cask/lib/hbc/artifact/app.rb rename to Library/Homebrew/cask/artifact/app.rb index cc6ef61a73..eb189fea4e 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/app.rb +++ b/Library/Homebrew/cask/artifact/app.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/artifact.rb b/Library/Homebrew/cask/artifact/artifact.rb similarity index 96% rename from Library/Homebrew/cask/lib/hbc/artifact/artifact.rb rename to Library/Homebrew/cask/artifact/artifact.rb index f61e997019..51f8386819 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/artifact.rb +++ b/Library/Homebrew/cask/artifact/artifact.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" require "extend/hash_validator" using HashValidator diff --git a/Library/Homebrew/cask/lib/hbc/artifact/audio_unit_plugin.rb b/Library/Homebrew/cask/artifact/audio_unit_plugin.rb similarity index 73% rename from Library/Homebrew/cask/lib/hbc/artifact/audio_unit_plugin.rb rename to Library/Homebrew/cask/artifact/audio_unit_plugin.rb index 3bad78073b..79fac1b3a5 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/audio_unit_plugin.rb +++ b/Library/Homebrew/cask/artifact/audio_unit_plugin.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/binary.rb b/Library/Homebrew/cask/artifact/binary.rb similarity index 91% rename from Library/Homebrew/cask/lib/hbc/artifact/binary.rb rename to Library/Homebrew/cask/artifact/binary.rb index 68f4b074da..ad059f7770 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/binary.rb +++ b/Library/Homebrew/cask/artifact/binary.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/symlinked" +require "cask/artifact/symlinked" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/colorpicker.rb b/Library/Homebrew/cask/artifact/colorpicker.rb similarity index 72% rename from Library/Homebrew/cask/lib/hbc/artifact/colorpicker.rb rename to Library/Homebrew/cask/artifact/colorpicker.rb index a866e64a5f..1e1adbcea2 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/colorpicker.rb +++ b/Library/Homebrew/cask/artifact/colorpicker.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/dictionary.rb b/Library/Homebrew/cask/artifact/dictionary.rb similarity index 71% rename from Library/Homebrew/cask/lib/hbc/artifact/dictionary.rb rename to Library/Homebrew/cask/artifact/dictionary.rb index e017992f02..4ac499738e 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/dictionary.rb +++ b/Library/Homebrew/cask/artifact/dictionary.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/font.rb b/Library/Homebrew/cask/artifact/font.rb similarity index 70% rename from Library/Homebrew/cask/lib/hbc/artifact/font.rb rename to Library/Homebrew/cask/artifact/font.rb index 5c64869b6d..81e6f436be 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/font.rb +++ b/Library/Homebrew/cask/artifact/font.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/input_method.rb b/Library/Homebrew/cask/artifact/input_method.rb similarity index 72% rename from Library/Homebrew/cask/lib/hbc/artifact/input_method.rb rename to Library/Homebrew/cask/artifact/input_method.rb index 0eb75a6c02..444b8238d3 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/input_method.rb +++ b/Library/Homebrew/cask/artifact/input_method.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/installer.rb b/Library/Homebrew/cask/artifact/installer.rb similarity index 98% rename from Library/Homebrew/cask/lib/hbc/artifact/installer.rb rename to Library/Homebrew/cask/artifact/installer.rb index 55102b1432..8c1e72295b 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/installer.rb +++ b/Library/Homebrew/cask/artifact/installer.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/abstract_artifact" +require "cask/artifact/abstract_artifact" require "extend/hash_validator" using HashValidator diff --git a/Library/Homebrew/cask/lib/hbc/artifact/internet_plugin.rb b/Library/Homebrew/cask/artifact/internet_plugin.rb similarity index 72% rename from Library/Homebrew/cask/lib/hbc/artifact/internet_plugin.rb rename to Library/Homebrew/cask/artifact/internet_plugin.rb index ab8586d699..2f232874cd 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/internet_plugin.rb +++ b/Library/Homebrew/cask/artifact/internet_plugin.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/moved.rb b/Library/Homebrew/cask/artifact/moved.rb similarity index 98% rename from Library/Homebrew/cask/lib/hbc/artifact/moved.rb rename to Library/Homebrew/cask/artifact/moved.rb index 88323f7177..a3730bfc55 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/moved.rb +++ b/Library/Homebrew/cask/artifact/moved.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/relocated" +require "cask/artifact/relocated" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb b/Library/Homebrew/cask/artifact/pkg.rb similarity index 98% rename from Library/Homebrew/cask/lib/hbc/artifact/pkg.rb rename to Library/Homebrew/cask/artifact/pkg.rb index 81b6e4d116..21f9280c46 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb +++ b/Library/Homebrew/cask/artifact/pkg.rb @@ -1,6 +1,6 @@ require "vendor/plist/plist" -require "hbc/artifact/abstract_artifact" +require "cask/artifact/abstract_artifact" require "extend/hash_validator" using HashValidator diff --git a/Library/Homebrew/cask/lib/hbc/artifact/postflight_block.rb b/Library/Homebrew/cask/artifact/postflight_block.rb similarity index 67% rename from Library/Homebrew/cask/lib/hbc/artifact/postflight_block.rb rename to Library/Homebrew/cask/artifact/postflight_block.rb index bfe218f958..9233343561 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/postflight_block.rb +++ b/Library/Homebrew/cask/artifact/postflight_block.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/abstract_flight_block" +require "cask/artifact/abstract_flight_block" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/preflight_block.rb b/Library/Homebrew/cask/artifact/preflight_block.rb similarity index 67% rename from Library/Homebrew/cask/lib/hbc/artifact/preflight_block.rb rename to Library/Homebrew/cask/artifact/preflight_block.rb index 35142df47d..80356bdd44 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/preflight_block.rb +++ b/Library/Homebrew/cask/artifact/preflight_block.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/abstract_flight_block" +require "cask/artifact/abstract_flight_block" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/prefpane.rb b/Library/Homebrew/cask/artifact/prefpane.rb similarity index 82% rename from Library/Homebrew/cask/lib/hbc/artifact/prefpane.rb rename to Library/Homebrew/cask/artifact/prefpane.rb index 87f120934d..ca06a0407c 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/prefpane.rb +++ b/Library/Homebrew/cask/artifact/prefpane.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/qlplugin.rb b/Library/Homebrew/cask/artifact/qlplugin.rb similarity index 94% rename from Library/Homebrew/cask/lib/hbc/artifact/qlplugin.rb rename to Library/Homebrew/cask/artifact/qlplugin.rb index 298714d894..0a5766e4b8 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/qlplugin.rb +++ b/Library/Homebrew/cask/artifact/qlplugin.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/relocated.rb b/Library/Homebrew/cask/artifact/relocated.rb similarity index 98% rename from Library/Homebrew/cask/lib/hbc/artifact/relocated.rb rename to Library/Homebrew/cask/artifact/relocated.rb index b9d897983b..ae3be9eebb 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/relocated.rb +++ b/Library/Homebrew/cask/artifact/relocated.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/abstract_artifact" +require "cask/artifact/abstract_artifact" require "extend/hash_validator" using HashValidator diff --git a/Library/Homebrew/cask/lib/hbc/artifact/screen_saver.rb b/Library/Homebrew/cask/artifact/screen_saver.rb similarity index 72% rename from Library/Homebrew/cask/lib/hbc/artifact/screen_saver.rb rename to Library/Homebrew/cask/artifact/screen_saver.rb index 4cdc6037c5..5526f6dcd1 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/screen_saver.rb +++ b/Library/Homebrew/cask/artifact/screen_saver.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/service.rb b/Library/Homebrew/cask/artifact/service.rb similarity index 71% rename from Library/Homebrew/cask/lib/hbc/artifact/service.rb rename to Library/Homebrew/cask/artifact/service.rb index 1af93c5334..b92c99efdd 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/service.rb +++ b/Library/Homebrew/cask/artifact/service.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/stage_only.rb b/Library/Homebrew/cask/artifact/stage_only.rb similarity index 90% rename from Library/Homebrew/cask/lib/hbc/artifact/stage_only.rb rename to Library/Homebrew/cask/artifact/stage_only.rb index 8c32a52d08..1da1ceff6e 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/stage_only.rb +++ b/Library/Homebrew/cask/artifact/stage_only.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/abstract_artifact" +require "cask/artifact/abstract_artifact" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/suite.rb b/Library/Homebrew/cask/artifact/suite.rb similarity index 85% rename from Library/Homebrew/cask/lib/hbc/artifact/suite.rb rename to Library/Homebrew/cask/artifact/suite.rb index 59ae58cf13..b8a6011d77 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/suite.rb +++ b/Library/Homebrew/cask/artifact/suite.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/symlinked.rb b/Library/Homebrew/cask/artifact/symlinked.rb similarity index 98% rename from Library/Homebrew/cask/lib/hbc/artifact/symlinked.rb rename to Library/Homebrew/cask/artifact/symlinked.rb index 5146a8ddb7..690fb76487 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/symlinked.rb +++ b/Library/Homebrew/cask/artifact/symlinked.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/relocated" +require "cask/artifact/relocated" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/uninstall.rb b/Library/Homebrew/cask/artifact/uninstall.rb similarity index 81% rename from Library/Homebrew/cask/lib/hbc/artifact/uninstall.rb rename to Library/Homebrew/cask/artifact/uninstall.rb index 2bbf82862a..41e8fd9d5b 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/uninstall.rb +++ b/Library/Homebrew/cask/artifact/uninstall.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/abstract_uninstall" +require "cask/artifact/abstract_uninstall" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/vst3_plugin.rb b/Library/Homebrew/cask/artifact/vst3_plugin.rb similarity index 71% rename from Library/Homebrew/cask/lib/hbc/artifact/vst3_plugin.rb rename to Library/Homebrew/cask/artifact/vst3_plugin.rb index 056fffc2a9..96ad48fe51 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/vst3_plugin.rb +++ b/Library/Homebrew/cask/artifact/vst3_plugin.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/vst_plugin.rb b/Library/Homebrew/cask/artifact/vst_plugin.rb similarity index 71% rename from Library/Homebrew/cask/lib/hbc/artifact/vst_plugin.rb rename to Library/Homebrew/cask/artifact/vst_plugin.rb index f388046359..e8e891e34a 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/vst_plugin.rb +++ b/Library/Homebrew/cask/artifact/vst_plugin.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/moved" +require "cask/artifact/moved" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/artifact/zap.rb b/Library/Homebrew/cask/artifact/zap.rb similarity index 80% rename from Library/Homebrew/cask/lib/hbc/artifact/zap.rb rename to Library/Homebrew/cask/artifact/zap.rb index 31ff54d201..057f5dd6cf 100644 --- a/Library/Homebrew/cask/lib/hbc/artifact/zap.rb +++ b/Library/Homebrew/cask/artifact/zap.rb @@ -1,4 +1,4 @@ -require "hbc/artifact/abstract_uninstall" +require "cask/artifact/abstract_uninstall" module Hbc module Artifact diff --git a/Library/Homebrew/cask/lib/hbc/audit.rb b/Library/Homebrew/cask/audit.rb similarity index 99% rename from Library/Homebrew/cask/lib/hbc/audit.rb rename to Library/Homebrew/cask/audit.rb index 2f596f0d10..ec7def3952 100644 --- a/Library/Homebrew/cask/lib/hbc/audit.rb +++ b/Library/Homebrew/cask/audit.rb @@ -1,5 +1,5 @@ -require "hbc/checkable" -require "hbc/download" +require "cask/checkable" +require "cask/download" require "digest" require "utils/git" diff --git a/Library/Homebrew/cask/lib/hbc/auditor.rb b/Library/Homebrew/cask/auditor.rb similarity index 98% rename from Library/Homebrew/cask/lib/hbc/auditor.rb rename to Library/Homebrew/cask/auditor.rb index 7eb8715008..014accd3d4 100644 --- a/Library/Homebrew/cask/lib/hbc/auditor.rb +++ b/Library/Homebrew/cask/auditor.rb @@ -1,4 +1,4 @@ -require "hbc/download" +require "cask/download" module Hbc class Auditor diff --git a/Library/Homebrew/cask/lib/hbc/cache.rb b/Library/Homebrew/cask/cache.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cache.rb rename to Library/Homebrew/cask/cache.rb diff --git a/Library/Homebrew/cask/lib/hbc/cask.rb b/Library/Homebrew/cask/cask.rb similarity index 97% rename from Library/Homebrew/cask/lib/hbc/cask.rb rename to Library/Homebrew/cask/cask.rb index b289fa8bde..c951dbde0e 100644 --- a/Library/Homebrew/cask/lib/hbc/cask.rb +++ b/Library/Homebrew/cask/cask.rb @@ -1,7 +1,7 @@ -require "hbc/cask_loader" -require "hbc/config" -require "hbc/dsl" -require "hbc/metadata" +require "cask/cask_loader" +require "cask/config" +require "cask/dsl" +require "cask/metadata" require "searchable" module Hbc diff --git a/Library/Homebrew/cask/lib/hbc/cask_dependencies.rb b/Library/Homebrew/cask/cask_dependencies.rb similarity index 96% rename from Library/Homebrew/cask/lib/hbc/cask_dependencies.rb rename to Library/Homebrew/cask/cask_dependencies.rb index 0edda074e3..7e838d1457 100644 --- a/Library/Homebrew/cask/lib/hbc/cask_dependencies.rb +++ b/Library/Homebrew/cask/cask_dependencies.rb @@ -1,6 +1,6 @@ require "delegate" -require "hbc/topological_hash" +require "cask/topological_hash" module Hbc class CaskDependencies < DelegateClass(Array) diff --git a/Library/Homebrew/cask/lib/hbc/cask_loader.rb b/Library/Homebrew/cask/cask_loader.rb similarity index 99% rename from Library/Homebrew/cask/lib/hbc/cask_loader.rb rename to Library/Homebrew/cask/cask_loader.rb index abbde664eb..c64c60e3fc 100644 --- a/Library/Homebrew/cask/lib/hbc/cask_loader.rb +++ b/Library/Homebrew/cask/cask_loader.rb @@ -1,4 +1,4 @@ -require "hbc/cask" +require "cask/cask" require "uri" module Hbc diff --git a/Library/Homebrew/cask/lib/hbc/caskroom.rb b/Library/Homebrew/cask/caskroom.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/caskroom.rb rename to Library/Homebrew/cask/caskroom.rb diff --git a/Library/Homebrew/cask/lib/hbc/checkable.rb b/Library/Homebrew/cask/checkable.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/checkable.rb rename to Library/Homebrew/cask/checkable.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli.rb b/Library/Homebrew/cask/cli.rb similarity index 91% rename from Library/Homebrew/cask/lib/hbc/cli.rb rename to Library/Homebrew/cask/cli.rb index 34e9d6904a..ee2176761d 100644 --- a/Library/Homebrew/cask/lib/hbc/cli.rb +++ b/Library/Homebrew/cask/cli.rb @@ -3,32 +3,32 @@ require "shellwords" require "extend/optparse" -require "hbc/config" +require "cask/config" -require "hbc/cli/options" +require "cask/cli/options" -require "hbc/cli/abstract_command" -require "hbc/cli/audit" -require "hbc/cli/cat" -require "hbc/cli/create" -require "hbc/cli/doctor" -require "hbc/cli/edit" -require "hbc/cli/fetch" -require "hbc/cli/home" -require "hbc/cli/info" -require "hbc/cli/install" -require "hbc/cli/list" -require "hbc/cli/outdated" -require "hbc/cli/reinstall" -require "hbc/cli/style" -require "hbc/cli/uninstall" -require "hbc/cli/upgrade" -require "hbc/cli/--version" -require "hbc/cli/zap" +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 "hbc/cli/abstract_internal_command" -require "hbc/cli/internal_help" -require "hbc/cli/internal_stanza" +require "cask/cli/abstract_internal_command" +require "cask/cli/internal_help" +require "cask/cli/internal_stanza" module Hbc class CLI diff --git a/Library/Homebrew/cask/lib/hbc/cli/--version.rb b/Library/Homebrew/cask/cli/--version.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/--version.rb rename to Library/Homebrew/cask/cli/--version.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/abstract_command.rb b/Library/Homebrew/cask/cli/abstract_command.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/abstract_command.rb rename to Library/Homebrew/cask/cli/abstract_command.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/abstract_internal_command.rb b/Library/Homebrew/cask/cli/abstract_internal_command.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/abstract_internal_command.rb rename to Library/Homebrew/cask/cli/abstract_internal_command.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/audit.rb b/Library/Homebrew/cask/cli/audit.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/audit.rb rename to Library/Homebrew/cask/cli/audit.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/cat.rb b/Library/Homebrew/cask/cli/cat.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/cat.rb rename to Library/Homebrew/cask/cli/cat.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/create.rb b/Library/Homebrew/cask/cli/create.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/create.rb rename to Library/Homebrew/cask/cli/create.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb b/Library/Homebrew/cask/cli/doctor.rb similarity index 99% rename from Library/Homebrew/cask/lib/hbc/cli/doctor.rb rename to Library/Homebrew/cask/cli/doctor.rb index 8d2ec08acd..c19b53b331 100644 --- a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb +++ b/Library/Homebrew/cask/cli/doctor.rb @@ -1,5 +1,5 @@ require "system_config" -require "hbc/checkable" +require "cask/checkable" module Hbc class CLI diff --git a/Library/Homebrew/cask/lib/hbc/cli/edit.rb b/Library/Homebrew/cask/cli/edit.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/edit.rb rename to Library/Homebrew/cask/cli/edit.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/fetch.rb b/Library/Homebrew/cask/cli/fetch.rb similarity index 96% rename from Library/Homebrew/cask/lib/hbc/cli/fetch.rb rename to Library/Homebrew/cask/cli/fetch.rb index 927a3d7139..5346d33dab 100644 --- a/Library/Homebrew/cask/lib/hbc/cli/fetch.rb +++ b/Library/Homebrew/cask/cli/fetch.rb @@ -1,4 +1,4 @@ -require "hbc/download" +require "cask/download" module Hbc class CLI diff --git a/Library/Homebrew/cask/lib/hbc/cli/home.rb b/Library/Homebrew/cask/cli/home.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/home.rb rename to Library/Homebrew/cask/cli/home.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/info.rb b/Library/Homebrew/cask/cli/info.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/info.rb rename to Library/Homebrew/cask/cli/info.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/install.rb b/Library/Homebrew/cask/cli/install.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/install.rb rename to Library/Homebrew/cask/cli/install.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/internal_help.rb b/Library/Homebrew/cask/cli/internal_help.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/internal_help.rb rename to Library/Homebrew/cask/cli/internal_help.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb b/Library/Homebrew/cask/cli/internal_stanza.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb rename to Library/Homebrew/cask/cli/internal_stanza.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/list.rb b/Library/Homebrew/cask/cli/list.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/list.rb rename to Library/Homebrew/cask/cli/list.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/options.rb b/Library/Homebrew/cask/cli/options.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/options.rb rename to Library/Homebrew/cask/cli/options.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/outdated.rb b/Library/Homebrew/cask/cli/outdated.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/outdated.rb rename to Library/Homebrew/cask/cli/outdated.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb b/Library/Homebrew/cask/cli/reinstall.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/reinstall.rb rename to Library/Homebrew/cask/cli/reinstall.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/style.rb b/Library/Homebrew/cask/cli/style.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/style.rb rename to Library/Homebrew/cask/cli/style.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb b/Library/Homebrew/cask/cli/uninstall.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/uninstall.rb rename to Library/Homebrew/cask/cli/uninstall.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/upgrade.rb b/Library/Homebrew/cask/cli/upgrade.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/upgrade.rb rename to Library/Homebrew/cask/cli/upgrade.rb diff --git a/Library/Homebrew/cask/lib/hbc/cli/zap.rb b/Library/Homebrew/cask/cli/zap.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/cli/zap.rb rename to Library/Homebrew/cask/cli/zap.rb diff --git a/Library/Homebrew/cask/lib/hbc/config.rb b/Library/Homebrew/cask/config.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/config.rb rename to Library/Homebrew/cask/config.rb diff --git a/Library/Homebrew/cask/lib/hbc/download.rb b/Library/Homebrew/cask/download.rb similarity index 94% rename from Library/Homebrew/cask/lib/hbc/download.rb rename to Library/Homebrew/cask/download.rb index 65a44e0c7f..1446d40dae 100644 --- a/Library/Homebrew/cask/lib/hbc/download.rb +++ b/Library/Homebrew/cask/download.rb @@ -1,7 +1,7 @@ require "fileutils" -require "hbc/cache" -require "hbc/quarantine" -require "hbc/verify" +require "cask/cache" +require "cask/quarantine" +require "cask/verify" module Hbc class Download diff --git a/Library/Homebrew/cask/lib/hbc/dsl.rb b/Library/Homebrew/cask/dsl.rb similarity index 94% rename from Library/Homebrew/cask/lib/hbc/dsl.rb rename to Library/Homebrew/cask/dsl.rb index 864e6247db..eac2880d0b 100644 --- a/Library/Homebrew/cask/lib/hbc/dsl.rb +++ b/Library/Homebrew/cask/dsl.rb @@ -1,24 +1,24 @@ require "locale" require "lazy_object" -require "hbc/artifact" +require "cask/artifact" -require "hbc/caskroom" -require "hbc/exceptions" +require "cask/caskroom" +require "cask/exceptions" -require "hbc/dsl/appcast" -require "hbc/dsl/base" -require "hbc/dsl/caveats" -require "hbc/dsl/conflicts_with" -require "hbc/dsl/container" -require "hbc/dsl/depends_on" -require "hbc/dsl/postflight" -require "hbc/dsl/preflight" -require "hbc/dsl/uninstall_postflight" -require "hbc/dsl/uninstall_preflight" -require "hbc/dsl/version" +require "cask/dsl/appcast" +require "cask/dsl/base" +require "cask/dsl/caveats" +require "cask/dsl/conflicts_with" +require "cask/dsl/container" +require "cask/dsl/depends_on" +require "cask/dsl/postflight" +require "cask/dsl/preflight" +require "cask/dsl/uninstall_postflight" +require "cask/dsl/uninstall_preflight" +require "cask/dsl/version" -require "hbc/url" +require "cask/url" module Hbc class DSL diff --git a/Library/Homebrew/cask/lib/hbc/dsl/appcast.rb b/Library/Homebrew/cask/dsl/appcast.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/dsl/appcast.rb rename to Library/Homebrew/cask/dsl/appcast.rb diff --git a/Library/Homebrew/cask/lib/hbc/dsl/base.rb b/Library/Homebrew/cask/dsl/base.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/dsl/base.rb rename to Library/Homebrew/cask/dsl/base.rb diff --git a/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/dsl/caveats.rb rename to Library/Homebrew/cask/dsl/caveats.rb diff --git a/Library/Homebrew/cask/lib/hbc/dsl/conflicts_with.rb b/Library/Homebrew/cask/dsl/conflicts_with.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/dsl/conflicts_with.rb rename to Library/Homebrew/cask/dsl/conflicts_with.rb diff --git a/Library/Homebrew/cask/lib/hbc/dsl/container.rb b/Library/Homebrew/cask/dsl/container.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/dsl/container.rb rename to Library/Homebrew/cask/dsl/container.rb diff --git a/Library/Homebrew/cask/lib/hbc/dsl/depends_on.rb b/Library/Homebrew/cask/dsl/depends_on.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/dsl/depends_on.rb rename to Library/Homebrew/cask/dsl/depends_on.rb diff --git a/Library/Homebrew/cask/lib/hbc/dsl/postflight.rb b/Library/Homebrew/cask/dsl/postflight.rb similarity index 91% rename from Library/Homebrew/cask/lib/hbc/dsl/postflight.rb rename to Library/Homebrew/cask/dsl/postflight.rb index 1026f6de60..63ce8f6318 100644 --- a/Library/Homebrew/cask/lib/hbc/dsl/postflight.rb +++ b/Library/Homebrew/cask/dsl/postflight.rb @@ -1,4 +1,4 @@ -require "hbc/staged" +require "cask/staged" module Hbc class DSL diff --git a/Library/Homebrew/cask/lib/hbc/dsl/preflight.rb b/Library/Homebrew/cask/dsl/preflight.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/dsl/preflight.rb rename to Library/Homebrew/cask/dsl/preflight.rb diff --git a/Library/Homebrew/cask/lib/hbc/dsl/uninstall_postflight.rb b/Library/Homebrew/cask/dsl/uninstall_postflight.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/dsl/uninstall_postflight.rb rename to Library/Homebrew/cask/dsl/uninstall_postflight.rb diff --git a/Library/Homebrew/cask/lib/hbc/dsl/uninstall_preflight.rb b/Library/Homebrew/cask/dsl/uninstall_preflight.rb similarity index 81% rename from Library/Homebrew/cask/lib/hbc/dsl/uninstall_preflight.rb rename to Library/Homebrew/cask/dsl/uninstall_preflight.rb index 36cdec12f5..5e00a2790f 100644 --- a/Library/Homebrew/cask/lib/hbc/dsl/uninstall_preflight.rb +++ b/Library/Homebrew/cask/dsl/uninstall_preflight.rb @@ -1,4 +1,4 @@ -require "hbc/staged" +require "cask/staged" module Hbc class DSL diff --git a/Library/Homebrew/cask/lib/hbc/dsl/version.rb b/Library/Homebrew/cask/dsl/version.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/dsl/version.rb rename to Library/Homebrew/cask/dsl/version.rb diff --git a/Library/Homebrew/cask/lib/hbc/exceptions.rb b/Library/Homebrew/cask/exceptions.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/exceptions.rb rename to Library/Homebrew/cask/exceptions.rb diff --git a/Library/Homebrew/cask/lib/hbc/installer.rb b/Library/Homebrew/cask/installer.rb similarity index 99% rename from Library/Homebrew/cask/lib/hbc/installer.rb rename to Library/Homebrew/cask/installer.rb index 68d1251a79..52b9c340ba 100644 --- a/Library/Homebrew/cask/lib/hbc/installer.rb +++ b/Library/Homebrew/cask/installer.rb @@ -3,11 +3,11 @@ require "rubygems" require "formula_installer" require "unpack_strategy" -require "hbc/cask_dependencies" -require "hbc/download" -require "hbc/staged" -require "hbc/verify" -require "hbc/quarantine" +require "cask/cask_dependencies" +require "cask/download" +require "cask/staged" +require "cask/verify" +require "cask/quarantine" require "cgi" diff --git a/Library/Homebrew/cask/lib/hbc.rb b/Library/Homebrew/cask/lib/hbc.rb deleted file mode 100644 index 8eca398094..0000000000 --- a/Library/Homebrew/cask/lib/hbc.rb +++ /dev/null @@ -1,21 +0,0 @@ -require "hardware" - -require "hbc/artifact" -require "hbc/audit" -require "hbc/auditor" -require "hbc/cache" -require "hbc/cask" -require "hbc/cask_loader" -require "hbc/caskroom" -require "hbc/checkable" -require "hbc/cli" -require "hbc/cask_dependencies" -require "hbc/exceptions" -require "hbc/installer" -require "hbc/macos" -require "hbc/pkg" -require "hbc/staged" -require "hbc/topological_hash" -require "hbc/utils" -require "hbc/verify" -require "hbc/version" diff --git a/Library/Homebrew/cask/lib/hbc/artifact.rb b/Library/Homebrew/cask/lib/hbc/artifact.rb deleted file mode 100644 index df1bc9b6a8..0000000000 --- a/Library/Homebrew/cask/lib/hbc/artifact.rb +++ /dev/null @@ -1,28 +0,0 @@ -require "hbc/artifact/app" -require "hbc/artifact/artifact" # generic 'artifact' stanza -require "hbc/artifact/binary" -require "hbc/artifact/colorpicker" -require "hbc/artifact/dictionary" -require "hbc/artifact/font" -require "hbc/artifact/input_method" -require "hbc/artifact/installer" -require "hbc/artifact/internet_plugin" -require "hbc/artifact/audio_unit_plugin" -require "hbc/artifact/vst_plugin" -require "hbc/artifact/vst3_plugin" -require "hbc/artifact/pkg" -require "hbc/artifact/postflight_block" -require "hbc/artifact/preflight_block" -require "hbc/artifact/prefpane" -require "hbc/artifact/qlplugin" -require "hbc/artifact/screen_saver" -require "hbc/artifact/service" -require "hbc/artifact/stage_only" -require "hbc/artifact/suite" -require "hbc/artifact/uninstall" -require "hbc/artifact/zap" - -module Hbc - module Artifact - end -end diff --git a/Library/Homebrew/cask/lib/hbc/macos.rb b/Library/Homebrew/cask/macos.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/macos.rb rename to Library/Homebrew/cask/macos.rb diff --git a/Library/Homebrew/cask/lib/hbc/metadata.rb b/Library/Homebrew/cask/metadata.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/metadata.rb rename to Library/Homebrew/cask/metadata.rb diff --git a/Library/Homebrew/cask/lib/hbc/pkg.rb b/Library/Homebrew/cask/pkg.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/pkg.rb rename to Library/Homebrew/cask/pkg.rb diff --git a/Library/Homebrew/cask/lib/hbc/quarantine.rb b/Library/Homebrew/cask/quarantine.rb similarity index 95% rename from Library/Homebrew/cask/lib/hbc/quarantine.rb rename to Library/Homebrew/cask/quarantine.rb index 952803a68d..c55a93e6a8 100644 --- a/Library/Homebrew/cask/lib/hbc/quarantine.rb +++ b/Library/Homebrew/cask/quarantine.rb @@ -5,7 +5,7 @@ module Hbc QUARANTINE_ATTRIBUTE = "com.apple.quarantine".freeze - QUARANTINE_SCRIPT = (HOMEBREW_LIBRARY_PATH/"cask/lib/hbc/utils/quarantine.swift").freeze + QUARANTINE_SCRIPT = (HOMEBREW_LIBRARY_PATH/"cask/utils/quarantine.swift").freeze # @private def swift diff --git a/Library/Homebrew/cask/lib/hbc/staged.rb b/Library/Homebrew/cask/staged.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/staged.rb rename to Library/Homebrew/cask/staged.rb diff --git a/Library/Homebrew/cask/lib/hbc/topological_hash.rb b/Library/Homebrew/cask/topological_hash.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/topological_hash.rb rename to Library/Homebrew/cask/topological_hash.rb diff --git a/Library/Homebrew/cask/lib/hbc/url.rb b/Library/Homebrew/cask/url.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/url.rb rename to Library/Homebrew/cask/url.rb diff --git a/Library/Homebrew/cask/lib/hbc/utils.rb b/Library/Homebrew/cask/utils.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/utils.rb rename to Library/Homebrew/cask/utils.rb diff --git a/Library/Homebrew/cask/lib/hbc/utils/quarantine.swift b/Library/Homebrew/cask/utils/quarantine.swift similarity index 100% rename from Library/Homebrew/cask/lib/hbc/utils/quarantine.swift rename to Library/Homebrew/cask/utils/quarantine.swift diff --git a/Library/Homebrew/cask/lib/hbc/verify.rb b/Library/Homebrew/cask/verify.rb similarity index 96% rename from Library/Homebrew/cask/lib/hbc/verify.rb rename to Library/Homebrew/cask/verify.rb index c5c6566731..94c11701bd 100644 --- a/Library/Homebrew/cask/lib/hbc/verify.rb +++ b/Library/Homebrew/cask/verify.rb @@ -1,4 +1,4 @@ -require "hbc/verify/checksum" +require "cask/verify/checksum" module Hbc module Verify diff --git a/Library/Homebrew/cask/lib/hbc/verify/checksum.rb b/Library/Homebrew/cask/verify/checksum.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/verify/checksum.rb rename to Library/Homebrew/cask/verify/checksum.rb diff --git a/Library/Homebrew/cask/lib/hbc/version.rb b/Library/Homebrew/cask/version.rb similarity index 100% rename from Library/Homebrew/cask/lib/hbc/version.rb rename to Library/Homebrew/cask/version.rb diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb index e88aff4076..3e4e624dc2 100644 --- a/Library/Homebrew/cleanup.rb +++ b/Library/Homebrew/cleanup.rb @@ -1,6 +1,6 @@ require "utils/bottles" require "formula" -require "hbc/cask_loader" +require "cask/cask_loader" require "set" module CleanupRefinement diff --git a/Library/Homebrew/cmd/cask.rb b/Library/Homebrew/cmd/cask.rb index b07e681deb..9291241595 100644 --- a/Library/Homebrew/cmd/cask.rb +++ b/Library/Homebrew/cmd/cask.rb @@ -1,4 +1,4 @@ -require "hbc" +require "cask/all" module Homebrew module_function diff --git a/Library/Homebrew/compat.rb b/Library/Homebrew/compat.rb index fbb74cb546..cf048d1beb 100644 --- a/Library/Homebrew/compat.rb +++ b/Library/Homebrew/compat.rb @@ -3,5 +3,5 @@ require "compat/dependable" require "compat/dependency_collector" require "compat/fileutils" require "compat/formula_support" -require "compat/hbc" +require "compat/cask" require "compat/tap" diff --git a/Library/Homebrew/compat/hbc.rb b/Library/Homebrew/compat/cask.rb similarity index 57% rename from Library/Homebrew/compat/hbc.rb rename to Library/Homebrew/compat/cask.rb index f254a27360..3a2c689733 100644 --- a/Library/Homebrew/compat/hbc.rb +++ b/Library/Homebrew/compat/cask.rb @@ -1,9 +1,9 @@ -require "compat/hbc/cask_loader" -require "compat/hbc/cli/cleanup" -require "compat/hbc/cli/search" -require "compat/hbc/cache" -require "compat/hbc/caskroom" -require "compat/hbc/dsl" +require "compat/cask/cask_loader" +require "compat/cask/cli/cleanup" +require "compat/cask/cli/search" +require "compat/cask/cache" +require "compat/cask/caskroom" +require "compat/cask/dsl" module Hbc class << self diff --git a/Library/Homebrew/compat/hbc/cache.rb b/Library/Homebrew/compat/cask/cache.rb similarity index 100% rename from Library/Homebrew/compat/hbc/cache.rb rename to Library/Homebrew/compat/cask/cache.rb diff --git a/Library/Homebrew/compat/hbc/cask_loader.rb b/Library/Homebrew/compat/cask/cask_loader.rb similarity index 100% rename from Library/Homebrew/compat/hbc/cask_loader.rb rename to Library/Homebrew/compat/cask/cask_loader.rb diff --git a/Library/Homebrew/compat/hbc/caskroom.rb b/Library/Homebrew/compat/cask/caskroom.rb similarity index 100% rename from Library/Homebrew/compat/hbc/caskroom.rb rename to Library/Homebrew/compat/cask/caskroom.rb diff --git a/Library/Homebrew/compat/hbc/cli/cleanup.rb b/Library/Homebrew/compat/cask/cli/cleanup.rb similarity index 96% rename from Library/Homebrew/compat/hbc/cli/cleanup.rb rename to Library/Homebrew/compat/cask/cli/cleanup.rb index 49242de783..dccada465d 100644 --- a/Library/Homebrew/compat/hbc/cli/cleanup.rb +++ b/Library/Homebrew/compat/cask/cli/cleanup.rb @@ -1,4 +1,4 @@ -require "hbc/cli/abstract_command" +require "cask/cli/abstract_command" require "cleanup" using CleanupRefinement diff --git a/Library/Homebrew/compat/hbc/cli/search.rb b/Library/Homebrew/compat/cask/cli/search.rb similarity index 91% rename from Library/Homebrew/compat/hbc/cli/search.rb rename to Library/Homebrew/compat/cask/cli/search.rb index 8aa761c3c3..cd46f59f53 100644 --- a/Library/Homebrew/compat/hbc/cli/search.rb +++ b/Library/Homebrew/compat/cask/cli/search.rb @@ -1,4 +1,4 @@ -require "hbc/cli/abstract_command" +require "cask/cli/abstract_command" require "cmd/search" module Hbc diff --git a/Library/Homebrew/compat/hbc/dsl.rb b/Library/Homebrew/compat/cask/dsl.rb similarity index 100% rename from Library/Homebrew/compat/hbc/dsl.rb rename to Library/Homebrew/compat/cask/dsl.rb diff --git a/Library/Homebrew/dev-cmd/irb.rb b/Library/Homebrew/dev-cmd/irb.rb index 97a0045826..7f5cd77f15 100644 --- a/Library/Homebrew/dev-cmd/irb.rb +++ b/Library/Homebrew/dev-cmd/irb.rb @@ -46,8 +46,7 @@ module Homebrew require "formula" require "keg" - - require "hbc" + require "cask/all" ohai "Interactive Homebrew Shell" puts "Example commands available with: brew irb --examples" diff --git a/Library/Homebrew/extend/os/mac/search.rb b/Library/Homebrew/extend/os/mac/search.rb index 5d1d7cc78a..9aada104b6 100644 --- a/Library/Homebrew/extend/os/mac/search.rb +++ b/Library/Homebrew/extend/os/mac/search.rb @@ -1,5 +1,5 @@ -require "hbc/cask" -require "hbc/cask_loader" +require "cask/cask" +require "cask/cask_loader" module Homebrew module Search diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index ce38bddd59..7517a64ff2 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -3,10 +3,6 @@ require "English" HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent -unless $LOAD_PATH.include?("#{HOMEBREW_LIBRARY_PATH}/cask/lib") - $LOAD_PATH.push("#{HOMEBREW_LIBRARY_PATH}/cask/lib") -end - unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s) $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.to_s) end diff --git a/Library/Homebrew/test/cask/dsl/caveats_spec.rb b/Library/Homebrew/test/cask/dsl/caveats_spec.rb index 1b82d98211..f91046e308 100644 --- a/Library/Homebrew/test/cask/dsl/caveats_spec.rb +++ b/Library/Homebrew/test/cask/dsl/caveats_spec.rb @@ -1,4 +1,4 @@ -require "test/support/helper/spec/shared_examples/hbc_dsl_base" +require "test/support/helper/spec/shared_examples/cask_dsl_base" describe Hbc::DSL::Caveats, :cask do let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) } diff --git a/Library/Homebrew/test/cask/dsl/postflight_spec.rb b/Library/Homebrew/test/cask/dsl/postflight_spec.rb index a7877d1abf..0fd4c1317f 100644 --- a/Library/Homebrew/test/cask/dsl/postflight_spec.rb +++ b/Library/Homebrew/test/cask/dsl/postflight_spec.rb @@ -1,5 +1,5 @@ -require "test/support/helper/spec/shared_examples/hbc_dsl_base" -require "test/support/helper/spec/shared_examples/hbc_staged" +require "test/support/helper/spec/shared_examples/cask_dsl_base" +require "test/support/helper/spec/shared_examples/cask_staged" describe Hbc::DSL::Postflight, :cask do let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) } diff --git a/Library/Homebrew/test/cask/dsl/preflight_spec.rb b/Library/Homebrew/test/cask/dsl/preflight_spec.rb index 1d152e06ad..70193154e2 100644 --- a/Library/Homebrew/test/cask/dsl/preflight_spec.rb +++ b/Library/Homebrew/test/cask/dsl/preflight_spec.rb @@ -1,5 +1,5 @@ -require "test/support/helper/spec/shared_examples/hbc_dsl_base" -require "test/support/helper/spec/shared_examples/hbc_staged" +require "test/support/helper/spec/shared_examples/cask_dsl_base" +require "test/support/helper/spec/shared_examples/cask_staged" describe Hbc::DSL::Preflight, :cask do let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) } diff --git a/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb b/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb index 189e526e29..540e2504a4 100644 --- a/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb +++ b/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb @@ -1,4 +1,4 @@ -require "test/support/helper/spec/shared_examples/hbc_dsl_base" +require "test/support/helper/spec/shared_examples/cask_dsl_base" describe Hbc::DSL::UninstallPostflight, :cask do let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) } diff --git a/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb b/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb index 8f4164b07d..ff1fdc63e2 100644 --- a/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb +++ b/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb @@ -1,5 +1,5 @@ -require "test/support/helper/spec/shared_examples/hbc_dsl_base" -require "test/support/helper/spec/shared_examples/hbc_staged" +require "test/support/helper/spec/shared_examples/cask_dsl_base" +require "test/support/helper/spec/shared_examples/cask_staged" describe Hbc::DSL::UninstallPreflight, :cask do let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) } diff --git a/Library/Homebrew/test/cleanup_spec.rb b/Library/Homebrew/test/cleanup_spec.rb index 18c0c9e51a..6df872f20d 100644 --- a/Library/Homebrew/test/cleanup_spec.rb +++ b/Library/Homebrew/test/cleanup_spec.rb @@ -1,6 +1,6 @@ require "test/support/fixtures/testball" require "cleanup" -require "hbc/cache" +require "cask/cache" require "fileutils" using CleanupRefinement diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb index 3155bf0de3..71816b5bc3 100644 --- a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb +++ b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb @@ -1,4 +1,4 @@ -require "hbc" +require "cask/all" require "test/support/helper/cask/fake_system_command" require "test/support/helper/cask/install_helper" diff --git a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_dsl_base.rb b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb similarity index 95% rename from Library/Homebrew/test/support/helper/spec/shared_examples/hbc_dsl_base.rb rename to Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb index 400ff40f62..b1431d2bcb 100644 --- a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_dsl_base.rb +++ b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb @@ -1,4 +1,4 @@ -require "hbc/dsl/base" +require "cask/dsl/base" shared_examples Hbc::DSL::Base do it "supports the token method" do diff --git a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb similarity index 99% rename from Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb rename to Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb index 1f2eb5b5d0..8d56439895 100644 --- a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb +++ b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb @@ -1,4 +1,4 @@ -require "hbc/staged" +require "cask/staged" shared_examples Hbc::Staged do let(:existing_path) { Pathname.new("/path/to/file/that/exists") } diff --git a/Library/Homebrew/update_migrator.rb b/Library/Homebrew/update_migrator.rb index a2e5557996..a75e735a09 100644 --- a/Library/Homebrew/update_migrator.rb +++ b/Library/Homebrew/update_migrator.rb @@ -1,5 +1,5 @@ -require "hbc/cask_loader" -require "hbc/download" +require "cask/cask_loader" +require "cask/download" module UpdateMigrator class << self From e06f8a8bebf7be7c82615b6e4589efc3cb6c91d5 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 3 Sep 2018 20:12:29 +0100 Subject: [PATCH 2/6] Rename Homebrew-Cask to Homebrew Cask. --- Library/Homebrew/cask/audit.rb | 4 ++-- Library/Homebrew/cask/cli.rb | 4 ++-- Library/Homebrew/cask/cli/--version.rb | 2 +- Library/Homebrew/cask/cli/doctor.rb | 8 +++---- Library/Homebrew/cask/dsl/caveats.rb | 2 +- Library/Homebrew/cask/exceptions.rb | 2 +- Library/Homebrew/cask/installer.rb | 4 ++-- Library/Homebrew/cask/utils/quarantine.swift | 2 +- Library/Homebrew/cask/version.rb | 2 +- Library/Homebrew/cmd/update-report.rb | 6 ++--- Library/Homebrew/extend/os/mac/diagnostic.rb | 2 +- Library/Homebrew/manpages/brew-cask.1.md | 24 +++++++++---------- Library/Homebrew/missing_formula.rb | 4 ++-- Library/Homebrew/requirement.rb | 2 +- Library/Homebrew/test/cask/audit_spec.rb | 4 ++-- .../Homebrew/test/cask/cli/--version_spec.rb | 4 ++-- Library/Homebrew/test/cask/cli/doctor_spec.rb | 2 +- .../spec/shared_context/homebrew_cask.rb | 4 ++-- manpages/brew-cask.1 | 24 +++++++++---------- manpages/brew.1 | 2 +- 20 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb index ec7def3952..272624ab31 100644 --- a/Library/Homebrew/cask/audit.rb +++ b/Library/Homebrew/cask/audit.rb @@ -65,7 +65,7 @@ module Hbc return if tap.user != "Homebrew" return unless cask.artifacts.any? { |k| k.is_a?(Hbc::Artifact::Pkg) && k.stanza_options.key?(:allow_untrusted) } - add_warning "allow_untrusted is not permitted in official Homebrew-Cask taps" + add_warning "allow_untrusted is not permitted in official Homebrew Cask taps" end def check_stanza_requires_uninstall @@ -204,7 +204,7 @@ module Hbc return unless cask.appcast return unless cask.appcast.checkpoint - add_error "Appcast checkpoints have been removed from Homebrew-Cask" + add_error "Appcast checkpoints have been removed from Homebrew Cask" end def check_latest_with_appcast diff --git a/Library/Homebrew/cask/cli.rb b/Library/Homebrew/cask/cli.rb index ee2176761d..4fafbcec97 100644 --- a/Library/Homebrew/cask/cli.rb +++ b/Library/Homebrew/cask/cli.rb @@ -225,8 +225,8 @@ module Hbc def purpose puts <<~EOS - brew-cask provides a friendly homebrew-style CLI workflow for the - administration of macOS applications distributed as binaries. + Homebrew Cask provides a friendly CLI workflow for the administration + of macOS applications distributed as binaries. EOS end diff --git a/Library/Homebrew/cask/cli/--version.rb b/Library/Homebrew/cask/cli/--version.rb index 1833c51c67..e903ae429f 100644 --- a/Library/Homebrew/cask/cli/--version.rb +++ b/Library/Homebrew/cask/cli/--version.rb @@ -16,7 +16,7 @@ module Hbc end def self.help - "displays the Homebrew-Cask version" + "displays the Homebrew Cask version" end end end diff --git a/Library/Homebrew/cask/cli/doctor.rb b/Library/Homebrew/cask/cli/doctor.rb index c19b53b331..e35a325667 100644 --- a/Library/Homebrew/cask/cli/doctor.rb +++ b/Library/Homebrew/cask/cli/doctor.rb @@ -33,7 +33,7 @@ module Hbc end def check_software_versions - ohai "Homebrew-Cask Version", Hbc.full_version + ohai "Homebrew Cask Version", Hbc.full_version ohai "macOS", MacOS.full_version ohai "SIP", self.class.check_sip ohai "Java", SystemConfig.describe_java @@ -43,7 +43,7 @@ module Hbc # where "doctor" is needed is precisely the situation where such # things are less dependable. def check_install_location - ohai "Homebrew-Cask Install Location" + ohai "Homebrew Cask Install Location" locations = Dir.glob(HOMEBREW_CELLAR.join("brew-cask", "*")).reverse if locations.empty? @@ -57,7 +57,7 @@ module Hbc end def check_staging_location - ohai "Homebrew-Cask Staging Location" + ohai "Homebrew Cask Staging Location" path = Caskroom.path @@ -72,7 +72,7 @@ module Hbc default_tap = Tap.default_cask_tap alt_taps = Tap.select { |t| t.cask_dir.exist? && t != default_tap } - ohai "Homebrew-Cask Taps:" + ohai "Homebrew Cask Taps:" [default_tap, *alt_taps].each do |tap| if tap.path.nil? || tap.path.to_s.empty? puts none_string diff --git a/Library/Homebrew/cask/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb index 54a28495ab..b3789a6621 100644 --- a/Library/Homebrew/cask/dsl/caveats.rb +++ b/Library/Homebrew/cask/dsl/caveats.rb @@ -79,7 +79,7 @@ module Hbc <<~EOS Cask #{@cask} installs files under /usr/local. The presence of such files can cause warnings when running "brew doctor", which is considered - to be a bug in Homebrew-Cask. + to be a bug in Homebrew Cask. EOS end diff --git a/Library/Homebrew/cask/exceptions.rb b/Library/Homebrew/cask/exceptions.rb index 7fc171586d..7e092e57e1 100644 --- a/Library/Homebrew/cask/exceptions.rb +++ b/Library/Homebrew/cask/exceptions.rb @@ -62,7 +62,7 @@ module Hbc class CaskX11DependencyError < AbstractCaskErrorWithToken def to_s <<~EOS - Cask '#{token}' requires XQuartz/X11, which can be installed using Homebrew-Cask by running + Cask '#{token}' requires XQuartz/X11, which can be installed using Homebrew Cask by running #{Formatter.identifier("brew cask install xquartz")} or manually, by downloading the package from diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb index 52b9c340ba..a029984c57 100644 --- a/Library/Homebrew/cask/installer.rb +++ b/Library/Homebrew/cask/installer.rb @@ -520,7 +520,7 @@ module Hbc # versioned staged distribution gain_permissions_remove(backup_path) if backup_path&.exist? - # Homebrew-Cask metadata + # Homebrew Cask metadata return unless backup_metadata_path.directory? backup_metadata_path.children.each do |subdir| @@ -535,7 +535,7 @@ module Hbc # versioned staged distribution gain_permissions_remove(@cask.staged_path) if @cask.staged_path&.exist? - # Homebrew-Cask metadata + # Homebrew Cask metadata if @cask.metadata_versioned_path.directory? @cask.metadata_versioned_path.children.each do |subdir| gain_permissions_remove(subdir) diff --git a/Library/Homebrew/cask/utils/quarantine.swift b/Library/Homebrew/cask/utils/quarantine.swift index af89e2ce15..e20889434c 100644 --- a/Library/Homebrew/cask/utils/quarantine.swift +++ b/Library/Homebrew/cask/utils/quarantine.swift @@ -16,7 +16,7 @@ let dataLocationUrl: NSURL = NSURL.init(fileURLWithPath: CommandLine.arguments[1 var errorBag: NSError? let quarantineProperties: [String: Any] = [ - kLSQuarantineAgentNameKey as String: "Homebrew-Cask", + kLSQuarantineAgentNameKey as String: "Homebrew Cask", kLSQuarantineTypeKey as String: kLSQuarantineTypeWebDownload, kLSQuarantineDataURLKey as String: CommandLine.arguments[2], kLSQuarantineOriginURLKey as String: CommandLine.arguments[3] diff --git a/Library/Homebrew/cask/version.rb b/Library/Homebrew/cask/version.rb index 370d37be41..c766378427 100644 --- a/Library/Homebrew/cask/version.rb +++ b/Library/Homebrew/cask/version.rb @@ -2,7 +2,7 @@ module Hbc def self.full_version @full_version ||= begin <<~EOS - Homebrew-Cask #{HOMEBREW_VERSION} + Homebrew Cask #{HOMEBREW_VERSION} #{Tap.default_cask_tap.full_name} #{Tap.default_cask_tap.version_string} EOS end diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 009180407b..38d59a0f53 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -328,7 +328,7 @@ class Reporter # For formulae migrated to cask: Auto-install cask or provide install instructions. if new_tap_name.start_with?("homebrew/cask") if new_tap.installed? && (HOMEBREW_PREFIX/"Caskroom").directory? - ohai "#{name} has been moved to Homebrew-Cask." + ohai "#{name} has been moved to Homebrew Cask." ohai "brew unlink #{name}" system HOMEBREW_BREW_FILE, "unlink", name ohai "brew prune" @@ -336,13 +336,13 @@ class Reporter ohai "brew cask install #{new_name}" system HOMEBREW_BREW_FILE, "cask", "install", new_name ohai <<~EOS - #{name} has been moved to Homebrew-Cask. + #{name} has been moved to Homebrew Cask. The existing keg has been unlinked. Please uninstall the formula when convenient by running: brew uninstall --force #{name} EOS else - ohai "#{name} has been moved to Homebrew-Cask.", <<~EOS + ohai "#{name} has been moved to Homebrew Cask.", <<~EOS To uninstall the formula and install the cask run: brew uninstall --force #{name} brew tap #{new_tap_name} diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index 7c9c7409e3..187fc03584 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -232,7 +232,7 @@ module Homebrew <<~EOS Your XQuartz (#{MacOS::XQuartz.version}) is outdated. Please install XQuartz #{MacOS::XQuartz.latest_version} (or delete the current version). - XQuartz can be updated using Homebrew-Cask by running + XQuartz can be updated using Homebrew Cask by running brew cask reinstall xquartz EOS end diff --git a/Library/Homebrew/manpages/brew-cask.1.md b/Library/Homebrew/manpages/brew-cask.1.md index 914f686a77..a49da1a19d 100644 --- a/Library/Homebrew/manpages/brew-cask.1.md +++ b/Library/Homebrew/manpages/brew-cask.1.md @@ -7,13 +7,13 @@ brew-cask(1) - a friendly binary installer for macOS ## DESCRIPTION -Homebrew-Cask is a tool for installing precompiled macOS binaries (such as +Homebrew Cask is a tool for installing precompiled macOS binaries (such as Applications) from the command line. The user is never required to use the graphical user interface. ## ALPHA-QUALITY SOFTWARE -Homebrew-Cask works robustly enough that we welcome new users, but the +Homebrew Cask works robustly enough that we welcome new users, but the project is still in early development. That means command names, option names, and other aspects of this manual are still subject to change. @@ -221,9 +221,9 @@ in a future version. ## INTERACTION WITH HOMEBREW -Homebrew-Cask is implemented as a external command for Homebrew. That means +Homebrew Cask is implemented as a external command for Homebrew. That means this project is entirely built upon the Homebrew infrastructure. For -example, upgrades to the Homebrew-Cask tool are received through Homebrew: +example, upgrades to the Homebrew Cask tool are received through Homebrew: brew update; brew cask upgrade; brew cleanup @@ -234,12 +234,12 @@ the Homebrew command: ## OTHER WAYS TO SPECIFY A CASK -Most Homebrew-Cask commands can accept a Cask token as an argument. As +Most Homebrew Cask commands can accept a Cask token as an argument. As described above, the argument can take the form of: * A simple token, e.g. `google-chrome` -Homebrew-Cask also accepts three other forms in place of plain tokens: +Homebrew Cask also accepts three other forms in place of plain tokens: * A fully-qualified token which includes the Tap name, e.g. `homebrew/cask-fonts/font-symbola` @@ -252,11 +252,11 @@ Homebrew-Cask also accepts three other forms in place of plain tokens: ## ENVIRONMENT -Homebrew-Cask respects many of the environment variables used by the +Homebrew Cask respects many of the environment variables used by the parent command `brew`. Please refer to the `brew`(1) man page for more information. -Environment variables specific to Homebrew-Cask: +Environment variables specific to Homebrew Cask: * `HOMEBREW_CASK_OPTS`: This variable may contain any arguments normally used as options on @@ -268,14 +268,14 @@ Environment variables specific to Homebrew-Cask: Other environment variables: * `SUDO_ASKPASS`: - When this variable is set, Homebrew-Cask will call `sudo`(8) with the `-A` option. + When this variable is set, Homebrew Cask will call `sudo`(8) with the `-A` option. ## SEE ALSO -The Homebrew-Cask home page: +The Homebrew Cask home page: -The Homebrew-Cask GitHub page: +The Homebrew Cask GitHub page: `brew`(1), `curl`(1) @@ -290,6 +290,6 @@ Man page format based on `brew.1.md` from Homebrew. We still have bugs - and we are busy fixing them! If you have a problem, don't be shy about reporting it on our [GitHub issues page](https://github.com/Homebrew/homebrew-cask/issues?state=open). -When reporting bugs, remember that Homebrew-Cask is an independent project from +When reporting bugs, remember that Homebrew Cask is an independent project from Homebrew. Do your best to direct bug reports to the appropriate project. If your command-line started with `brew cask`, bring the bug to us first! diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb index 3966088c1f..616efd4a8b 100644 --- a/Library/Homebrew/missing_formula.rb +++ b/Library/Homebrew/missing_formula.rb @@ -19,7 +19,7 @@ module Homebrew We recommend using a MacTeX distribution: https://www.tug.org/mactex/ - You can install it with Homebrew-Cask: + You can install it with Homebrew Cask: brew cask install mactex EOS when "pip" then <<~EOS @@ -76,7 +76,7 @@ module Homebrew when "ngrok" then <<~EOS Upstream sunsetted 1.x in March 2016 and 2.x is not open-source. - If you wish to use the 2.x release you can install with Homebrew-Cask: + If you wish to use the 2.x release you can install with Homebrew Cask: brew cask install ngrok EOS end diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb index fed639bc1c..608e8d3a35 100644 --- a/Library/Homebrew/requirement.rb +++ b/Library/Homebrew/requirement.rb @@ -34,7 +34,7 @@ class Requirement s = "#{class_name} unsatisfied!\n" if cask s += <<~EOS - You can install with Homebrew-Cask: + You can install with Homebrew Cask: brew cask install #{cask} EOS end diff --git a/Library/Homebrew/test/cask/audit_spec.rb b/Library/Homebrew/test/cask/audit_spec.rb index 170af5b101..b5bb990e71 100644 --- a/Library/Homebrew/test/cask/audit_spec.rb +++ b/Library/Homebrew/test/cask/audit_spec.rb @@ -94,7 +94,7 @@ describe Hbc::Audit, :cask do end describe "pkg allow_untrusted checks" do - let(:warning_msg) { "allow_untrusted is not permitted in official Homebrew-Cask taps" } + let(:warning_msg) { "allow_untrusted is not permitted in official Homebrew Cask taps" } context "when the Cask has no pkg stanza" do let(:cask_token) { "basic-cask" } @@ -318,7 +318,7 @@ describe Hbc::Audit, :cask do end describe "appcast checkpoint check" do - let(:error_msg) { "Appcast checkpoints have been removed from Homebrew-Cask" } + let(:error_msg) { "Appcast checkpoints have been removed from Homebrew Cask" } context "when the Cask does not have a checkpoint" do let(:cask_token) { "with-appcast" } diff --git a/Library/Homebrew/test/cask/cli/--version_spec.rb b/Library/Homebrew/test/cask/cli/--version_spec.rb index e7fcab65c1..dc1a95805c 100644 --- a/Library/Homebrew/test/cask/cli/--version_spec.rb +++ b/Library/Homebrew/test/cask/cli/--version_spec.rb @@ -1,8 +1,8 @@ describe Hbc::CLI::Version, :cask do describe "::run" do - it "outputs the current Homebrew-Cask version" do + it "outputs the current Homebrew Cask version" do expect { described_class.run } - .to output(/\AHomebrew-Cask.*\d+\.\d+\.\d+/).to_stdout + .to output(/\AHomebrew Cask.*\d+\.\d+\.\d+/).to_stdout .and not_to_output.to_stderr end diff --git a/Library/Homebrew/test/cask/cli/doctor_spec.rb b/Library/Homebrew/test/cask/cli/doctor_spec.rb index e3967060ed..d6a3a27157 100644 --- a/Library/Homebrew/test/cask/cli/doctor_spec.rb +++ b/Library/Homebrew/test/cask/cli/doctor_spec.rb @@ -6,7 +6,7 @@ describe Hbc::CLI::Doctor, :cask do it "displays some nice info about the environment" do expect { Hbc::CLI::Doctor.run - }.to output(/\A==> Homebrew-Cask Version/).to_stdout + }.to output(/\A==> Homebrew Cask Version/).to_stdout end it "raises an exception when arguments are given" do diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb index 71816b5bc3..6aa9f5a04e 100644 --- a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb +++ b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb @@ -11,7 +11,7 @@ HOMEBREW_CASK_DIRS = { :servicedir => Pathname.new(TEST_TMPDIR).join("cask-servicedir"), }.freeze -RSpec.shared_context "Homebrew-Cask", :needs_macos do +RSpec.shared_context "Homebrew Cask", :needs_macos do before do HOMEBREW_CASK_DIRS.each do |method, path| allow(Hbc::Config.global).to receive(method).and_return(path) @@ -47,5 +47,5 @@ RSpec.shared_context "Homebrew-Cask", :needs_macos do end RSpec.configure do |config| - config.include_context "Homebrew-Cask", :cask + config.include_context "Homebrew Cask", :cask end diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1 index ed0dca508d..d861af4111 100644 --- a/manpages/brew-cask.1 +++ b/manpages/brew-cask.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BREW\-CASK" "1" "August 2018" "Homebrew" "brew-cask" +.TH "BREW\-CASK" "1" "September 2018" "Homebrew" "brew-cask" . .SH "NAME" \fBbrew\-cask\fR \- a friendly binary installer for macOS @@ -10,10 +10,10 @@ \fBbrew cask\fR command [options] [ \fItoken\fR \.\.\. ] . .SH "DESCRIPTION" -Homebrew\-Cask is a tool for installing precompiled macOS binaries (such as Applications) from the command line\. The user is never required to use the graphical user interface\. +Homebrew Cask is a tool for installing precompiled macOS binaries (such as Applications) from the command line\. The user is never required to use the graphical user interface\. . .SH "ALPHA\-QUALITY SOFTWARE" -Homebrew\-Cask works robustly enough that we welcome new users, but the project is still in early development\. That means command names, option names, and other aspects of this manual are still subject to change\. +Homebrew Cask works robustly enough that we welcome new users, but the project is still in early development\. That means command names, option names, and other aspects of this manual are still subject to change\. . .SH "FREQUENTLY USED COMMANDS" . @@ -230,7 +230,7 @@ Do not link "helper" executables to \fB/usr/local/bin\fR\. Output debugging information of use to Cask authors and developers\. . .SH "INTERACTION WITH HOMEBREW" -Homebrew\-Cask is implemented as a external command for Homebrew\. That means this project is entirely built upon the Homebrew infrastructure\. For example, upgrades to the Homebrew\-Cask tool are received through Homebrew: +Homebrew Cask is implemented as a external command for Homebrew\. That means this project is entirely built upon the Homebrew infrastructure\. For example, upgrades to the Homebrew Cask tool are received through Homebrew: . .IP "" 4 . @@ -256,7 +256,7 @@ brew update .IP "" 0 . .SH "OTHER WAYS TO SPECIFY A CASK" -Most Homebrew\-Cask commands can accept a Cask token as an argument\. As described above, the argument can take the form of: +Most Homebrew Cask commands can accept a Cask token as an argument\. As described above, the argument can take the form of: . .IP "\(bu" 4 A simple token, e\.g\. \fBgoogle\-chrome\fR @@ -264,7 +264,7 @@ A simple token, e\.g\. \fBgoogle\-chrome\fR .IP "" 0 . .P -Homebrew\-Cask also accepts three other forms in place of plain tokens: +Homebrew Cask also accepts three other forms in place of plain tokens: . .IP "\(bu" 4 A fully\-qualified token which includes the Tap name, e\.g\. \fBhomebrew/cask\-fonts/font\-symbola\fR @@ -278,10 +278,10 @@ A \fBcurl\fR\-retrievable URI to a Cask file, e\.g\. \fBhttps://raw\.githubuserc .IP "" 0 . .SH "ENVIRONMENT" -Homebrew\-Cask respects many of the environment variables used by the parent command \fBbrew\fR\. Please refer to the \fBbrew\fR(1) man page for more information\. +Homebrew Cask respects many of the environment variables used by the parent command \fBbrew\fR\. Please refer to the \fBbrew\fR(1) man page for more information\. . .P -Environment variables specific to Homebrew\-Cask: +Environment variables specific to Homebrew Cask: . .TP \fBHOMEBREW_CASK_OPTS\fR @@ -303,13 +303,13 @@ Other environment variables: . .TP \fBSUDO_ASKPASS\fR -When this variable is set, Homebrew\-Cask will call \fBsudo\fR(8) with the \fB\-A\fR option\. +When this variable is set, Homebrew Cask will call \fBsudo\fR(8) with the \fB\-A\fR option\. . .SH "SEE ALSO" -The Homebrew\-Cask home page: \fIhttps://caskroom\.github\.io/\fR +The Homebrew Cask home page: \fIhttps://caskroom\.github\.io/\fR . .P -The Homebrew\-Cask GitHub page: \fIhttps://github\.com/Homebrew/homebrew\-cask\fR +The Homebrew Cask GitHub page: \fIhttps://github\.com/Homebrew/homebrew\-cask\fR . .P \fBbrew\fR(1), \fBcurl\fR(1) @@ -324,4 +324,4 @@ Man page format based on \fBbrew\.1\.md\fR from Homebrew\. We still have bugs \- and we are busy fixing them! If you have a problem, don\'t be shy about reporting it on our GitHub issues page \fIhttps://github\.com/Homebrew/homebrew\-cask/issues?state=open\fR\. . .P -When reporting bugs, remember that Homebrew\-Cask is an independent project from Homebrew\. Do your best to direct bug reports to the appropriate project\. If your command\-line started with \fBbrew cask\fR, bring the bug to us first! +When reporting bugs, remember that Homebrew Cask is an independent project from Homebrew\. Do your best to direct bug reports to the appropriate project\. If your command\-line started with \fBbrew cask\fR, bring the bug to us first! diff --git a/manpages/brew.1 b/manpages/brew.1 index df2451c071..3bf6e5095b 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BREW" "1" "August 2018" "Homebrew" "brew" +.TH "BREW" "1" "September 2018" "Homebrew" "brew" . .SH "NAME" \fBbrew\fR \- The missing package manager for macOS From 1d86d7a7c762e5ef236d63aed4b6ea395ae0f592 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 3 Sep 2018 20:17:29 +0100 Subject: [PATCH 3/6] 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 From 1ae232698484c252563ff1eb829331e7fcdb6a2d Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 4 Sep 2018 08:45:48 +0100 Subject: [PATCH 4/6] Rename Cask::CLI to Cask::Cmd. --- Library/Homebrew/cask/cmd.rb | 6 +-- Library/Homebrew/cask/cmd/--version.rb | 2 +- Library/Homebrew/cask/cmd/abstract_command.rb | 2 +- .../cask/cmd/abstract_internal_command.rb | 2 +- Library/Homebrew/cask/cmd/audit.rb | 2 +- Library/Homebrew/cask/cmd/cat.rb | 2 +- Library/Homebrew/cask/cmd/create.rb | 2 +- Library/Homebrew/cask/cmd/doctor.rb | 2 +- Library/Homebrew/cask/cmd/edit.rb | 2 +- Library/Homebrew/cask/cmd/fetch.rb | 2 +- Library/Homebrew/cask/cmd/home.rb | 2 +- Library/Homebrew/cask/cmd/info.rb | 2 +- Library/Homebrew/cask/cmd/install.rb | 2 +- Library/Homebrew/cask/cmd/internal_help.rb | 6 +-- Library/Homebrew/cask/cmd/internal_stanza.rb | 2 +- Library/Homebrew/cask/cmd/list.rb | 2 +- Library/Homebrew/cask/cmd/options.rb | 2 +- Library/Homebrew/cask/cmd/outdated.rb | 2 +- Library/Homebrew/cask/cmd/reinstall.rb | 2 +- Library/Homebrew/cask/cmd/style.rb | 2 +- Library/Homebrew/cask/cmd/uninstall.rb | 2 +- Library/Homebrew/cask/cmd/upgrade.rb | 2 +- Library/Homebrew/cask/cmd/zap.rb | 2 +- Library/Homebrew/cmd/cask.rb | 2 +- Library/Homebrew/compat/cask/cmd/cleanup.rb | 2 +- Library/Homebrew/compat/cask/cmd/search.rb | 2 +- .../Homebrew/test/cask/cli/--version_spec.rb | 2 +- Library/Homebrew/test/cask/cli/audit_spec.rb | 2 +- Library/Homebrew/test/cask/cli/cat_spec.rb | 2 +- Library/Homebrew/test/cask/cli/create_spec.rb | 2 +- Library/Homebrew/test/cask/cli/doctor_spec.rb | 6 +-- Library/Homebrew/test/cask/cli/edit_spec.rb | 2 +- Library/Homebrew/test/cask/cli/fetch_spec.rb | 2 +- Library/Homebrew/test/cask/cli/home_spec.rb | 2 +- Library/Homebrew/test/cask/cli/info_spec.rb | 2 +- .../Homebrew/test/cask/cli/install_spec.rb | 2 +- .../test/cask/cli/internal_stanza_spec.rb | 2 +- Library/Homebrew/test/cask/cli/list_spec.rb | 2 +- .../Homebrew/test/cask/cli/options_spec.rb | 2 +- .../Homebrew/test/cask/cli/outdated_spec.rb | 2 +- .../Homebrew/test/cask/cli/quarantine_spec.rb | 40 +++++++++---------- .../Homebrew/test/cask/cli/reinstall_spec.rb | 10 ++--- Library/Homebrew/test/cask/cli/style_spec.rb | 2 +- .../Homebrew/test/cask/cli/uninstall_spec.rb | 2 +- .../Homebrew/test/cask/cli/upgrade_spec.rb | 6 +-- Library/Homebrew/test/cask/cli/zap_spec.rb | 2 +- Library/Homebrew/test/cask/cmd_spec.rb | 8 ++-- 47 files changed, 81 insertions(+), 81 deletions(-) diff --git a/Library/Homebrew/cask/cmd.rb b/Library/Homebrew/cask/cmd.rb index 8272d9e8a6..30de50eb5f 100644 --- a/Library/Homebrew/cask/cmd.rb +++ b/Library/Homebrew/cask/cmd.rb @@ -31,7 +31,7 @@ require "cask/cmd/internal_help" require "cask/cmd/internal_stanza" module Hbc - class CLI + class Cmd ALIASES = { "ls" => "list", "homepage" => "home", @@ -232,10 +232,10 @@ module Hbc end def usage - max_command_len = CLI.commands.map(&:length).max + max_command_len = Cmd.commands.map(&:length).max puts "Commands:\n\n" - CLI.command_classes.each do |klass| + Cmd.command_classes.each do |klass| next unless klass.visible puts " #{klass.command_name.ljust(max_command_len)} #{_help_for(klass)}" end diff --git a/Library/Homebrew/cask/cmd/--version.rb b/Library/Homebrew/cask/cmd/--version.rb index e903ae429f..75fff8d2a9 100644 --- a/Library/Homebrew/cask/cmd/--version.rb +++ b/Library/Homebrew/cask/cmd/--version.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Version < AbstractCommand def self.command_name "--#{super}" diff --git a/Library/Homebrew/cask/cmd/abstract_command.rb b/Library/Homebrew/cask/cmd/abstract_command.rb index 59e7de6f4e..60ada8e7eb 100644 --- a/Library/Homebrew/cask/cmd/abstract_command.rb +++ b/Library/Homebrew/cask/cmd/abstract_command.rb @@ -2,7 +2,7 @@ require_relative "options" require "search" module Hbc - class CLI + class Cmd class AbstractCommand include Options include Homebrew::Search diff --git a/Library/Homebrew/cask/cmd/abstract_internal_command.rb b/Library/Homebrew/cask/cmd/abstract_internal_command.rb index 8af71e5895..cc0032fc7d 100644 --- a/Library/Homebrew/cask/cmd/abstract_internal_command.rb +++ b/Library/Homebrew/cask/cmd/abstract_internal_command.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class AbstractInternalCommand < AbstractCommand def self.command_name super.sub(/^internal_/i, "_") diff --git a/Library/Homebrew/cask/cmd/audit.rb b/Library/Homebrew/cask/cmd/audit.rb index 4f215826d2..0d8ce73783 100644 --- a/Library/Homebrew/cask/cmd/audit.rb +++ b/Library/Homebrew/cask/cmd/audit.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Audit < AbstractCommand option "--download", :download, false option "--token-conflicts", :token_conflicts, false diff --git a/Library/Homebrew/cask/cmd/cat.rb b/Library/Homebrew/cask/cmd/cat.rb index 0430805561..67d6dc280d 100644 --- a/Library/Homebrew/cask/cmd/cat.rb +++ b/Library/Homebrew/cask/cmd/cat.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Cat < AbstractCommand def initialize(*) super diff --git a/Library/Homebrew/cask/cmd/create.rb b/Library/Homebrew/cask/cmd/create.rb index 0f5034a54f..1de142edfc 100644 --- a/Library/Homebrew/cask/cmd/create.rb +++ b/Library/Homebrew/cask/cmd/create.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Create < AbstractCommand def initialize(*) super diff --git a/Library/Homebrew/cask/cmd/doctor.rb b/Library/Homebrew/cask/cmd/doctor.rb index e35a325667..8772712282 100644 --- a/Library/Homebrew/cask/cmd/doctor.rb +++ b/Library/Homebrew/cask/cmd/doctor.rb @@ -2,7 +2,7 @@ require "system_config" require "cask/checkable" module Hbc - class CLI + class Cmd class Doctor < AbstractCommand include Checkable diff --git a/Library/Homebrew/cask/cmd/edit.rb b/Library/Homebrew/cask/cmd/edit.rb index 693edcd515..0a22dadc69 100644 --- a/Library/Homebrew/cask/cmd/edit.rb +++ b/Library/Homebrew/cask/cmd/edit.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Edit < AbstractCommand def initialize(*) super diff --git a/Library/Homebrew/cask/cmd/fetch.rb b/Library/Homebrew/cask/cmd/fetch.rb index 5346d33dab..5131b6761b 100644 --- a/Library/Homebrew/cask/cmd/fetch.rb +++ b/Library/Homebrew/cask/cmd/fetch.rb @@ -1,7 +1,7 @@ require "cask/download" module Hbc - class CLI + class Cmd class Fetch < AbstractCommand option "--force", :force, false diff --git a/Library/Homebrew/cask/cmd/home.rb b/Library/Homebrew/cask/cmd/home.rb index d496e309ea..0d36b821ec 100644 --- a/Library/Homebrew/cask/cmd/home.rb +++ b/Library/Homebrew/cask/cmd/home.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Home < AbstractCommand def run if casks.none? diff --git a/Library/Homebrew/cask/cmd/info.rb b/Library/Homebrew/cask/cmd/info.rb index ecf30ff5dd..afef9da708 100644 --- a/Library/Homebrew/cask/cmd/info.rb +++ b/Library/Homebrew/cask/cmd/info.rb @@ -1,7 +1,7 @@ require "json" module Hbc - class CLI + class Cmd class Info < AbstractCommand option "--json=VERSION", :json diff --git a/Library/Homebrew/cask/cmd/install.rb b/Library/Homebrew/cask/cmd/install.rb index f8a8929367..4a6c925ab6 100644 --- a/Library/Homebrew/cask/cmd/install.rb +++ b/Library/Homebrew/cask/cmd/install.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Install < AbstractCommand option "--force", :force, false option "--skip-cask-deps", :skip_cask_deps, false diff --git a/Library/Homebrew/cask/cmd/internal_help.rb b/Library/Homebrew/cask/cmd/internal_help.rb index beac77b293..ccde3f0d02 100644 --- a/Library/Homebrew/cask/cmd/internal_help.rb +++ b/Library/Homebrew/cask/cmd/internal_help.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class InternalHelp < AbstractInternalCommand def initialize(*) super @@ -8,9 +8,9 @@ module Hbc end def run - max_command_len = CLI.commands.map(&:length).max + max_command_len = Cmd.commands.map(&:length).max puts "Unstable Internal-use Commands:\n\n" - CLI.command_classes.each do |klass| + Cmd.command_classes.each do |klass| next if klass.visible puts " #{klass.command_name.ljust(max_command_len)} #{self.class.help_for(klass)}" end diff --git a/Library/Homebrew/cask/cmd/internal_stanza.rb b/Library/Homebrew/cask/cmd/internal_stanza.rb index 779f29b068..fbb321110b 100644 --- a/Library/Homebrew/cask/cmd/internal_stanza.rb +++ b/Library/Homebrew/cask/cmd/internal_stanza.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class InternalStanza < AbstractInternalCommand # Syntax # diff --git a/Library/Homebrew/cask/cmd/list.rb b/Library/Homebrew/cask/cmd/list.rb index 916860e7e2..ab09207392 100644 --- a/Library/Homebrew/cask/cmd/list.rb +++ b/Library/Homebrew/cask/cmd/list.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class List < AbstractCommand option "-1", :one, false option "--versions", :versions, false diff --git a/Library/Homebrew/cask/cmd/options.rb b/Library/Homebrew/cask/cmd/options.rb index 75dd772120..8ccd0a89eb 100644 --- a/Library/Homebrew/cask/cmd/options.rb +++ b/Library/Homebrew/cask/cmd/options.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd module Options def self.included(klass) klass.extend(ClassMethods) diff --git a/Library/Homebrew/cask/cmd/outdated.rb b/Library/Homebrew/cask/cmd/outdated.rb index 593fea19da..f61f4ade52 100644 --- a/Library/Homebrew/cask/cmd/outdated.rb +++ b/Library/Homebrew/cask/cmd/outdated.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Outdated < AbstractCommand option "--greedy", :greedy, false option "--quiet", :quiet, false diff --git a/Library/Homebrew/cask/cmd/reinstall.rb b/Library/Homebrew/cask/cmd/reinstall.rb index 95d419991c..f5c3af8850 100644 --- a/Library/Homebrew/cask/cmd/reinstall.rb +++ b/Library/Homebrew/cask/cmd/reinstall.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Reinstall < Install def run casks.each do |cask| diff --git a/Library/Homebrew/cask/cmd/style.rb b/Library/Homebrew/cask/cmd/style.rb index cb2e5e0537..2aea7e2a1a 100644 --- a/Library/Homebrew/cask/cmd/style.rb +++ b/Library/Homebrew/cask/cmd/style.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Style < AbstractCommand def self.help "checks Cask style using RuboCop" diff --git a/Library/Homebrew/cask/cmd/uninstall.rb b/Library/Homebrew/cask/cmd/uninstall.rb index c962632bca..4a06824ea0 100644 --- a/Library/Homebrew/cask/cmd/uninstall.rb +++ b/Library/Homebrew/cask/cmd/uninstall.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Uninstall < AbstractCommand option "--force", :force, false diff --git a/Library/Homebrew/cask/cmd/upgrade.rb b/Library/Homebrew/cask/cmd/upgrade.rb index 01ff0d36fc..7218a8d199 100644 --- a/Library/Homebrew/cask/cmd/upgrade.rb +++ b/Library/Homebrew/cask/cmd/upgrade.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Upgrade < AbstractCommand option "--greedy", :greedy, false option "--quiet", :quiet, false diff --git a/Library/Homebrew/cask/cmd/zap.rb b/Library/Homebrew/cask/cmd/zap.rb index 7148bdf10c..8ce8df0a1a 100644 --- a/Library/Homebrew/cask/cmd/zap.rb +++ b/Library/Homebrew/cask/cmd/zap.rb @@ -1,5 +1,5 @@ module Hbc - class CLI + class Cmd class Zap < AbstractCommand option "--force", :force, false diff --git a/Library/Homebrew/cmd/cask.rb b/Library/Homebrew/cmd/cask.rb index 9291241595..ac37399e2b 100644 --- a/Library/Homebrew/cmd/cask.rb +++ b/Library/Homebrew/cmd/cask.rb @@ -4,6 +4,6 @@ module Homebrew module_function def cask - Hbc::CLI.run(*ARGV) + Hbc::Cmd.run(*ARGV) end end diff --git a/Library/Homebrew/compat/cask/cmd/cleanup.rb b/Library/Homebrew/compat/cask/cmd/cleanup.rb index cc9ac24abd..878d9fe432 100644 --- a/Library/Homebrew/compat/cask/cmd/cleanup.rb +++ b/Library/Homebrew/compat/cask/cmd/cleanup.rb @@ -4,7 +4,7 @@ require "cleanup" using CleanupRefinement module Hbc - class CLI + class Cmd class Cleanup < AbstractCommand OUTDATED_DAYS = 10 OUTDATED_TIMESTAMP = Time.now - (60 * 60 * 24 * OUTDATED_DAYS) diff --git a/Library/Homebrew/compat/cask/cmd/search.rb b/Library/Homebrew/compat/cask/cmd/search.rb index 142b9e8922..fca45f77bf 100644 --- a/Library/Homebrew/compat/cask/cmd/search.rb +++ b/Library/Homebrew/compat/cask/cmd/search.rb @@ -2,7 +2,7 @@ require "cask/cmd/abstract_command" require "cmd/search" module Hbc - class CLI + class Cmd module Compat class Search < AbstractCommand def run diff --git a/Library/Homebrew/test/cask/cli/--version_spec.rb b/Library/Homebrew/test/cask/cli/--version_spec.rb index dc1a95805c..b1fefeaa14 100644 --- a/Library/Homebrew/test/cask/cli/--version_spec.rb +++ b/Library/Homebrew/test/cask/cli/--version_spec.rb @@ -1,4 +1,4 @@ -describe Hbc::CLI::Version, :cask do +describe Hbc::Cmd::Version, :cask do describe "::run" do it "outputs the current Homebrew Cask version" do expect { described_class.run } diff --git a/Library/Homebrew/test/cask/cli/audit_spec.rb b/Library/Homebrew/test/cask/cli/audit_spec.rb index 4619e38a67..5fc7156d44 100644 --- a/Library/Homebrew/test/cask/cli/audit_spec.rb +++ b/Library/Homebrew/test/cask/cli/audit_spec.rb @@ -1,6 +1,6 @@ require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Audit, :cask do +describe Hbc::Cmd::Audit, :cask do let(:cask) { Hbc::Cask.new(nil) } it_behaves_like "a command that handles invalid options" diff --git a/Library/Homebrew/test/cask/cli/cat_spec.rb b/Library/Homebrew/test/cask/cli/cat_spec.rb index 086f1879dc..293000c93a 100644 --- a/Library/Homebrew/test/cask/cli/cat_spec.rb +++ b/Library/Homebrew/test/cask/cli/cat_spec.rb @@ -1,7 +1,7 @@ require_relative "shared_examples/requires_cask_token" require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Cat, :cask do +describe Hbc::Cmd::Cat, :cask do it_behaves_like "a command that requires a Cask token" it_behaves_like "a command that handles invalid options" diff --git a/Library/Homebrew/test/cask/cli/create_spec.rb b/Library/Homebrew/test/cask/cli/create_spec.rb index bc9d28bdec..06a25f54fb 100644 --- a/Library/Homebrew/test/cask/cli/create_spec.rb +++ b/Library/Homebrew/test/cask/cli/create_spec.rb @@ -1,7 +1,7 @@ require_relative "shared_examples/requires_cask_token" require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Create, :cask do +describe Hbc::Cmd::Create, :cask do around do |example| begin example.run diff --git a/Library/Homebrew/test/cask/cli/doctor_spec.rb b/Library/Homebrew/test/cask/cli/doctor_spec.rb index d6a3a27157..e49eae51af 100644 --- a/Library/Homebrew/test/cask/cli/doctor_spec.rb +++ b/Library/Homebrew/test/cask/cli/doctor_spec.rb @@ -1,17 +1,17 @@ require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Doctor, :cask do +describe Hbc::Cmd::Doctor, :cask do it_behaves_like "a command that handles invalid options" it "displays some nice info about the environment" do expect { - Hbc::CLI::Doctor.run + Hbc::Cmd::Doctor.run }.to output(/\A==> Homebrew Cask Version/).to_stdout end it "raises an exception when arguments are given" do expect { - Hbc::CLI::Doctor.run("argument") + Hbc::Cmd::Doctor.run("argument") }.to raise_error(ArgumentError) end end diff --git a/Library/Homebrew/test/cask/cli/edit_spec.rb b/Library/Homebrew/test/cask/cli/edit_spec.rb index 90e6ad3c50..91c67fb9b2 100644 --- a/Library/Homebrew/test/cask/cli/edit_spec.rb +++ b/Library/Homebrew/test/cask/cli/edit_spec.rb @@ -1,7 +1,7 @@ require_relative "shared_examples/requires_cask_token" require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Edit, :cask do +describe Hbc::Cmd::Edit, :cask do before do allow_any_instance_of(described_class).to receive(:exec_editor) end diff --git a/Library/Homebrew/test/cask/cli/fetch_spec.rb b/Library/Homebrew/test/cask/cli/fetch_spec.rb index ea83d48084..51ba3329b7 100644 --- a/Library/Homebrew/test/cask/cli/fetch_spec.rb +++ b/Library/Homebrew/test/cask/cli/fetch_spec.rb @@ -1,7 +1,7 @@ require_relative "shared_examples/requires_cask_token" require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Fetch, :cask do +describe Hbc::Cmd::Fetch, :cask do let(:local_transmission) { Hbc::CaskLoader.load(cask_path("local-transmission")) } diff --git a/Library/Homebrew/test/cask/cli/home_spec.rb b/Library/Homebrew/test/cask/cli/home_spec.rb index eefdfbc849..719b73ae75 100644 --- a/Library/Homebrew/test/cask/cli/home_spec.rb +++ b/Library/Homebrew/test/cask/cli/home_spec.rb @@ -1,6 +1,6 @@ require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Home, :cask do +describe Hbc::Cmd::Home, :cask do before do allow(described_class).to receive(:open_url) end diff --git a/Library/Homebrew/test/cask/cli/info_spec.rb b/Library/Homebrew/test/cask/cli/info_spec.rb index 0fb5efe804..14110f34ee 100644 --- a/Library/Homebrew/test/cask/cli/info_spec.rb +++ b/Library/Homebrew/test/cask/cli/info_spec.rb @@ -1,7 +1,7 @@ require_relative "shared_examples/requires_cask_token" require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Info, :cask do +describe Hbc::Cmd::Info, :cask do it_behaves_like "a command that requires a Cask token" it_behaves_like "a command that handles invalid options" diff --git a/Library/Homebrew/test/cask/cli/install_spec.rb b/Library/Homebrew/test/cask/cli/install_spec.rb index 8522e72640..fb0153ebcb 100644 --- a/Library/Homebrew/test/cask/cli/install_spec.rb +++ b/Library/Homebrew/test/cask/cli/install_spec.rb @@ -1,7 +1,7 @@ require_relative "shared_examples/requires_cask_token" require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Install, :cask do +describe Hbc::Cmd::Install, :cask do it_behaves_like "a command that requires a Cask token" it_behaves_like "a command that handles invalid options" diff --git a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb index 9869b7e9f2..04c3ceb7b2 100644 --- a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb +++ b/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb @@ -1,4 +1,4 @@ -describe Hbc::CLI::InternalStanza, :cask do +describe Hbc::Cmd::InternalStanza, :cask do it "shows stanza of the Specified Cask" do command = described_class.new("homepage", "local-caffeine") expect { diff --git a/Library/Homebrew/test/cask/cli/list_spec.rb b/Library/Homebrew/test/cask/cli/list_spec.rb index 968afcca26..28dbd59bee 100644 --- a/Library/Homebrew/test/cask/cli/list_spec.rb +++ b/Library/Homebrew/test/cask/cli/list_spec.rb @@ -1,6 +1,6 @@ require_relative "shared_examples/invalid_option" -describe Hbc::CLI::List, :cask do +describe Hbc::Cmd::List, :cask do it_behaves_like "a command that handles invalid options" it "lists the installed Casks in a pretty fashion" do diff --git a/Library/Homebrew/test/cask/cli/options_spec.rb b/Library/Homebrew/test/cask/cli/options_spec.rb index 8b084113c9..da686cc073 100644 --- a/Library/Homebrew/test/cask/cli/options_spec.rb +++ b/Library/Homebrew/test/cask/cli/options_spec.rb @@ -1,4 +1,4 @@ -describe Hbc::CLI, :cask do +describe Hbc::Cmd, :cask do it "supports setting the appdir" do allow(Hbc::Config.global).to receive(:appdir).and_call_original diff --git a/Library/Homebrew/test/cask/cli/outdated_spec.rb b/Library/Homebrew/test/cask/cli/outdated_spec.rb index 1ee6a6d7da..328dbb7048 100644 --- a/Library/Homebrew/test/cask/cli/outdated_spec.rb +++ b/Library/Homebrew/test/cask/cli/outdated_spec.rb @@ -1,6 +1,6 @@ require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Outdated, :cask do +describe Hbc::Cmd::Outdated, :cask do let(:installed) do [ Hbc::CaskLoader.load(cask_path("basic-cask")), diff --git a/Library/Homebrew/test/cask/cli/quarantine_spec.rb b/Library/Homebrew/test/cask/cli/quarantine_spec.rb index 21c1754221..cd4a9a3795 100644 --- a/Library/Homebrew/test/cask/cli/quarantine_spec.rb +++ b/Library/Homebrew/test/cask/cli/quarantine_spec.rb @@ -9,7 +9,7 @@ describe Hbc::Quarantine, :cask do describe "by default" do it "quarantines a nice fresh Cask" do - Hbc::CLI::Install.run("local-transmission") + Hbc::Cmd::Install.run("local-transmission") expect( Hbc::CaskLoader.load(cask_path("local-transmission")), @@ -21,7 +21,7 @@ describe Hbc::Quarantine, :cask do end it "quarantines Cask fetches" do - Hbc::CLI::Fetch.run("local-transmission") + Hbc::Cmd::Fetch.run("local-transmission") local_transmission = Hbc::CaskLoader.load(cask_path("local-transmission")) cached_location = Hbc::Download.new(local_transmission, force: false, quarantine: false).perform @@ -29,7 +29,7 @@ describe Hbc::Quarantine, :cask do end it "quarantines Cask audits" do - Hbc::CLI::Audit.run("local-transmission", "--download") + Hbc::Cmd::Audit.run("local-transmission", "--download") local_transmission = Hbc::CaskLoader.load(cask_path("local-transmission")) cached_location = Hbc::Download.new(local_transmission, force: false, quarantine: false).perform @@ -38,7 +38,7 @@ describe Hbc::Quarantine, :cask do end it "quarantines dmg-based Casks" do - Hbc::CLI::Install.run("container-dmg") + Hbc::Cmd::Install.run("container-dmg") expect( Hbc::CaskLoader.load(cask_path("container-dmg")), @@ -48,7 +48,7 @@ describe Hbc::Quarantine, :cask do end it "quarantines tar-gz-based Casks" do - Hbc::CLI::Install.run("container-tar-gz") + Hbc::Cmd::Install.run("container-tar-gz") expect( Hbc::CaskLoader.load(cask_path("container-tar-gz")), @@ -58,7 +58,7 @@ describe Hbc::Quarantine, :cask do end it "quarantines xar-based Casks" do - Hbc::CLI::Install.run("container-xar") + Hbc::Cmd::Install.run("container-xar") expect( Hbc::CaskLoader.load(cask_path("container-xar")), @@ -68,7 +68,7 @@ describe Hbc::Quarantine, :cask do end it "quarantines pure bzip2-based Casks" do - Hbc::CLI::Install.run("container-bzip2") + Hbc::Cmd::Install.run("container-bzip2") expect( Hbc::CaskLoader.load(cask_path("container-bzip2")), @@ -78,7 +78,7 @@ describe Hbc::Quarantine, :cask do end it "quarantines pure gzip-based Casks" do - Hbc::CLI::Install.run("container-gzip") + Hbc::Cmd::Install.run("container-gzip") expect( Hbc::CaskLoader.load(cask_path("container-gzip")), @@ -88,7 +88,7 @@ describe Hbc::Quarantine, :cask do end it "quarantines the pkg in naked-pkg-based Casks" do - Hbc::CLI::Install.run("container-pkg") + Hbc::Cmd::Install.run("container-pkg") naked_pkg = Hbc::CaskLoader.load(cask_path("container-pkg")) @@ -100,7 +100,7 @@ describe Hbc::Quarantine, :cask do end it "quarantines a nested container" do - Hbc::CLI::Install.run("nested-app") + Hbc::Cmd::Install.run("nested-app") expect( Hbc::CaskLoader.load(cask_path("nested-app")), @@ -112,7 +112,7 @@ describe Hbc::Quarantine, :cask do describe "when disabled" do it "does not quarantine even a nice, fresh Cask" do - Hbc::CLI::Install.run("local-transmission", "--no-quarantine") + Hbc::Cmd::Install.run("local-transmission", "--no-quarantine") expect( Hbc::CaskLoader.load(cask_path("local-transmission")), @@ -122,7 +122,7 @@ describe Hbc::Quarantine, :cask do end it "does not quarantine Cask fetches" do - Hbc::CLI::Fetch.run("local-transmission", "--no-quarantine") + Hbc::Cmd::Fetch.run("local-transmission", "--no-quarantine") local_transmission = Hbc::CaskLoader.load(cask_path("local-transmission")) cached_location = Hbc::Download.new(local_transmission, force: false, quarantine: false).perform @@ -130,7 +130,7 @@ describe Hbc::Quarantine, :cask do end it "does not quarantine dmg-based Casks" do - Hbc::CLI::Install.run("container-dmg", "--no-quarantine") + Hbc::Cmd::Install.run("container-dmg", "--no-quarantine") expect( Hbc::CaskLoader.load(cask_path("container-dmg")), @@ -140,7 +140,7 @@ describe Hbc::Quarantine, :cask do end it "does not quarantine tar-gz-based Casks" do - Hbc::CLI::Install.run("container-tar-gz", "--no-quarantine") + Hbc::Cmd::Install.run("container-tar-gz", "--no-quarantine") expect( Hbc::CaskLoader.load(cask_path("container-tar-gz")), @@ -150,7 +150,7 @@ describe Hbc::Quarantine, :cask do end it "does not quarantine xar-based Casks" do - Hbc::CLI::Install.run("container-xar", "--no-quarantine") + Hbc::Cmd::Install.run("container-xar", "--no-quarantine") expect( Hbc::CaskLoader.load(cask_path("container-xar")), @@ -160,7 +160,7 @@ describe Hbc::Quarantine, :cask do end it "does not quarantine pure bzip2-based Casks" do - Hbc::CLI::Install.run("container-bzip2", "--no-quarantine") + Hbc::Cmd::Install.run("container-bzip2", "--no-quarantine") expect( Hbc::CaskLoader.load(cask_path("container-bzip2")), @@ -170,7 +170,7 @@ describe Hbc::Quarantine, :cask do end it "does not quarantine pure gzip-based Casks" do - Hbc::CLI::Install.run("container-gzip", "--no-quarantine") + Hbc::Cmd::Install.run("container-gzip", "--no-quarantine") expect( Hbc::CaskLoader.load(cask_path("container-gzip")), @@ -180,7 +180,7 @@ describe Hbc::Quarantine, :cask do end it "does not quarantine the pkg in naked-pkg-based Casks" do - Hbc::CLI::Install.run("container-pkg", "--no-quarantine") + Hbc::Cmd::Install.run("container-pkg", "--no-quarantine") naked_pkg = Hbc::CaskLoader.load(cask_path("container-pkg")) @@ -192,7 +192,7 @@ describe Hbc::Quarantine, :cask do end it "does not quarantine a nested container" do - Hbc::CLI::Install.run("nested-app", "--no-quarantine") + Hbc::Cmd::Install.run("nested-app", "--no-quarantine") expect( Hbc::CaskLoader.load(cask_path("nested-app")), @@ -202,7 +202,7 @@ describe Hbc::Quarantine, :cask do end it "does not quarantine Cask audits" do - Hbc::CLI::Audit.run("local-transmission", "--download", "--no-quarantine") + Hbc::Cmd::Audit.run("local-transmission", "--download", "--no-quarantine") local_transmission = Hbc::CaskLoader.load(cask_path("local-transmission")) cached_location = Hbc::Download.new(local_transmission, force: false, quarantine: false).perform diff --git a/Library/Homebrew/test/cask/cli/reinstall_spec.rb b/Library/Homebrew/test/cask/cli/reinstall_spec.rb index 41a0ca92ea..6bac52021e 100644 --- a/Library/Homebrew/test/cask/cli/reinstall_spec.rb +++ b/Library/Homebrew/test/cask/cli/reinstall_spec.rb @@ -1,6 +1,6 @@ require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Reinstall, :cask do +describe Hbc::Cmd::Reinstall, :cask do it_behaves_like "a command that handles invalid options" it "displays the reinstallation progress" do @@ -22,23 +22,23 @@ describe Hbc::CLI::Reinstall, :cask do EOS expect { - Hbc::CLI::Reinstall.run("local-caffeine") + Hbc::Cmd::Reinstall.run("local-caffeine") }.to output(output).to_stdout end it "allows reinstalling a Cask" do - Hbc::CLI::Install.run("local-transmission") + Hbc::Cmd::Install.run("local-transmission") expect(Hbc::CaskLoader.load(cask_path("local-transmission"))).to be_installed - Hbc::CLI::Reinstall.run("local-transmission") + Hbc::Cmd::Reinstall.run("local-transmission") expect(Hbc::CaskLoader.load(cask_path("local-transmission"))).to be_installed end it "allows reinstalling a non installed Cask" do expect(Hbc::CaskLoader.load(cask_path("local-transmission"))).not_to be_installed - Hbc::CLI::Reinstall.run("local-transmission") + Hbc::Cmd::Reinstall.run("local-transmission") expect(Hbc::CaskLoader.load(cask_path("local-transmission"))).to be_installed end end diff --git a/Library/Homebrew/test/cask/cli/style_spec.rb b/Library/Homebrew/test/cask/cli/style_spec.rb index b04886bd9b..8194ff4ebb 100644 --- a/Library/Homebrew/test/cask/cli/style_spec.rb +++ b/Library/Homebrew/test/cask/cli/style_spec.rb @@ -3,7 +3,7 @@ require "rubygems" require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Style, :cask do +describe Hbc::Cmd::Style, :cask do let(:args) { [] } let(:cli) { described_class.new(*args) } diff --git a/Library/Homebrew/test/cask/cli/uninstall_spec.rb b/Library/Homebrew/test/cask/cli/uninstall_spec.rb index 45fb600c3c..5fea31a2d5 100644 --- a/Library/Homebrew/test/cask/cli/uninstall_spec.rb +++ b/Library/Homebrew/test/cask/cli/uninstall_spec.rb @@ -1,7 +1,7 @@ require_relative "shared_examples/requires_cask_token" require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Uninstall, :cask do +describe Hbc::Cmd::Uninstall, :cask do it_behaves_like "a command that requires a Cask token" it_behaves_like "a command that handles invalid options" diff --git a/Library/Homebrew/test/cask/cli/upgrade_spec.rb b/Library/Homebrew/test/cask/cli/upgrade_spec.rb index 912bb8541f..f1afd54718 100644 --- a/Library/Homebrew/test/cask/cli/upgrade_spec.rb +++ b/Library/Homebrew/test/cask/cli/upgrade_spec.rb @@ -1,6 +1,6 @@ require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Upgrade, :cask do +describe Hbc::Cmd::Upgrade, :cask do it_behaves_like "a command that handles invalid options" context "successful upgrade" do @@ -14,7 +14,7 @@ describe Hbc::CLI::Upgrade, :cask do } before do - installed.each { |cask| Hbc::CLI::Install.run(cask) } + installed.each { |cask| Hbc::Cmd::Install.run(cask) } allow_any_instance_of(described_class).to receive(:verbose?).and_return(true) end @@ -177,7 +177,7 @@ describe Hbc::CLI::Upgrade, :cask do } before do - installed.each { |cask| Hbc::CLI::Install.run(cask) } + installed.each { |cask| Hbc::Cmd::Install.run(cask) } allow_any_instance_of(described_class).to receive(:verbose?).and_return(true) end diff --git a/Library/Homebrew/test/cask/cli/zap_spec.rb b/Library/Homebrew/test/cask/cli/zap_spec.rb index 0440f04b3c..3c5fc41fc3 100644 --- a/Library/Homebrew/test/cask/cli/zap_spec.rb +++ b/Library/Homebrew/test/cask/cli/zap_spec.rb @@ -1,7 +1,7 @@ require_relative "shared_examples/requires_cask_token" require_relative "shared_examples/invalid_option" -describe Hbc::CLI::Zap, :cask do +describe Hbc::Cmd::Zap, :cask do it_behaves_like "a command that requires a Cask token" it_behaves_like "a command that handles invalid options" diff --git a/Library/Homebrew/test/cask/cmd_spec.rb b/Library/Homebrew/test/cask/cmd_spec.rb index cd4f79583a..6d2b030e8f 100644 --- a/Library/Homebrew/test/cask/cmd_spec.rb +++ b/Library/Homebrew/test/cask/cmd_spec.rb @@ -1,4 +1,4 @@ -describe Hbc::CLI, :cask do +describe Hbc::Cmd, :cask do it "lists the taps for Casks that show up in two taps" do listing = described_class.nice_listing(%w[ homebrew/cask/adium @@ -28,13 +28,13 @@ describe Hbc::CLI, :cask do context "when no option is specified" do it "--binaries is true by default" do - command = Hbc::CLI::Install.new("some-cask") + command = Hbc::Cmd::Install.new("some-cask") expect(command.binaries?).to be true end end context "::run" do - let(:noop_command) { double("CLI::Noop") } + let(:noop_command) { double("Cmd::Noop") } before do allow(described_class).to receive(:lookup_command).with("noop").and_return(noop_command) @@ -42,7 +42,7 @@ describe Hbc::CLI, :cask do end it "passes `--version` along to the subcommand" do - version_command = double("CLI::Version") + version_command = double("Cmd::Version") allow(described_class).to receive(:lookup_command).with("--version").and_return(version_command) expect(described_class).to receive(:run_command).with(version_command) described_class.run("--version") From 9d28502625e8934996ef56fbc572d1b6ec6fa439 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 4 Sep 2018 09:58:43 +0100 Subject: [PATCH 5/6] Homebrew Cask isn't an independent project. --- Library/Homebrew/manpages/brew-cask.1.md | 4 ++-- manpages/brew-cask.1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/manpages/brew-cask.1.md b/Library/Homebrew/manpages/brew-cask.1.md index a49da1a19d..9a83e360bf 100644 --- a/Library/Homebrew/manpages/brew-cask.1.md +++ b/Library/Homebrew/manpages/brew-cask.1.md @@ -290,6 +290,6 @@ Man page format based on `brew.1.md` from Homebrew. We still have bugs - and we are busy fixing them! If you have a problem, don't be shy about reporting it on our [GitHub issues page](https://github.com/Homebrew/homebrew-cask/issues?state=open). -When reporting bugs, remember that Homebrew Cask is an independent project from -Homebrew. Do your best to direct bug reports to the appropriate project. If +When reporting bugs, remember that Homebrew Cask is an separate repository within +Homebrew. Do your best to direct bug reports to the appropriate repository. If your command-line started with `brew cask`, bring the bug to us first! diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1 index d861af4111..1043b68704 100644 --- a/manpages/brew-cask.1 +++ b/manpages/brew-cask.1 @@ -324,4 +324,4 @@ Man page format based on \fBbrew\.1\.md\fR from Homebrew\. We still have bugs \- and we are busy fixing them! If you have a problem, don\'t be shy about reporting it on our GitHub issues page \fIhttps://github\.com/Homebrew/homebrew\-cask/issues?state=open\fR\. . .P -When reporting bugs, remember that Homebrew Cask is an independent project from Homebrew\. Do your best to direct bug reports to the appropriate project\. If your command\-line started with \fBbrew cask\fR, bring the bug to us first! +When reporting bugs, remember that Homebrew Cask is an separate repository within Homebrew\. Do your best to direct bug reports to the appropriate repository\. If your command\-line started with \fBbrew cask\fR, bring the bug to us first! From 6db4b7220094205424e4174c43319be273a4b9de Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 4 Sep 2018 09:58:58 +0100 Subject: [PATCH 6/6] tap: fix GitHub naming. --- Library/Homebrew/tap.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb index c0e7c92158..7d50102595 100644 --- a/Library/Homebrew/tap.rb +++ b/Library/Homebrew/tap.rb @@ -3,9 +3,9 @@ require "readall" # a {Tap} is used to extend the formulae provided by Homebrew core. # Usually, it's synced with a remote git repository. And it's likely -# a Github repository with the name of `user/homebrew-repo`. In such +# a GitHub repository with the name of `user/homebrew-repo`. In such # case, `user/repo` will be used as the {#name} of this {Tap}, where -# {#user} represents Github username and {#repo} represents repository +# {#user} represents GitHub username and {#repo} represents repository # name without leading `homebrew-`. class Tap extend Cachable @@ -52,7 +52,7 @@ class Tap extend Enumerable - # The user name of this {Tap}. Usually, it's the Github username of + # The user name of this {Tap}. Usually, it's the GitHub username of # this #{Tap}'s remote repository. attr_reader :user