@uirouter/publish-scripts 2.5.5 → 2.6.1

package/release.js

@@ -1,164 +1,164 @@
-#!/usr/bin/env node
-
-require('./util').packageDir();
-require('shelljs/global');
-const open = require('open');
-
-const readlineSync = require('readline-sync');
-const shelljs = require('shelljs');
-const fs = require('fs');
-const path = require('path');
-const semver = require('semver');
-const packageJson = JSON.parse(fs.readFileSync('package.json'));
-const modifiedFiles = [];
-
-const yargs = require('yargs')
-    .option('dryrun', {
-      alias: ['dry-run', 'd'],
-      description: 'Dry run: Ignores dirty working copy and does not commit or publish anything.',
-      boolean: true,
-    })
-    .option('deps', {
-      description: 'Deps to include in changelog',
-      array: true,
-    });
-
-const util = require('./util');
-const _exec = util._exec;
-
-if (yargs.argv.dryrun) {
-  console.log('Dry run mode...')
-} else {
-  util.ensureCleanMaster('master');
-}
-
-
-// Bump version
-const currentVersion = JSON.parse(fs.readFileSync('./package.json')).version;
-const versionBumps = ['patch', 'minor', 'major', 'none'];
-
-const versionBump = versionBumps[readlineSync.keyInSelect(versionBumps, `Current version: ${currentVersion} ; bump version?`)];
-if (!versionBump) {
-  process.exit(1);
-}
-
-let version = currentVersion;
-if (versionBump !== 'none') {
-  version = semver.inc(currentVersion, versionBump);
-
-  console.log(`Bumping version: ${version}`);
-
-  packageJson.version = version;
-  fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 2) + "\n");
-  modifiedFiles.push('package.json');
-
-  if (yargs.argv.bower) {
-    const bowerJson = fs.readFileSync('bower.json');
-    bowerJson.version = version;
-    fs.writeFileSync('bower.json', JSON.stringify(bowerJson, null, 2) + "\n");
-    modifiedFiles.push('bower.json');
-  }
-}
-
-
-// Generate changelog
-let changelog;
-if (readlineSync.keyInYN('\n\nUpdate CHANGELOG?')) {
-  const depsArg = yargs.argv.deps ? `--deps ${yargs.argv.deps.join(' ')}` : '';
-  const show_changelog = path.resolve(__dirname, 'show_changelog.js');
-
-  changelog = _exec(`${show_changelog} ${depsArg}`, true).stdout;
-
-  console.log('CHANGELOG:\n\n');
-  console.log(changelog);
-
-  const tempChangelogFile = `CHANGELOG.md.${version}`;
-  fs.writeFileSync(tempChangelogFile, changelog);
-
-  console.log(`Wrote changelog to temp file: ${tempChangelogFile}`);
-  if (!readlineSync.keyInYN('Does the CHANGELOG look OK?')) {
-    process.exit(1);
-  }
-
-  let existingChangelog = fs.readFileSync('CHANGELOG.md');
-  changelog = fs.readFileSync(tempChangelogFile);
-  fs.writeFileSync('CHANGELOG.md', changelog + '\n' + existingChangelog);
-  fs.unlinkSync(tempChangelogFile);
-  modifiedFiles.push('CHANGELOG.md');
-}
-
-
-// Run tests
-if (readlineSync.keyInYN('Run tests?')) {
-  _exec('npm test')
-}
-
-
-// Commit and push changes
-if (!readlineSync.keyInYN('Ready to publish?')) {
-  console.log(`\n\nRun this command to undo changes:\n\ngit checkout ${modifiedFiles.join(' ')}\n\n`);
-  process.exit(1);
-}
-
-if (!yargs.argv.dryrun) {
-  _exec(`git commit -m ${version} ${modifiedFiles.join(' ')}`);
-  _exec(`git add ${modifiedFiles.join(' ')}`); // in case prettier reformatted these files
-}
-
-if (!yargs.argv.dryrun) {
-  util.ensureCleanMaster('master');
-}
-
-
-// Publish to NPM and push to github
-if (!yargs.argv.dryrun) {
-  const distDir = packageJson.distDir || '.';
-  if (distDir !== '.' && packageJson.scripts && packageJson.scripts.build) {
-    _exec('npm run build')
-  }
-  shelljs.pushd(distDir);
-  _exec(`npm publish`);
-  shelljs.popd();
-  _exec(`git tag ${version}`);
-  _exec(`git push origin master`);
-  _exec(`git push origin ${version}`);
-}
-
-
-// Help with manual steps
-let githuburl = packageJson.repository && packageJson.repository.url;
-githuburl = githuburl && githuburl.replace(/^git\+/, '').replace(/\.git$/, '');
-
-if (githuburl) {
-  if (changelog) {
-    const haspbcopy = shelljs.exec(`which pbcopy`, true).code === 0;
-    console.log(`\n\n1) Update the GitHub release with the release notes/CHANGELOG`);
-    console.log(`\n   (Make sure you see "\u2714 Existing tag")`);
-
-    if (haspbcopy) {
-      fs.writeFileSync('CHANGELOG.tmp', changelog);
-      _exec('pbcopy < CHANGELOG.tmp', true);
-      fs.unlinkSync('CHANGELOG.tmp');
-      console.log(`(The CHANGELOG has been copied to your clipboard)`);
-    } else {
-      console.log('CHANGELOG:\n\n');
-      console.log(changelog);
-    }
-    console.log(`\n${githuburl}/releases/edit/${version}`);
-    open(`${githuburl}/releases/edit/${version}`);
-  }
-
-  console.log(`\n\n2) Check for milestones`);
-  console.log(`\n${githuburl}/milestones`);
-
-  console.log(`\n\n\n`);
-} else {
-  console.log("Could not determine github URL from package.json")
-}
-
-// Generate docs
-util.packageDir();
-if (fs.existsSync('typedoc.json') && readlineSync.keyInYN('Generate docs?')) {
-  _exec('generate_docs');
-  _exec('publish_docs');
-}
+#!/usr/bin/env node
+
+require('./util').packageDir();
+require('shelljs/global');
+const open = require('open');
+
+const readlineSync = require('readline-sync');
+const shelljs = require('shelljs');
+const fs = require('fs');
+const path = require('path');
+const semver = require('semver');
+const packageJson = JSON.parse(fs.readFileSync('package.json'));
+const modifiedFiles = [];
+
+const yargs = require('yargs')
+    .option('dryrun', {
+      alias: ['dry-run', 'd'],
+      description: 'Dry run: Ignores dirty working copy and does not commit or publish anything.',
+      boolean: true,
+    })
+    .option('deps', {
+      description: 'Deps to include in changelog',
+      array: true,
+    });
+
+const util = require('./util');
+const _exec = util._exec;
+
+if (yargs.argv.dryrun) {
+  console.log('Dry run mode...')
+} else {
+  util.ensureCleanMaster('master');
+}
+
+
+// Bump version
+const currentVersion = JSON.parse(fs.readFileSync('./package.json')).version;
+const versionBumps = ['patch', 'minor', 'major', 'none'];
+
+const versionBump = versionBumps[readlineSync.keyInSelect(versionBumps, `Current version: ${currentVersion} ; bump version?`)];
+if (!versionBump) {
+  process.exit(1);
+}
+
+let version = currentVersion;
+if (versionBump !== 'none') {
+  version = semver.inc(currentVersion, versionBump);
+
+  console.log(`Bumping version: ${version}`);
+
+  packageJson.version = version;
+  fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 2) + "\n");
+  modifiedFiles.push('package.json');
+
+  if (yargs.argv.bower) {
+    const bowerJson = fs.readFileSync('bower.json');
+    bowerJson.version = version;
+    fs.writeFileSync('bower.json', JSON.stringify(bowerJson, null, 2) + "\n");
+    modifiedFiles.push('bower.json');
+  }
+}
+
+
+// Generate changelog
+let changelog;
+if (readlineSync.keyInYN('\n\nUpdate CHANGELOG?')) {
+  const depsArg = yargs.argv.deps ? `--deps ${yargs.argv.deps.join(' ')}` : '';
+  const show_changelog = path.resolve(__dirname, 'show_changelog.js');
+
+  changelog = _exec(`node ${show_changelog} ${depsArg}`, true).stdout;
+
+  console.log('CHANGELOG:\n\n');
+  console.log(changelog);
+
+  const tempChangelogFile = `CHANGELOG.md.${version}`;
+  fs.writeFileSync(tempChangelogFile, changelog);
+
+  console.log(`Wrote changelog to temp file: ${tempChangelogFile}`);
+  if (!readlineSync.keyInYN('Does the CHANGELOG look OK?')) {
+    process.exit(1);
+  }
+
+  let existingChangelog = fs.readFileSync('CHANGELOG.md');
+  changelog = fs.readFileSync(tempChangelogFile);
+  fs.writeFileSync('CHANGELOG.md', changelog + '\n' + existingChangelog);
+  fs.unlinkSync(tempChangelogFile);
+  modifiedFiles.push('CHANGELOG.md');
+}
+
+
+// Run tests
+if (readlineSync.keyInYN('Run tests?')) {
+  _exec('npm test')
+}
+
+
+// Commit and push changes
+if (!readlineSync.keyInYN('Ready to publish?')) {
+  console.log(`\n\nRun this command to undo changes:\n\ngit checkout ${modifiedFiles.join(' ')}\n\n`);
+  process.exit(1);
+}
+
+if (!yargs.argv.dryrun) {
+  _exec(`git commit -m ${version} ${modifiedFiles.join(' ')}`);
+  _exec(`git add ${modifiedFiles.join(' ')}`); // in case prettier reformatted these files
+}
+
+if (!yargs.argv.dryrun) {
+  util.ensureCleanMaster('master');
+}
+
+
+// Publish to NPM and push to github
+if (!yargs.argv.dryrun) {
+  const distDir = packageJson.distDir || '.';
+  if (distDir !== '.' && packageJson.scripts && packageJson.scripts.build) {
+    _exec('npm run build')
+  }
+  shelljs.pushd(distDir);
+  _exec(`npm publish`);
+  shelljs.popd();
+  _exec(`git tag ${version}`);
+  _exec(`git push origin master`);
+  _exec(`git push origin ${version}`);
+}
+
+
+// Help with manual steps
+let githuburl = packageJson.repository && packageJson.repository.url;
+githuburl = githuburl && githuburl.replace(/^git\+/, '').replace(/\.git$/, '');
+
+if (githuburl) {
+  if (changelog) {
+    const haspbcopy = shelljs.exec(`which pbcopy`, true).code === 0;
+    console.log(`\n\n1) Update the GitHub release with the release notes/CHANGELOG`);
+    console.log(`\n   (Make sure you see "\u2714 Existing tag")`);
+
+    if (haspbcopy) {
+      fs.writeFileSync('CHANGELOG.tmp', changelog);
+      _exec('pbcopy < CHANGELOG.tmp', true);
+      fs.unlinkSync('CHANGELOG.tmp');
+      console.log(`(The CHANGELOG has been copied to your clipboard)`);
+    } else {
+      console.log('CHANGELOG:\n\n');
+      console.log(changelog);
+    }
+    console.log(`\n${githuburl}/releases/edit/${version}`);
+    open(`${githuburl}/releases/edit/${version}`);
+  }
+
+  console.log(`\n\n2) Check for milestones`);
+  console.log(`\n${githuburl}/milestones`);
+
+  console.log(`\n\n\n`);
+} else {
+  console.log("Could not determine github URL from package.json")
+}
+
+// Generate docs
+util.packageDir();
+if (fs.existsSync('typedoc.json') && readlineSync.keyInYN('Generate docs?')) {
+  _exec('generate_docs');
+  _exec('publish_docs');
+}

package/show_changelog.js

@@ -1,142 +1,142 @@
-#!/usr/bin/env node
-"use strict";
-
-const shelljs = require('shelljs');
-const path = require('path');
-const fs = require('fs');
-const conventionalChangelog = require('conventional-changelog');
-const _exec = require('./util')._exec;
-const yargs = require('yargs')
-    .option('from', {
-      description: 'The starting tag'
-    })
-    .option('to', {
-      description: 'The ending tag'
-    })
-    .option('deps', {
-      description: 'Include changelogs of dependencies',
-      array: true,
-    })
-    .check(argv => {
-      if (argv.to && !argv.from)
-        throw new Error(`If you specify a 'to', you should also specify a 'from'.`);
-      return true;
-    });
-
-let options = {
-  preset: 'ui-router-core'
-};
-
-const context = {}, gitOpts = { merges: null };
-const to = yargs.argv.to;
-const from = yargs.argv.from;
-const deps = yargs.argv.deps || [];
-const scriptPath = path.resolve(__dirname, __filename);
-
-if (to && from) {
-  gitOpts.to = context.currentTag = to;
-  gitOpts.from = context.previousTag = from;
-} else if (from) {
-  gitOpts.from = context.previousTag = from;
-} else if (!to && !from) {
-  gitOpts.from = context.previousTag = getVersion('current');
-} else {
-  throw new Error('How did this happen?');
-}
-
-const cwd = shelljs.pwd().stdout;
-
-if (deps.length) {
-  // If --deps was used, shell out and re-run the show_changelog command without the --deps argument
-  // This is an awful hack to flush the changelog to stdout before getting the dependency changelog(s)
-  // because conventional-changelog-core doesn't seem to have a callback to tap into
-  const fromArg = (from ? ` --from ${from}` : '');
-  const toArg = (to ? ` --to ${to}` : '');
-  let stdout = _exec(`${scriptPath} ${fromArg} ${toArg}`, true).stdout;
-  console.log(stdout.trim());
-
-  shelljs.mkdir('.show_changelog.tmp');
-  try {
-    deps.forEach(showDepChangelog);
-  } finally {
-    shelljs.cd(cwd);
-    shelljs.rm('-rf', '.show_changelog.tmp');
-  }
-} else {
-  showChangelog(context, gitOpts);
-}
-
-function showDepChangelog(dependency) {
-  if (typeof dependency !== 'string') throw new Error('Expected dep to be a string: ' + dependency);
-
-  const tmpdir = path.resolve(cwd, '.show_changelog.tmp', dependency.replace(/[^a-zA-Z]/g, "_"));
-
-  const pkgPath = `${cwd}/node_modules/${dependency}/package.json`;
-  const pkg = JSON.parse(fs.readFileSync(pkgPath));
-  const repotype = pkg.repository && pkg.repository.type;
-  let giturl = pkg.repository && pkg.repository.url;
-
-  if (repotype !== 'git') {
-    throw new Error(`Expected repository.type to be 'git' in ${pkgPath} but it was '${repotype}'`);
-  }
-
-  if (!giturl) {
-    throw new Error(`Expected repository.url to be defined in ${pkgPath} `);
-  }
-
-  giturl = giturl.replace(/^git\+/, '');
-
-  const from = getDepVersion(dependency, 'tag', gitOpts.from);
-  const to = (function() {
-    if (gitOpts.to) return getDepVersion(dependency, 'tag', gitOpts.to);
-    return getDepVersion(dependency, 'workingcopy');
-  }());
-
-  if (from === to) return;
-
-  try {
-    _exec(`git clone ${giturl} ${tmpdir}`, true);
-    shelljs.config.silent = true;
-    shelljs.pushd(tmpdir);
-    shelljs.config.silent = false;
-    console.log(`\n`);
-    console.log(`---`);
-    console.log(`\n`);
-    console.log(`### Updated \`${dependency}\` from ${from} to ${to}`);
-    console.log(`\n`);
-    console.log(`Changelog for \`${dependency}\`:`);
-    console.log(`\n`);
-    let depChangelog = _exec(`node ${scriptPath} --from ${from} --to ${to}`, true).stdout.trim();
-    console.log(depChangelog.split(/[\r\n]/).slice(1).join('\n'));
-  } finally {
-    shelljs.config.silent = true;
-    shelljs.popd();
-    shelljs.config.silent = false;
-  }
-}
-
-// mode: 'workingcopy', 'current', 'previous', 'tag'
-// tag: (optional) the tag to fetch from
-function getVersion(mode, tag) {
-  const showversion = path.resolve(__dirname, 'show_version.js');
-  return _exec(`node ${showversion} --${mode} ${tag || ''}`, true).stdout.replace(/[\r\n]/g, '');
-}
-
-// dep: the dependency
-// mode: 'workingcopy', 'current', 'previous', 'tag'
-// tag: (optional) the tag to fetch from
-function getDepVersion(dep, mode, tag) {
-  const showversion = path.resolve(__dirname, 'show_version.js');
-  return _exec(`node ${showversion} --dep ${dep} --${mode} ${tag || ''}`, true).stdout.replace(/[\r\n]/g, '');
-}
-
-function showChangelog(context, gitOpts) {
-  var writerOpts = {
-    doFlush: true,
-    generateOn: function () {
-      return false;
-    }
-  };
-  const readable = conventionalChangelog(options, context, gitOpts, undefined, writerOpts).pipe(process.stdout);
-  return new Promise(resolve => readable.on('end', resolve));
-}
+#!/usr/bin/env node
+"use strict";
+
+const shelljs = require('shelljs');
+const path = require('path');
+const fs = require('fs');
+const conventionalChangelog = require('conventional-changelog');
+const _exec = require('./util')._exec;
+const yargs = require('yargs')
+    .option('from', {
+      description: 'The starting tag'
+    })
+    .option('to', {
+      description: 'The ending tag'
+    })
+    .option('deps', {
+      description: 'Include changelogs of dependencies',
+      array: true,
+    })
+    .check(argv => {
+      if (argv.to && !argv.from)
+        throw new Error(`If you specify a 'to', you should also specify a 'from'.`);
+      return true;
+    });
+
+let options = {
+  preset: 'ui-router-core'
+};
+
+const context = {}, gitOpts = { merges: null };
+const to = yargs.argv.to;
+const from = yargs.argv.from;
+const deps = yargs.argv.deps || [];
+const scriptPath = path.resolve(__dirname, __filename);
+
+if (to && from) {
+  gitOpts.to = context.currentTag = to;
+  gitOpts.from = context.previousTag = from;
+} else if (from) {
+  gitOpts.from = context.previousTag = from;
+} else if (!to && !from) {
+  gitOpts.from = context.previousTag = getVersion('current');
+} else {
+  throw new Error('How did this happen?');
+}
+
+const cwd = shelljs.pwd().stdout;
+
+if (deps.length) {
+  // If --deps was used, shell out and re-run the show_changelog command without the --deps argument
+  // This is an awful hack to flush the changelog to stdout before getting the dependency changelog(s)
+  // because conventional-changelog-core doesn't seem to have a callback to tap into
+  const fromArg = (from ? ` --from ${from}` : '');
+  const toArg = (to ? ` --to ${to}` : '');
+  let stdout = _exec(`node ${scriptPath} ${fromArg} ${toArg}`, true).stdout;
+  console.log(stdout.trim());
+
+  shelljs.mkdir('.show_changelog.tmp');
+  try {
+    deps.forEach(showDepChangelog);
+  } finally {
+    shelljs.cd(cwd);
+    shelljs.rm('-rf', '.show_changelog.tmp');
+  }
+} else {
+  showChangelog(context, gitOpts);
+}
+
+function showDepChangelog(dependency) {
+  if (typeof dependency !== 'string') throw new Error('Expected dep to be a string: ' + dependency);
+
+  const tmpdir = path.resolve(cwd, '.show_changelog.tmp', dependency.replace(/[^a-zA-Z]/g, "_"));
+
+  const pkgPath = `${cwd}/node_modules/${dependency}/package.json`;
+  const pkg = JSON.parse(fs.readFileSync(pkgPath));
+  const repotype = pkg.repository && pkg.repository.type;
+  let giturl = pkg.repository && pkg.repository.url;
+
+  if (repotype !== 'git') {
+    throw new Error(`Expected repository.type to be 'git' in ${pkgPath} but it was '${repotype}'`);
+  }
+
+  if (!giturl) {
+    throw new Error(`Expected repository.url to be defined in ${pkgPath} `);
+  }
+
+  giturl = giturl.replace(/^git\+/, '');
+
+  const from = getDepVersion(dependency, 'tag', gitOpts.from);
+  const to = (function() {
+    if (gitOpts.to) return getDepVersion(dependency, 'tag', gitOpts.to);
+    return getDepVersion(dependency, 'workingcopy');
+  }());
+
+  if (from === to) return;
+
+  try {
+    _exec(`git clone ${giturl} ${tmpdir}`, true);
+    shelljs.config.silent = true;
+    shelljs.pushd(tmpdir);
+    shelljs.config.silent = false;
+    console.log(`\n`);
+    console.log(`---`);
+    console.log(`\n`);
+    console.log(`### Updated \`${dependency}\` from ${from} to ${to}`);
+    console.log(`\n`);
+    console.log(`Changelog for \`${dependency}\`:`);
+    console.log(`\n`);
+    let depChangelog = _exec(`node ${scriptPath} --from ${from} --to ${to}`, true).stdout.trim();
+    console.log(depChangelog.split(/[\r\n]/).slice(1).join('\n'));
+  } finally {
+    shelljs.config.silent = true;
+    shelljs.popd();
+    shelljs.config.silent = false;
+  }
+}
+
+// mode: 'workingcopy', 'current', 'previous', 'tag'
+// tag: (optional) the tag to fetch from
+function getVersion(mode, tag) {
+  const showversion = path.resolve(__dirname, 'show_version.js');
+  return _exec(`node ${showversion} --${mode} ${tag || ''}`, true).stdout.replace(/[\r\n]/g, '');
+}
+
+// dep: the dependency
+// mode: 'workingcopy', 'current', 'previous', 'tag'
+// tag: (optional) the tag to fetch from
+function getDepVersion(dep, mode, tag) {
+  const showversion = path.resolve(__dirname, 'show_version.js');
+  return _exec(`node ${showversion} --dep ${dep} --${mode} ${tag || ''}`, true).stdout.replace(/[\r\n]/g, '');
+}
+
+function showChangelog(context, gitOpts) {
+  var writerOpts = {
+    doFlush: true,
+    generateOn: function () {
+      return false;
+    }
+  };
+  const readable = conventionalChangelog(options, context, gitOpts, undefined, writerOpts).pipe(process.stdout);
+  return new Promise(resolve => readable.on('end', resolve));
+}