From d6f30a4bc1ef50ff3c5368f3ad6a0ebe2d4d7a33 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 7 Dec 2020 01:07:10 +0100 Subject: [PATCH] Handle formatted versions ending with build version. --- .../Homebrew/dev-cmd/bump-unversioned-casks.rb | 2 +- .../dev-cmd/bump-unversioned-casks_spec.rb | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-unversioned-casks.rb b/Library/Homebrew/dev-cmd/bump-unversioned-casks.rb index a86c0a0926..f98ccd3594 100644 --- a/Library/Homebrew/dev-cmd/bump-unversioned-casks.rb +++ b/Library/Homebrew/dev-cmd/bump-unversioned-casks.rb @@ -275,7 +275,7 @@ module Homebrew end if short_version&.match?(/\A\d+(\.\d+)*\Z/) && version&.match?(/\A\d+\Z/) - return short_version if short_version.start_with?("#{version}.") + return short_version if short_version.start_with?("#{version}.") || short_version.end_with?(".#{version}") return "#{short_version},#{version}" end diff --git a/Library/Homebrew/test/dev-cmd/bump-unversioned-casks_spec.rb b/Library/Homebrew/test/dev-cmd/bump-unversioned-casks_spec.rb index e5929cb9e4..3be2e21820 100644 --- a/Library/Homebrew/test/dev-cmd/bump-unversioned-casks_spec.rb +++ b/Library/Homebrew/test/dev-cmd/bump-unversioned-casks_spec.rb @@ -9,14 +9,16 @@ describe "Homebrew.bump_unversioned_casks_args" do describe "::decide_between_versions" do expected_mappings = { - [nil, nil] => nil, - ["1.2", nil] => "1.2", - [nil, "1.2.3"] => "1.2.3", - ["1.2", "1.2.3"] => "1.2.3", - ["1.2.3", "1.2"] => "1.2.3", - ["1.2.3", "8312"] => "1.2.3,8312", - ["2021", "2006"] => "2021,2006", - ["1.0", "1"] => "1.0", + [nil, nil] => nil, + ["1.2", nil] => "1.2", + [nil, "1.2.3"] => "1.2.3", + ["1.2", "1.2.3"] => "1.2.3", + ["1.2.3", "1.2"] => "1.2.3", + ["1.2.3", "8312"] => "1.2.3,8312", + ["2021", "2006"] => "2021,2006", + ["1.0", "1"] => "1.0", + ["1.0", "0"] => "1.0", + ["1.2.3.4000", "4000"] => "1.2.3.4000", } expected_mappings.each do |(short_version, version), expected_version|