From d29e00d40e6c813f96a7859056e5b8089115f53e Mon Sep 17 00:00:00 2001 From: Douglas Eichelberger Date: Sun, 7 Sep 2025 14:17:14 -0700 Subject: [PATCH] A few more --- Library/Homebrew/formula_installer.rb | 2 +- Library/Homebrew/sbom.rb | 2 +- Library/Homebrew/software_spec.rb | 2 +- Library/Homebrew/test/cask/info_spec.rb | 3 ++- Library/Homebrew/test/system_command_spec.rb | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index e75ce424ea..8138be383c 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -809,7 +809,7 @@ on_request: installed_on_request?, options:) else [] end - options += effective_build_options_for(formula).used_options.to_a + options += effective_build_options_for(formula).used_options.to_a.map(&:to_s) options end diff --git a/Library/Homebrew/sbom.rb b/Library/Homebrew/sbom.rb index 2f72ee0ad4..a6f7542d73 100644 --- a/Library/Homebrew/sbom.rb +++ b/Library/Homebrew/sbom.rb @@ -255,7 +255,7 @@ class SBOM sig { params(bottling: T::Boolean) - .returns(T::Array[T::Hash[Symbol, T.any(T::Boolean, String, T::Array[T::Hash[Symbol, String]])]]) + .returns(T::Array[T::Hash[Symbol, T.any(T::Boolean, String, T::Array[T::Hash[Symbol, String]])]]) } def full_spdx_runtime_dependencies(bottling:) return [] if bottling || @runtime_dependencies.blank? diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 625aaf3306..0850110c17 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -219,7 +219,7 @@ class SoftwareSpec options << opt end - sig { params(hash: T::Hash[T.any(String, Symbol), T.any(String, Symbol)]).void } + sig { params(hash: T::Hash[T.any(String, Symbol, T::Array[String]), T.any(String, Symbol, T::Array[String])]).void } def deprecated_option(hash) raise ArgumentError, "deprecated_option hash must not be empty" if hash.empty? diff --git a/Library/Homebrew/test/cask/info_spec.rb b/Library/Homebrew/test/cask/info_spec.rb index e0ad16c55c..f342b961cf 100644 --- a/Library/Homebrew/test/cask/info_spec.rb +++ b/Library/Homebrew/test/cask/info_spec.rb @@ -169,7 +169,8 @@ RSpec.describe Cask::Info, :cask do cask = Cask::CaskLoader.load("local-transmission") time = 1_720_189_863 - tab = Cask::Tab.new("loaded_from_api" => true, "tabfile" => TEST_FIXTURE_DIR/"cask_receipt.json", "time" => time) + tab = Cask::Tab.new("loaded_from_api" => true, "tabfile" => TEST_FIXTURE_DIR/"cask_receipt.json", + "time" => time) expect(cask).to receive(:installed?).and_return(true) expect(cask).to receive(:caskroom_path).and_return(caskroom) expect(cask).to receive(:installed_version).and_return("2.61") diff --git a/Library/Homebrew/test/system_command_spec.rb b/Library/Homebrew/test/system_command_spec.rb index 7eefe508fa..1884f39049 100644 --- a/Library/Homebrew/test/system_command_spec.rb +++ b/Library/Homebrew/test/system_command_spec.rb @@ -275,7 +275,7 @@ RSpec.describe SystemCommand do FileUtils.chmod "+x", path/"tool" - expect(described_class.run("tool", env: { "PATH" => path }).stdout).to include "Hello, world!" + expect(described_class.run("tool", env: { "PATH" => path.to_s }).stdout).to include "Hello, world!" end end