zarro 1.133.1 → 1.136.1

package/gulp-tasks/modules/dotnet-cli.js

@@ -101,6 +101,11 @@
         pushMsbuildProperties(args, opts);
         pushEnvVars(args, opts.env);
         pushAdditionalArgs(args, opts);
+        // there's a lot of stdio/stderr from tests, and it
+        // should be shown already - including it in the
+        // error dump is not only unnecessary, it confuses
+        // the test handler wrt quackers output handling
+        opts.suppressStdIoInErrors = true;
         return runDotNetWith(args, opts);
     }
     async function pack(opts) {
@@ -169,7 +174,8 @@
         try {
             return await spawn("dotnet", args, {
                 stdout: opts.stdout,
-                stderr: opts.stderr
+                stderr: opts.stderr,
+                suppressStdIoInErrors: opts.suppressStdIoInErrors
             });
         }
         catch (e) {

package/gulp-tasks/modules/spawn.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
             this._args = args;
             this._exe = exe;
             this._exitCode = exitCode;
-            this._stderr = [...stderr];
-            this._stdout = [...stdout];
+            this._stderr = stderr ? [...stderr] : null;
+            this._stdout = stdout ? [...stdout] : null;
         }
         get args() {
             return this._args;
@@ -22,16 +22,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
             return this._exitCode;
         }
         get stdout() {
-            return [...this._stdout];
+            return this._stdout ? [...this._stdout] : [];
         }
         get stderr() {
-            return [...this._stderr];
+            return this._stderr ? [...this._stderr] : [];
         }
         toString() {
             const lines = [
                 `${this.exe} ${this.args.join(" ")}`,
                 `Process exited with code: ${this.exitCode}`,
             ];
+            if (this._stderr === null && this._stdout === null) {
+                // io has been suppressed;
+                return lines.join("\n");
+            }
             const hasStdOut = this.stdout && this.stdout.length > 0;
             const hasStdErr = this.stderr && this.stderr.length > 0;
             const hasOutput = hasStdErr || hasStdOut;
@@ -113,7 +117,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
             opts.stderr = undefined;
             opts.stdout = undefined;
         }
-        if (executable.indexOf("gulp") > -1) {
+        if (debug("gulp") > -1) {
             console.log("running gulp", opts);
         }
         if (!opts.stdio && defaultOptions.stdio /* this is just to make ts happy*/) {
@@ -147,13 +151,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
         return new Promise((resolve, reject) => {
             try {
                 const child = child_process.spawn(executable, quotedArgs, opts);
-                if (executable.indexOf("gulp") > -1) {
-                    console.log("gulp io", {
-                        stdout: child.stdout,
-                        stderr: child.stderr,
-                        stdin: child.stdin
-                    });
-                }
                 if (!child) {
                     reject(new Error(`unable to spawn ${executable} with args [${args.join(",")}]`));
                 }
@@ -163,7 +160,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 child.on("error", (err) => {
                     debug(`child error: ${err}`);
                     destroyPipesOn(child);
-                    const e = new SpawnError(`"${[executable].concat(args).join(" ")}" failed with "${err}"`, executable, quotedArgs, -1, stderr, stdout);
+                    const e = new SpawnError(`"${[executable].concat(args).join(" ")}" failed with "${err}"`, executable, quotedArgs, -1, opts.suppressStdIoInErrors ? null : stderr, opts.suppressStdIoInErrors ? null : stdout);
                     reject(e);
                 });
                 let exited = false;
@@ -188,7 +185,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                         else {
                             const err = new SpawnError(`"${[executable]
                                 .concat(args)
-                                .join(" ")}" failed with exit code ${code}`, executable, args, code, stdout, stderr);
+                                .join(" ")}" failed with exit code ${code}`, executable, args, code, opts.suppressStdIoInErrors ? null : stdout, opts.suppressStdIoInErrors ? null : stderr);
                             reject(err);
                         }
                     };

package/gulp-tasks/release-npm.js

@@ -35,7 +35,9 @@
                 if (isBeta) {
                     args.push("--tag", "beta");
                 }
-                await spawn("npm", args);
+                await spawn("npm", args, {
+                    interactive: true
+                });
             }
         }
         catch (e) {

package/gulp-tasks/start/gulpfile.js

@@ -230,6 +230,10 @@ function runNpmWith(args) {
   const os = require("os");
 
   return os.platform() === "win32"
-    ? spawn("cmd", [ "/c", "npm" ].concat(args))
-    : spawn("npm", args);
+    ? spawn("cmd", [ "/c", "npm" ].concat(args), {
+      interactive: true
+    })
+    : spawn("npm", args, {
+      interactive: true
+    });
 }

package/gulp-tasks/update-self.js

@@ -34,7 +34,8 @@ function updateZarroPipe(beta) {
         }
         console.log(chalk.yellow(`update zarro in: ${file.dirname}`));
         const proc = "npm", tag = beta ? "beta" : "latest", args = ["install", save ? "--save" : "--save-dev", `zarro@${tag}`, "--no-progress", "--silent"], opts = {
-            cwd: file.dirname
+            cwd: file.dirname,
+            interactive: true
         };
         if (env.resolveFlag(env.DRY_RUN)) {
             console.log({
@@ -53,10 +54,10 @@ function updateZarroPipe(beta) {
             stream.emit("end");
         }
         catch (err) {
-            console.error(chalk.redBright(`
- ==================================================
-| WARNING: Unable to update zarro, error(s) follow |
- ==================================================
+            console.error(chalk.redBright(`
+ ==================================================
+| WARNING: Unable to update zarro, error(s) follow |
+ ==================================================
 `));
             stream.emit("error", err);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.133.1",
+  "version": "1.136.1",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"

package/types.d.ts

@@ -32,6 +32,7 @@ declare global {
     (() => Promise<any> | NodeJS.EventEmitter) | ((done: VoidVoid) => Promise<any> | NodeJS.EventEmitter)
   type TryDo<T> = (logic: AsyncVoidFunc<T>, retries: number | string, onTransientError?: ErrorReporter, onFinalFailure?: VoidVoid) => Promise<void>;
   type Optional<T> = T | undefined;
+  type Nullable<T> = T | null;
   type ResolveNuget = (nugetPath: Optional<string>, errorOnMissing: boolean) => string;
   type FindLocalNuget = () => Promise<string>;
 
@@ -516,6 +517,7 @@ declare global {
     * collection is done as the IO is left as "inherit"
      */
     interactive?: boolean;
+    suppressStdIoInErrors?: boolean
   }
 
   interface SpawnError extends Error {
@@ -568,6 +570,7 @@ declare global {
     verbosity?: DotNetVerbosity;
     // when set, errors are returned instead of thrown
     suppressErrors?: boolean;
+    suppressStdIoInErrors?: boolean;
   }
 
   interface DotNetCommonBuildOptions extends DotNetBaseOptions {