From e27f7b0ed101608fbcb5e36e3cef77f3ffbda40d Mon Sep 17 00:00:00 2001 From: Seeker Date: Tue, 11 Aug 2020 12:40:35 -0700 Subject: [PATCH] audit: use version token helper methods --- Library/Homebrew/dev-cmd/audit.rb | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index c8cf5f8039..ab667f09b5 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -261,9 +261,8 @@ module Homebrew !(versioned_formulae = formula.versioned_formulae).empty? versioned_aliases = formula.aliases.grep(/.@\d/) _, last_alias_version = versioned_formulae.map(&:name).last.split("@") - major, minor, = formula.version.to_s.split(".") - alias_name_major = "#{formula.name}@#{major}" - alias_name_major_minor = "#{alias_name_major}.#{minor}" + alias_name_major = "#{formula.name}@#{formula.version.major}" + alias_name_major_minor = "#{alias_name_major}.#{formula.version.minor}" alias_name = if last_alias_version.split(".").length == 1 alias_name_major else @@ -488,11 +487,7 @@ module Homebrew return unless formula.name == "postgresql" return unless @core_tap - major_version = formula.version - .to_s - .split(".") - .first - .to_i + major_version = formula.version.major.to_i previous_major_version = major_version - 1 previous_formula_name = "postgresql@#{previous_major_version}" begin @@ -689,7 +684,7 @@ module Homebrew }.freeze # version_prefix = stable_version_string.sub(/\d+$/, "") - # version_prefix = stable_version_string.split(".")[0..1].join(".") + # version_prefix = stable.version.major_minor def audit_specs problem "Head-only (no stable download)" if head_only?(formula) @@ -753,11 +748,9 @@ module Homebrew stable_version_string = stable.version.to_s stable_url_version = Version.parse(stable.url) - _, stable_url_minor_version, = stable_url_version.to_s - .split(".", 3) - .map(&:to_i) + stable_url_minor_version = stable_url_version.minor.to_i - formula_suffix = stable_version_string.split(".").last.to_i + formula_suffix = stable.version.patch.to_i throttled_rate = THROTTLED_FORMULAE[formula.name] if throttled_rate && formula_suffix.modulo(throttled_rate).nonzero? problem "should only be updated every #{throttled_rate} releases on multiples of #{throttled_rate}" @@ -771,7 +764,7 @@ module Homebrew problem "Stable version URLs should not contain #{matched}" when %r{download\.gnome\.org/sources}, %r{ftp\.gnome\.org/pub/GNOME/sources}i - version_prefix = stable_version_string.split(".")[0..1].join(".") + version_prefix = stable.version.major_minor return if GNOME_DEVEL_ALLOWLIST[formula.name] == version_prefix return if stable_url_version < Version.create("1.0") return if stable_url_minor_version.even?