From b681d64e59b07f64bbf7b68016a4bdb792d935ff Mon Sep 17 00:00:00 2001 From: EricFromCanada Date: Fri, 28 Feb 2020 14:33:34 -0500 Subject: [PATCH] version: handle -stable in tag --- Library/Homebrew/test/language/node_spec.rb | 2 +- Library/Homebrew/test/version_spec.rb | 2 +- Library/Homebrew/version.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/test/language/node_spec.rb b/Library/Homebrew/test/language/node_spec.rb index 0501297b7cf90..79c3cf2496929 100644 --- a/Library/Homebrew/test/language/node_spec.rb +++ b/Library/Homebrew/test/language/node_spec.rb @@ -6,7 +6,7 @@ describe "#setup_npm_environment" do it "calls prepend_path when node formula exists only during the first call" do node = formula "node" do - url "node-test" + url "node-test-v1.0" end stub_formula_loader(node) expect(ENV).to receive(:prepend_path) diff --git a/Library/Homebrew/test/version_spec.rb b/Library/Homebrew/test/version_spec.rb index 9b10aed3a2899..60128a8a2c859 100644 --- a/Library/Homebrew/test/version_spec.rb +++ b/Library/Homebrew/test/version_spec.rb @@ -686,7 +686,7 @@ specify "from tag" do expect(described_class.create("1.2.3")) - .to be_detected_from("https://github.com/foo/bar.git", tag: "v1.2.3") + .to be_detected_from("https://github.com/foo/bar.git", tag: "v1.2.3-stable") end specify "beta from tag" do diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb index 8ca79245ca3ac..27116a243e94a 100644 --- a/Library/Homebrew/version.rb +++ b/Library/Homebrew/version.rb @@ -336,11 +336,11 @@ def self._parse(spec) return m.captures.first unless m.nil? # e.g. https://www.openssl.org/source/openssl-0.9.8s.tar.gz - m = /-v?([^-]+)/.match(stem) + m = /-v?(\d[^-]+)/.match(stem) return m.captures.first unless m.nil? # e.g. astyle_1.23_macosx.tar.gz - m = /_([^_]+)/.match(stem) + m = /_v?(\d[^_]+)/.match(stem) return m.captures.first unless m.nil? # e.g. http://mirrors.jenkins-ci.org/war/1.486/jenkins.war