From 8a32954940bd36e202d21e69a5273db0196a7553 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 9 Aug 2020 01:34:07 +0200 Subject: [PATCH] Move `cask/all` to just `cask`. --- Library/Homebrew/{cask/all.rb => cask.rb} | 13 ++++++++++--- Library/Homebrew/cask/auditor.rb | 2 ++ Library/Homebrew/cask/cmd/audit.rb | 1 + Library/Homebrew/cask/quarantine.rb | 2 ++ Library/Homebrew/cmd/cask.rb | 2 +- Library/Homebrew/cmd/uninstall.rb | 1 - Library/Homebrew/dev-cmd/irb.rb | 2 +- Library/Homebrew/sorbet/files.yaml | 2 +- Library/Homebrew/test/cask/audit_spec.rb | 2 ++ Library/Homebrew/test/cask/denylist_spec.rb | 2 ++ Library/Homebrew/test/cask/quarantine_spec.rb | 7 +++++++ .../helper/spec/shared_context/homebrew_cask.rb | 2 +- 12 files changed, 30 insertions(+), 8 deletions(-) rename Library/Homebrew/{cask/all.rb => cask.rb} (62%) diff --git a/Library/Homebrew/cask/all.rb b/Library/Homebrew/cask.rb similarity index 62% rename from Library/Homebrew/cask/all.rb rename to Library/Homebrew/cask.rb index 2b798d8cb5..0e2132e78e 100644 --- a/Library/Homebrew/cask/all.rb +++ b/Library/Homebrew/cask.rb @@ -1,19 +1,26 @@ # frozen_string_literal: true -require "hardware" - require "cask/artifact" require "cask/audit" require "cask/auditor" require "cask/cache" -require "cask/cask" require "cask/cask_loader" +require "cask/cask" require "cask/caskroom" require "cask/cmd" +require "cask/config" +require "cask/exceptions" +require "cask/denylist" +require "cask/download" +require "cask/dsl" require "cask/exceptions" require "cask/installer" require "cask/macos" +require "cask/metadata" require "cask/pkg" +require "cask/quarantine" require "cask/staged" +require "cask/topological_hash" +require "cask/url" require "cask/utils" require "cask/verify" diff --git a/Library/Homebrew/cask/auditor.rb b/Library/Homebrew/cask/auditor.rb index 9ba9148e66..91c7c88c27 100644 --- a/Library/Homebrew/cask/auditor.rb +++ b/Library/Homebrew/cask/auditor.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require "cask/audit" + module Cask class Auditor extend Predicable diff --git a/Library/Homebrew/cask/cmd/audit.rb b/Library/Homebrew/cask/cmd/audit.rb index 543c1a3c06..fbc16e3bb2 100644 --- a/Library/Homebrew/cask/cmd/audit.rb +++ b/Library/Homebrew/cask/cmd/audit.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require "cli/parser" +require "cask/auditor" module Cask class Cmd diff --git a/Library/Homebrew/cask/quarantine.rb b/Library/Homebrew/cask/quarantine.rb index 583cab3924..381ee80a06 100644 --- a/Library/Homebrew/cask/quarantine.rb +++ b/Library/Homebrew/cask/quarantine.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true require "development_tools" +require "cask/exceptions" + module Cask module Quarantine module_function diff --git a/Library/Homebrew/cmd/cask.rb b/Library/Homebrew/cmd/cask.rb index 82f0ffcd00..07d827803f 100644 --- a/Library/Homebrew/cmd/cask.rb +++ b/Library/Homebrew/cmd/cask.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "cask/all" +require "cask" module Homebrew module_function diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb index 0a789eab26..6c73e2694a 100644 --- a/Library/Homebrew/cmd/uninstall.rb +++ b/Library/Homebrew/cmd/uninstall.rb @@ -5,7 +5,6 @@ require "formula" require "diagnostic" require "migrator" require "cli/parser" -require "cask/all" require "cask/cmd" require "cask/cask_loader" diff --git a/Library/Homebrew/dev-cmd/irb.rb b/Library/Homebrew/dev-cmd/irb.rb index 4f05e3de6d..fb91ecc63a 100644 --- a/Library/Homebrew/dev-cmd/irb.rb +++ b/Library/Homebrew/dev-cmd/irb.rb @@ -54,7 +54,7 @@ module Homebrew require "formula" require "keg" - require "cask/all" + require "cask" ohai "Interactive Homebrew Shell" puts "Example commands available with: brew irb --examples" diff --git a/Library/Homebrew/sorbet/files.yaml b/Library/Homebrew/sorbet/files.yaml index 1e9e30b945..297977885f 100644 --- a/Library/Homebrew/sorbet/files.yaml +++ b/Library/Homebrew/sorbet/files.yaml @@ -900,7 +900,7 @@ true: - ./version/null.rb strict: - - ./cask/all.rb + - ./cask.rb - ./cask/artifact.rb - ./cask/dsl/uninstall_postflight.rb - ./compat.rb diff --git a/Library/Homebrew/test/cask/audit_spec.rb b/Library/Homebrew/test/cask/audit_spec.rb index 3ddfdcc7ea..fa18a168dc 100644 --- a/Library/Homebrew/test/cask/audit_spec.rb +++ b/Library/Homebrew/test/cask/audit_spec.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require "cask/audit" + describe Cask::Audit, :cask do def include_msg?(messages, msg) if msg.is_a?(Regexp) diff --git a/Library/Homebrew/test/cask/denylist_spec.rb b/Library/Homebrew/test/cask/denylist_spec.rb index 79cae362a4..8c34b5988c 100644 --- a/Library/Homebrew/test/cask/denylist_spec.rb +++ b/Library/Homebrew/test/cask/denylist_spec.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require "cask/denylist" + describe Cask::Denylist, :cask do describe "::reason" do matcher :disallow do |name| diff --git a/Library/Homebrew/test/cask/quarantine_spec.rb b/Library/Homebrew/test/cask/quarantine_spec.rb index 684587bbdd..33c8f7a975 100644 --- a/Library/Homebrew/test/cask/quarantine_spec.rb +++ b/Library/Homebrew/test/cask/quarantine_spec.rb @@ -1,5 +1,12 @@ # frozen_string_literal: true +require "cask/cmd/audit" +require "cask/cmd/fetch" +require "cask/cmd/install" +require "cask/cask_loader" +require "cask/download" +require "cask/quarantine" + describe Cask::Quarantine, :cask do matcher :be_quarantined do match do |path| 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 e0b01d9afe..2f414c643a 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,6 +1,6 @@ # frozen_string_literal: true -require "cask/all" +require "cask/config" require "test/support/helper/cask/fake_system_command" require "test/support/helper/cask/install_helper"