From ee0054c086d101613f2fbc84de23222dda24c25a Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Fri, 17 May 2019 09:28:42 +0200
Subject: [PATCH] fix: malformed ruby version string (#3732)
Use fork until this fix is merged upstream
---
package.json | 2 +-
test/versioning/__snapshots__/ruby.spec.js.snap | 3 +++
test/versioning/ruby.spec.js | 6 ++++++
yarn.lock | 7 +++----
4 files changed, 13 insertions(+), 5 deletions(-)
create mode 100644 test/versioning/__snapshots__/ruby.spec.js.snap
diff --git a/package.json b/package.json
index 74ffa93ad1..ad9844b672 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
"@renovate/pep440": "0.4.1",
"@renovatebot/docker-registry-client": "3.3.0",
"@sindresorhus/is": "0.17.0",
- "@snyk/ruby-semver": "2.0.1",
+ "@snyk/ruby-semver": "rarkins/ruby-semver#semverfix",
"@yarnpkg/lockfile": "1.1.0",
"azure-devops-node-api": "7.2.0",
"bunyan": "1.8.12",
diff --git a/test/versioning/__snapshots__/ruby.spec.js.snap b/test/versioning/__snapshots__/ruby.spec.js.snap
new file mode 100644
index 0000000000..b29379aaf5
--- /dev/null
+++ b/test/versioning/__snapshots__/ruby.spec.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`semverRuby .getNewValue does not error 1`] = `">= 3.2, < 6.0.2"`;
diff --git a/test/versioning/ruby.spec.js b/test/versioning/ruby.spec.js
index b559e16111..65384b64cc 100644
--- a/test/versioning/ruby.spec.js
+++ b/test/versioning/ruby.spec.js
@@ -383,6 +383,12 @@ describe('semverRuby', () => {
});
});
+ it('does not error', () => {
+ expect(
+ semverRuby.getNewValue('>= 3.2, < 5.0', 'replace', '4.0.2', '6.0.1')
+ ).toMatchSnapshot();
+ });
+
it('returns correct version for replace strategy', () => {
[
['1.2.3', '1.0.3', 'replace', '1.0.3', '1.2.3'],
diff --git a/yarn.lock b/yarn.lock
index b175843ef8..4e06fb231d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -442,10 +442,9 @@
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
-"@snyk/ruby-semver@2.0.1":
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/@snyk/ruby-semver/-/ruby-semver-2.0.1.tgz#e674f6917642d9153629abc27ef394d9e57258f9"
- integrity sha512-zea2ixA/LsFtH+ajBGh0n4tF3WVjZ1MRZDib9jzI7Up5G75ogTx5opRWwSjrXid2nRpLv1w/yRVWxuetehBqFQ==
+"@snyk/ruby-semver@rarkins/ruby-semver#semverfix":
+ version "2.0.2-rc.0"
+ resolved "https://codeload.github.com/rarkins/ruby-semver/tar.gz/aefe0848d062e417ade9d9529dfe3cbd2e53dad3"
dependencies:
lodash "^4.17.11"
--
GitLab