zarro 1.185.0 → 1.187.0

package/gulp-tasks/modules/generate-version-suffix.js

@@ -1,20 +1,12 @@
 "use strict";
 (function () {
     const { currentShortSHA } = requireModule("git-sha");
-    function timestamp() {
-        const now = new Date(Date.now()), year = `${now.getFullYear()}`.substring(2), month = zeroPad(now.getMonth() + 1), day = zeroPad(now.getDate()), hour = zeroPad(now.getHours()), minute = zeroPad(now.getMinutes());
-        return [
-            year,
-            month,
-            day,
-            hour,
-            minute
-        ].join("");
-    }
-    function zeroPad(i) {
-        return i < 10 ? `0${i}` : `${i}`;
-    }
+    const { timestamp } = requireModule("timestamp");
+    const options = {
+        fullYear: false,
+        includeSeconds: false
+    };
     module.exports = function generateVersionSuffix() {
-        return `${timestamp()}.${currentShortSHA()}`;
+        return `${timestamp(options)}.${currentShortSHA()}`;
     };
 })();

package/gulp-tasks/modules/git-push.js

@@ -1,53 +1,53 @@
-(function () {
-  const
-    gitFactory = require("simple-git"),
-    resolveGitBranch = requireModule("resolve-git-branch"),
-    resolveGitRemote = requireModule("resolve-git-remote"),
-    gutil = requireModule("gulp-util");
-
-  async function gitPush(
-    dryRun,
-    quiet,
-    where
-  ) {
-    if (dryRun === undefined) {
-      dryRun = {};
-    }
-    if (typeof dryRun === "object") {
-      quiet = dryRun.quiet || false;
-      where = dryRun.where || ".";
-      dryRun = dryRun.dryRun || false;
-    } else if (quiet !== undefined) {
-      gutil.log.warn(
-        gutil.colors.red(
-          "depreciation warning: options for git-push should be sent via an object"
-        )
-      );
-    }
-    where = where || ".";
-    quiet = !!quiet;
-    const
-      git = gitFactory(where),
-      more = (where && where !== ".") ? ` (${ where })` : "";
-    if (dryRun) {
-      gutil.log(gutil.colors.green(`dry run: whould push local commits now${ more }...`));
-      return Promise.resolve();
-    }
-    if (!quiet) {
-      gutil.log(gutil.colors.green(`pushing local commits${ more }...`));
-    }
-    const
-      remote = await resolveGitRemote(),
-      branch = await resolveGitBranch();
-    if (remote && branch) {
-      await git.push(
-        remote,
-        branch, [
-          "-u" // we're probably already tracking, but this will help a new branch
-        ]
-      );
-    }
-  }
-
-  module.exports = gitPush;
-})();
+(function () {
+  const
+    gitFactory = require("simple-git"),
+    resolveGitBranch = requireModule("resolve-git-branch"),
+    resolveGitRemote = requireModule("resolve-git-remote"),
+    gutil = requireModule("gulp-util");
+
+  async function gitPush(
+    dryRun,
+    quiet,
+    where
+  ) {
+    if (dryRun === undefined) {
+      dryRun = {};
+    }
+    if (typeof dryRun === "object") {
+      quiet = dryRun.quiet || false;
+      where = dryRun.where || ".";
+      dryRun = dryRun.dryRun || false;
+    } else if (quiet !== undefined) {
+      gutil.log.warn(
+        gutil.colors.red(
+          "depreciation warning: options for git-push should be sent via an object"
+        )
+      );
+    }
+    where = where || ".";
+    quiet = !!quiet;
+    const
+      git = gitFactory(where),
+      more = (where && where !== ".") ? ` (${ where })` : "";
+    if (dryRun) {
+      gutil.log(gutil.colors.green(`dry run: whould push local commits now${ more }...`));
+      return Promise.resolve();
+    }
+    if (!quiet) {
+      gutil.log(gutil.colors.green(`pushing local commits${ more }...`));
+    }
+    const
+      remote = await resolveGitRemote(),
+      branch = await resolveGitBranch();
+    if (remote && branch) {
+      await git.push(
+        remote,
+        branch, [
+          "-u" // we're probably already tracking, but this will help a new branch
+        ]
+      );
+    }
+  }
+
+  module.exports = gitPush;
+})();

package/gulp-tasks/modules/parse-flag.js

@@ -33,12 +33,12 @@
         for (const item of negatives) {
             possibleNegatives.push(item);
         }
-        throw new Error(`${value} is not a valid flag value.
-Try one of:
-  - accepted truthy values:
-    ${possiblePositives.join(", ")}
-  - accepted falsey values:
-    ${possibleNegatives.join(", ")}
+        throw new Error(`${value} is not a valid flag value.
+Try one of:
+  - accepted truthy values:
+    ${possiblePositives.join(", ")}
+  - accepted falsey values:
+    ${possibleNegatives.join(", ")}
 `);
     }
     module.exports = {

package/gulp-tasks/modules/resolve-nuget.js

@@ -99,7 +99,7 @@
             throw new ZarroError("MONO is required to run nuget restore on this platform");
         }
         const baseFolder = findNpmBase();
-        const script = `#!/bin/sh
+        const script = `#!/bin/sh
 mono ${path.resolve(nugetPath)} $@`;
         const scriptPath = path.join(baseFolder, "node_modules", ".bin", "mono-nuget");
         writeFileSync(scriptPath, script, { encoding: "utf-8" });

package/gulp-tasks/modules/system.js

@@ -91,6 +91,21 @@ ${tempFileContents}
         const result = new SystemResult(`${exe}`, programArgs, undefined, [], []);
         return new Promise((resolve, reject) => {
             const child = child_process.spawn(exe, programArgs, spawnOptions);
+            if (!!options) {
+                const optsWithKill = options;
+                optsWithKill.kill = (signal) => {
+                    destroyPipesOn(child);
+                    child.kill(signal);
+                };
+                if (optsWithKill === null || optsWithKill === void 0 ? void 0 : optsWithKill.onChildSpawned) {
+                    try {
+                        optsWithKill.onChildSpawned(child, optsWithKill);
+                    }
+                    catch (e) {
+                        // suppress
+                    }
+                }
+            }
             const stdoutFn = typeof opts.stdout === "function" ? opts.stdout : noop;
             const stderrFn = typeof opts.stderr === "function" ? opts.stderr : noop;
             const stdoutLineBuffer = new LineBuffer(s => {

package/gulp-tasks/modules/timestamp.js

@@ -0,0 +1,41 @@
+"use strict";
+(function () {
+    function timestamp(opts) {
+        var _a;
+        opts = opts || {};
+        if (!opts.delimiter) {
+            opts.delimiter = "";
+        }
+        if (opts.includeSeconds === undefined) {
+            opts.includeSeconds = true;
+        }
+        if (opts.includeMilliseconds === undefined) {
+            opts.includeMilliseconds = false;
+        }
+        if (opts.fullYear === undefined) {
+            opts.fullYear = true;
+        }
+        const now = (_a = opts.forDate) !== null && _a !== void 0 ? _a : new Date();
+        let yearString = `${now.getFullYear()}`;
+        if (!opts.fullYear) {
+            yearString = yearString.substring(2, 4);
+        }
+        const parts = [
+            yearString,
+            `${now.getMonth() + 1}`.padStart(2, "0"),
+            `${now.getDate()}`.padStart(2, "0"),
+            `${now.getHours()}`.padStart(2, "0"),
+            `${now.getMinutes()}`.padStart(2, "0")
+        ];
+        if (opts.includeSeconds) {
+            parts.push(`${now.getSeconds()}`.padStart(2, "0"));
+        }
+        if (opts.includeMilliseconds) {
+            parts.push(`${now.getMilliseconds()}`.padStart(3, "0"));
+        }
+        return parts.join(opts.delimiter);
+    }
+    module.exports = {
+        timestamp
+    };
+})();

package/package.json

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

package/types.d.ts

@@ -5,7 +5,7 @@ import { StatsBase } from "fs";
 import { Stream, Transform } from "stream";
 import ansiColors, { StyleFunction } from "ansi-colors";
 import { RimrafOptions } from "./gulp-tasks/modules/rimraf";
-import { ExecFileOptionsWithBufferEncoding } from "child_process";
+import { ChildProcess, ExecFileOptionsWithBufferEncoding } from "child_process";
 import * as vinyl from "vinyl";
 import { BufferFile } from "vinyl";
 // noinspection ES6PreferShortImport
@@ -1095,6 +1095,7 @@ declare global {
      * io writer or the result from after spawn completes
      */
     suppressOutput?: boolean;
+
   }
 
   interface SystemOptions {
@@ -1134,6 +1135,17 @@ declare global {
      * / error as the first argument, with the exe set to either cmd or sh
      */
     keepTempFiles?: boolean;
+
+    // gain direct access to the child process as
+    // soon as it spawns
+    onChildSpawned?: (child: ChildProcess, originalOptions: SystemOptionsWithKill) => void;
+
+  }
+
+  interface SystemOptionsWithKill extends SystemOptions {
+    // this function will be filled in for you once the
+    // child process has started
+    kill: (signal?: NodeJS.Signals | number) => void;
   }
 
   /**
@@ -2189,5 +2201,16 @@ declare global {
     forget(key: string): void;
     clear(): void;
   }
+
+  export interface TimestampOptions {
+    delimiter?: string;
+    includeSeconds?: boolean;
+    includeMilliseconds?: boolean;
+    fullYear?: boolean;
+    forDate?: Date;
+  }
+  interface Timestamp {
+    timestamp: (opts?: TimestampOptions) => string;
+  }
 }