zarro 1.153.2 → 1.154.0

package/gulp-tasks/default-tools-installer.js

@@ -3,7 +3,7 @@
     const debug = requireModule("debug")(__filename), gulp = requireModule("gulp"), env = requireModule("env"), nugetSourceName = process.env.NUGET_SOURCE || "nuget.org", installLocalTools = requireModule("install-local-tools"), isDotnetCore = env.resolveFlag("DOTNET_CORE"), tools = isDotnetCore
         ? [] // currently, only dotnet targets are used for dotnet test/build
         : [
-            `${nugetSourceName}/nunit.console`,
+            `${nugetSourceName}/nunit.consolerunner`,
             `${nugetSourceName}/opencover`,
             `${nugetSourceName}/Jetbrains.dotCover.CommandLineTools`,
             `${nugetSourceName}/reportgenerator`
@@ -11,7 +11,11 @@
     env.associate("default-tools-installer", ["BUILD_TOOLS_FOLDER", "DOTNET_CORE"]);
     gulp.task("default-tools-installer", `Installs the default toolset: ${tools.join(", ")}`, () => {
         if (env.resolveFlag("DOTNET_CORE")) {
-            debug("not invoked for dotnet core builds");
+            debug(`DOTNET_CORE builds currently have ${tools.length} default tools to install`);
+        }
+        if (tools.length === 0) {
+            // don't waste time calling into the installer
+            // when there are no tools to install
             return Promise.resolve();
         }
         return installLocalTools.install(tools);

package/gulp-tasks/modules/install-local-tools.js

@@ -98,14 +98,16 @@
         }
     }
     async function doInstallViaNodeNugetClient(toolsFolder, requiredTools) {
-        const { NugetClient } = require("node-nuget-client");
+        const { ExecStepContext } = require("exec-step"), ctx = new ExecStepContext(), { NugetClient } = require("node-nuget-client");
         for (const tool of requiredTools) {
-            const spec = tool.includes("/")
-                ? tool
-                : `nuget.org/${tool}`, parts = spec.split("/"), [source, packageId] = parts, client = new NugetClient(source);
-            await client.downloadPackage({
-                packageId,
-                output: toolsFolder
+            await ctx.exec(`Installing local tool: ${tool}`, async () => {
+                const spec = tool.includes("/")
+                    ? tool
+                    : `nuget.org/${tool}`, parts = spec.split("/"), [source, packageId] = parts, client = new NugetClient(source);
+                await client.downloadPackage({
+                    packageId,
+                    output: toolsFolder
+                });
             });
         }
     }

package/gulp-tasks/modules/testutil-finder.js

@@ -85,8 +85,7 @@
         return fs.existsSync(somePath) ? somePath : undefined;
     }
     function tryToFindNUnit(options) {
-        return initialToolSearch("nunit3-console.exe", "NUNIT") ||
-            searchForNunit(options);
+        return initialToolSearch("nunit3-console.exe", "NUNIT") || searchForSystemNUnit(options);
     }
     function latestNUnit(options) {
         const result = tryToFindNUnit(options);
@@ -99,7 +98,7 @@
         }
         return finder([programFilesFolder], undefined, "NUnit", searchBin, options);
     }
-    function searchForNunit(options) {
+    function searchForSystemNUnit(options) {
         options = options || {};
         const isX86 = (options.x86 || ((options.platform || options.architecture) === "x86"));
         const runner = isX86 ? "/bin/nunit-console-x86.exe" : "/bin/nunit-console.exe";

package/package.json

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