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

Merge pull request #19889 from Homebrew/update-eol_data

Browse Source 
Update eol_data for API changes
This commit is contained in:
Bo Anderson 2025-05-04 04:37:50 +00:00 committed by GitHub
commit 1dc5f5c55c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 66 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/formula_auditor.rb
View File

@ -612,11 +612,10 @@ module Homebrew
metadata = SharedAudits.eol_data(name, formula.version.major.to_s) metadata = SharedAudits.eol_data(name, formula.version.major.to_s)
metadata ||= SharedAudits.eol_data(name, formula.version.major_minor.to_s) metadata ||= SharedAudits.eol_data(name, formula.version.major_minor.to_s)
return if metadata.blank? || (eol = metadata["eol"]).blank? return if metadata.blank? || (metadata.dig("result", "isEol") != true)
is_eol = eol == true eol_from = metadata.dig("result", "eolFrom")
is_eol ||= eol.is_a?(String) && (eol_date = Date.parse(eol)) <= Date.today eol_date = Date.parse(eol_from) if eol_from.present?
return unless is_eol
message = "Product is EOL" message = "Product is EOL"
message += " since #{eol_date}" if eol_date.present? message += " since #{eol_date}" if eol_date.present?

50
Library/Homebrew/test/utils/shared_audits_spec.rb
View File

@ -1,8 +1,58 @@
# frozen_string_literal: true # frozen_string_literal: true
require "utils/shared_audits" require "utils/shared_audits"
require "utils/curl"
RSpec.describe SharedAudits do RSpec.describe SharedAudits do
let(:eol_json_text) do
<<~JSON
{
"schema_version" : "1.0.0",
"generated_at": "2025-01-02T01:23:45+00:00",
"result": {
"name": "1.2",
"codename": null,
"label": "1.2",
"releaseDate": "2024-01-01",
"isLts": false,
"ltsFrom": null,
"isEol": true,
"eolFrom": "2025-01-01",
"isMaintained": false,
"latest": {
"name": "1.0.0",
"date": "2024-01-01",
"link": "https://example.com/1.0.0"
}
}
}
JSON
end
def mock_curl_output(stdout: "", success: true)
status = instance_double(Process::Status, success?: success)
curl_output = instance_double(SystemCommand::Result, stdout:, status:)
allow(Utils::Curl).to receive(:curl_output).and_return curl_output
end
describe "::eol_data" do
it "returns a parsed JSON object if the product is found" do
mock_curl_output stdout: eol_json_text
expect(described_class.eol_data("product", "cycle")&.dig("result", "isEol")).to be(true)
expect(described_class.eol_data("product", "cycle")&.dig("result", "eolFrom")).to eq("2025-01-01")
end
it "returns nil if the product is not found" do
mock_curl_output stdout: "<html></html>"
expect(described_class.eol_data("none", "cycle")).to be_nil
end
it "returns nil if api call fails" do
mock_curl_output success: false
expect(described_class.eol_data("", "")).to be_nil
end
end
describe "::github_tag_from_url" do describe "::github_tag_from_url" do
it "finds tags in archive urls" do it "finds tags in archive urls" do
url = "https://github.com/a/b/archive/refs/tags/v1.2.3.tar.gz" url = "https://github.com/a/b/archive/refs/tags/v1.2.3.tar.gz"

18
Library/Homebrew/utils/shared_audits.rb
View File

@ -11,11 +11,19 @@ module SharedAudits
sig { params(product: String, cycle: String).returns(T.nilable(T::Hash[String, T.untyped])) } sig { params(product: String, cycle: String).returns(T.nilable(T::Hash[String, T.untyped])) }
def self.eol_data(product, cycle) def self.eol_data(product, cycle)
@eol_data ||= T.let({}, T.nilable(T::Hash[String, T.untyped])) @eol_data ||= T.let({}, T.nilable(T::Hash[String, T.untyped]))
@eol_data["#{product}/#{cycle}"] ||= begin key = "#{product}/#{cycle}"
result = Utils::Curl.curl_output("--location", "https://endoflife.date/api/#{product}/#{cycle}.json") return @eol_data[key] if @eol_data.key?(key)
json = JSON.parse(result.stdout) if result.status.success?
json = nil if json&.dig("message")&.include?("Product not found") result = Utils::Curl.curl_output(
json "--location",
"https://endoflife.date/api/v1/products/#{product}/releases/#{cycle}",
)
return unless result.status.success?
@eol_data[key] = begin
JSON.parse(result.stdout)
rescue JSON::ParserError
nil
end end
end end