admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #11491 from samford/update-version-parsers-for-luajit-openresty

Browse Source 
Version: Add parser for additional hyphenated filenames
This commit is contained in:
Sam Ford 2021-06-17 08:25:31 -04:00 committed by GitHub
commit e4ad1a3f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/test/version_spec.rb
View File

@ -479,6 +479,12 @@ describe Version do
specify "version internal dash" do specify "version internal dash" do
expect(described_class.create("1.1-2")) expect(described_class.create("1.1-2"))
.to be_detected_from("https://brew.sh/foo-arse-1.1-2.tar.gz") .to be_detected_from("https://brew.sh/foo-arse-1.1-2.tar.gz")
expect(described_class.create("3.3.04-1"))
.to be_detected_from("https://brew.sh/3.3.04-1.tar.gz")
expect(described_class.create("1.2-20200102"))
.to be_detected_from("https://brew.sh/v1.2-20200102.tar.gz")
expect(described_class.create("3.6.6-0.2"))
.to be_detected_from("https://brew.sh/v3.6.6-0.2.tar.gz")
end end
specify "version single digit" do specify "version single digit" do

8
Library/Homebrew/version.rb
View File

@ -417,6 +417,14 @@ class Version
# e.g. ruby-1.9.1-p243 # e.g. ruby-1.9.1-p243
StemParser.new(/[_-](#{NUMERIC_WITH_DOTS}-(?:p|rc|RC)?\d+)#{CONTENT_SUFFIX}?$/), StemParser.new(/[_-](#{NUMERIC_WITH_DOTS}-(?:p|rc|RC)?\d+)#{CONTENT_SUFFIX}?$/),
# Hyphenated versions without software-name prefix (e.g. brew-)
# e.g. v0.0.8-12.tar.gz
# e.g. 3.3.04-1.tar.gz
# e.g. v2.1-20210510.tar.gz
# e.g. 2020.11.11-3.tar.gz
# e.g. v3.6.6-0.2
StemParser.new(/^v?(#{NUMERIC_WITH_DOTS}(?:-#{NUMERIC_WITH_OPTIONAL_DOTS})+)/),
# URL with no extension # URL with no extension
# e.g. https://waf.io/waf-1.8.12 # e.g. https://waf.io/waf-1.8.12
# e.g. https://codeload.github.com/gsamokovarov/jump/tar.gz/v0.7.1 # e.g. https://codeload.github.com/gsamokovarov/jump/tar.gz/v0.7.1