Repository: cordova-coho Updated Branches: refs/heads/master d27736a98 -> 34ae0bbbe
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/src/repo-update.js ---------------------------------------------------------------------- diff --git a/src/repo-update.js b/src/repo-update.js index 1ec198d..63ec4af 100644 --- a/src/repo-update.js +++ b/src/repo-update.js @@ -25,22 +25,22 @@ var gitutil = require('./gitutil'); var repoutil = require('./repoutil'); var print = apputil.print; -module.exports = function*(argv) { - var opt = flagutil.registerRepoFlag(optimist) +module.exports = function * (argv) { + var opt = flagutil.registerRepoFlag(optimist); opt = flagutil.registerDepthFlag(opt); - var opt = opt + var opt = opt // eslint-disable-line no-redeclare .options('b', { alias: 'branch', desc: 'The name of the branch to update. Can be specified multiple times to update multiple branches.', default: ['master'] - }) + }) .options('fetch', { type: 'boolean', desc: 'Use --no-fetch to skip the "git fetch" step.', default: true - }); + }); opt = flagutil.registerHelpFlag(opt); - var argv = opt + var argv = opt // eslint-disable-line no-redeclare .usage('Updates git repositories by performing the following commands:\n' + ' save active branch\n' + ' git fetch $REMOTE \n' + @@ -70,13 +70,13 @@ module.exports = function*(argv) { ); // ensure that any missing repos are cloned - yield require('./repo-clone').cloneRepos(repos,true,depth); + yield require('./repo-clone').cloneRepos(repos, true, depth); yield updateRepos(repos, branches, !argv.fetch); -} +}; -function *updateRepos(repos, branches, noFetch) { +function * updateRepos (repos, branches, noFetch) { // Pre-fetch checks. - yield repoutil.forEachRepo(repos, function*(repo) { + yield repoutil.forEachRepo(repos, function * (repo) { if (repo.svn) { return; } @@ -90,7 +90,7 @@ function *updateRepos(repos, branches, noFetch) { if (!noFetch) { var fetchPromises = []; - yield repoutil.forEachRepo(repos, function*(repo) { + yield repoutil.forEachRepo(repos, function * (repo) { if (repo.svn) { return; } @@ -98,22 +98,22 @@ function *updateRepos(repos, branches, noFetch) { fetchPromises.push(executil.execHelper(executil.ARGS('git remote update ', repo.remoteName), 3)); }); if (fetchPromises.length > 1) { - print('Waiting for concurrent fetches to finish...'); + print('Waiting for concurrent fetches to finish...'); } yield fetchPromises; } if (branches && branches.length) { var errors = ''; - yield repoutil.forEachRepo(repos, function*(repo) { - if(repo.id === 'firefoxos' && process.platform === 'win32') { - console.log('Skipping firefox OS repo on Windows as it fails due to max path length issues'); - return; + yield repoutil.forEachRepo(repos, function * (repo) { + if (repo.id === 'firefoxos' && process.platform === 'win32') { + console.log('Skipping firefox OS repo on Windows as it fails due to max path length issues'); + return; } - + if (repo.svn) { try { - yield executil.execHelper(executil.ARGS('svn up'), /*silent*/ false, /*allowError*/ true); + yield executil.execHelper(executil.ARGS('svn up'), /* silent */ false, /* allowError */ true); } catch (e) { errors += '(' + repo.repoName + '): ' + e + '\n'; // Log failure and continue updating other repos @@ -126,38 +126,37 @@ function *updateRepos(repos, branches, noFetch) { var branchName = branches[i]; if (yield gitutil.localBranchExists(branchName)) { if (yield gitutil.remoteBranchExists(repo, branchName)) { - var changes = yield executil.execHelper(executil.ARGS('git log --oneline ' + branchName + '..' + repo.remoteName + '/' + branchName), - /*silent*/ true, /*allowError*/ true); + var changes = yield executil.execHelper(executil.ARGS('git log --oneline ' + branchName + '..' + repo.remoteName + '/' + branchName), + /* silent */ true, /* allowError */ true); staleBranches[branchName] = !!changes; } } else { - yield executil.execHelper(executil.ARGS('git checkout -b ' + branchName + ' remotes/' + repo.remoteName + '/' + branchName), - /*silent*/ true, /*allowError*/ false); + yield executil.execHelper(executil.ARGS('git checkout -b ' + branchName + ' remotes/' + repo.remoteName + '/' + branchName), + /* silent */ true, /* allowError */ false); } } - var staleBranches = branches.filter(function(branchName) { + var staleBranches = branches.filter(function (branchName) { // eslint-disable-line no-redeclare return !!staleBranches[branchName]; }); if (!staleBranches.length) { print('Already up-to-date: ' + repo.repoName); } else { - yield gitutil.stashAndPop(repo, function*() { + yield gitutil.stashAndPop(repo, function * () { for (var i = 0; i < staleBranches.length; ++i) { var branchName = staleBranches[i]; yield gitutil.gitCheckout(branchName); try { - var ret = yield executil.execHelper(executil.ARGS('git merge --ff-only', repo.remoteName + '/' + branchName), - /*silent*/ false, /*allowError*/ true); + var ret = yield executil.execHelper(executil.ARGS('git merge --ff-only', repo.remoteName + '/' + branchName), + /* silent */ false, /* allowError */ true); if (ret === null) { try { - ret = yield executil.execHelper(executil.ARGS('git rebase ' + repo.remoteName + '/' + branchName), - /*silent*/ false, /*allowError*/ true); + ret = yield executil.execHelper(executil.ARGS('git rebase ' + repo.remoteName + '/' + branchName), + /* silent */ false, /* allowError */ true); } catch (ret) { apputil.fatal('\n\nUpdate failed. Run again with --no-fetch to try again without re-fetching.'); } } - } - catch(e) { + } catch (e) { errors += '(' + repo.repoName + '): ' + e + '\n'; // Log failure and continue updating other repos console.log(e); @@ -174,27 +173,26 @@ function *updateRepos(repos, branches, noFetch) { } module.exports.updateRepos = updateRepos; -function *determineApacheRemote(repo) { +function * determineApacheRemote (repo) { var fields = (yield executil.execHelper(executil.ARGS('git remote -v'), true)).split(/\s+/); - + var ret = null; - - // prefer github - in particular, ASF remote does not respond well to repo-update command. + + // prefer github - in particular, ASF remote does not respond well to repo-update command. [ - 'github.com/apache/', - 'git-wip-us.apache.org/repos/asf/', - 'git.apache.org/', - ].forEach(function(validRepo) { + 'github.com/apache/', + 'git-wip-us.apache.org/repos/asf/', + 'git.apache.org/' + ].forEach(function (validRepo) { for (var i = 1; i < fields.length; i += 3) { - if (!ret && fields[i].indexOf(validRepo + repo.repoName) != -1) { + if (!ret && fields[i].indexOf(validRepo + repo.repoName) !== -1) { ret = fields[i - 1]; } } }); - + if (ret) { return ret; } apputil.fatal('Could not find an apache remote for repo ' + repo.repoName); } - http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/src/repoutil.js ---------------------------------------------------------------------- diff --git a/src/repoutil.js b/src/repoutil.js index 06bdfcc..1865926 100644 --- a/src/repoutil.js +++ b/src/repoutil.js @@ -35,7 +35,7 @@ var platformRepos = [ title: 'iOS', versions: ['9.0', '9.1', '9.2', '9.3', '10.0', '10.1', '10.2', '10.3'], id: 'ios', - github: true, + github: true, repoName: 'cordova-ios', jiraComponentName: 'cordova-ios', cordovaJsPaths: ['CordovaLib/cordova.js'], @@ -52,7 +52,7 @@ var platformRepos = [ }, { title: 'Windows', id: 'windows', - github: true, + github: true, repoName: 'cordova-windows', jiraComponentName: 'cordova-windows', cordovaJsSrcName: 'cordova.windows.js', @@ -96,7 +96,7 @@ var platformRepos = [ }, { title: 'Browser', id: 'browser', - github: true, + github: true, repoName: 'cordova-browser', jiraComponentName: 'cordova-browser', cordovaJsSrcName: 'cordova.browser.js', @@ -419,23 +419,22 @@ var repoGroups = { 'plugin': pluginRepos, 'plugins': pluginRepos, 'tools': toolRepos, - 'active-platform': platformRepos.filter(function(r) { return !r.inactive }), - 'active-plugins': pluginRepos.filter(function(r) { return !r.inactive }), - 'release-repos': allRepos.filter(function(r) { return !r.inactive }) + 'active-platform': platformRepos.filter(function (r) { return !r.inactive; }), + 'active-plugins': pluginRepos.filter(function (r) { return !r.inactive; }), + 'release-repos': allRepos.filter(function (r) { return !r.inactive; }) }; repoGroups['cadence'] = repoGroups['active-platform'].concat([getRepoById('mobile-spec'), getRepoById('app-hello-world')]); repoGroups['nightly'] = repoGroups['active-platform'].concat([getRepoById('cli'), getRepoById('lib')]); -repoGroups.__defineGetter__('auto', function() { - return allRepos.filter(function(repo) { +repoGroups.__defineGetter__('auto', function () { + return allRepos.filter(function (repo) { return fs.existsSync(repo.repoName); }); }); - exports.repoGroups = repoGroups; -function isInRepoGroup(repoToCheck, groupName) { +function isInRepoGroup (repoToCheck, groupName) { var repos = repoGroups[groupName]; if (!repos) return false; return repos.some(function (repo) { @@ -444,11 +443,11 @@ function isInRepoGroup(repoToCheck, groupName) { } exports.isInRepoGroup = isInRepoGroup; -function getRepoById(id, opt_repos) { +function getRepoById (id, opt_repos) { // Strip cordova- prefix if it exists. var repos = opt_repos || allRepos; for (var i = 0; i < repos.length; ++i) { - if (repos[i].id == id || repos[i].packageName == id || repos[i].repoName == id) { + if (repos[i].id === id || repos[i].packageName === id || repos[i].repoName === id) { return repos[i]; } } @@ -458,7 +457,7 @@ exports.getRepoById = getRepoById; var isInForEachRepoFunction = false; -exports.forEachRepo = function*(repos, func) { +exports.forEachRepo = function * (repos, func) { for (var i = 0; i < repos.length; ++i) { var repo = repos[i]; var origPath = isInForEachRepoFunction ? process.cwd() : '..'; @@ -469,8 +468,8 @@ exports.forEachRepo = function*(repos, func) { // TODO: rely less on process.cwd() isInForEachRepoFunction = true; - //cordova-lib lives inside of a top level cordova-lib directory - if(repo.id === 'lib'){ + // cordova-lib lives inside of a top level cordova-lib directory + if (repo.id === 'lib') { origPath = origPath + '/..'; } var repoDir = getRepoDir(repo); @@ -483,11 +482,11 @@ exports.forEachRepo = function*(repos, func) { shelljs.cd(origPath); - isInForEachRepoFunction = !((origPath === '..')||(origPath === '../..')); + isInForEachRepoFunction = !((origPath === '..') || (origPath === '../..')); } -} +}; -function resolveCwdRepo() { +function resolveCwdRepo () { var curPath = apputil.resolveUserSpecifiedPath('.'); var prevPath; for (;;) { @@ -496,7 +495,7 @@ function resolveCwdRepo() { return value; } curPath = path.resolve(curPath, '..'); - if (curPath == prevPath) { + if (curPath === prevPath) { apputil.fatal('Repo could not be resolved because you are not in a cordova repository.'); } prevPath = curPath; @@ -504,7 +503,7 @@ function resolveCwdRepo() { } exports.resolveCwdRepo = resolveCwdRepo; -function getRepoDir(repo) { +function getRepoDir (repo) { var baseWorkingDir = apputil.getBaseDir(); var repoDir = path.join(baseWorkingDir, repo.repoName); if (repo.path) { @@ -514,7 +513,7 @@ function getRepoDir(repo) { } exports.getRepoDir = getRepoDir; -function getRepoIncludePath(repo) { +function getRepoIncludePath (repo) { var repoPath = repo.path; if (!repoPath) { return []; @@ -529,13 +528,13 @@ function getRepoIncludePath(repo) { // The harder case - this is the main repo. We want to include the repo root folder and the folder pointed to by // repo.path, but exclude all module folders. var matchingRepos = allRepos.filter(function (testRepo) { - return testRepo.isModule && testRepo.repoName == repo.repoName; + return testRepo.isModule && testRepo.repoName === repo.repoName; }); return matchingRepos.reduce(function (previous, moduleRepo) { // Note that wwe have to do the '../' stuff because we're not in the root directory of the repo. previous.push(':!../' + moduleRepo.path); return previous; - }, ['--', '../']); + }, ['--', '../']); } exports.getRepoIncludePath = getRepoIncludePath; http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/src/retrieve-sha.js ---------------------------------------------------------------------- diff --git a/src/retrieve-sha.js b/src/retrieve-sha.js index 713629a..7024baa 100644 --- a/src/retrieve-sha.js +++ b/src/retrieve-sha.js @@ -19,10 +19,10 @@ under the License. var repoutil = require('./repoutil'); var executil = require('./executil'); -module.exports = function *(repos) { +module.exports = function * (repos) { var shas = {}; - yield repoutil.forEachRepo(repos, function*(repo) { + yield repoutil.forEachRepo(repos, function * (repo) { shas[repo.id] = yield executil.execHelper(executil.ARGS('git rev-parse --short=8 HEAD'), true, true); }); return shas; -} +}; http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/src/shortlog.js ---------------------------------------------------------------------- diff --git a/src/shortlog.js b/src/shortlog.js index b6e5589..4a1d497 100644 --- a/src/shortlog.js +++ b/src/shortlog.js @@ -18,12 +18,11 @@ under the License. */ var optimist = require('optimist'); -var path = require('path'); var executil = require('./executil'); var flagutil = require('./flagutil'); var repoutil = require('./repoutil'); -module.exports = function*() { +module.exports = function * () { var opt = flagutil.registerRepoFlag(optimist); opt = flagutil.registerHelpFlag(opt); opt.usage('A version of `git shortlog -s` aggregated across multiple repos.\n' + @@ -31,6 +30,7 @@ module.exports = function*() { 'Usage: $0 shortlog [--repo=ios] [--days=7] [--filter=regexp]\n' + ' --filter: Sum up all commits that match this pattern\n' + ' --days=n: Show commits from the past n days'); + /* eslint-disable no-undef */ argv = opt.argv; if (argv.h) { @@ -40,13 +40,13 @@ module.exports = function*() { var repos = flagutil.computeReposFromFlag(argv.r); var emailFilter = argv.filter && new RegExp(argv.filter); var days = argv.days || 7; - + /* eslint-enable no-undef */ var resultsByAuthor = Object.create(null); - yield repoutil.forEachRepo(repos, function*(repo) { + yield repoutil.forEachRepo(repos, function * (repo) { var cmd = executil.ARGS('git shortlog -s -e --no-merges ', '--since=' + days + ' days ago'); var output = yield executil.execHelper(cmd, true); if (output) { - output.split(/\n/).forEach(function(line) { + output.split(/\n/).forEach(function (line) { var m = /\s*(\d+).*?<(.*?)>/.exec(line); var author = m[2]; var count = +m[1]; @@ -57,19 +57,19 @@ module.exports = function*() { var total = 0; var filterTotal = 0; - var records = Object.keys(resultsByAuthor).map(function(author) { + var records = Object.keys(resultsByAuthor).map(function (author) { var count = resultsByAuthor[author]; total += count; if (emailFilter && emailFilter.exec(author)) { filterTotal += count; } - return {author:author, count:count}; + return {author: author, count: count}; }); - records.sort(function(a,b) { + records.sort(function (a, b) { return b.count - a.count; }); - records.forEach(function(r) { + records.forEach(function (r) { console.log(r.count + '\t' + r.author); }); console.log(); @@ -77,4 +77,4 @@ module.exports = function*() { console.log('Total that mathed filter: ' + filterTotal); } console.log('Total Commits: ' + total); -} +}; http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/src/superspawn.js ---------------------------------------------------------------------- diff --git a/src/superspawn.js b/src/superspawn.js index 1b9aa78..de35505 100644 --- a/src/superspawn.js +++ b/src/superspawn.js @@ -22,9 +22,9 @@ var fs = require('fs'); var path = require('path'); var Q = require('q'); var shell = require('shelljs'); -var iswin32 = process.platform == 'win32'; +var iswin32 = process.platform === 'win32'; -function extend(dst, src) { +function extend (dst, src) { for (var k in src) { dst[k] = src[k]; } @@ -32,9 +32,9 @@ function extend(dst, src) { } // On Windows, spawn() for batch files requires absolute path & having the extension. -function resolveWindowsExe(cmd) { +function resolveWindowsExe (cmd) { var winExtensions = ['.exe', '.cmd', '.bat', '.js', '.vbs']; - function isValidExe(c) { + function isValidExe (c) { return winExtensions.indexOf(path.extname(c)) !== -1 && fs.existsSync(c); } if (isValidExe(cmd)) { @@ -42,7 +42,7 @@ function resolveWindowsExe(cmd) { } cmd = shell.which(cmd) || cmd; if (!isValidExe(cmd)) { - winExtensions.some(function(ext) { + winExtensions.some(function (ext) { if (fs.existsSync(cmd + ext)) { cmd = cmd + ext; return true; @@ -52,8 +52,8 @@ function resolveWindowsExe(cmd) { return cmd; } -function maybeQuote(a) { - if (a.indexOf(' ') != -1) { +function maybeQuote (a) { + if (a.indexOf(' ') !== -1) { a = '"' + a + '"'; } return a; @@ -67,7 +67,7 @@ function maybeQuote(a) { // env: Map of extra environment variables. // cwd: Working directory for the command. // Returns a promise that succeeds only for return code = 0. -exports.spawn = function(cmd, args, opts) { +exports.spawn = function (cmd, args, opts) { args = args || []; opts = opts || {}; var spawnOpts = {}; @@ -77,9 +77,9 @@ exports.spawn = function(cmd, args, opts) { cmd = resolveWindowsExe(cmd); // If we couldn't find the file, likely we'll end up failing, // but for things like "del", cmd will do the trick. - if (path.extname(cmd) != '.exe' && cmd.indexOf(' ') != -1) { + if (path.extname(cmd) !== '.exe' && cmd.indexOf(' ') !== -1) { // We need to use /s to ensure that spaces are parsed properly with cmd spawned content - args = [['/s', '/c', '"'+[cmd].concat(args).map(function(a){if (/^[^"].* .*[^"]/.test(a)) return '"'+a+'"'; return a;}).join(" ")+'"'].join(" ")]; + args = [['/s', '/c', '"' + [cmd].concat(args).map(function (a) { if (/^[^"].* .*[^"]/.test(a)) return '"' + a + '"'; return a; }).join(' ') + '"'].join(' ')]; cmd = 'cmd'; spawnOpts.windowsVerbatimArguments = true; } else if (!fs.existsSync(cmd)) { @@ -88,8 +88,8 @@ exports.spawn = function(cmd, args, opts) { } } - var pipeOutput = opts.stdio == 'inherit'; - if (opts.stdio == 'ignore') { + var pipeOutput = opts.stdio === 'inherit'; + if (opts.stdio === 'ignore') { spawnOpts.stdio = 'ignore'; } else if (pipeOutput) { spawnOpts.stdio = [process.stdin, 'pipe', process.stderr]; @@ -113,7 +113,7 @@ exports.spawn = function(cmd, args, opts) { if (child.stdout) { child.stdout.setEncoding('utf8'); - child.stdout.on('data', function(data) { + child.stdout.on('data', function (data) { capturedOut += data; if (pipeOutput) { process.stdout.write(data); @@ -122,17 +122,17 @@ exports.spawn = function(cmd, args, opts) { } if (child.stderr) { child.stderr.setEncoding('utf8'); - child.stderr.on('data', function(data) { + child.stderr.on('data', function (data) { capturedErr += data; }); } child.on('close', whenDone); child.on('error', whenDone); - function whenDone(arg) { + function whenDone (arg) { child.removeListener('close', whenDone); child.removeListener('error', whenDone); - var code = typeof arg == 'number' ? arg : arg && arg.code; + var code = typeof arg === 'number' ? arg : arg && arg.code; if (code === 0) { d.resolve(capturedOut.trim()); @@ -150,4 +150,3 @@ exports.spawn = function(cmd, args, opts) { return d.promise; }; - http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/src/svnutil.js ---------------------------------------------------------------------- diff --git a/src/svnutil.js b/src/svnutil.js index 75538eb..28d0ffb 100644 --- a/src/svnutil.js +++ b/src/svnutil.js @@ -17,17 +17,16 @@ specific language governing permissions and limitations under the License. */ -var path = require('path'); var executil = require('./executil'); -exports.update = function*() { +exports.update = function * () { yield executil.execHelper(executil.ARGS('svn update'), false, false); -} +}; -exports.add = function*(location) { +exports.add = function * (location) { yield executil.execHelper(executil.ARGS('svn add ' + location), false, false); -} +}; -exports.commit = function*(username, password, msg) { +exports.commit = function * (username, password, msg) { yield executil.execHelper(['svn', 'commit', '--username', username, '--password', password, '-m', '"' + msg + '"'], false, false); -} +}; http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/src/update-release-notes.js ---------------------------------------------------------------------- diff --git a/src/update-release-notes.js b/src/update-release-notes.js index 42cd530..1810fda 100644 --- a/src/update-release-notes.js +++ b/src/update-release-notes.js @@ -30,8 +30,7 @@ var co_stream = require('co-stream'); var relNotesFile = 'RELEASENOTES.md'; -module.exports = function*() { - var meEmail = yield executil.execHelper(executil.ARGS('git config user.email'), true); +module.exports = function * () { var opt = flagutil.registerRepoFlag(optimist); opt = flagutil.registerHelpFlag(opt) .usage('Updates release notes with commits since the most recent tag.\n' + @@ -42,22 +41,22 @@ module.exports = function*() { .options('to-tag', {desc: 'Update to a specific tag instead of "master"'}) .options('override-date', {desc: 'Update to a specific date instead of today.'}) .options('last-two-tags', {desc: 'Update with the latest and previous tagged commits'}); - argv = opt.argv; + argv = opt.argv; // eslint-disable-line no-undef - if (argv.h) { + if (argv.h) { // eslint-disable-line no-undef optimist.showHelp(); process.exit(1); } - var repos = flagutil.computeReposFromFlag(argv.r, {includeModules: true}); + var repos = flagutil.computeReposFromFlag(argv.r, {includeModules: true}); // eslint-disable-line no-undef - yield repoutil.forEachRepo(repos, function*(repo) { + yield repoutil.forEachRepo(repos, function * (repo) { // TODO: we should use gitutil.summaryOfChanges here. var cmd = executil.ARGS('git log --topo-order --no-merges'); cmd.push(['--pretty=format:* %s']); var fromTag, toTag, hasOneTag; hasOneTag = false; - if (argv['last-two-tags']) { + if (argv['last-two-tags']) { // eslint-disable-line no-undef var last_two = (yield gitutil.findMostRecentTag(repo.versionPrefix)); if (last_two) { toTag = last_two[0]; @@ -69,12 +68,13 @@ module.exports = function*() { } } } else { - if (argv['from-tag']){ + /* eslint-disable no-undef */ + if (argv['from-tag']) { fromTag = argv['from-tag']; } else { fromTag = (yield gitutil.findMostRecentTag(repo.versionPrefix))[0]; } - if (argv['to-tag']){ + if (argv['to-tag']) { toTag = argv['to-tag']; } else { toTag = 'master'; @@ -101,39 +101,40 @@ module.exports = function*() { var final_notes = yield createNotes(repo, newVersion, output, argv['override-date']); fs.writeFileSync(relNotesFile, final_notes, {encoding: 'utf8'}); return linkify.file(relNotesFile); + /* eslint-enable no-undef */ } }); }; -function backtick(text, token) { - return text.replace(new RegExp(" " + token, "gi"), " `" + token + "`"); +function backtick (text, token) { + return text.replace(new RegExp(' ' + token, 'gi'), ' `' + token + '`'); } -function bold(text, token) { - return text.replace(new RegExp(" " + token, "gi"), " **" + token + "**"); +function bold (text, token) { + return text.replace(new RegExp(' ' + token, 'gi'), ' **' + token + '**'); } -var GITHUB_CLOSE_COMMIT_MSG = /^\*\s+Closes?\s+\#\d+$/gi; -var VIA_COHO_COMMIT_MSG = /\(via coho\)/gi +var GITHUB_CLOSE_COMMIT_MSG = /^\*\s+Closes?\s+\#\d+$/gi; // eslint-disable-line no-useless-escape +var VIA_COHO_COMMIT_MSG = /\(via coho\)/gi; -function *createNotes(repo, newVersion, changes, overrideDate) { +function * createNotes (repo, newVersion, changes, overrideDate) { // pump changes through JIRA linkifier first through a stream pipe - var transformer = linkify.stream("CB"); - var read = new stream.Readable(); - read._read = function(){};// noop - read.push(changes); - read.push(null); - var write = new stream.Writable(); - var data = ''; - write._write = function(chunk, encoding, done) { - data += chunk.toString(); - done(); - } - read.pipe(transformer).pipe(write); + var transformer = linkify.stream('CB'); + var read = new stream.Readable(); + read._read = function () {};// noop + read.push(changes); + read.push(null); + var write = new stream.Writable(); + var data = ''; + write._write = function (chunk, encoding, done) { + data += chunk.toString(); + done(); + }; + read.pipe(transformer).pipe(write); yield co_stream.wait(write); // wait for the writable stream to finish/end // remove any commit logs in the form "Close #xxx", used for closing github pull requests. var lines = data.split('\n'); - data = lines.filter(function(line) { + data = lines.filter(function (line) { return !( line.match(GITHUB_CLOSE_COMMIT_MSG) || line.match(VIA_COHO_COMMIT_MSG) @@ -141,27 +142,27 @@ function *createNotes(repo, newVersion, changes, overrideDate) { }).join('\n'); // some more release note linting: enclose in backticks certain tokens - ['plugin.xml', 'package.json', 'config.xml', 'README', 'InAppBrowser'].forEach(function(token) { + ['plugin.xml', 'package.json', 'config.xml', 'README', 'InAppBrowser'].forEach(function (token) { data = backtick(data, token); }); - flagutil.computeReposFromFlag('platforms').map(function(r) { return r.repoName; }).forEach(function(platform_name) { + flagutil.computeReposFromFlag('platforms').map(function (r) { return r.repoName; }).forEach(function (platform_name) { data = backtick(data, platform_name); }); // bold platform labels (with optional version numbers, too) var version_labels = []; - repoutil.repoGroups.platforms.filter(function(p) { + repoutil.repoGroups.platforms.filter(function (p) { // first only pull out the platform repos that we have explicitly labeled with nice version strings return p.versions && p.versions.length; - }).forEach(function(p) { + }).forEach(function (p) { // next, generate the labels for later tokenization - p.versions.forEach(function(v) { + p.versions.forEach(function (v) { version_labels.push(p.title + ' ' + v); }); }); - version_labels.forEach(function(label) { + version_labels.forEach(function (label) { data = bold(data, label); }); - repoutil.repoGroups.platforms.map(function(r) { return r.title; }).forEach(function(platform) { + repoutil.repoGroups.platforms.map(function (r) { return r.title; }).forEach(function (platform) { data = bold(data, platform); }); // then interpolate linkified changes into existing release notes and compose the final release notes string @@ -173,7 +174,7 @@ function *createNotes(repo, newVersion, changes, overrideDate) { } else { date = new Date().toDateString().split(' '); } - return relNotesData.substr(0, headerPos) + "### " + newVersion + ' (' + date[1] + ' ' + date[2] + ', ' + date[3] + ')\n' + data + '\n\n' + relNotesData.substr(headerPos); + return relNotesData.substr(0, headerPos) + '### ' + newVersion + ' (' + date[1] + ' ' + date[2] + ', ' + date[3] + ')\n' + data + '\n\n' + relNotesData.substr(headerPos); } module.exports.createNotes = createNotes; http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/src/verify-tags.js ---------------------------------------------------------------------- diff --git a/src/verify-tags.js b/src/verify-tags.js index fef27f6..a158c06 100644 --- a/src/verify-tags.js +++ b/src/verify-tags.js @@ -22,12 +22,11 @@ var apputil = require('./apputil'); var flagutil = require('./flagutil'); var gitutil = require('./gitutil'); var repoutil = require('./repoutil'); -var print = apputil.print; var chalk = require('chalk'); var Q = require('q'); var readline = require('readline'); -function readInput() { +function readInput () { var ret = Q.defer(); var rl = readline.createInterface({ @@ -49,9 +48,9 @@ function readInput() { return ret.promise; } -exports.createCommand = function*(argv) { +exports.createCommand = function * (argv) { var opt = flagutil.registerHelpFlag(optimist); - var argv = opt + var argv = opt // eslint-disable-line .usage('Makes sure the given hashs match the tags.\n' + 'Paste the output of the `print-tags` into this command to verify.\n' + 'e.g.: cordova-plugin-camera: 0.3.0 (4fa934e06f)\n' + @@ -71,15 +70,15 @@ exports.createCommand = function*(argv) { var pattern = /\s*(cordova-.+?):\s*(.*?)\s+\((.*?)\)/g; var m; var results = []; - while (m = pattern.exec(input)) { + while (m = pattern.exec(input)) { // eslint-disable-line no-cond-assign results.push({repoId: m[1], tagName: m[2], hash: m[3]}); } if (results.length === 0) { apputil.fatal('Error processing input.'); } var hadErrors = false; - for (var i = 0, entry; entry = results[i]; ++i) { - yield repoutil.forEachRepo([repoutil.getRepoById(entry.repoId)], function*(repo) { + for (var i = 0, entry; entry = results[i]; ++i) { // eslint-disable-line no-cond-assign + yield repoutil.forEachRepo([repoutil.getRepoById(entry.repoId)], function * (repo) { var foundHash = yield gitutil.hashForRef(entry.tagName); if (!foundHash) { // Plugins have a prefixed 'r' @@ -98,5 +97,4 @@ exports.createCommand = function*(argv) { if (hadErrors) { console.log('Some tags didn\'t exist. Try updating your repositories and trying again.'); } -} - +}; http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/src/versionutil.js ---------------------------------------------------------------------- diff --git a/src/versionutil.js b/src/versionutil.js index 5937684..fd782ff 100644 --- a/src/versionutil.js +++ b/src/versionutil.js @@ -22,14 +22,13 @@ var path = require('path'); var shelljs = require('shelljs'); var xml2js = require('xml2js'); var apputil = require('./apputil'); -var executil = require('./executil'); var flagutil = require('./flagutil'); var gitutil = require('./gitutil'); var repoutil = require('./repoutil'); -function *getRepoVersion(repo) { +function * getRepoVersion (repo) { var version; - yield repoutil.forEachRepo([repo], function*() { + yield repoutil.forEachRepo([repo], function * () { var platformPackage = path.join(process.cwd(), 'package.json'); var platformPackageJson = require(platformPackage); version = platformPackageJson.version; @@ -39,43 +38,43 @@ function *getRepoVersion(repo) { exports.getRepoVersion = getRepoVersion; -function removeDev(version) { +function removeDev (version) { var newVersion = version.replace('-dev', ''); return newVersion; } exports.removeDev = removeDev; -//updates platformsConfig.json -//Needs to be passed a object which includes repo.id as key -//and the new version as value -//ex {android:4.0.0} -function updatePlatformsConfig(newValues) { +// updates platformsConfig.json +// Needs to be passed a object which includes repo.id as key +// and the new version as value +// ex {android:4.0.0} +function updatePlatformsConfig (newValues) { var platformsConfig = path.join(repoutil.getRepoDir(repoutil.getRepoById('lib')), 'src/platforms/platformsConfig.json'); var platformsJS = require(platformsConfig); flagutil.computeReposFromFlag('active-platform') - .forEach(function(repo) { + .forEach(function (repo) { if (newValues[repo.id]) { // For blackberry platformsConfig.json uses 'blackberry10' key - var correctRepoId = (repo.id === 'blackberry') ? "blackberry10" : repo.id; + var correctRepoId = (repo.id === 'blackberry') ? 'blackberry10' : repo.id; platformsJS[correctRepoId].version = newValues[repo.id]; } }); - fs.writeFileSync(platformsConfig, JSON.stringify(platformsJS, null, 4) + '\n', 'utf8', function(err) { - if (err) return console.log (err); + fs.writeFileSync(platformsConfig, JSON.stringify(platformsJS, null, 4) + '\n', 'utf8', function (err) { + if (err) return console.log(err); }); } exports.updatePlatformsConfig = updatePlatformsConfig; -exports.getReleaseBranchNameFromVersion = function(version) { +exports.getReleaseBranchNameFromVersion = function (version) { if (/-dev$/.test(version)) { return 'master'; } return version.replace(/\d+(-?rc\d)?$/, 'x'); -} +}; /** * Updates VERSION file, version executable script, package.json and @@ -88,32 +87,32 @@ exports.getReleaseBranchNameFromVersion = function(version) { * @param {Boolean} [opts.commitChanges=true] Specifies whether to commit changes * to the repo after update is done. */ -exports.updateRepoVersion = function *updateRepoVersion(repo, version, opts) { +exports.updateRepoVersion = function * updateRepoVersion (repo, version, opts) { // Update the VERSION files. // TODO: why do we read files asynchronously in this function, but write // and check for existence synchronously? var versionFilePaths = repo.versionFilePaths || ['VERSION']; var isPlatformRepo = !!repoutil.isInRepoGroup(repo, 'platform'); if (isPlatformRepo && fs.existsSync(versionFilePaths[0])) { - versionFilePaths.forEach(function(versionFilePath) { + versionFilePaths.forEach(function (versionFilePath) { fs.writeFileSync(versionFilePath, version + '\n'); }); shelljs.config.fatal = true; - if (repo.id == 'android' || repo.id == 'amazon-fireos') { + if (repo.id === 'android' || repo.id === 'amazon-fireos') { shelljs.sed('-i', /CORDOVA_VERSION.*=.*;/, 'CORDOVA_VERSION = "' + version + '";', path.join('framework', 'src', 'org', 'apache', 'cordova', 'CordovaWebView.java')); shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin', 'templates', 'cordova', 'version')); // Set build.gradle version, vcsTag, and name shelljs.sed('-i', /version.*=.*/, "version = '" + version + "'", path.join('framework', 'build.gradle')); shelljs.sed('-i', /vcsTag.*=.*/, "vcsTag = '" + version + "'", path.join('framework', 'build.gradle')); shelljs.sed('-i', /version.{\n.*(name.*=.*)/, "version {\n name = '" + version + "'", path.join('framework', 'build.gradle')); - } else if (repo.id == 'ios' || repo.id == 'osx') { + } else if (repo.id === 'ios' || repo.id === 'osx') { shelljs.sed('-i', /VERSION.*=.*/, 'VERSION="' + version + '";', path.join('bin', 'templates', 'scripts', 'cordova', 'version')); - } else if (repo.id == 'blackberry') { - shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin', 'templates', 'project','cordova', 'lib', 'version.js')); - } else if (repo.id == 'firefoxos' || repo.id == 'browser' || repo.id == 'ubuntu') { - shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin', 'templates', 'project','cordova', 'version')); - } else if (repo.id == 'windows') { - if(fs.existsSync(path.join('template', 'cordova', 'version'))) { + } else if (repo.id === 'blackberry') { + shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin', 'templates', 'project', 'cordova', 'lib', 'version.js')); + } else if (repo.id === 'firefoxos' || repo.id === 'browser' || repo.id === 'ubuntu') { + shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin', 'templates', 'project', 'cordova', 'version')); + } else if (repo.id === 'windows') { + if (fs.existsSync(path.join('template', 'cordova', 'version'))) { shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('template', 'cordova', 'version')); } } @@ -146,14 +145,14 @@ exports.updateRepoVersion = function *updateRepoVersion(repo, version, opts) { var isPluginRepo = !!repoutil.isInRepoGroup(repo, 'plugins'); if (isPluginRepo) { var xmlFilePaths = repo.xmlFilePaths || ['plugin.xml', 'tests/plugin.xml']; - xmlFilePaths.forEach(function(xmlFile) { + xmlFilePaths.forEach(function (xmlFile) { if (fs.existsSync(xmlFile)) { fs.readFile(xmlFile, {encoding: 'utf-8'}, function (err, data) { if (err) throw err; - xml2js.parseString(data, function(err, xml) { + xml2js.parseString(data, function (err, xml) { if (err) throw err; var prev_version = xml.plugin['$'].version; - shelljs.sed('-i', new RegExp('version="' + prev_version + '"','i'), 'version="' + version + '"', xmlFile); + shelljs.sed('-i', new RegExp('version="' + prev_version + '"', 'i'), 'version="' + version + '"', xmlFile); }); }); } else { @@ -169,4 +168,4 @@ exports.updateRepoVersion = function *updateRepoVersion(repo, version, opts) { if (commitChanges && (yield gitutil.pendingChangesExist())) { yield gitutil.commitChanges('Set VERSION to ' + version + ' (via coho)'); } -} +}; http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/test/flagutil.test.js ---------------------------------------------------------------------- diff --git a/test/flagutil.test.js b/test/flagutil.test.js index 27599f8..74ff433 100644 --- a/test/flagutil.test.js +++ b/test/flagutil.test.js @@ -20,7 +20,7 @@ under the License. var test = require('tape'); var flagutil = require('../src/flagutil'); -test('test computeReposFromFlagAndroid', function(t) { +test('test computeReposFromFlagAndroid', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('android'); t.equal(repo.length, 1); @@ -28,7 +28,7 @@ test('test computeReposFromFlagAndroid', function(t) { t.equal(repo[0].id, 'android'); t.equal(repo[0].repoName, 'cordova-android'); }); -test('test computeReposFromFlagiOS', function(t) { +test('test computeReposFromFlagiOS', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('ios'); t.equal(repo.length, 1); @@ -37,11 +37,11 @@ test('test computeReposFromFlagiOS', function(t) { t.equal(repo[0].repoName, 'cordova-ios'); }); -test('test computeReposFromFlagWindows', function(t) { +test('test computeReposFromFlagWindows', function (t) { t.plan(5); var repo = flagutil.computeReposFromFlag('windows'); t.equal(repo.length, 1); - t.equal(repo[0].cordovaJsSrcName,'cordova.windows.js'); + t.equal(repo[0].cordovaJsSrcName, 'cordova.windows.js'); t.equal(typeof repo[0], 'object'); t.equal(repo[0].id, 'windows'); t.equal(repo[0].repoName, 'cordova-windows'); @@ -57,17 +57,17 @@ test('test computeReposFromFlagWindows', function(t) { // t.equal(repo.length, 1); // // }); -test('test computeReposFromFlagWindowsPhone8', function(t) { +test('test computeReposFromFlagWindowsPhone8', function (t) { t.plan(5); var repo = flagutil.computeReposFromFlag('wp8'); t.equal(repo.length, 1); t.equal(typeof repo[0], 'object'); - t.equal(repo[0].cordovaJsSrcName,'cordova.wp8.js'); + t.equal(repo[0].cordovaJsSrcName, 'cordova.wp8.js'); t.equal(repo[0].id, 'wp8'); t.equal(repo[0].repoName, 'cordova-wp8'); }); -test('test computeReposFromFlagBlackberry', function(t) { +test('test computeReposFromFlagBlackberry', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('blackberry'); t.equal(repo.length, 1); @@ -75,7 +75,7 @@ test('test computeReposFromFlagBlackberry', function(t) { t.equal(repo[0].id, 'blackberry'); t.equal(repo[0].repoName, 'cordova-blackberry'); }); -test('test computeReposFromFlagFirefoxos', function(t) { +test('test computeReposFromFlagFirefoxos', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('firefoxos'); t.equal(repo.length, 1); @@ -83,7 +83,7 @@ test('test computeReposFromFlagFirefoxos', function(t) { t.equal(repo[0].id, 'firefoxos'); t.equal(repo[0].repoName, 'cordova-firefoxos'); }); -test('test computeReposFromFlagOsx', function(t) { +test('test computeReposFromFlagOsx', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('osx'); t.equal(repo.length, 1); @@ -91,7 +91,7 @@ test('test computeReposFromFlagOsx', function(t) { t.equal(repo[0].id, 'osx'); t.equal(repo[0].repoName, 'cordova-osx'); }); -test('test computeReposFromFlagUbuntu', function(t) { +test('test computeReposFromFlagUbuntu', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('ubuntu'); t.equal(repo.length, 1); @@ -99,7 +99,7 @@ test('test computeReposFromFlagUbuntu', function(t) { t.equal(repo[0].id, 'ubuntu'); t.equal(repo[0].repoName, 'cordova-ubuntu'); }); -test('test computeReposFromFlagAmazon-fireos', function(t) { +test('test computeReposFromFlagAmazon-fireos', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('amazon-fireos'); t.equal(repo.length, 1); @@ -107,7 +107,7 @@ test('test computeReposFromFlagAmazon-fireos', function(t) { t.equal(repo[0].id, 'amazon-fireos'); t.equal(repo[0].repoName, 'cordova-amazon-fireos'); }); -test('test computeReposFromFlagBrowser', function(t) { +test('test computeReposFromFlagBrowser', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('browser'); t.equal(repo.length, 1); @@ -115,7 +115,7 @@ test('test computeReposFromFlagBrowser', function(t) { t.equal(repo[0].id, 'browser'); t.equal(repo[0].repoName, 'cordova-browser'); }); -test('test computeReposFromFlagBada', function(t) { +test('test computeReposFromFlagBada', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('bada'); t.equal(repo.length, 1); @@ -123,7 +123,7 @@ test('test computeReposFromFlagBada', function(t) { t.equal(repo[0].id, 'bada'); t.equal(repo[0].repoName, 'cordova-bada'); }); -test('test computeReposFromFlagBada-wac', function(t) { +test('test computeReposFromFlagBada-wac', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('bada-wac'); t.equal(repo.length, 1); @@ -131,7 +131,7 @@ test('test computeReposFromFlagBada-wac', function(t) { t.equal(repo[0].id, 'bada-wac'); t.equal(repo[0].repoName, 'cordova-bada-wac'); }); -test('test computeReposFromFlagWebOS', function(t) { +test('test computeReposFromFlagWebOS', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('webos'); t.equal(repo.length, 1); @@ -139,7 +139,7 @@ test('test computeReposFromFlagWebOS', function(t) { t.equal(repo[0].id, 'webos'); t.equal(repo[0].repoName, 'cordova-webos'); }); -test('test computeReposFromFlagQt', function(t) { +test('test computeReposFromFlagQt', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('qt'); console.log(repo); @@ -148,7 +148,7 @@ test('test computeReposFromFlagQt', function(t) { t.equal(repo[0].id, 'qt'); t.equal(repo[0].repoName, 'cordova-qt'); }); -test('test computeReposFromFlagTizen', function(t) { +test('test computeReposFromFlagTizen', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('tizen'); t.equal(repo.length, 1); @@ -156,7 +156,7 @@ test('test computeReposFromFlagTizen', function(t) { t.equal(repo[0].id, 'tizen'); t.equal(repo[0].repoName, 'cordova-tizen'); }); -test('test computeReposFromFlagDocs', function(t) { +test('test computeReposFromFlagDocs', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('docs'); t.equal(repo.length, 1); @@ -164,7 +164,7 @@ test('test computeReposFromFlagDocs', function(t) { t.equal(repo[0].id, 'docs'); t.equal(repo[0].repoName, 'cordova-docs'); }); -test('test computeReposFromFlagMobilespec', function(t) { +test('test computeReposFromFlagMobilespec', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('mobile-spec'); t.equal(repo.length, 1); @@ -172,7 +172,7 @@ test('test computeReposFromFlagMobilespec', function(t) { t.equal(repo[0].id, 'mobile-spec'); t.equal(repo[0].repoName, 'cordova-mobile-spec'); }); -test('test computeReposFromFlagAppHelloWorld', function(t) { +test('test computeReposFromFlagAppHelloWorld', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('app-hello-world'); t.equal(repo.length, 1); @@ -180,7 +180,7 @@ test('test computeReposFromFlagAppHelloWorld', function(t) { t.equal(repo[0].id, 'app-hello-world'); t.equal(repo[0].repoName, 'cordova-app-hello-world'); }); -test('test computeReposFromFlagPluginBatteryStatus', function(t) { +test('test computeReposFromFlagPluginBatteryStatus', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-battery-status'); t.equal(repo.length, 1); @@ -188,7 +188,7 @@ test('test computeReposFromFlagPluginBatteryStatus', function(t) { t.equal(repo[0].id, 'plugin-battery-status'); t.equal(repo[0].repoName, 'cordova-plugin-battery-status'); }); -test('test computeReposFromFlagPluginCamera', function(t) { +test('test computeReposFromFlagPluginCamera', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-camera'); t.equal(repo.length, 1); @@ -196,7 +196,7 @@ test('test computeReposFromFlagPluginCamera', function(t) { t.equal(repo[0].id, 'plugin-camera'); t.equal(repo[0].repoName, 'cordova-plugin-camera'); }); -test('test computeReposFromFlagPluginConsole', function(t) { +test('test computeReposFromFlagPluginConsole', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-console'); t.equal(repo.length, 1); @@ -204,7 +204,7 @@ test('test computeReposFromFlagPluginConsole', function(t) { t.equal(repo[0].id, 'plugin-console'); t.equal(repo[0].repoName, 'cordova-plugin-console'); }); -test('test computeReposFromFlagPluginContacts', function(t) { +test('test computeReposFromFlagPluginContacts', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-contacts'); t.equal(repo.length, 1); @@ -212,7 +212,7 @@ test('test computeReposFromFlagPluginContacts', function(t) { t.equal(repo[0].id, 'plugin-contacts'); t.equal(repo[0].repoName, 'cordova-plugin-contacts'); }); -test('test computeReposFromFlagDocs', function(t) { +test('test computeReposFromFlagDocs', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('docs'); t.equal(repo.length, 1); @@ -220,7 +220,7 @@ test('test computeReposFromFlagDocs', function(t) { t.equal(repo[0].id, 'docs'); t.equal(repo[0].repoName, 'cordova-docs'); }); -test('test computeReposFromFlagPluginDeviceMotion', function(t) { +test('test computeReposFromFlagPluginDeviceMotion', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-device-motion'); t.equal(repo.length, 1); @@ -228,7 +228,7 @@ test('test computeReposFromFlagPluginDeviceMotion', function(t) { t.equal(repo[0].id, 'plugin-device-motion'); t.equal(repo[0].repoName, 'cordova-plugin-device-motion'); }); -test('test computeReposFromFlagPluginDeviceOrientation', function(t) { +test('test computeReposFromFlagPluginDeviceOrientation', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-device-orientation'); t.equal(repo.length, 1); @@ -237,7 +237,7 @@ test('test computeReposFromFlagPluginDeviceOrientation', function(t) { t.equal(repo[0].repoName, 'cordova-plugin-device-orientation'); }); -test('test computeReposFromFlagPlugin-device', function(t) { +test('test computeReposFromFlagPlugin-device', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-device'); t.equal(repo.length, 1); @@ -246,7 +246,7 @@ test('test computeReposFromFlagPlugin-device', function(t) { t.equal(repo[0].repoName, 'cordova-plugin-device'); }); -test('test computeReposFromFlagPluginDialogs', function(t) { +test('test computeReposFromFlagPluginDialogs', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-dialogs'); t.equal(repo.length, 1); @@ -255,7 +255,7 @@ test('test computeReposFromFlagPluginDialogs', function(t) { t.equal(repo[0].repoName, 'cordova-plugin-dialogs'); }); -test('test computeReposFromFlagPluginFileTransfer', function(t) { +test('test computeReposFromFlagPluginFileTransfer', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-file-transfer'); t.equal(repo.length, 1); @@ -264,16 +264,16 @@ test('test computeReposFromFlagPluginFileTransfer', function(t) { t.equal(repo[0].repoName, 'cordova-plugin-file-transfer'); }); -test('test computeReposFromFlagPluginGeolocation', function(t) { +test('test computeReposFromFlagPluginGeolocation', function (t) { t.plan(4); - var repo = flagutil.computeReposFromFlag('plugin-geolocation'); + var repo = flagutil.computeReposFromFlag('plugin-geolocation'); t.equal(repo.length, 1); t.equal(typeof repo[0], 'object'); t.equal(repo[0].id, 'plugin-geolocation'); t.equal(repo[0].repoName, 'cordova-plugin-geolocation'); }); -test('test computeReposFromFlagPluginGlobalization', function(t) { +test('test computeReposFromFlagPluginGlobalization', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-globalization'); t.equal(repo.length, 1); @@ -281,7 +281,7 @@ test('test computeReposFromFlagPluginGlobalization', function(t) { t.equal(repo[0].id, 'plugin-globalization'); t.equal(repo[0].repoName, 'cordova-plugin-globalization'); }); -test('test computeReposFromFlagInappbrowser', function(t) { +test('test computeReposFromFlagInappbrowser', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-inappbrowser'); t.equal(repo.length, 1); @@ -289,7 +289,7 @@ test('test computeReposFromFlagInappbrowser', function(t) { t.equal(repo[0].id, 'plugin-inappbrowser'); t.equal(repo[0].repoName, 'cordova-plugin-inappbrowser'); }); -test('test computeReposFromFlagMedia', function(t) { +test('test computeReposFromFlagMedia', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-media'); t.equal(repo.length, 1); @@ -297,7 +297,7 @@ test('test computeReposFromFlagMedia', function(t) { t.equal(repo[0].id, 'plugin-media'); t.equal(repo[0].repoName, 'cordova-plugin-media'); }); -test('test computeReposFromFlagMediaCapture', function(t) { +test('test computeReposFromFlagMediaCapture', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-media-capture'); t.equal(repo.length, 1); @@ -305,7 +305,7 @@ test('test computeReposFromFlagMediaCapture', function(t) { t.equal(repo[0].id, 'plugin-media-capture'); t.equal(repo[0].repoName, 'cordova-plugin-media-capture'); }); -test('test computeReposFromFlagNetworkInformation', function(t) { +test('test computeReposFromFlagNetworkInformation', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-network-information'); t.equal(repo.length, 1); @@ -313,7 +313,7 @@ test('test computeReposFromFlagNetworkInformation', function(t) { t.equal(repo[0].id, 'plugin-network-information'); t.equal(repo[0].repoName, 'cordova-plugin-network-information'); }); -test('test computeReposFromFlagSplashscreen', function(t) { +test('test computeReposFromFlagSplashscreen', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-splashscreen'); t.equal(repo.length, 1); @@ -321,7 +321,7 @@ test('test computeReposFromFlagSplashscreen', function(t) { t.equal(repo[0].id, 'plugin-splashscreen'); t.equal(repo[0].repoName, 'cordova-plugin-splashscreen'); }); -test('test computeReposFromFlagVibration', function(t) { +test('test computeReposFromFlagVibration', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-vibration'); t.equal(repo.length, 1); @@ -329,7 +329,7 @@ test('test computeReposFromFlagVibration', function(t) { t.equal(repo[0].id, 'plugin-vibration'); t.equal(repo[0].repoName, 'cordova-plugin-vibration'); }); -test('test computeReposFromFlagStatusbar', function(t) { +test('test computeReposFromFlagStatusbar', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-statusbar'); t.equal(repo.length, 1); @@ -337,7 +337,7 @@ test('test computeReposFromFlagStatusbar', function(t) { t.equal(repo[0].id, 'plugin-statusbar'); t.equal(repo[0].repoName, 'cordova-plugin-statusbar'); }); -test('test computeReposFromFlagWhitelist', function(t) { +test('test computeReposFromFlagWhitelist', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-whitelist'); t.equal(repo.length, 1); @@ -345,7 +345,7 @@ test('test computeReposFromFlagWhitelist', function(t) { t.equal(repo[0].id, 'plugin-whitelist'); t.equal(repo[0].repoName, 'cordova-plugin-whitelist'); }); -test('test computeReposFromFlagLegacyWhitelist', function(t) { +test('test computeReposFromFlagLegacyWhitelist', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-legacy-whitelist'); t.equal(repo.length, 1); @@ -353,7 +353,7 @@ test('test computeReposFromFlagLegacyWhitelist', function(t) { t.equal(repo[0].id, 'plugin-legacy-whitelist'); t.equal(repo[0].repoName, 'cordova-plugin-legacy-whitelist'); }); -test('test computeReposFromFlagPlugins', function(t) { +test('test computeReposFromFlagPlugins', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('cordova-plugins'); t.equal(repo.length, 1); @@ -361,7 +361,7 @@ test('test computeReposFromFlagPlugins', function(t) { t.equal(repo[0].id, 'cordova-plugins'); t.equal(repo[0].repoName, 'cordova-plugins'); }); -test('test computeReposFromFlagTestFramework', function(t) { +test('test computeReposFromFlagTestFramework', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugin-test-framework'); t.equal(repo.length, 1); @@ -369,7 +369,7 @@ test('test computeReposFromFlagTestFramework', function(t) { t.equal(repo[0].id, 'plugin-test-framework'); t.equal(repo[0].repoName, 'cordova-plugin-test-framework'); }); -test('test computeReposFromFlagCli', function(t) { +test('test computeReposFromFlagCli', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('cli'); t.equal(repo.length, 1); @@ -377,7 +377,7 @@ test('test computeReposFromFlagCli', function(t) { t.equal(repo[0].id, 'cli'); t.equal(repo[0].repoName, 'cordova-cli'); }); -test('test computeReposFromFlagPlugman', function(t) { +test('test computeReposFromFlagPlugman', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('plugman'); t.equal(repo.length, 1); @@ -385,7 +385,7 @@ test('test computeReposFromFlagPlugman', function(t) { t.equal(repo[0].id, 'plugman'); t.equal(repo[0].repoName, 'cordova-plugman'); }); -test('test computeReposFromFlagLib', function(t) { +test('test computeReposFromFlagLib', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('lib'); t.equal(repo.length, 1); @@ -393,7 +393,7 @@ test('test computeReposFromFlagLib', function(t) { t.equal(repo[0].id, 'lib'); t.equal(repo[0].repoName, 'cordova-lib'); }); -test('test computeReposFromFlagServe', function(t) { +test('test computeReposFromFlagServe', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('serve'); t.equal(repo.length, 1); @@ -401,7 +401,7 @@ test('test computeReposFromFlagServe', function(t) { t.equal(repo[0].id, 'serve'); t.equal(repo[0].repoName, 'cordova-lib'); }); -test('test computeReposFromFlagJs', function(t) { +test('test computeReposFromFlagJs', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('js'); t.equal(repo.length, 1); @@ -409,7 +409,7 @@ test('test computeReposFromFlagJs', function(t) { t.equal(repo[0].id, 'js'); t.equal(repo[0].repoName, 'cordova-js'); }); -test('test computeReposFromFlagCoho', function(t) { +test('test computeReposFromFlagCoho', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('coho'); t.equal(repo.length, 1); @@ -417,7 +417,7 @@ test('test computeReposFromFlagCoho', function(t) { t.equal(repo[0].id, 'coho'); t.equal(repo[0].repoName, 'cordova-coho'); }); -test('test computeReposFromFlagMedic', function(t) { +test('test computeReposFromFlagMedic', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('medic'); t.equal(repo.length, 1); @@ -425,7 +425,7 @@ test('test computeReposFromFlagMedic', function(t) { t.equal(repo[0].id, 'medic'); t.equal(repo[0].repoName, 'cordova-medic'); }); -test('test computeReposFromFlagAppharness', function(t) { +test('test computeReposFromFlagAppharness', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('app-harness'); t.equal(repo.length, 1); @@ -433,7 +433,7 @@ test('test computeReposFromFlagAppharness', function(t) { t.equal(repo[0].id, 'app-harness'); t.equal(repo[0].repoName, 'cordova-app-harness'); }); -test('test computeReposFromFlagLabs', function(t) { +test('test computeReposFromFlagLabs', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('labs'); t.equal(repo.length, 1); @@ -441,7 +441,7 @@ test('test computeReposFromFlagLabs', function(t) { t.equal(repo[0].id, 'labs'); t.equal(repo[0].repoName, 'cordova-labs'); }); -test('test computeReposFromFlagRegistryWeb', function(t) { +test('test computeReposFromFlagRegistryWeb', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('registry-web'); t.equal(repo.length, 1); @@ -449,7 +449,7 @@ test('test computeReposFromFlagRegistryWeb', function(t) { t.equal(repo[0].id, 'registry-web'); t.equal(repo[0].repoName, 'cordova-registry-web'); }); -test('test computeReposFromFlagRegistry', function(t) { +test('test computeReposFromFlagRegistry', function (t) { t.plan(4); var repo = flagutil.computeReposFromFlag('registry'); t.equal(repo.length, 1); http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/34ae0bbb/test/test.js ---------------------------------------------------------------------- diff --git a/test/test.js b/test/test.js index e4c3ffb..12408cf 100644 --- a/test/test.js +++ b/test/test.js @@ -18,14 +18,14 @@ under the License. */ try { - eval('(function*(){})'); + eval('(function*(){})'); // eslint-disable-line no-eval } catch (e) { try { require('gnode'); // Enable generators support } catch (e) { - console.log('Please run "npm install" from this directory:\n\t' + __dirname); + console.log('Please run "npm install" from this directory:\n\t' + __dirname); // eslint-disable-line no-path-concat process.exit(2); } } -require('tape-runner')() +require('tape-runner')(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
