admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

cask/installer: update to match formula_installer

Browse Source
This commit is contained in:
Carlo Cabrera 2024-05-05 13:54:26 +01:00
parent 3555d09c1d
commit 34387bfc8a
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cask/installer.rb
View File

@ -584,7 +584,7 @@ on_request: true)
unless skip_cask_deps? unless skip_cask_deps?
cask_and_formula_dependencies.each do |cask_or_formula| cask_and_formula_dependencies.each do |cask_or_formula|
dep_tap = cask_or_formula.tap dep_tap = cask_or_formula.tap
next if dep_tap.blank? || dep_tap.allowed_by_env? next if dep_tap.blank? || (dep_tap.allowed_by_env? && !dep_tap.forbidden_by_env?)
dep_full_name = cask_or_formula.full_name dep_full_name = cask_or_formula.full_name
error_message = +"The installation of #{@cask} has a dependency #{dep_full_name}\n" \ error_message = +"The installation of #{@cask} has a dependency #{dep_full_name}\n" \
@ -599,7 +599,7 @@ on_request: true)
end end
cask_tap = @cask.tap cask_tap = @cask.tap
return if cask_tap.blank? || cask_tap.allowed_by_env? return if cask_tap.blank? || (cask_tap.allowed_by_env? && !cask_tap.forbidden_by_env?)
error_message = +"The installation of #{@cask.full_name} has the tap #{cask_tap}\n" \ error_message = +"The installation of #{@cask.full_name} has the tap #{cask_tap}\n" \
"but #{owner} " "but #{owner} "

19
Library/Homebrew/test/cask/installer_spec.rb
View File

@ -326,22 +326,27 @@ RSpec.describe Cask::Installer, :cask do
end end
describe "#forbidden_tap_check" do describe "#forbidden_tap_check" do
it "raises on forbidden tap on cask" do before do
ENV["HOMEBREW_FORBIDDEN_TAPS"] = tap = "homebrew/forbidden" allow(Tap).to receive(:forbidden_taps).and_return(forbidden_taps_set)
end
cask = Cask::Cask.new("homebrew-forbidden-tap", tap: Tap.fetch(tap)) do let(:homebrew_forbidden) { Tap.fetch("homebrew/forbidden") }
let(:forbidden_taps_set) { Set.new([homebrew_forbidden]) }
it "raises on forbidden tap on cask" do
cask = Cask::Cask.new("homebrew-forbidden-tap", tap: homebrew_forbidden) do
url "file://#{TEST_FIXTURE_DIR}/cask/container.tar.gz" url "file://#{TEST_FIXTURE_DIR}/cask/container.tar.gz"
end end
expect do expect do
described_class.new(cask).forbidden_tap_check described_class.new(cask).forbidden_tap_check
end.to raise_error(Cask::CaskCannotBeInstalledError, /has the tap #{tap}/) end.to raise_error(Cask::CaskCannotBeInstalledError, /has the tap #{homebrew_forbidden}/)
end end
it "raises on forbidden tap on dependency" do it "raises on forbidden tap on dependency" do
ENV["HOMEBREW_FORBIDDEN_TAPS"] = dep_tap = "homebrew/forbidden" dep_tap = homebrew_forbidden
dep_name = "homebrew-forbidden-dependency-tap" dep_name = "homebrew-forbidden-dependency-tap"
dep_path = Tap.fetch(dep_tap).new_formula_path(dep_name) dep_path = dep_tap.new_formula_path(dep_name)
dep_path.parent.mkpath dep_path.parent.mkpath
dep_path.write <<~RUBY dep_path.write <<~RUBY
class #{Formulary.class_s(dep_name)} < Formula class #{Formulary.class_s(dep_name)} < Formula
@ -358,7 +363,7 @@ RSpec.describe Cask::Installer, :cask do
expect do expect do
described_class.new(cask).forbidden_tap_check described_class.new(cask).forbidden_tap_check
end.to raise_error(Cask::CaskCannotBeInstalledError, /but the #{dep_tap} tap was forbidden/) end.to raise_error(Cask::CaskCannotBeInstalledError, /from the #{dep_tap} tap but/)
ensure ensure
dep_path.parent.parent.rmtree dep_path.parent.parent.rmtree
end end