Repository: cordova-coho Updated Branches: refs/heads/master 9c6987041 -> 6f57d6dc9
CB-7094 Use correct package name when unpublishing old nightly Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/6f57d6dc Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/6f57d6dc Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/6f57d6dc Branch: refs/heads/master Commit: 6f57d6dc9f7f537d4717fff803fa2bae32e9a2b3 Parents: 9c69870 Author: Vladimir Kotikov <kotikov.vladi...@gmail.com> Authored: Fri May 13 15:28:57 2016 +0300 Committer: Vladimir Kotikov <kotikov.vladi...@gmail.com> Committed: Fri May 13 15:28:57 2016 +0300 ---------------------------------------------------------------------- src/nightly.js | 6 +++--- src/npm-publish.js | 5 +++-- src/repoutil.js | 5 +++++ 3 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/6f57d6dc/src/nightly.js ---------------------------------------------------------------------- diff --git a/src/nightly.js b/src/nightly.js index ad455e1..e69328f 100644 --- a/src/nightly.js +++ b/src/nightly.js @@ -118,9 +118,9 @@ module.exports = function*(argv) { //unpublish old nightly yield repoutil.forEachRepo([cordovaLib, cli], function*(repo) { - var repoName = repo.id === 'cli' ? 'cordova' : repo.repoName; - var oldNightlyVersion = yield executil.execHelper(executil.ARGS('npm view ' + repoName + ' dist-tags.nightly')); - apputil.print('Latest ' + repoName + '@nightly version is ' + oldNightlyVersion); + var packageName = repo.packageName || repo.repoName; + var oldNightlyVersion = yield executil.execHelper(executil.ARGS('npm view ' + packageName + ' dist-tags.nightly')); + apputil.print('Latest ' + packageName + '@nightly version is ' + oldNightlyVersion); options.r = [repo.id]; options.version = oldNightlyVersion; http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/6f57d6dc/src/npm-publish.js ---------------------------------------------------------------------- diff --git a/src/npm-publish.js b/src/npm-publish.js index abd7dd3..5433d41 100644 --- a/src/npm-publish.js +++ b/src/npm-publish.js @@ -122,8 +122,9 @@ function *unpublish(options) { var repos = flagutil.computeReposFromFlag(argv.r); yield repoutil.forEachRepo(repos, function*(repo) { - yield executil.execOrPretend(executil.ARGS('npm unpublish '+ repo.id + '@' + argv.version), argv.pretend); - }) + var packageId = repo.packageName || repo.repoName; + yield executil.execOrPretend(executil.ARGS('npm unpublish '+ packageId + '@' + argv.version), argv.pretend); + }); } module.exports.unpublish = unpublish; http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/6f57d6dc/src/repoutil.js ---------------------------------------------------------------------- diff --git a/src/repoutil.js b/src/repoutil.js index fcf9c14..59ab1fe 100644 --- a/src/repoutil.js +++ b/src/repoutil.js @@ -306,11 +306,13 @@ var toolRepos = [ { title: 'Cordova CLI', id: 'cli', + packageName: 'cordova', repoName: 'cordova-cli', jiraComponentName: 'CLI' }, { title: 'Cordova Plugman', id: 'plugman', + packageName: 'plugman', repoName: 'cordova-plugman', jiraComponentName: 'Plugman' }, { @@ -322,6 +324,7 @@ var toolRepos = [ }, { title: 'Cordova Serve', id: 'serve', + packageName: 'cordova-serve', repoName: 'cordova-lib', path: 'cordova-serve', versionPrefix: 'serve', @@ -329,6 +332,7 @@ var toolRepos = [ }, { title: 'Cordova Common', id: 'common', + packageName: 'cordova-common', repoName: 'cordova-lib', path: 'cordova-common', versionPrefix: 'common', @@ -336,6 +340,7 @@ var toolRepos = [ }, { title: 'Cordova Fetch', id: 'fetch', + packageName: 'cordova-fetch', repoName: 'cordova-lib', path: 'cordova-fetch', versionPrefix: 'fetch', --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
