diff options
| author | Mike McQuaid | 2012-10-16 10:31:03 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2012-10-16 10:31:35 +0100 |
| commit | 425440de3bebb1f28fc51e99bc98587f5a54f295 (patch) | |
| tree | c4508651b260e382399b6f8a596dc8cb7cbddb04 | |
| parent | 55fabe36e0b6a27116e76405f3e8c23139dc6149 (diff) | |
| download | brew-425440de3bebb1f28fc51e99bc98587f5a54f295.tar.bz2 | |
Add Jenkins version matching (and test).
| -rw-r--r-- | Library/Homebrew/test/test_versions.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/version.rb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb index 49f6b9a1d..e1566b50e 100644 --- a/Library/Homebrew/test/test_versions.rb +++ b/Library/Homebrew/test/test_versions.rb @@ -235,6 +235,10 @@ class VersionParsingTests < Test::Unit::TestCase assert_version_detected '3.4', 'http://www.antlr.org/download/antlr-3.4-complete.jar' end + def test_jenkins_version_style + assert_version_detected '1.486', 'http://mirrors.jenkins-ci.org/war/1.486/jenkins.war' + end + # def test_version_ghc_style # assert_version_detected '7.0.4', 'http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-x86_64-apple-darwin.tar.bz2' # assert_version_detected '7.0.4', 'http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-i386-apple-darwin.tar.bz2' diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb index 9e2fd32ae..be1ee63c2 100644 --- a/Library/Homebrew/version.rb +++ b/Library/Homebrew/version.rb @@ -175,6 +175,10 @@ class Version # e.g. astyle_1.23_macosx.tar.gz m = /_([^_]+)/.match(stem) return m.captures.first unless m.nil? + + # e.g. http://mirrors.jenkins-ci.org/war/1.486/jenkins.war + m = /\/(\d\.\d+)\//.match(spec.to_s) + return m.captures.first unless m.nil? end # DSL for defining comparators |
