Merge pull request #8262 from reitermarkus/cask-all

Move `cask/all` to just `cask`.
Homebrew · Aug 9, 2020 · 797c648 · 797c648
2 parents 02ca0dd + 8a32954
commit 797c648
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 8 deletions.
diff --git a/Library/Homebrew/cask/all.rb → Library/Homebrew/cask.rb b/Library/Homebrew/cask/all.rb → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,6 @@
 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
@@ -54,7 +54,7 @@ def irb
 
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"