Merge pull request #18102 from Homebrew/requires_ancestor

Homebrew · Aug 21, 2024 · d5b7de5 · d5b7de5
2 parents f827410 + 6db4ed2
commit d5b7de5
Show file tree

Hide file tree

Showing 22 changed files with 41 additions and 75 deletions.
diff --git a/Library/Homebrew/cask/staged.rb b/Library/Homebrew/cask/staged.rb
@@ -6,6 +6,10 @@
 module Cask
   # Helper functions for staged casks.
   module Staged
+    extend T::Helpers
+
+    requires_ancestor { Kernel }
+
     # FIXME: Enable cop again when https://github.com/sorbet/sorbet/issues/3532 is fixed.
     # rubocop:disable Style/MutableConstant
     Paths = T.type_alias { T.any(String, Pathname, T::Array[T.any(String, Pathname)]) }

diff --git a/Library/Homebrew/cask/staged.rbi b/Library/Homebrew/cask/staged.rbi
diff --git a/Library/Homebrew/dependencies_helpers.rb b/Library/Homebrew/dependencies_helpers.rb
@@ -5,6 +5,10 @@
 
 # Helper functions for dependencies.
 module DependenciesHelpers
+  extend T::Helpers
+
+  requires_ancestor { Kernel }
+
   def args_includes_ignores(args)
     includes = [:required?, :recommended?] # included by default
     includes << :build? if args.include_build?

diff --git a/Library/Homebrew/dependencies_helpers.rbi b/Library/Homebrew/dependencies_helpers.rbi
diff --git a/Library/Homebrew/formula_assertions.rb b/Library/Homebrew/formula_assertions.rb
@@ -5,6 +5,9 @@ module Homebrew
   # Helper functions available in formula `test` blocks.
   module Assertions
     include Context
+    extend T::Helpers
+
+    requires_ancestor { Kernel }
 
     require "minitest"
     require "minitest/assertions"

diff --git a/Library/Homebrew/formula_assertions.rbi b/Library/Homebrew/formula_assertions.rbi
diff --git a/Library/Homebrew/formula_cellar_checks.rb b/Library/Homebrew/formula_cellar_checks.rb
@@ -8,6 +8,7 @@ module FormulaCellarChecks
   extend T::Helpers
 
   abstract!
+  requires_ancestor { Kernel }
 
   sig { abstract.returns(Formula) }
   def formula; end

diff --git a/Library/Homebrew/formula_cellar_checks.rbi b/Library/Homebrew/formula_cellar_checks.rbi
diff --git a/Library/Homebrew/language/node.rb b/Library/Homebrew/language/node.rb
@@ -89,6 +89,10 @@ def self.local_npm_install_args
 
     # Mixin module for {Formula} adding shebang rewrite features.
     module Shebang
+      extend T::Helpers
+
+      requires_ancestor { Formula }
+
       module_function
 
       # A regex to match potential shebang permutations.

diff --git a/Library/Homebrew/language/node.rbi b/Library/Homebrew/language/node.rbi
diff --git a/Library/Homebrew/language/perl.rb b/Library/Homebrew/language/perl.rb
@@ -8,6 +8,10 @@ module Language
   module Perl
     # Helper module for replacing `perl` shebangs.
     module Shebang
+      extend T::Helpers
+
+      requires_ancestor { Formula }
+
       module_function
 
       # A regex to match potential shebang permutations.

diff --git a/Library/Homebrew/language/perl.rbi b/Library/Homebrew/language/perl.rbi
diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb
@@ -105,6 +105,10 @@ def self.setup_install_args(prefix, python = "python3")
 
     # Mixin module for {Formula} adding shebang rewrite features.
     module Shebang
+      extend T::Helpers
+
+      requires_ancestor { Formula }
+
       module_function
 
       # A regex to match potential shebang permutations.
@@ -144,6 +148,10 @@ def detected_python_shebang(formula = T.cast(self, Formula), use_python_from_pat
 
     # Mixin module for {Formula} adding virtualenv support features.
     module Virtualenv
+      extend T::Helpers
+
+      requires_ancestor { Formula }
+
       # Instantiates, creates and yields a {Virtualenv} object for use from
       # {Formula#install}, which provides helper methods for instantiating and
       # installing packages into a Python virtualenv.

diff --git a/Library/Homebrew/language/python.rbi b/Library/Homebrew/language/python.rbi
diff --git a/Library/Homebrew/unpack_strategy.rb b/Library/Homebrew/unpack_strategy.rb
@@ -9,6 +9,8 @@ module UnpackStrategy
   include SystemCommand::Mixin
   abstract!
 
+  requires_ancestor { Kernel }
+
   # FIXME: Enable cop again when https://github.com/sorbet/sorbet/issues/3532 is fixed.
   # rubocop:disable Style/MutableConstant
   UnpackStrategyType = T.type_alias { T.all(T::Class[UnpackStrategy], UnpackStrategy::ClassMethods) }

diff --git a/Library/Homebrew/unpack_strategy.rbi b/Library/Homebrew/unpack_strategy.rbi
diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb
@@ -11,6 +11,9 @@ module Utils
   module Curl
     include SystemCommand::Mixin
     extend SystemCommand::Mixin
+    extend T::Helpers
+
+    requires_ancestor { Kernel }
 
     # Error returned when the server sent data curl could not parse.
     CURL_WEIRD_SERVER_REPLY_EXIT_CODE = 8

diff --git a/Library/Homebrew/utils/curl.rbi b/Library/Homebrew/utils/curl.rbi
diff --git a/Library/Homebrew/utils/shebang.rb b/Library/Homebrew/utils/shebang.rb
@@ -4,6 +4,10 @@
 module Utils
   # Helper functions for manipulating shebang lines.
   module Shebang
+    extend T::Helpers
+
+    requires_ancestor { Kernel }
+
     module_function
 
     # Specification on how to rewrite a given shebang.

diff --git a/Library/Homebrew/utils/shebang.rbi b/Library/Homebrew/utils/shebang.rbi
diff --git a/Library/Homebrew/utils/shell.rb b/Library/Homebrew/utils/shell.rb
@@ -3,6 +3,10 @@
 
 module Utils
   module Shell
+    extend T::Helpers
+
+    requires_ancestor { Kernel }
+
     module_function
 
     # Take a path and heuristically convert it to a shell name,

diff --git a/Library/Homebrew/utils/shell.rbi b/Library/Homebrew/utils/shell.rbi