Introduce UnpackStrategyImpl

Library/Homebrew/unpack_strategy.rb

@@ -6,47 +6,27 @@ require "system_command"
 # Module containing all available strategies for unpacking archives.
 module UnpackStrategy
   extend T::Helpers
+  include SystemCommand::Mixin
+  abstract!
 
-  # FIXME: Enable cop again when https://github.com/sorbet/sorbet/issues/3532 is fixed.
+  # rubocop:disable Style/MutableConstant
-  AnyStrategy = T.type_alias do # rubocop:disable Style/MutableConstant
+  UnpackStrategyImpl = T.type_alias { T.all(T::Class[UnpackStrategy], UnpackStrategy::ClassMethods) }
-    T.any(
+  # rubocop:enable Style/MutableConstant
-      T.class_of(UnpackStrategy::Tar),
+
-      T.class_of(UnpackStrategy::Pax),
+  module ClassMethods
-      T.class_of(UnpackStrategy::Gzip),
+    extend T::Helpers
-      T.class_of(UnpackStrategy::Dmg),
+    abstract!
-      T.class_of(UnpackStrategy::Lzma),
+
-      T.class_of(UnpackStrategy::Xz),
+    sig { abstract.returns(T::Array[String]) }
-      T.class_of(UnpackStrategy::Zstd),
+    def extensions; end
-      T.class_of(UnpackStrategy::Lzip),
+
-      T.class_of(UnpackStrategy::Air),
+    sig { abstract.params(path: Pathname).returns(T::Boolean) }
-      T.class_of(UnpackStrategy::Jar),
+    def can_extract?(path); end
-      T.class_of(UnpackStrategy::LuaRock),
-      T.class_of(UnpackStrategy::MicrosoftOfficeXml),
-      T.class_of(UnpackStrategy::Zip),
-      T.class_of(UnpackStrategy::Pkg),
-      T.class_of(UnpackStrategy::Xar),
-      T.class_of(UnpackStrategy::Ttf),
-      T.class_of(UnpackStrategy::Otf),
-      T.class_of(UnpackStrategy::Git),
-      T.class_of(UnpackStrategy::Mercurial),
-      T.class_of(UnpackStrategy::Subversion),
-      T.class_of(UnpackStrategy::Cvs),
-      T.class_of(UnpackStrategy::SelfExtractingExecutable),
-      T.class_of(UnpackStrategy::Cab),
-      T.class_of(UnpackStrategy::Executable),
-      T.class_of(UnpackStrategy::Bzip2),
-      T.class_of(UnpackStrategy::Fossil),
-      T.class_of(UnpackStrategy::Bazaar),
-      T.class_of(UnpackStrategy::P7Zip),
-      T.class_of(UnpackStrategy::Sit),
-      T.class_of(UnpackStrategy::Rar),
-      T.class_of(UnpackStrategy::Lha),
-    )
   end
 
-  include SystemCommand::Mixin
+  mixes_in_class_methods(ClassMethods)
 
-  sig { returns(T.nilable(T::Array[AnyStrategy])) }
+  sig { returns(T.nilable(T::Array[UnpackStrategyImpl])) }
   def self.strategies
     @strategies ||= T.let([
       Tar, # Needs to be before Bzip2/Gzip/Xz/Lzma/Zstd.
@@ -81,11 +61,11 @@ module UnpackStrategy
       Sit,
       Rar,
       Lha,
-    ].freeze, T.nilable(T::Array[AnyStrategy]))
+    ].freeze, T.nilable(T::Array[UnpackStrategyImpl]))
   end
   private_class_method :strategies
 
-  sig { params(type: Symbol).returns(T.nilable(T.any(T.class_of(UnpackStrategy::Uncompressed), AnyStrategy))) }
+  sig { params(type: Symbol).returns(T.nilable(UnpackStrategyImpl)) }
   def self.from_type(type)
     type = {
       naked:     :uncompressed,
@@ -100,7 +80,7 @@ module UnpackStrategy
     end
   end
 
-  sig { params(extension: String).returns(T.nilable(AnyStrategy)) }
+  sig { params(extension: String).returns(T.nilable(UnpackStrategyImpl)) }
   def self.from_extension(extension)
     return unless strategies
 
@@ -109,7 +89,7 @@ module UnpackStrategy
               &.find { |s| s.extensions.any? { |ext| extension.end_with?(ext) } }
   end
 
-  sig { params(path: Pathname).returns(T.nilable(AnyStrategy)) }
+  sig { params(path: Pathname).returns(T.nilable(UnpackStrategyImpl)) }
   def self.from_magic(path)
     strategies&.find { |s| s.can_extract?(path) }
   end
@@ -152,7 +132,6 @@ module UnpackStrategy
     @merge_xattrs = merge_xattrs
   end
 
-  abstract!
   sig { abstract.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).void }
   def extract_to_dir(unpack_dir, basename:, verbose:); end
   private :extract_to_dir

Library/Homebrew/unpack_strategy/air.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Air
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".air"]
     end

Library/Homebrew/unpack_strategy/bzip2.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Bzip2
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".bz2"]
     end

Library/Homebrew/unpack_strategy/cab.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Cab
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".cab"]
     end

Library/Homebrew/unpack_strategy/compress.rb

@@ -6,7 +6,7 @@ require_relative "tar"
 module UnpackStrategy
   # Strategy for unpacking compress archives.
   class Compress < Tar
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".Z"]
     end

Library/Homebrew/unpack_strategy/directory.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Directory
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       []
     end

Library/Homebrew/unpack_strategy/dmg.rb

@@ -121,6 +121,12 @@ module UnpackStrategy
         end
       end
 
+      sig { override.returns(T::Array[String]) }
+      def self.extensions = []
+
+      sig { override.params(_path: Pathname).returns(T::Boolean) }
+      def self.can_extract?(_path) = false
+
       private
 
       sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
@@ -165,7 +171,7 @@ module UnpackStrategy
     end
     private_constant :Mount
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".dmg"]
     end

Library/Homebrew/unpack_strategy/executable.rb

@@ -6,7 +6,7 @@ require_relative "uncompressed"
 module UnpackStrategy
   # Strategy for unpacking executables.
   class Executable < Uncompressed
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".sh", ".bash"]
     end

Library/Homebrew/unpack_strategy/fossil.rb

@@ -9,7 +9,7 @@ module UnpackStrategy
     include UnpackStrategy
     extend SystemCommand::Mixin
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       []
     end

Library/Homebrew/unpack_strategy/generic_unar.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class GenericUnar
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       []
     end

Library/Homebrew/unpack_strategy/gzip.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Gzip
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".gz"]
     end

Library/Homebrew/unpack_strategy/jar.rb

@@ -6,7 +6,7 @@ require_relative "uncompressed"
 module UnpackStrategy
   # Strategy for unpacking Java archives.
   class Jar < Uncompressed
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".apk", ".jar"]
     end

Library/Homebrew/unpack_strategy/lha.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Lha
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".lha", ".lzh"]
     end

Library/Homebrew/unpack_strategy/lua_rock.rb

@@ -6,7 +6,7 @@ require_relative "uncompressed"
 module UnpackStrategy
   # Strategy for unpacking LuaRock archives.
   class LuaRock < Uncompressed
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".rock"]
     end

Library/Homebrew/unpack_strategy/lzip.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Lzip
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".lz"]
     end

Library/Homebrew/unpack_strategy/lzma.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Lzma
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".lzma"]
     end

Library/Homebrew/unpack_strategy/microsoft_office_xml.rb

@@ -6,7 +6,7 @@ require_relative "uncompressed"
 module UnpackStrategy
   # Strategy for unpacking Microsoft Office documents.
   class MicrosoftOfficeXml < Uncompressed
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [
         ".doc", ".docx",

Library/Homebrew/unpack_strategy/otf.rb

@@ -6,7 +6,7 @@ require_relative "uncompressed"
 module UnpackStrategy
   # Strategy for unpacking OpenType fonts.
   class Otf < Uncompressed
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".otf"]
     end

Library/Homebrew/unpack_strategy/p7zip.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class P7Zip
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".7z"]
     end

Library/Homebrew/unpack_strategy/pax.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Pax
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".pax"]
     end

Library/Homebrew/unpack_strategy/pkg.rb

@@ -6,7 +6,7 @@ require_relative "uncompressed"
 module UnpackStrategy
   # Strategy for unpacking macOS package installers.
   class Pkg < Uncompressed
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".pkg", ".mkpg"]
     end

Library/Homebrew/unpack_strategy/rar.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Rar
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".rar"]
     end

Library/Homebrew/unpack_strategy/self_extracting_executable.rb

@@ -6,7 +6,7 @@ require_relative "generic_unar"
 module UnpackStrategy
   # Strategy for unpacking self-extracting executables.
   class SelfExtractingExecutable < GenericUnar
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       []
     end

Library/Homebrew/unpack_strategy/sit.rb

@@ -6,7 +6,7 @@ require_relative "generic_unar"
 module UnpackStrategy
   # Strategy for unpacking Stuffit archives.
   class Sit < GenericUnar
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".sit"]
     end

Library/Homebrew/unpack_strategy/tar.rb

@@ -9,7 +9,7 @@ module UnpackStrategy
     include UnpackStrategy
     extend SystemCommand::Mixin
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [
         ".tar",

Library/Homebrew/unpack_strategy/ttf.rb

@@ -6,7 +6,7 @@ require_relative "uncompressed"
 module UnpackStrategy
   # Strategy for unpacking TrueType fonts.
   class Ttf < Uncompressed
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".ttc", ".ttf"]
     end

Library/Homebrew/unpack_strategy/uncompressed.rb

@@ -6,6 +6,12 @@ module UnpackStrategy
   class Uncompressed
     include UnpackStrategy
 
+    sig { override.returns(T::Array[String]) }
+    def self.extensions = []
+
+    sig { override.params(_path: Pathname).returns(T::Boolean) }
+    def self.can_extract?(_path) = false
+
     sig {
       params(
         to:                   T.nilable(Pathname),

Library/Homebrew/unpack_strategy/xar.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Xar
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".xar"]
     end

Library/Homebrew/unpack_strategy/xz.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Xz
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".xz"]
     end

Library/Homebrew/unpack_strategy/zip.rb

@@ -6,12 +6,12 @@ module UnpackStrategy
   class Zip
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".zip"]
     end
 
-    sig { params(path: Pathname).returns(T::Boolean) }
+    sig { override.params(path: Pathname).returns(T::Boolean) }
     def self.can_extract?(path)
       path.magic_number.match?(/\APK(\003\004|\005\006)/n)
     end

Library/Homebrew/unpack_strategy/zstd.rb

@@ -6,7 +6,7 @@ module UnpackStrategy
   class Zstd
     include UnpackStrategy
 
-    sig { returns(T::Array[String]) }
+    sig { override.returns(T::Array[String]) }
     def self.extensions
       [".zst"]
     end