From 467c33a528ef6a7909ebbb8f23a8a7dd47b77f20 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Mon, 9 Jan 2017 07:09:20 +0100
Subject: [PATCH] Rename nextVersion to newVersion
---
src/config.js | 10 +++++-----
src/index.js | 24 ++++++++++++------------
src/npm.js | 2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/config.js b/src/config.js
index bfdd33ff9c..47de6d88a2 100644
--- a/src/config.js
+++ b/src/config.js
@@ -3,19 +3,19 @@ module.exports = {
baseBranch: 'master',
templates: {
branchName: (params) => {
- return `renovate/${params.depName}-${params.nextVersionMajor}.x`;
+ return `renovate/${params.depName}-${params.newVersionMajor}.x`;
},
commitMessage: (params) => {
- return `Upgrade dependency ${params.depName} to version ${params.nextVersion}`;
+ return `Upgrade dependency ${params.depName} to version ${params.newVersion}`;
},
prBody: (params) => {
- return `This Pull Request updates dependency ${params.depName} from version ${params.currentVersion} to ${params.nextVersion}.`;
+ return `This Pull Request updates dependency ${params.depName} from version ${params.currentVersion} to ${params.newVersion}.`;
},
prTitleMajor: (params) => {
- return `Upgrade dependency ${params.depName} to version ${params.nextVersionMajor}.x`;
+ return `Upgrade dependency ${params.depName} to version ${params.newVersionMajor}.x`;
},
prTitleMinor: (params) => {
- return `Upgrade dependency ${params.depName} to version ${params.nextVersion}`;
+ return `Upgrade dependency ${params.depName} to version ${params.newVersion}`;
},
}
};
diff --git a/src/index.js b/src/index.js
index 498954c812..df559daa87 100644
--- a/src/index.js
+++ b/src/index.js
@@ -65,22 +65,22 @@ function processUpgradesSequentially(upgrades) {
// 2. Edge case collision of branch name, e.g. dependency also listed as dev dependency
return upgrades.reduce((promise, upgrade) => {
return promise.then(() => {
- return updateDependency(upgrade.depType, upgrade.depName, upgrade.currentVersion, upgrade.nextVersion);
+ return updateDependency(upgrade.depType, upgrade.depName, upgrade.currentVersion, upgrade.newVersion);
});
}, Promise.resolve());
}
-function updateDependency(depType, depName, currentVersion, nextVersion) {
- const nextVersionMajor = semver.major(nextVersion);
- const branchName = config.templates.branchName({depType, depName, currentVersion, nextVersion, nextVersionMajor});
+function updateDependency(depType, depName, currentVersion, newVersion) {
+ const newVersionMajor = semver.major(newVersion);
+ const branchName = config.templates.branchName({depType, depName, currentVersion, newVersion, newVersionMajor});
let prTitle = '';
- if (nextVersionMajor > semver.major(currentVersion)) {
- prTitle = config.templates.prTitleMajor({ depType, depName, currentVersion, nextVersion, nextVersionMajor });
+ if (newVersionMajor > semver.major(currentVersion)) {
+ prTitle = config.templates.prTitleMajor({ depType, depName, currentVersion, newVersion, newVersionMajor });
} else {
- prTitle = config.templates.prTitleMinor({ depType, depName, currentVersion, nextVersion, nextVersionMajor });
+ prTitle = config.templates.prTitleMinor({ depType, depName, currentVersion, newVersion, newVersionMajor });
}
- const prBody = config.templates.prBody({ depName, currentVersion, nextVersion });
- const commitMessage = config.templates.commitMessage({ depName, currentVersion, nextVersion });
+ const prBody = config.templates.prBody({ depName, currentVersion, newVersion });
+ const commitMessage = config.templates.commitMessage({ depName, currentVersion, newVersion });
// Check if same PR already existed and skip if so
// This allows users to close an unwanted upgrade PR and not worry about seeing it raised again
@@ -118,12 +118,12 @@ function updateDependency(depType, depName, currentVersion, nextVersion) {
const currentSHA = res.body.sha;
const currentFileContent = new Buffer(res.body.content, 'base64').toString();
const currentFileContentJson = JSON.parse(currentFileContent);
- if (currentFileContentJson[depType][depName] !== nextVersion) {
+ if (currentFileContentJson[depType][depName] !== newVersion) {
// Branch is new, or needs version updated
if (config.verbose) {
- console.log(`${depName}: Updating to ${nextVersion} in branch ${branchName}`);
+ console.log(`${depName}: Updating to ${newVersion} in branch ${branchName}`);
}
- const newPackageContents = packageJson.setNewValue(currentFileContent, depType, depName, nextVersion);
+ const newPackageContents = packageJson.setNewValue(currentFileContent, depType, depName, newVersion);
return github.writeFile(branchName, currentSHA, packageFile, newPackageContents, commitMessage);
} else {
if (config.verbose) {
diff --git a/src/npm.js b/src/npm.js
index 4417cd7c4f..2d1e55d455 100644
--- a/src/npm.js
+++ b/src/npm.js
@@ -49,7 +49,7 @@ module.exports = {
depType: depType,
depName: depName,
currentVersion: currentVersion,
- nextVersion: res[majorVersion],
+ newVersion: res[majorVersion],
});
});
} else {
--
GitLab