From 921fa5b6ed2ddf0f49c1b97f3f8df5d41be27575 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Mon, 29 Jul 2024 10:10:10 -0400 Subject: [PATCH 1/2] resource_auditor: normalize PyPI names to kebab case before auditing Signed-off-by: William Woodruff --- Library/Homebrew/resource_auditor.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/resource_auditor.rb b/Library/Homebrew/resource_auditor.rb index 86a13bea59..4ef3afb951 100644 --- a/Library/Homebrew/resource_auditor.rb +++ b/Library/Homebrew/resource_auditor.rb @@ -117,9 +117,11 @@ module Homebrew pypi_package_name, = File.basename(path).split("-", 2) else url =~ %r{/(?[^/]+)-} - pypi_package_name = Regexp.last_match(:package_name).to_s.gsub(/[_.]/, "-") + pypi_package_name = Regexp.last_match(:package_name).to_s end + pypi_package_name.gsub!(/[_.]/, "-") + return if name.casecmp(pypi_package_name).zero? problem "resource name should be `#{pypi_package_name}` to match the PyPI package name" From de582fbdbfcb4912161d613b6c04b6355cfa85b3 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Mon, 29 Jul 2024 10:27:42 -0400 Subject: [PATCH 2/2] resource_auditor: make typechecker happy Signed-off-by: William Woodruff --- Library/Homebrew/resource_auditor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/resource_auditor.rb b/Library/Homebrew/resource_auditor.rb index 4ef3afb951..795b2cbe9f 100644 --- a/Library/Homebrew/resource_auditor.rb +++ b/Library/Homebrew/resource_auditor.rb @@ -120,7 +120,7 @@ module Homebrew pypi_package_name = Regexp.last_match(:package_name).to_s end - pypi_package_name.gsub!(/[_.]/, "-") + T.must(pypi_package_name).gsub!(/[_.]/, "-") return if name.casecmp(pypi_package_name).zero?