Revert "PoC: Use a factory rather than dynamically redefine methods"

This reverts commit c4f9e5e.
dduugg · Aug 15, 2024 · a486b1d · a486b1d
1 parent c4f9e5e
commit a486b1d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 31 deletions.
diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb
@@ -1,4 +1,4 @@
-# typed: strict
+# typed: true # rubocop:todo Sorbet/StrictSigil
 # frozen_string_literal: true
 
 # Cleans a newly installed keg.
@@ -104,7 +104,7 @@ def prune
     end
   end
 
-  sig { overridable.params(path: Pathname).returns(T::Boolean) }
+  sig { params(path: Pathname).returns(T::Boolean) }
   def executable_path?(path)
     path.text_executable? || path.executable?
   end
@@ -113,7 +113,7 @@ def executable_path?(path)
   # pointless conflicts with other formulae. They are removed by Debian,
   # Arch & MacPorts amongst other packagers as well. The files are
   # created as part of installing any Perl module.
-  PERL_BASENAMES = T.let(Set.new(%w[perllocal.pod .packlist]).freeze, T::Set[String])
+  PERL_BASENAMES = Set.new(%w[perllocal.pod .packlist]).freeze
 
   # Clean a top-level (`bin`, `sbin`, `lib`) directory, recursively, by fixing file
   # permissions and removing .la files, unless the files (or parent
@@ -201,3 +201,5 @@ def clean_python_metadata
     end
   end
 end
+
+require "extend/os/cleaner"
diff --git a/Library/Homebrew/cleaner_factory.rb b/Library/Homebrew/cleaner_factory.rb
diff --git a/Library/Homebrew/extend/os/cleaner.rb b/Library/Homebrew/extend/os/cleaner.rb
@@ -0,0 +1,8 @@
+# typed: strict
+# frozen_string_literal: true
+
+if OS.mac?
+  require "extend/os/mac/cleaner"
+elsif OS.linux?
+  require "extend/os/linux/cleaner"
+end
diff --git a/Library/Homebrew/extend/os/linux/cleaner.rb b/Library/Homebrew/extend/os/linux/cleaner.rb
@@ -1,10 +1,10 @@
 # typed: strict
 # frozen_string_literal: true
 
-class CleanerLinux < Cleaner
+class Cleaner
   private
 
-  sig { override.params(path: Pathname).returns(T::Boolean) }
+  sig { params(path: Pathname).returns(T::Boolean) }
   def executable_path?(path)
     path.elf? || path.text_executable?
   end

diff --git a/Library/Homebrew/extend/os/mac/cleaner.rb b/Library/Homebrew/extend/os/mac/cleaner.rb
@@ -1,10 +1,12 @@
 # typed: strict
 # frozen_string_literal: true
 
-class CleanerMac < Cleaner
+class Cleaner
   private
 
-  sig { override.params(path: Pathname).returns(T::Boolean) }
+  undef executable_path?
+
+  sig { params(path: Pathname).returns(T::Boolean) }
   def executable_path?(path)
     path.mach_o_executable? || path.text_executable?
   end

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
@@ -6,7 +6,7 @@
 require "tab"
 require "utils/bottles"
 require "caveats"
-require "cleaner_factory"
+require "cleaner"
 require "formula_cellar_checks"
 require "install_renamed"
 require "sandbox"
@@ -1107,7 +1107,7 @@ def fix_dynamic_linkage(keg)
   sig { void }
   def clean
     ohai "Cleaning" if verbose?
-    CleanerFactory.create(formula).clean
+    Cleaner.new(formula).clean
   rescue Exception => e # rubocop:disable Lint/RescueException
     opoo "The cleaning step did not complete successfully"
     puts "Still, the installation was successful, so we will link it into your prefix."