cask: move cask/lib/hbc/* to cask/*.

Fix the load path, requires and some filenames accordingly.

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"

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

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

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

Library/Homebrew/cask/artifact/app.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/artifact.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 require "extend/hash_validator"
 using HashValidator

Library/Homebrew/cask/artifact/audio_unit_plugin.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/binary.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/symlinked"
+require "cask/artifact/symlinked"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/colorpicker.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/dictionary.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/font.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/input_method.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

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

Library/Homebrew/cask/artifact/internet_plugin.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/moved.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/relocated"
+require "cask/artifact/relocated"
 
 module Hbc
   module Artifact

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

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

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

Library/Homebrew/cask/artifact/prefpane.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/qlplugin.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

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

Library/Homebrew/cask/artifact/screen_saver.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/service.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

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

Library/Homebrew/cask/artifact/suite.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/symlinked.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/relocated"
+require "cask/artifact/relocated"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/uninstall.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_uninstall"
+require "cask/artifact/abstract_uninstall"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/vst3_plugin.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/vst_plugin.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
 
 module Hbc
   module Artifact

Library/Homebrew/cask/artifact/zap.rb

@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_uninstall"
+require "cask/artifact/abstract_uninstall"
 
 module Hbc
   module Artifact

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"
 

Library/Homebrew/cask/auditor.rb

@@ -1,4 +1,4 @@
-require "hbc/download"
+require "cask/download"
 
 module Hbc
   class Auditor

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

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)

Library/Homebrew/cask/cask_loader.rb

@@ -1,4 +1,4 @@
-require "hbc/cask"
+require "cask/cask"
 require "uri"
 
 module Hbc

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

Library/Homebrew/cask/cli/doctor.rb

@@ -1,5 +1,5 @@
 require "system_config"
-require "hbc/checkable"
+require "cask/checkable"
 
 module Hbc
   class CLI

Library/Homebrew/cask/cli/fetch.rb

@@ -1,4 +1,4 @@
-require "hbc/download"
+require "cask/download"
 
 module Hbc
   class CLI

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

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

Library/Homebrew/cask/dsl/postflight.rb

@@ -1,4 +1,4 @@
-require "hbc/staged"
+require "cask/staged"
 
 module Hbc
   class DSL

Library/Homebrew/cask/dsl/uninstall_preflight.rb

@@ -1,4 +1,4 @@
-require "hbc/staged"
+require "cask/staged"
 
 module Hbc
   class DSL

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"
 

Library/Homebrew/cask/lib/hbc.rb

@@ -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"

Library/Homebrew/cask/lib/hbc/artifact.rb

@@ -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

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

Library/Homebrew/cask/verify.rb

@@ -1,4 +1,4 @@
-require "hbc/verify/checksum"
+require "cask/verify/checksum"
 
 module Hbc
   module Verify

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

Library/Homebrew/cmd/cask.rb

@@ -1,4 +1,4 @@
-require "hbc"
+require "cask/all"
 
 module Homebrew
   module_function

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"

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

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