From 6ef3bab4a35f0a085670d29341c65862796665ef Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 15 May 2014 11:00:58 +0100 Subject: [PATCH] bottle_version: support fontforge scheme. --- 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 2d1bfb04ea..6075f967aa 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -29,6 +29,10 @@ class BottleVersion < Version m = /-(\d+_\d+(_\d+)+)/.match(stem) return m.captures.first unless m.nil? + # e.g. 20120731 from fontforge-20120731.mavericks.bottle.tar.gz + m = /-(\d+)/.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 a37f07307f..d7ad5b310f 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -45,4 +45,9 @@ class BottleVersionParsingTests < Test::Unit::TestCase assert_version_detected '00-5.0.5', '/usr/local/zpython-00-5.0.5.mavericks.bottle.tar.gz' end + + def test_fontforge_style + assert_version_detected '20120731', + '/usr/local/fontforge-20120731.mavericks.bottle.tar.gz' + end end