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

Merge pull request #20366 from Homebrew/livecheck/special-case-unsigned-deprecations

Browse Source 
SkipConditions: special case unsigned deprecations
This commit is contained in:
Patrick Linnane 2025-08-03 20:22:56 +00:00 committed by GitHub
commit 9e4bedad2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/livecheck/skip_conditions.rb
View File

@ -120,6 +120,7 @@ module Homebrew
} }
private_class_method def self.cask_deprecated(cask, livecheck_defined, full_name: false, verbose: false) private_class_method def self.cask_deprecated(cask, livecheck_defined, full_name: false, verbose: false)
return {} if !cask.deprecated? || livecheck_defined return {} if !cask.deprecated? || livecheck_defined
return {} if cask.disable_date && cask.deprecation_reason == :unsigned
Livecheck.status_hash(cask, "deprecated", full_name:, verbose:) Livecheck.status_hash(cask, "deprecated", full_name:, verbose:)
end end

28
Library/Homebrew/test/livecheck/skip_conditions_spec.rb
View File

@ -82,7 +82,7 @@ RSpec.describe Homebrew::Livecheck::SkipConditions do
basic: Cask::Cask.new("test") do basic: Cask::Cask.new("test") do
version "0.0.1,2" version "0.0.1,2"
url "https://brew.sh/test-0.0.1.tgz" url "https://brew.sh/test-#{version.csv.first}.tgz"
name "Test" name "Test"
desc "Test cask" desc "Test cask"
homepage "https://brew.sh" homepage "https://brew.sh"
@ -96,7 +96,7 @@ RSpec.describe Homebrew::Livecheck::SkipConditions do
version "0.0.1" version "0.0.1"
sha256 :no_check sha256 :no_check
url "https://brew.sh/test-0.0.1.tgz" url "https://brew.sh/test-#{version}.tgz"
name "Test Deprecate" name "Test Deprecate"
desc "Deprecated test cask" desc "Deprecated test cask"
homepage "https://brew.sh" homepage "https://brew.sh"
@ -107,17 +107,27 @@ RSpec.describe Homebrew::Livecheck::SkipConditions do
version "0.0.1" version "0.0.1"
sha256 :no_check sha256 :no_check
url "https://brew.sh/test-0.0.1.tgz" url "https://brew.sh/test-#{version}.tgz"
name "Test Disable" name "Test Disable"
desc "Disabled test cask" desc "Disabled test cask"
homepage "https://brew.sh" homepage "https://brew.sh"
disable! date: "2020-06-25", because: :discontinued disable! date: "2020-06-25", because: :discontinued
end, end,
future_disable_unsigned: Cask::Cask.new("test_future_disable_unsigned") do
version "0.0.1"
url "https://brew.sh/test-#{version}.tgz"
name "Test Future Disabled Unsigned"
desc "Future Disable Unsigned test cask"
homepage "https://brew.sh"
disable! date: "3000-06-25", because: :unsigned
end,
extract_plist: Cask::Cask.new("test_extract_plist_skip") do extract_plist: Cask::Cask.new("test_extract_plist_skip") do
version "0.0.1" version "0.0.1"
url "https://brew.sh/test-0.0.1.tgz" url "https://brew.sh/test-#{version}.tgz"
name "Test ExtractPlist Skip" name "Test ExtractPlist Skip"
desc "Skipped test cask" desc "Skipped test cask"
homepage "https://brew.sh" homepage "https://brew.sh"
@ -147,7 +157,7 @@ RSpec.describe Homebrew::Livecheck::SkipConditions do
skip: Cask::Cask.new("test_skip") do skip: Cask::Cask.new("test_skip") do
version "0.0.1" version "0.0.1"
url "https://brew.sh/test-0.0.1.tgz" url "https://brew.sh/test-#{version}.tgz"
name "Test Skip" name "Test Skip"
desc "Skipped test cask" desc "Skipped test cask"
homepage "https://brew.sh" homepage "https://brew.sh"
@ -159,7 +169,7 @@ RSpec.describe Homebrew::Livecheck::SkipConditions do
skip_with_message: Cask::Cask.new("test_skip_with_message") do skip_with_message: Cask::Cask.new("test_skip_with_message") do
version "0.0.1" version "0.0.1"
url "https://brew.sh/test-0.0.1.tgz" url "https://brew.sh/test-#{version}.tgz"
name "Test Skip" name "Test Skip"
desc "Skipped test cask" desc "Skipped test cask"
homepage "https://brew.sh" homepage "https://brew.sh"
@ -374,6 +384,12 @@ RSpec.describe Homebrew::Livecheck::SkipConditions do
end end
end end
context "when a cask without a `livecheck` block is deprecated with a future disable date because `:unsigned`" do
it "does not skip" do
expect(skip_conditions.skip_information(casks[:future_disable_unsigned])).to eq({})
end
end
context "when a cask has a `livecheck` block using `ExtractPlist` and `--extract-plist` is not used" do context "when a cask has a `livecheck` block using `ExtractPlist` and `--extract-plist` is not used" do
it "skips" do it "skips" do
expect(skip_conditions.skip_information(casks[:extract_plist], extract_plist: false)) expect(skip_conditions.skip_information(casks[:extract_plist], extract_plist: false))