From 7a1d30c8b6481bbcbc59c5c943914a5b8b10d664 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 21 May 2018 17:30:55 +0200
Subject: [PATCH] refactor: move semver to lib/versioning
---
lib/config/validation.js | 2 +-
lib/datasource/github.js | 2 +-
lib/manager/_helpers/node/package.js | 2 +-
lib/manager/bazel/package.js | 2 +-
lib/manager/buildkite/package.js | 2 +-
lib/manager/docker/package.js | 2 +-
lib/manager/npm/package.js | 4 ++--
lib/manager/npm/versions.js | 2 +-
lib/manager/pip_requirements/package.js | 2 +-
lib/manager/travis/package.js | 5 ++++-
lib/util/package-rules.js | 2 +-
lib/{util/semver.js => versioning/semver/index.js} | 0
lib/workers/pr/changelog/manager-npm.js | 2 +-
lib/workers/pr/changelog/manager-pip.js | 2 +-
lib/workers/pr/changelog/source-github.js | 5 ++++-
test/util/semver.spec.js | 2 +-
16 files changed, 22 insertions(+), 16 deletions(-)
rename lib/{util/semver.js => versioning/semver/index.js} (100%)
diff --git a/lib/config/validation.js b/lib/config/validation.js
index 3eb263ad1c..4a8fa81658 100644
--- a/lib/config/validation.js
+++ b/lib/config/validation.js
@@ -1,5 +1,5 @@
const options = require('./definitions').getOptions();
-const { isValidSemver } = require('../util/semver');
+const { isValidSemver } = require('../versioning/semver');
const { resolveConfigPresets } = require('./presets');
const {
hasValidSchedule,
diff --git a/lib/datasource/github.js b/lib/datasource/github.js
index d04d68ace1..f0c1a84792 100644
--- a/lib/datasource/github.js
+++ b/lib/datasource/github.js
@@ -1,5 +1,5 @@
const ghGot = require('../platform/github/gh-got-wrapper');
-const { isPinnedVersion, semverSort } = require('../util/semver');
+const { isPinnedVersion, semverSort } = require('../versioning/semver');
module.exports = {
getRepoTags,
diff --git a/lib/manager/_helpers/node/package.js b/lib/manager/_helpers/node/package.js
index dd342fa45e..2735115fec 100644
--- a/lib/manager/_helpers/node/package.js
+++ b/lib/manager/_helpers/node/package.js
@@ -3,7 +3,7 @@ const {
getMinor,
isGreaterThan,
isPinnedVersion,
-} = require('../../../util/semver');
+} = require('../../../versioning/semver');
const { getRepoTags, semverSort } = require('../../../datasource/github');
async function getPackageUpdates(config) {
diff --git a/lib/manager/bazel/package.js b/lib/manager/bazel/package.js
index 7959624198..41ad40b64d 100644
--- a/lib/manager/bazel/package.js
+++ b/lib/manager/bazel/package.js
@@ -3,7 +3,7 @@ const {
isGreaterThan,
isStable,
isPinnedVersion,
-} = require('../../util/semver');
+} = require('../../versioning/semver');
const { getRepoTags, getRepoReleases } = require('../../datasource/github');
module.exports = {
diff --git a/lib/manager/buildkite/package.js b/lib/manager/buildkite/package.js
index 7d6f0c928c..20ddd6ab7c 100644
--- a/lib/manager/buildkite/package.js
+++ b/lib/manager/buildkite/package.js
@@ -4,7 +4,7 @@ const {
semverSort,
getMajor,
getMinor,
-} = require('../../util/semver');
+} = require('../../versioning/semver');
const { getRepoTags } = require('../../datasource/github');
module.exports = {
diff --git a/lib/manager/docker/package.js b/lib/manager/docker/package.js
index c0fb3ec35d..67d5f1f902 100644
--- a/lib/manager/docker/package.js
+++ b/lib/manager/docker/package.js
@@ -1,4 +1,4 @@
-const { getMajor, isValidSemver } = require('../../util/semver');
+const { getMajor, isValidSemver } = require('../../versioning/semver');
const dockerApi = require('../../datasource/docker');
const compareVersions = require('compare-versions');
diff --git a/lib/manager/npm/package.js b/lib/manager/npm/package.js
index 92173142b1..cfa17a378b 100644
--- a/lib/manager/npm/package.js
+++ b/lib/manager/npm/package.js
@@ -1,8 +1,8 @@
const npmApi = require('../../datasource/npm');
const versions = require('./versions');
-const { isValidSemver } = require('../../util/semver');
+const { isValidSemver } = require('../../versioning/semver');
const nodeManager = require('../_helpers/node/package');
-const { parseRange } = require('../../util/semver');
+const { parseRange } = require('../../versioning/semver');
module.exports = {
getRangeStrategy,
diff --git a/lib/manager/npm/versions.js b/lib/manager/npm/versions.js
index 4b33eba8ae..5bad668162 100644
--- a/lib/manager/npm/versions.js
+++ b/lib/manager/npm/versions.js
@@ -14,7 +14,7 @@ const {
parseRange,
parseVersion,
stringifyRange,
-} = require('../../util/semver');
+} = require('../../versioning/semver');
const moment = require('moment');
module.exports = {
diff --git a/lib/manager/pip_requirements/package.js b/lib/manager/pip_requirements/package.js
index 4d92d90bfd..d11a8cdf38 100644
--- a/lib/manager/pip_requirements/package.js
+++ b/lib/manager/pip_requirements/package.js
@@ -4,7 +4,7 @@ const {
semverSort,
isPinnedVersion,
getMajor,
-} = require('../../util/semver');
+} = require('../../versioning/semver');
module.exports = {
getPackageUpdates,
diff --git a/lib/manager/travis/package.js b/lib/manager/travis/package.js
index 4ecc30c318..c6c302ad56 100644
--- a/lib/manager/travis/package.js
+++ b/lib/manager/travis/package.js
@@ -1,6 +1,9 @@
const { isEqual } = require('lodash');
const { getRepoReleases } = require('../../datasource/github');
-const { isPinnedVersion, maxSatisfyingVersion } = require('../../util/semver');
+const {
+ isPinnedVersion,
+ maxSatisfyingVersion,
+} = require('../../versioning/semver');
module.exports = {
getPackageUpdates,
diff --git a/lib/util/package-rules.js b/lib/util/package-rules.js
index 6e58eeeb20..8d4e8312d3 100644
--- a/lib/util/package-rules.js
+++ b/lib/util/package-rules.js
@@ -1,6 +1,6 @@
const minimatch = require('minimatch');
-const { intersectsSemver } = require('./semver');
+const { intersectsSemver } = require('../versioning/semver');
const { mergeChildConfig } = require('../config');
module.exports = {
diff --git a/lib/util/semver.js b/lib/versioning/semver/index.js
similarity index 100%
rename from lib/util/semver.js
rename to lib/versioning/semver/index.js
diff --git a/lib/workers/pr/changelog/manager-npm.js b/lib/workers/pr/changelog/manager-npm.js
index 6fe3da2170..3c49d4b8b5 100644
--- a/lib/workers/pr/changelog/manager-npm.js
+++ b/lib/workers/pr/changelog/manager-npm.js
@@ -1,5 +1,5 @@
const npmRegistry = require('../../../datasource/npm');
-const { semverSort } = require('../../../util/semver');
+const { semverSort } = require('../../../versioning/semver');
module.exports = {
getPackage,
diff --git a/lib/workers/pr/changelog/manager-pip.js b/lib/workers/pr/changelog/manager-pip.js
index 404f1e0d70..c1dc02d5f9 100644
--- a/lib/workers/pr/changelog/manager-pip.js
+++ b/lib/workers/pr/changelog/manager-pip.js
@@ -1,5 +1,5 @@
const got = require('got');
-const { semverSort, isPinnedVersion } = require('../../../util/semver');
+const { semverSort, isPinnedVersion } = require('../../../versioning/semver');
module.exports = {
getPackage,
diff --git a/lib/workers/pr/changelog/source-github.js b/lib/workers/pr/changelog/source-github.js
index 6a61089eff..3ad8ac2d45 100644
--- a/lib/workers/pr/changelog/source-github.js
+++ b/lib/workers/pr/changelog/source-github.js
@@ -1,4 +1,7 @@
-const { matchesSemver, isPinnedVersion } = require('../../../util/semver');
+const {
+ matchesSemver,
+ isPinnedVersion,
+} = require('../../../versioning/semver');
const ghGot = require('../../../platform/github/gh-got-wrapper');
module.exports = {
diff --git a/test/util/semver.spec.js b/test/util/semver.spec.js
index bfd5c79a4a..814b0cb23c 100644
--- a/test/util/semver.spec.js
+++ b/test/util/semver.spec.js
@@ -1,4 +1,4 @@
-const semver = require('../../lib/util/semver');
+const semver = require('../../lib/versioning/semver');
describe('.isValidSemver(input)', () => {
it('should return null for irregular versions', () => {
--
GitLab