From b3b78eceeb53bb84402507d65308ca5bf30afb24 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Mon, 15 Jun 2009 00:54:58 +0100 Subject: [PATCH] Test for astyle versioning --- Library/Homebrew/brewkit.rb | 8 +++++--- Library/Homebrew/unittest.rb | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/brewkit.rb b/Library/Homebrew/brewkit.rb index 1bd250e779..d0a59b888c 100644 --- a/Library/Homebrew/brewkit.rb +++ b/Library/Homebrew/brewkit.rb @@ -77,9 +77,11 @@ def extract_version basename /((\d+\.)*\d+)$/.match basename return $1 if $1 - # eg. (erlang) otp_src_R13B - /^.*[-_.](.*)$/.match basename - return $1 if $1 + # eg. otp_src_R13B (this is erlang's style) + # eg. astyle_1.23_macosx.tar.gz + basename.scan /_([^_]+)/ do |match| + return match.first if /\d/.match $1 + end end diff --git a/Library/Homebrew/unittest.rb b/Library/Homebrew/unittest.rb index 229bc57b41..5ac1f994a4 100755 --- a/Library/Homebrew/unittest.rb +++ b/Library/Homebrew/unittest.rb @@ -34,6 +34,11 @@ class BeerTasting