From eec8cc6a12b6676e8a8da3a7cced4547d8bd3c8b Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 27 Jan 2013 22:34:53 +0000 Subject: [PATCH] jpeg: support version format. --- Library/Homebrew/test/test_versions.rb | 4 ++++ Library/Homebrew/version.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb index 0458481b40..bdda4093b4 100644 --- a/Library/Homebrew/test/test_versions.rb +++ b/Library/Homebrew/test/test_versions.rb @@ -243,6 +243,10 @@ class VersionParsingTests < Test::Unit::TestCase assert_version_detected '1.2.0-rc2', 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.2.0/apache-cassandra-1.2.0-rc2-bin.tar.gz' end + def test_jpeg_style + assert_version_detected '8d', 'http://www.ijg.org/files/jpegsrc.v8d.tar.gz' + 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 192463ed8c..982c83bfe7 100644 --- a/Library/Homebrew/version.rb +++ b/Library/Homebrew/version.rb @@ -183,6 +183,10 @@ class Version # 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? + + # e.g. http://www.ijg.org/files/jpegsrc.v8d.tar.gz + m = /\.v(\d+[a-z]?)/.match(stem) + return m.captures.first unless m.nil? end # DSL for defining comparators