From 6b58107693b01473c42f9901eb25f52b20b9bd56 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 15 Mar 2015 16:29:21 +0000 Subject: [PATCH] bottle_version: add erlang versions style regex. --- 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 9cba7fbfc4..8cb447229c 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -7,6 +7,10 @@ class BottleVersion < Version m = /-([\d\.]+-x86(_64)?)/.match(stem) return m.captures.first unless m.nil? + # e.g. R14B04 from erlang-r14-R14B04.yosemite.bottle.tar.gz + m = /erlang-r\d+-(R\d+B\d+(-\d)?)/.match(stem) + return m.captures.first unless m.nil? + # e.g. x264-r2197.4.mavericks.bottle.tar.gz # e.g. lz4-r114.mavericks.bottle.tar.gz m = /-(r\d+\.?\d*)/.match(stem) diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb index 05316ec5fc..529728c533 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -56,6 +56,11 @@ class BottleVersionParsingTests < Homebrew::TestCase 'erlang-R16B03-1.mavericks.bottle.2.tar.gz' end + def test_erlang_versions_style + assert_version_detected 'R14B04', + 'erlang-r14-R14B04.yosemite.bottle.tar.gz' + end + def test_libpano_style assert_version_detected '13-2.9.19', 'libpano-13-2.9.19_1.yosemite.bottle.tar.gz'