From f5a54ab3495a65324cca353dd387d0755d6c7ba9 Mon Sep 17 00:00:00 2001 From: "Tim D. Smith" Date: Sun, 2 Nov 2014 18:23:09 -0800 Subject: [PATCH] BottleVersion: add imap-uw style versions --- Library/Homebrew/bottle_version.rb | 4 ++++ Library/Homebrew/test/test_bottle_versions.rb | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb index c05ab8a831..120eac6363 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -37,6 +37,10 @@ class BottleVersion < Version m = /-(\d{8})/.match(stem) return m.captures.first unless m.nil? + # e.g. 2007f from imap-uw-2007f.yosemite.bottle.tar.gz + m = /-(\d+[a-z])/.match(stem) + return m.captures.first unless m.nil? + super end end diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb index 20eff12461..08333020d3 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -60,4 +60,9 @@ class BottleVersionParsingTests < Homebrew::TestCase assert_version_detected '13-2.9.19', 'libpano-13-2.9.19_1.yosemite.bottle.tar.gz' end + + def test_imapuw_style + assert_version_detected '2007f', + 'imap-uw-2007f.yosemite.bottle.tar.gz' + end end