diff options
| author | Stefano Pigozzi | 2015-12-26 19:55:19 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2015-12-26 21:47:14 +0000 |
| commit | e865cee3d33e38485a46e1b88f8aa9466f31633f (patch) | |
| tree | 63ab25d5757dd5afe178b93a6c7d8fb39a235b49 /Library | |
| parent | 30455d0fb5fce2652ca8cadd5941aecccc611e5b (diff) | |
| download | brew-e865cee3d33e38485a46e1b88f8aa9466f31633f.tar.bz2 | |
Fix version parsing on URLs with no extensions
Diffstat (limited to 'Library')
| -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 3efc1df6a..5bc9aded8 100644 --- a/Library/Homebrew/test/test_versions.rb +++ b/Library/Homebrew/test/test_versions.rb @@ -361,4 +361,8 @@ class VersionParsingTests < Homebrew::TestCase assert_version_detected "1.0.2", "https://opam.ocaml.org/archives/easy-format.1.0.2+opam.tar.gz" end + + def test_waf_version + assert_version_detected "1.8.12", "https://waf.io/waf-1.8.12" + end end diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb index 49296a142..70e7198b0 100644 --- a/Library/Homebrew/version.rb +++ b/Library/Homebrew/version.rb @@ -307,6 +307,10 @@ class Version m = /[-_]((?:\d+\.)*\d\.\d+-(?:p|rc|RC)?\d+)(?:[-._](?:bin|dist|stable|src|sources))?$/.match(stem) return m.captures.first unless m.nil? + # URL with no extension e.g. https://waf.io/waf-1.8.12 + m = /-((?:\d+\.)*\d+)$/.match(spec_s) + return m.captures.first unless m.nil? + # e.g. lame-398-1 m = /-((?:\d)+-\d)/.match(stem) return m.captures.first unless m.nil? |