From c7d53a2d9c6aee0222392cd180e96b51cee83522 Mon Sep 17 00:00:00 2001
From: apainintheneck <apainintheneck@gmail.com>
Date: Sat, 19 Nov 2022 21:46:58 -0800
Subject: [PATCH 1/9] Add cop to police os checks

The methods `OS.linux?` and `OS.mac?` should only be used
in `extend/os` and this cop makes sure of that.
---
 Library/.rubocop.yml                          |  5 ++++
 Library/Homebrew/rubocops/all.rb              |  1 +
 Library/Homebrew/rubocops/platform.rb         | 25 +++++++++++++++++++
 .../Homebrew/test/rubocops/platform_spec.rb   | 22 ++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 Library/Homebrew/rubocops/platform.rb
 create mode 100644 Library/Homebrew/test/rubocops/platform_spec.rb

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 091daf83ec..5d4dcfa749 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -55,6 +55,11 @@ FormulaAudit:
 FormulaAuditStrict:
   Enabled: true
 
+Homebrew/MoveToExtendOS:
+  Exclude:
+    - "Homebrew/{extend,test}/**/*"
+    - "Taps/**/*"
+
 # enable all Homebrew custom cops
 Homebrew:
   Enabled: true
diff --git a/Library/Homebrew/rubocops/all.rb b/Library/Homebrew/rubocops/all.rb
index 0f0ce7e0e1..86cb5ab8e0 100644
--- a/Library/Homebrew/rubocops/all.rb
+++ b/Library/Homebrew/rubocops/all.rb
@@ -14,6 +14,7 @@ end
 
 require_relative "io_read"
 require_relative "shell_commands"
+require_relative "platform"
 
 require_relative "formula_desc"
 require_relative "components_order"
diff --git a/Library/Homebrew/rubocops/platform.rb b/Library/Homebrew/rubocops/platform.rb
new file mode 100644
index 0000000000..0cc65e9344
--- /dev/null
+++ b/Library/Homebrew/rubocops/platform.rb
@@ -0,0 +1,25 @@
+# typed: false
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Homebrew
+      # This cop ensures that platform specific code ends up in `extend/os`.
+      #
+      # @api private
+      class MoveToExtendOS < Base
+        MSG = "Move calls to `OS.linux?` and `OS.mac?` to `extend/os`."
+
+        def_node_matcher :os_check?, <<~PATTERN
+          (send (const nil? :OS) {:mac? | :linux?})
+        PATTERN
+
+        def on_send(node)
+          return unless os_check?(node)
+
+          add_offense(node)
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/rubocops/platform_spec.rb b/Library/Homebrew/test/rubocops/platform_spec.rb
new file mode 100644
index 0000000000..8a8819d6a3
--- /dev/null
+++ b/Library/Homebrew/test/rubocops/platform_spec.rb
@@ -0,0 +1,22 @@
+# typed: false
+# frozen_string_literal: true
+
+require "rubocops/platform"
+
+describe RuboCop::Cop::Homebrew::MoveToExtendOS do
+  subject(:cop) { described_class.new }
+
+  it "registers an offense when using `OS.linux?`" do
+    expect_offense(<<~RUBY)
+      OS.linux?
+      ^^^^^^^^^ Move calls to `OS.linux?` and `OS.mac?` to `extend/os`.
+    RUBY
+  end
+
+  it "registers an offense when using `OS.mac?`" do
+    expect_offense(<<~RUBY)
+      OS.mac?
+      ^^^^^^^ Move calls to `OS.linux?` and `OS.mac?` to `extend/os`.
+    RUBY
+  end
+end

From d69326c8d069495bed28e2e6c7a615bd1425e213 Mon Sep 17 00:00:00 2001
From: apainintheneck <apainintheneck@gmail.com>
Date: Sun, 20 Nov 2022 10:49:53 -0800
Subject: [PATCH 2/9] Move ::Cleanup check to extend/os

---
 Library/Homebrew/cleanup.rb                 | 22 +++++----------------
 Library/Homebrew/extend/os/cleanup.rb       |  8 ++++++++
 Library/Homebrew/extend/os/linux/cleanup.rb | 22 +++++++++++++++++++++
 Library/Homebrew/extend/os/mac/cleanup.rb   | 14 +++++++++++++
 4 files changed, 49 insertions(+), 17 deletions(-)
 create mode 100644 Library/Homebrew/extend/os/cleanup.rb
 create mode 100644 Library/Homebrew/extend/os/linux/cleanup.rb
 create mode 100644 Library/Homebrew/extend/os/mac/cleanup.rb

diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb
index 24d32b0cfa..e134256d74 100644
--- a/Library/Homebrew/cleanup.rb
+++ b/Library/Homebrew/cleanup.rb
@@ -405,28 +405,12 @@ module Homebrew
     end
 
     def cleanup_portable_ruby
-      rubies = [which("ruby"), which("ruby", ORIGINAL_PATHS)].compact
-      system_ruby = Pathname.new("/usr/bin/ruby")
-      rubies << system_ruby if system_ruby.exist?
-
-      use_system_ruby = if Homebrew::EnvConfig.force_vendor_ruby?
-        false
-      elsif OS.mac?
-        ENV["HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH"].present?
-      else
-        check_ruby_version = HOMEBREW_LIBRARY_PATH/"utils/ruby_check_version_script.rb"
-        rubies.uniq.any? do |ruby|
-          quiet_system ruby, "--enable-frozen-string-literal", "--disable=gems,did_you_mean,rubyopt",
-                       check_ruby_version, HOMEBREW_REQUIRED_RUBY_VERSION
-        end
-      end
-
       vendor_dir = HOMEBREW_LIBRARY/"Homebrew/vendor"
       portable_ruby_latest_version = (vendor_dir/"portable-ruby-version").read.chomp
 
       portable_rubies_to_remove = []
       Pathname.glob(vendor_dir/"portable-ruby/*.*").select(&:directory?).each do |path|
-        next if !use_system_ruby && portable_ruby_latest_version == path.basename.to_s
+        next if !use_system_ruby? && portable_ruby_latest_version == path.basename.to_s
 
         portable_rubies_to_remove << path
       end
@@ -445,6 +429,8 @@ module Homebrew
       end
     end
 
+    def use_system_ruby?; end
+
     def cleanup_bootsnap
       bootsnap = cache/"bootsnap"
       return unless bootsnap.exist?
@@ -615,3 +601,5 @@ module Homebrew
     end
   end
 end
+
+require "extend/os/cleanup"
diff --git a/Library/Homebrew/extend/os/cleanup.rb b/Library/Homebrew/extend/os/cleanup.rb
new file mode 100644
index 0000000000..f96bca2d0f
--- /dev/null
+++ b/Library/Homebrew/extend/os/cleanup.rb
@@ -0,0 +1,8 @@
+# typed: false
+# frozen_string_literal: true
+
+if OS.mac?
+  require "extend/os/mac/cleanup"
+elsif OS.linux?
+  require "extend/os/linux/cleanup"
+end
diff --git a/Library/Homebrew/extend/os/linux/cleanup.rb b/Library/Homebrew/extend/os/linux/cleanup.rb
new file mode 100644
index 0000000000..474a3f08ce
--- /dev/null
+++ b/Library/Homebrew/extend/os/linux/cleanup.rb
@@ -0,0 +1,22 @@
+# typed: false
+# frozen_string_literal: true
+
+module Homebrew
+  class Cleanup
+    undef use_system_ruby?
+
+    def use_system_ruby?
+      return false if Homebrew::EnvConfig.force_vendor_ruby?
+
+      rubies = [which("ruby"), which("ruby", ORIGINAL_PATHS)].compact
+      system_ruby = Pathname.new("/usr/bin/ruby")
+      rubies << system_ruby if system_ruby.exist?
+
+      check_ruby_version = HOMEBREW_LIBRARY_PATH/"utils/ruby_check_version_script.rb"
+      rubies.uniq.any? do |ruby|
+        quiet_system ruby, "--enable-frozen-string-literal", "--disable=gems,did_you_mean,rubyopt",
+                      check_ruby_version, HOMEBREW_REQUIRED_RUBY_VERSION
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/extend/os/mac/cleanup.rb b/Library/Homebrew/extend/os/mac/cleanup.rb
new file mode 100644
index 0000000000..549e09eaca
--- /dev/null
+++ b/Library/Homebrew/extend/os/mac/cleanup.rb
@@ -0,0 +1,14 @@
+# typed: false
+# frozen_string_literal: true
+
+module Homebrew
+  class Cleanup
+    undef use_system_ruby?
+
+    def use_system_ruby?
+      return false if Homebrew::EnvConfig.force_vendor_ruby?
+
+      ENV["HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH"].present?
+    end
+  end
+end

From 260fc858dfc538aaa3de3d82e3c5aaaf5301ae3d Mon Sep 17 00:00:00 2001
From: apainintheneck <apainintheneck@gmail.com>
Date: Sun, 20 Nov 2022 12:53:44 -0800
Subject: [PATCH 3/9] Fix rubocop errors

---
 Library/Homebrew/extend/os/linux/cleanup.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/extend/os/linux/cleanup.rb b/Library/Homebrew/extend/os/linux/cleanup.rb
index 474a3f08ce..82aab766f9 100644
--- a/Library/Homebrew/extend/os/linux/cleanup.rb
+++ b/Library/Homebrew/extend/os/linux/cleanup.rb
@@ -15,7 +15,7 @@ module Homebrew
       check_ruby_version = HOMEBREW_LIBRARY_PATH/"utils/ruby_check_version_script.rb"
       rubies.uniq.any? do |ruby|
         quiet_system ruby, "--enable-frozen-string-literal", "--disable=gems,did_you_mean,rubyopt",
-                      check_ruby_version, HOMEBREW_REQUIRED_RUBY_VERSION
+                     check_ruby_version, HOMEBREW_REQUIRED_RUBY_VERSION
       end
     end
   end

From 65bce0ed3cf71161afb348e2a7a7bc89813d0385 Mon Sep 17 00:00:00 2001
From: apainintheneck <apainintheneck@gmail.com>
Date: Sun, 20 Nov 2022 13:00:53 -0800
Subject: [PATCH 4/9] Move unpack_strategy/zip check to extend/os

---
 Library/Homebrew/extend/os/unpack_strategy/zip.rb | 4 ++++
 Library/Homebrew/unpack_strategy/zip.rb           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 Library/Homebrew/extend/os/unpack_strategy/zip.rb

diff --git a/Library/Homebrew/extend/os/unpack_strategy/zip.rb b/Library/Homebrew/extend/os/unpack_strategy/zip.rb
new file mode 100644
index 0000000000..007300b114
--- /dev/null
+++ b/Library/Homebrew/extend/os/unpack_strategy/zip.rb
@@ -0,0 +1,4 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "extend/os/mac/unpack_strategy/zip" if OS.mac?
diff --git a/Library/Homebrew/unpack_strategy/zip.rb b/Library/Homebrew/unpack_strategy/zip.rb
index 6f8e6f7426..c8925c96c6 100644
--- a/Library/Homebrew/unpack_strategy/zip.rb
+++ b/Library/Homebrew/unpack_strategy/zip.rb
@@ -49,4 +49,4 @@ module UnpackStrategy
   end
 end
 
-require "extend/os/mac/unpack_strategy/zip" if OS.mac?
+require "extend/os/unpack_strategy/zip"

From 9c2293a08e00e8c417df7a173b0aa13322352a59 Mon Sep 17 00:00:00 2001
From: apainintheneck <apainintheneck@gmail.com>
Date: Sun, 20 Nov 2022 14:27:28 -0800
Subject: [PATCH 5/9] Move Sandbox check to extend/os

---
 Library/Homebrew/extend/os/mac/sandbox.rb | 9 +++++++++
 Library/Homebrew/extend/os/sandbox.rb     | 4 ++++
 Library/Homebrew/sandbox.rb               | 4 +++-
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 Library/Homebrew/extend/os/mac/sandbox.rb
 create mode 100644 Library/Homebrew/extend/os/sandbox.rb

diff --git a/Library/Homebrew/extend/os/mac/sandbox.rb b/Library/Homebrew/extend/os/mac/sandbox.rb
new file mode 100644
index 0000000000..976ede4716
--- /dev/null
+++ b/Library/Homebrew/extend/os/mac/sandbox.rb
@@ -0,0 +1,9 @@
+# typed: strict
+# frozen_string_literal: true
+
+class Sandbox
+  sig { returns(T::Boolean) }
+  def self.available?
+    File.executable?(SANDBOX_EXEC)
+  end
+end
diff --git a/Library/Homebrew/extend/os/sandbox.rb b/Library/Homebrew/extend/os/sandbox.rb
new file mode 100644
index 0000000000..f34ef2b4b2
--- /dev/null
+++ b/Library/Homebrew/extend/os/sandbox.rb
@@ -0,0 +1,4 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "extend/os/mac/sandbox" if OS.mac?
diff --git a/Library/Homebrew/sandbox.rb b/Library/Homebrew/sandbox.rb
index f601b801c5..6525a2f750 100644
--- a/Library/Homebrew/sandbox.rb
+++ b/Library/Homebrew/sandbox.rb
@@ -17,7 +17,7 @@ class Sandbox
 
   sig { returns(T::Boolean) }
   def self.available?
-    OS.mac? && File.executable?(SANDBOX_EXEC)
+    false
   end
 
   sig { void }
@@ -256,3 +256,5 @@ class Sandbox
   end
   private_constant :SandboxProfile
 end
+
+require "extend/os/sandbox"

From 1db5d967c315bb607a162792c123df42eabb3f82 Mon Sep 17 00:00:00 2001
From: apainintheneck <apainintheneck@gmail.com>
Date: Sun, 20 Nov 2022 15:12:40 -0800
Subject: [PATCH 6/9] Ignore os.rb where checks are defined

---
 Library/.rubocop.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 5d4dcfa749..3636e41d3b 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -59,6 +59,7 @@ Homebrew/MoveToExtendOS:
   Exclude:
     - "Homebrew/{extend,test}/**/*"
     - "Taps/**/*"
+    - "Homebrew/os.rb"
 
 # enable all Homebrew custom cops
 Homebrew:

From 2eee1e7c2a10bbd2f638609e35f62f1810b5bdcc Mon Sep 17 00:00:00 2001
From: apainintheneck <apainintheneck@gmail.com>
Date: Mon, 21 Nov 2022 21:04:22 -0800
Subject: [PATCH 7/9] Move SimulateSystem check to extend/os

---
 .../extend/os/linux/simulate_system.rb        | 29 +++++++++++++++++++
 .../Homebrew/extend/os/mac/simulate_system.rb | 21 ++++++++++++++
 Library/Homebrew/extend/os/simulate_system.rb |  8 +++++
 Library/Homebrew/simulate_system.rb           | 20 +++----------
 4 files changed, 62 insertions(+), 16 deletions(-)
 create mode 100644 Library/Homebrew/extend/os/linux/simulate_system.rb
 create mode 100644 Library/Homebrew/extend/os/mac/simulate_system.rb
 create mode 100644 Library/Homebrew/extend/os/simulate_system.rb

diff --git a/Library/Homebrew/extend/os/linux/simulate_system.rb b/Library/Homebrew/extend/os/linux/simulate_system.rb
new file mode 100644
index 0000000000..35ddeb8740
--- /dev/null
+++ b/Library/Homebrew/extend/os/linux/simulate_system.rb
@@ -0,0 +1,29 @@
+# typed: true
+# frozen_string_literal: true
+
+module Homebrew
+  class SimulateSystem
+    class << self
+      undef os
+      undef simulating_or_running_on_linux?
+      undef current_os
+
+      sig { returns(T.nilable(Symbol)) }
+      def os
+        return :macos if @os.blank? && Homebrew::EnvConfig.simulate_macos_on_linux?
+
+        @os
+      end
+
+      sig { returns(T::Boolean) }
+      def simulating_or_running_on_linux?
+        os.blank? || os == :linux
+      end
+
+      sig { returns(Symbol) }
+      def current_os
+        os || :linux
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/extend/os/mac/simulate_system.rb b/Library/Homebrew/extend/os/mac/simulate_system.rb
new file mode 100644
index 0000000000..053d361869
--- /dev/null
+++ b/Library/Homebrew/extend/os/mac/simulate_system.rb
@@ -0,0 +1,21 @@
+# typed: true
+# frozen_string_literal: true
+
+module Homebrew
+  class SimulateSystem
+    class << self
+      undef simulating_or_running_on_macos?
+      undef current_os
+
+      sig { returns(T::Boolean) }
+      def simulating_or_running_on_macos?
+        os.blank? || [:macos, *MacOSVersions::SYMBOLS.keys].include?(os)
+      end
+
+      sig { returns(Symbol) }
+      def current_os
+        os || MacOS.version.to_sym
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/extend/os/simulate_system.rb b/Library/Homebrew/extend/os/simulate_system.rb
new file mode 100644
index 0000000000..5558a82de2
--- /dev/null
+++ b/Library/Homebrew/extend/os/simulate_system.rb
@@ -0,0 +1,8 @@
+# typed: strict
+# frozen_string_literal: true
+
+if OS.mac?
+  require "extend/os/mac/simulate_system"
+elsif OS.linux?
+  require "extend/os/linux/simulate_system"
+end
diff --git a/Library/Homebrew/simulate_system.rb b/Library/Homebrew/simulate_system.rb
index 206e9a460f..51be4690a6 100644
--- a/Library/Homebrew/simulate_system.rb
+++ b/Library/Homebrew/simulate_system.rb
@@ -9,14 +9,7 @@ module Homebrew
     class << self
       extend T::Sig
 
-      attr_reader :arch
-
-      sig { returns(T.nilable(Symbol)) }
-      def os
-        return :macos if @os.blank? && !OS.mac? && Homebrew::EnvConfig.simulate_macos_on_linux?
-
-        @os
-      end
+      attr_reader :arch, :os
 
       sig { params(new_os: Symbol).void }
       def os=(new_os)
@@ -40,15 +33,11 @@ module Homebrew
 
       sig { returns(T::Boolean) }
       def simulating_or_running_on_macos?
-        return OS.mac? if os.blank?
-
         [:macos, *MacOSVersions::SYMBOLS.keys].include?(os)
       end
 
       sig { returns(T::Boolean) }
       def simulating_or_running_on_linux?
-        return OS.linux? if os.blank?
-
         os == :linux
       end
 
@@ -59,11 +48,10 @@ module Homebrew
 
       sig { returns(Symbol) }
       def current_os
-        return T.must(os) if os.present?
-        return :linux if OS.linux?
-
-        MacOS.version.to_sym
+        os || :generic
       end
     end
   end
 end
+
+require "extend/os/simulate_system"

From d48859a9ce631031163612de7e2d1705dbc386ec Mon Sep 17 00:00:00 2001
From: apainintheneck <apainintheneck@gmail.com>
Date: Mon, 21 Nov 2022 22:08:11 -0800
Subject: [PATCH 8/9] Move FormulaInstaller check to extend/os

---
 Library/Homebrew/extend/os/formula_installer.rb      |  8 ++++++++
 .../Homebrew/extend/os/linux/formula_installer.rb    | 12 ++++++++++++
 Library/Homebrew/extend/os/mac/formula_installer.rb  | 12 ++++++++++++
 Library/Homebrew/formula_installer.rb                |  9 ++++++---
 4 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 Library/Homebrew/extend/os/formula_installer.rb
 create mode 100644 Library/Homebrew/extend/os/linux/formula_installer.rb
 create mode 100644 Library/Homebrew/extend/os/mac/formula_installer.rb

diff --git a/Library/Homebrew/extend/os/formula_installer.rb b/Library/Homebrew/extend/os/formula_installer.rb
new file mode 100644
index 0000000000..b4ce658527
--- /dev/null
+++ b/Library/Homebrew/extend/os/formula_installer.rb
@@ -0,0 +1,8 @@
+# typed: strict
+# frozen_string_literal: true
+
+if OS.mac?
+  require "extend/os/mac/formula_installer"
+elsif OS.linux?
+  require "extend/os/linux/formula_installer"
+end
diff --git a/Library/Homebrew/extend/os/linux/formula_installer.rb b/Library/Homebrew/extend/os/linux/formula_installer.rb
new file mode 100644
index 0000000000..7a118ae87e
--- /dev/null
+++ b/Library/Homebrew/extend/os/linux/formula_installer.rb
@@ -0,0 +1,12 @@
+# typed: true
+# frozen_string_literal: true
+
+class FormulaInstaller
+  undef fresh_install?
+
+  sig { params(formula: Formula).returns(T.nilable(T::Boolean)) }
+  def fresh_install?(formula)
+    !Homebrew::EnvConfig.developer? &&
+      (!installed_as_dependency? || !formula.any_version_installed?)
+  end
+end
diff --git a/Library/Homebrew/extend/os/mac/formula_installer.rb b/Library/Homebrew/extend/os/mac/formula_installer.rb
new file mode 100644
index 0000000000..8da9417fcf
--- /dev/null
+++ b/Library/Homebrew/extend/os/mac/formula_installer.rb
@@ -0,0 +1,12 @@
+# typed: true
+# frozen_string_literal: true
+
+class FormulaInstaller
+  undef fresh_install?
+
+  sig { params(formula: Formula).returns(T.nilable(T::Boolean)) }
+  def fresh_install?(formula)
+    !Homebrew::EnvConfig.developer? && !OS::Mac.version.outdated_release? &&
+      (!installed_as_dependency? || !formula.any_version_installed?)
+  end
+end
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index a657aa5c61..defac21d1f 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -258,9 +258,7 @@ class FormulaInstaller
       # don't want to complain about no bottle available if doing an
       # upgrade/reinstall/dependency install (but do in the case the bottle
       # check fails)
-      elsif !Homebrew::EnvConfig.developer? &&
-            (!installed_as_dependency? || !formula.any_version_installed?) &&
-            (!OS.mac? || !OS::Mac.version.outdated_release?)
+      elsif fresh_install?(formula)
         <<~EOS
           #{formula}: no bottle available!
         EOS
@@ -343,6 +341,11 @@ class FormulaInstaller
           "#{formula.full_name} requires the latest version of pinned dependencies"
   end
 
+  sig { params(_formula: Formula).returns(T.nilable(T::Boolean)) }
+  def fresh_install?(_formula)
+    false
+  end
+
   sig { void }
   def install_fetch_deps
     return if @compute_dependencies.blank?

From c477b9aab3ef9769687dbe82c665cd067e362d6a Mon Sep 17 00:00:00 2001
From: apainintheneck <apainintheneck@gmail.com>
Date: Mon, 21 Nov 2022 22:14:04 -0800
Subject: [PATCH 9/9] Cleanup after adding os specific rubocop

- Change name of rubocop warning
- Disable linting on remaining offending lines
- Add todos to move lines with disabled linting
  checks to extend/os in the future
---
 Library/.rubocop.yml                            | 2 +-
 Library/Homebrew/cask/cmd/install.rb            | 3 ++-
 Library/Homebrew/cmd/update-report.rb           | 3 ++-
 Library/Homebrew/default_prefix.rb              | 3 ++-
 Library/Homebrew/dev-cmd/bottle.rb              | 9 +++++++--
 Library/Homebrew/dev-cmd/tests.rb               | 3 +++
 Library/Homebrew/dev-cmd/update-test.rb         | 3 ++-
 Library/Homebrew/formula_cellar_checks.rb       | 3 ++-
 Library/Homebrew/rubocops/platform.rb           | 2 +-
 Library/Homebrew/test/rubocops/platform_spec.rb | 4 ++--
 10 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 3636e41d3b..568235043a 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -57,7 +57,7 @@ FormulaAuditStrict:
 
 Homebrew/MoveToExtendOS:
   Exclude:
-    - "Homebrew/{extend,test}/**/*"
+    - "Homebrew/{extend,test,requirements}/**/*"
     - "Taps/**/*"
     - "Homebrew/os.rb"
 
diff --git a/Library/Homebrew/cask/cmd/install.rb b/Library/Homebrew/cask/cmd/install.rb
index c4a550b5ba..1a3cd870db 100644
--- a/Library/Homebrew/cask/cmd/install.rb
+++ b/Library/Homebrew/cask/cmd/install.rb
@@ -68,7 +68,8 @@ module Cask
         zap: nil,
         dry_run: nil
       )
-        odie "Installing casks is supported only on macOS" unless OS.mac?
+        # TODO: Refactor and move to extend/os
+        odie "Installing casks is supported only on macOS" unless OS.mac? # rubocop:disable Homebrew/MoveToExtendOS
 
         options = {
           verbose:        verbose,
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index dbc9a7fbfc..71ecb09d92 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -293,7 +293,8 @@ module Homebrew
   end
 
   def migrate_gcc_dependents_if_needed
-    return if OS.mac?
+    # TODO: Refactor and move to extend/os
+    return if OS.mac? # rubocop:disable Homebrew/MoveToExtendOS
     return if Settings.read("gcc-rpaths.fixed") == "true"
 
     Formula.installed.each do |formula|
diff --git a/Library/Homebrew/default_prefix.rb b/Library/Homebrew/default_prefix.rb
index 70e493c233..de132865d9 100644
--- a/Library/Homebrew/default_prefix.rb
+++ b/Library/Homebrew/default_prefix.rb
@@ -4,7 +4,8 @@
 require "simulate_system"
 
 module Homebrew
-  DEFAULT_PREFIX, DEFAULT_REPOSITORY = if OS.mac? && Hardware::CPU.arm?
+  # TODO: Refactor and move to extend/os
+  DEFAULT_PREFIX, DEFAULT_REPOSITORY = if OS.mac? && Hardware::CPU.arm? # rubocop:disable Homebrew/MoveToExtendOS
     [HOMEBREW_MACOS_ARM_DEFAULT_PREFIX, HOMEBREW_MACOS_ARM_DEFAULT_REPOSITORY]
   elsif Homebrew::SimulateSystem.simulating_or_running_on_linux?
     [HOMEBREW_LINUX_DEFAULT_PREFIX, HOMEBREW_LINUX_DEFAULT_REPOSITORY]
diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index 66320adf32..56965db1c1 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -247,7 +247,8 @@ module Homebrew
       "--pax-option", "globexthdr.name=/GlobalHead.%n,exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
     ].freeze
 
-    return ["tar", gnutar_args].freeze if OS.linux?
+    # TODO: Refactor and move to extend/os
+    return ["tar", gnutar_args].freeze if OS.linux? # rubocop:disable Homebrew/MoveToExtendOS
 
     # Use gnu-tar on macOS as it can be set up for reproducibility better than libarchive.
     begin
@@ -275,6 +276,8 @@ module Homebrew
       ignores << %r{#{cellar_regex}/#{go_regex}/[\d.]+/libexec}
     end
 
+    # TODO: Refactor and move to extend/os
+    # rubocop:disable Homebrew/MoveToExtendOS
     ignores << case f.name
     # On Linux, GCC installation can be moved so long as the whole directory tree is moved together:
     # https://gcc-help.gcc.gnu.narkive.com/GnwuCA7l/moving-gcc-from-the-installation-path-is-it-allowed.
@@ -284,6 +287,7 @@ module Homebrew
     when Version.formula_optionally_versioned_regex(:binutils)
       %r{#{cellar_regex}/binutils} if OS.linux?
     end
+    # rubocop:enable Homebrew/MoveToExtendOS
 
     ignores.compact
   end
@@ -409,7 +413,8 @@ module Homebrew
           # Set the times for reproducible bottles.
           if file.symlink?
             # Need to make symlink permissions consistent on macOS and Linux
-            File.lchmod 0777, file if OS.mac?
+            # TODO: Refactor and move to extend/os
+            File.lchmod 0777, file if OS.mac? # rubocop:disable Homebrew/MoveToExtendOS
             File.lutime(tab.source_modified_time, tab.source_modified_time, file)
           else
             file.utime(tab.source_modified_time, tab.source_modified_time)
diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index 1335d35dcb..2852fdb7d7 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -157,6 +157,8 @@ module Homebrew
         --require spec_helper
       ]
 
+      # TODO: Refactor and move to extend/os
+      # rubocop:disable Homebrew/MoveToExtendOS
       unless OS.mac?
         bundle_args << "--tag" << "~needs_macos" << "--tag" << "~cask"
         files = files.grep_v(%r{^test/(os/mac|cask)(/.*|_spec\.rb)$})
@@ -166,6 +168,7 @@ module Homebrew
         bundle_args << "--tag" << "~needs_linux"
         files = files.grep_v(%r{^test/os/linux(/.*|_spec\.rb)$})
       end
+      # rubocop:enable Homebrew/MoveToExtendOS
 
       puts "Randomized with seed #{seed}"
 
diff --git a/Library/Homebrew/dev-cmd/update-test.rb b/Library/Homebrew/dev-cmd/update-test.rb
index 69bfe66f0f..8abffa4869 100644
--- a/Library/Homebrew/dev-cmd/update-test.rb
+++ b/Library/Homebrew/dev-cmd/update-test.rb
@@ -65,7 +65,8 @@ module Homebrew
           tags = if (HOMEBREW_REPOSITORY/".git/shallow").exist?
             safe_system "git", "fetch", "--tags", "--depth=1"
             Utils.popen_read("git", "tag", "--list", "--sort=-version:refname")
-          elsif OS.linux?
+          # TODO: Refactor and move to extend/os
+          elsif OS.linux? # rubocop:disable Homebrew/MoveToExtendOS
             Utils.popen_read("git tag --list | sort -rV")
           end
         end
diff --git a/Library/Homebrew/formula_cellar_checks.rb b/Library/Homebrew/formula_cellar_checks.rb
index 8045e2c968..6f85ab259a 100644
--- a/Library/Homebrew/formula_cellar_checks.rb
+++ b/Library/Homebrew/formula_cellar_checks.rb
@@ -319,7 +319,8 @@ module FormulaCellarChecks
   def check_binary_arches(formula)
     return unless formula.prefix.directory?
     # There is no `binary_executable_or_library_files` method for the generic OS
-    return if !OS.mac? && !OS.linux?
+    # TODO: Refactor and move to extend/os
+    return if !OS.mac? && !OS.linux? # rubocop:disable Homebrew/MoveToExtendOS
 
     keg = Keg.new(formula.prefix)
     mismatches = {}
diff --git a/Library/Homebrew/rubocops/platform.rb b/Library/Homebrew/rubocops/platform.rb
index 0cc65e9344..31706ed63f 100644
--- a/Library/Homebrew/rubocops/platform.rb
+++ b/Library/Homebrew/rubocops/platform.rb
@@ -8,7 +8,7 @@ module RuboCop
       #
       # @api private
       class MoveToExtendOS < Base
-        MSG = "Move calls to `OS.linux?` and `OS.mac?` to `extend/os`."
+        MSG = "Move `OS.linux?` and `OS.mac?` calls to `extend/os`."
 
         def_node_matcher :os_check?, <<~PATTERN
           (send (const nil? :OS) {:mac? | :linux?})
diff --git a/Library/Homebrew/test/rubocops/platform_spec.rb b/Library/Homebrew/test/rubocops/platform_spec.rb
index 8a8819d6a3..4e8872c077 100644
--- a/Library/Homebrew/test/rubocops/platform_spec.rb
+++ b/Library/Homebrew/test/rubocops/platform_spec.rb
@@ -9,14 +9,14 @@ describe RuboCop::Cop::Homebrew::MoveToExtendOS do
   it "registers an offense when using `OS.linux?`" do
     expect_offense(<<~RUBY)
       OS.linux?
-      ^^^^^^^^^ Move calls to `OS.linux?` and `OS.mac?` to `extend/os`.
+      ^^^^^^^^^ Move `OS.linux?` and `OS.mac?` calls to `extend/os`.
     RUBY
   end
 
   it "registers an offense when using `OS.mac?`" do
     expect_offense(<<~RUBY)
       OS.mac?
-      ^^^^^^^ Move calls to `OS.linux?` and `OS.mac?` to `extend/os`.
+      ^^^^^^^ Move `OS.linux?` and `OS.mac?` calls to `extend/os`.
     RUBY
   end
 end