zarro 1.100.1 → 1.100.4

package/gulp-tasks/build.js

@@ -17,7 +17,7 @@ const
   tryDo = requireModule("try-do"),
   msbuild = require("gulp-msbuild");
 
-gulp.task("prebuild", ["nuget-restore", "clean"]);
+gulp.task("prebuild", gulp.series("nuget-restore", "clean"));
 
 const myTasks = ["build"],
   myVars = [
@@ -51,7 +51,7 @@ gulp.task("quick-build", "Quick build without pre-cursors", tryBuild);
 async function tryBuild() {
   return tryDo(
     build,
-    env.resolveNumber("BUILD_RETRIES"),
+    "BUILD_RETRIES",
     e => console.error(chalk.red(`Build fails: ${e}`)),
     () => console.log(chalk.magentaBright(`Build fails! If the error looks transient, I suggest setting the environment variable 'BUILD_RETRIES' to some number > 0 🔨.`))
   );

package/gulp-tasks/clean.js

@@ -26,9 +26,9 @@ gulp.task(
 );
 
 function tryClean() {
-  tryDo(
+  return tryDo(
     clean,
-    env.resolveNumber("BUILD_RETRIES"),
+    "BUILD_RETRIES",
     e => console.error(chalk.red(`Clean fails: ${e}`))
   );
 }

package/gulp-tasks/modules/register-environment-variables.js

@@ -522,9 +522,19 @@ module.exports = function _env(env) {
     default: "public"
   });
 
+  function retryMessage(label) {
+    return `Retry ${label} again up to this many times on failure (work around transient errors on build host)`
+  }
+
   env.register({
     name: "BUILD_RETRIES",
-    help: "Retry the build again up to this many times on failure (work around transient errors on build host)",
+    help: retryMessage("the build"),
+    default: "0"
+  });
+
+  env.register({
+    name: "RESTORE_RETRIES",
+    help: retryMessage("nuget package restore"),
     default: "0"
   });
 

package/gulp-tasks/nuget-restore.js

@@ -1,57 +1,64 @@
-const
-  env = requireModule("env"),
-  gulp = requireModule("gulp"),
-  debug = require("debug")("nuget-restore"),
-  nugetRestore = requireModule("./gulp-nuget-restore"),
-  promisify = requireModule("promisify"),
-  resolveMasks = requireModule("resolve-masks"),
-  { ZarroError } = requireModule("zarro-error"),
-  findLocalNuget = requireModule("find-local-nuget");
-
-const myTasks = [ "nuget-restore" ],
-  myVars = [
-    "DOTNET_CORE",
-    "BUILD_INCLUDE",
-    "BUILD_EXCLUDE",
-    "BUILD_ADDITIONAL_EXCLUDE"
-  ];
-env.associate(myVars, myTasks);
-
-gulp.task(
-  "nuget-restore",
-  "Restores all nuget packages in all solutions",
-  [ "install-tools" ],
-  async () => {
-    const
-      allDNC = env.resolveFlag("DOTNET_CORE"),
-      slnMasks = resolveMasks("BUILD_INCLUDE", [ "BUILD_EXCLUDE", "BUILD_EXTRA_EXCLUDE" ]);
-    debug({
-      allDNC,
-      slnMasks,
-      cwd: process.cwd()
-    });
-    var options = {
-      debug: false
-    };
-    const start = allDNC
-      ? Promise.resolve()
-      : findLocalNuget();
-    if (allDNC) {
-      options.nuget = "dotnet";
-    }
-    return start.then(() => {
-      return promisify(
-        gulp
-          .src(slnMasks, { allowEmpty: true })
-          .pipe(
-            nugetRestore(options)
-          )
-      ).then(() => {
-        debug("nuget restore complete!");
-      }).catch(e => {
-        console.error("nugetRestore errs:", e);
-        throw new ZarroError(e);
-      });
-    });
-  }
-);
+const
+  chalk = require("ansi-colors"),
+  env = requireModule("env"),
+  gulp = requireModule("gulp"),
+  debug = require("debug")("nuget-restore"),
+  nugetRestore = requireModule("./gulp-nuget-restore"),
+  promisify = requireModule("promisify"),
+  resolveMasks = requireModule("resolve-masks"),
+  { ZarroError } = requireModule("zarro-error"),
+  tryDo = requireModule("try-do"),
+  findLocalNuget = requireModule("find-local-nuget");
+
+const myTasks = [ "nuget-restore" ],
+  myVars = [
+    "DOTNET_CORE",
+    "BUILD_INCLUDE",
+    "BUILD_EXCLUDE",
+    "BUILD_ADDITIONAL_EXCLUDE",
+    "RESTORE_RETRIES"
+  ];
+env.associate(myVars, myTasks);
+
+gulp.task(
+  "nuget-restore",
+  "Restores all nuget packages in all solutions",
+  [ "install-tools" ],
+  tryRestore
+);
+
+async function tryRestore() {
+  tryDo(
+    restore,
+    "RESTORE_RETRIES",
+    e => console.error(chalk.red(`Clean fails: ${e}`))
+  );
+}
+
+async function restore() {
+  const
+    allDNC = env.resolveFlag("DOTNET_CORE"),
+    slnMasks = resolveMasks("BUILD_INCLUDE", [ "BUILD_EXCLUDE", "BUILD_EXTRA_EXCLUDE" ]);
+  debug({
+    allDNC,
+    slnMasks,
+    cwd: process.cwd()
+  });
+  const options = {
+    debug: false
+  };
+  const start = allDNC
+    ? () => Promise.resolve()
+    : findLocalNuget();
+  if (allDNC) {
+    options.nuget = "dotnet";
+  }
+  await start();
+  await promisify(
+    gulp.src(slnMasks, { allowEmpty: true })
+      .pipe(
+        nugetRestore(options)
+      )
+  );
+  debug("nuget restore complete!");
+}

package/package.json

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