Support gloox version style

2 files changed, 9 insertions, 0 deletions

diff --git a/Library/Homebrew/brewkit.rb b/Library/Homebrew/brewkit.rb
index 49f29369c..9a82f8f4f 100644
--- a/Library/Homebrew/brewkit.rb
+++ b/Library/Homebrew/brewkit.rb
@@ -73,6 +73,10 @@ def extract_version basename
   /-((\d+\.)*\d+([abc]|rc\d))$/.match basename
   return $1 if $1
   
+  # eg foobar-4.5.0-beta1
+  /-((\d+\.)*\d+-beta\d+)$/.match basename
+  return $1 if $1
+  
   # eg. foobar4.5.1
   /((\d+\.)*\d+)$/.match basename
   return $1 if $1
diff --git a/Library/Homebrew/unittest.rb b/Library/Homebrew/unittest.rb
index f3e24c407..84f0d3f81 100755
--- a/Library/Homebrew/unittest.rb
+++ b/Library/Homebrew/unittest.rb
@@ -47,6 +47,11 @@ class BeerTasting <Test::Unit::TestCase
     assert_equal '9.04', r.version
   end
   
+  def test_gloox_beta_style
+    r=TestFormula.new "http://camaya.net/download/gloox-1.0-beta7.tar.bz2"
+    assert_equal '1.0-beta7', r.version
+  end
+  
   def test_astyle_verson_style
     r=TestFormula.new "http://kent.dl.sourceforge.net/sourceforge/astyle/astyle_1.23_macosx.tar.gz"
     assert_equal '1.23', r.version