ci: publish --tag flag and changelog feat

hansl · hansl · commit 3157f6876184 · 2018-06-05T17:55:19.000-07:00
If no github token passed to changelog script it will output the markdown
to stdout.
diff --git a/scripts/changelog.ts b/scripts/changelog.ts
@@ -88,7 +88,7 @@ export default function(args: ChangelogOptions, logger: logging.Logger) {
         commits,
       });
 
-      if (args.stdout) {
+      if (args.stdout || !githubToken) {
         console.log(markdown);
         process.exit(0);
       }
diff --git a/scripts/publish.ts b/scripts/publish.ts
@@ -7,51 +7,51 @@
  */
 // tslint:disable:no-implicit-dependencies
 import { logging } from '@angular-devkit/core';
-import { resolve } from '@angular-devkit/core/node';
-import * as stream from 'stream';
+import { spawnSync } from 'child_process';
 import { packages } from '../lib/packages';
 import build from './build';
 
-const npm = require(resolve('npm', { basedir: '/', checkGlobal: true }));
 
-class NullStream extends stream.Writable {
-  _write() {}
+function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
+  const { status, error, stderr, stdout } = spawnSync(command, args, { ...opts });
+
+  if (status != 0) {
+    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    if (error) {
+      logger.error('Error: ' + (error ? error.message : 'undefined'));
+    } else {
+      logger.error(`STDERR:\n${stderr}`);
+    }
+    throw error;
+  } else {
+    return stdout.toString();
+  }
 }
 
 
-export default function (_: {}, logger: logging.Logger) {
+export default function (args: { tag?: string }, logger: logging.Logger) {
   logger.info('Building...');
   build({}, logger.createChild('build'));
 
-  return new Promise<void>((resolve, reject) => {
-    const loadOptions = { progress: false, logstream: new NullStream() };
-    npm.load(loadOptions, (err: Error | string) => err ? reject(err) : resolve());
-  })
-    .then(() => {
-      return Object.keys(packages).reduce((acc: Promise<void>, name: string) => {
-        const pkg = packages[name];
-        if (pkg.packageJson['private']) {
-          logger.debug(`${name} (private)`);
-
-          return acc;
-        }
-
-        return acc
-          .then(() => new Promise<void>((resolve, reject) => {
-            logger.info(name);
-            process.chdir(pkg.dist);
-            npm.commands['publish']([], (err: Error) => {
-              if (err) {
-                reject(err);
-              } else {
-                resolve();
-              }
-            });
-          }))
-          .catch((err: Error) => {
-            logger.error(err.message);
-          });
-      }, Promise.resolve());
-    })
-    .then(() => logger.info('done'), (err: Error) => logger.fatal(err.message));
+  return Object.keys(packages).reduce((acc: Promise<void>, name: string) => {
+    const pkg = packages[name];
+    if (pkg.packageJson['private']) {
+      logger.debug(`${name} (private)`);
+
+      return acc;
+    }
+
+    return acc
+      .then(() => {
+        logger.info(name);
+
+        return _exec('npm', ['publish'].concat(args.tag ? ['--tag', args.tag] : []), {
+          cwd: pkg.dist,
+        }, logger);
+      })
+      .then((stdout: string) => {
+        logger.info(stdout);
+      });
+  }, Promise.resolve())
+  .then(() => logger.info('done'), (err: Error) => logger.fatal(err.message));
 }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export default function(args: ChangelogOptions, logger: logging.Logger) {`
`88`	`88`	`commits,`
`89`	`89`	`});`
`90`	`90`
`91`		`- if (args.stdout) {`
	`91`	`+ if (args.stdout \|\| !githubToken) {`
`92`	`92`	`console.log(markdown);`
`93`	`93`	`process.exit(0);`
`94`	`94`	`}`