Merge pull request #23043 from Homebrew/no-clt-cask-installs

Allow no-CLT cask installs

Author: MikeMcQuaid

Library/Homebrew/extend/os/mac/development_tools.rb

@@ -17,7 +17,7 @@ def locate(tool)
           @locate.fetch(tool) do |key|
             @locate[key] = if (located_tool = super(tool))
               located_tool
-            else
+            elsif installed?
               path = Utils.popen_read("/usr/bin/xcrun", "-no-cache", "-find", tool.to_s, err: :close).chomp
               ::Pathname.new(path) if File.executable?(path)
             end

Library/Homebrew/extend/os/mac/diagnostic.rb

@@ -64,15 +64,14 @@ def fatal_preinstall_checks
             check_access_directories
           ]
 
-          # We need the developer tools for `codesign`.
-          checks << "check_for_installed_developer_tools" if ::Hardware::CPU.arm?
-
+          # Developer tools are checked when building from source.
           checks.freeze
         end
 
         sig { returns(T::Array[String]) }
         def fatal_build_from_source_checks
           %w[
+            check_for_installed_developer_tools
             check_xcode_license_approved
             check_xcode_minimum_version
             check_clt_minimum_version

Library/Homebrew/extend/os/mac/formula_installer.rb

@@ -13,6 +13,21 @@ def fresh_install?(formula)
         !::Homebrew::EnvConfig.developer? && !OS::Mac.version.outdated_release? &&
           (installed_on_request? || !formula.any_version_installed?)
       end
+
+      sig { void }
+      def check_developer_tools_for_bottle_pour
+        return unless ::Hardware::CPU.arm?
+        return if formula.bottle_specification.skip_relocation?
+
+        # We need the developer tools for `codesign` when relocating bottles.
+        require "diagnostic"
+        unless (developer_tools_warning = ::Homebrew::Diagnostic::Checks.new.check_for_installed_developer_tools)
+          return
+        end
+
+        ofail developer_tools_warning
+        exit 1
+      end
     end
   end
 end

Library/Homebrew/formula_installer.rb

@@ -554,7 +554,9 @@ def install
     lock
 
     start_time = Time.now
-    if !pour_bottle? && DevelopmentTools.installed?
+    if pour_bottle?
+      check_developer_tools_for_bottle_pour
+    else
       require "install"
       Homebrew::Install.perform_build_from_source_checks
     end
@@ -1634,6 +1636,9 @@ def problem_if_output(output)
     @show_summary_heading = true
   end
 
+  sig { void }
+  def check_developer_tools_for_bottle_pour; end
+
   sig { void }
   def audit_installed
     unless formula.keg_only?

Library/Homebrew/shims/shared/git

@@ -44,7 +44,7 @@ then
   #   /usr/bin/<tool> will be a popup stub under such configuration.
   # xcrun hangs if xcode-select is set to "/"
   xcode_path="$(/usr/bin/xcode-select -print-path 2>/dev/null)"
-  if [[ -z "${xcode_path}" ]]
+  if [[ -z "${xcode_path}" || ! -d "${xcode_path}" ]]
   then
     popup_stub=1
   fi

Library/Homebrew/test/formula_installer_bottle_spec.rb

@@ -113,7 +113,7 @@ def test_basic_formula_setup(formula)
 
     expect do
       described_class.new(formula).install
-    end.to raise_error(UnbottledError)
+    end.to raise_error(SystemExit)
 
     expect(formula).not_to be_latest_version_installed
   end

Library/Homebrew/test/formula_installer_spec.rb

@@ -87,6 +87,22 @@ def temporary_install(formula, **options)
     end
   end
 
+  specify "relocated bottle install requires developer tools on Apple Silicon", :needs_macos do
+    formula = TestballBottle.new
+    installer = described_class.new(formula)
+
+    allow(installer).to receive_messages(lock: nil, pour_bottle?: true)
+    allow(Hardware::CPU).to receive(:arm?).and_return(true)
+    allow(formula.bottle_specification).to receive(:skip_relocation?).and_return(false)
+    allow_any_instance_of(Homebrew::Diagnostic::Checks)
+      .to receive(:check_for_installed_developer_tools)
+      .and_return("No developer tools installed.")
+
+    expect do
+      installer.install
+    end.to raise_error(SystemExit)
+  end
+
   describe "#finish" do
     it "runs post-install steps before the remaining `post_install` hook" do
       formula = formula "finish-install-steps" do

Library/Homebrew/test/os/mac/development_tools_spec.rb

@@ -0,0 +1,36 @@
+# typed: true
+# frozen_string_literal: true
+
+require "development_tools"
+
+RSpec.describe DevelopmentTools, :needs_macos do
+  describe ".locate" do
+    before do
+      described_class.remove_instance_variable(:@locate) if described_class.instance_variable_defined?(:@locate)
+    end
+
+    it "doesn't call xcrun when Xcode and the CLT are not installed" do
+      allow(File).to receive(:executable?).and_call_original
+      allow(File).to receive(:executable?).with("/usr/bin/missing-tool").and_return(false)
+      allow(OS::Mac::Xcode).to receive(:installed?).and_return(false)
+      allow(OS::Mac::CLT).to receive(:installed?).and_return(false)
+
+      expect(Utils).not_to receive(:popen_read)
+
+      expect(described_class.locate("missing-tool")).to be_nil
+    end
+
+    it "uses xcrun when developer tools are installed" do
+      allow(File).to receive(:executable?).and_call_original
+      allow(File).to receive(:executable?).with("/usr/bin/xcode-tool").and_return(false)
+      allow(File).to receive(:executable?).with("/Xcode/usr/bin/xcode-tool").and_return(true)
+      allow(OS::Mac::Xcode).to receive(:installed?).and_return(true)
+      allow(OS::Mac::CLT).to receive(:installed?).and_return(false)
+      expect(Utils).to receive(:popen_read)
+        .with("/usr/bin/xcrun", "-no-cache", "-find", "xcode-tool", err: :close)
+        .and_return("/Xcode/usr/bin/xcode-tool\n")
+
+      expect(described_class.locate("xcode-tool")).to eq(Pathname("/Xcode/usr/bin/xcode-tool"))
+    end
+  end
+end

Library/Homebrew/test/os/mac/diagnostic_spec.rb

@@ -62,6 +62,26 @@
       .to match("Xcode alone is not sufficient on Big Sur")
   end
 
+  describe "#fatal_preinstall_checks" do
+    it "doesn't require developer tools on Apple Silicon" do
+      allow(Hardware::CPU).to receive(:arm?).and_return(true)
+
+      expect(checks.fatal_preinstall_checks).not_to include("check_for_installed_developer_tools")
+    end
+  end
+
+  describe "#fatal_build_from_source_checks" do
+    it "requires developer tools" do
+      expect(checks.fatal_build_from_source_checks).to include("check_for_installed_developer_tools")
+    end
+  end
+
+  describe "#build_from_source_checks" do
+    it "warns about missing developer tools" do
+      expect(checks.build_from_source_checks).to include("check_for_installed_developer_tools")
+    end
+  end
+
   describe "#check_if_supported_sdk_available" do
     let(:macos_version) { MacOSVersion.new("11") }