zarro 1.152.6 → 1.153.2

package/README.md

@@ -305,3 +305,4 @@ of people don't really "get" git submodules:
 - the name is inspired from the old bugzilla, which would proudly proclaim "zarro boogs"
   when there were zero bug matches for a query, because (a) names are hard and (b)
   zarro aims to be zero- to low-conf
+

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

@@ -28,7 +28,7 @@
         // packagename (eg 'nunit')
         //  - retrieves the package according to the system config (original & default behavior)
         // source/packagename (eg 'proget.mycompany.moo/nunit')
-        //  - retrieves the package from the named source (same as nuget.exe install nunit -source proget.mycompany.moo}
+        //  - retrieves the package from the named source (same as nuget.exe install nunit -source proget.mycompany.moo)
         //  - allows consumer to be specific about where the package should come from
         //  - allows third-parties to be specific about their packages being from, eg, nuget.org
         const parts = toolSpec.split("/");
@@ -37,11 +37,6 @@
             "install", toolPackage[0], "-OutputDirectory", quoteIfRequired(outputDirectory)
         ].concat(generateNugetSourcesOptions(parts[0]));
     }
-    // gulp4 doesn't seem to protect against repeated dependencies, so this is a safeguard
-    //  here to prevent accidental parallel installation
-    //   let
-    //     installingPromise: Optional<Promise<void>>,
-    //     installingRequest: Optional<string[]>;
     const inProgress = {};
     const keyDelimiter = "||";
     function makeKey(parts) {
@@ -92,15 +87,24 @@
         return inProgress[inProgressKey] = doInstall(toolsFolder, requiredTools);
     }
     async function doInstall(toolsFolder, requiredTools) {
-        return env.resolveFlag(env.BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE)
-            ? doInstallViaNugetExe(toolsFolder, requiredTools)
-            : doInstallViaNodeNugetClient(toolsFolder, requiredTools);
+        const forceNugetUsage = env.resolveFlag(env.BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE);
+        if (forceNugetUsage) {
+            debug(`${env.BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE} is set truthy - forcing usage of nuget.exe for tool installation`);
+            return doInstallViaNugetExe(toolsFolder, requiredTools);
+        }
+        else {
+            debug(`using node-nuget-client for tool installation`);
+            return doInstallViaNodeNugetClient(toolsFolder, requiredTools);
+        }
     }
     async function doInstallViaNodeNugetClient(toolsFolder, requiredTools) {
-        const { NugetClient } = require("node-nuget-client"), client = new NugetClient();
+        const { 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: tool,
+                packageId,
                 output: toolsFolder
             });
         }

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

@@ -12,7 +12,7 @@
         });
         env.register({
             name: "BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE",
-            help: `Flag: when set, revert to the original behavior for downloading tooling via nuget.exe 
+            help: `Flag: when set, revert to the original behavior for downloading tooling via nuget.exe 
   (default is to use node-nuget-client since nuget.exe now refuses to download packages marked as tools)`,
             default: "false"
         });
@@ -157,8 +157,8 @@
             default: "auto",
             help: "process model for nunit-runner to use"
         });
-        const extra = `
-   - globs match dotnet core projects or .net framework built assemblies
+        const extra = `
+   - globs match dotnet core projects or .net framework built assemblies
    - elements surrounded with () are treated as pure gulp.src masks`, defaultTestInclude = "*.Tests,*.Tests.*,Tests,Test,Test.*", defaultTestExclude = `{!**/node_modules/**/*},{!./${getToolsFolder(env)}/**/*}`;
         env.register({
             name: "TEST_INCLUDE",
@@ -656,9 +656,9 @@
         env.register({
             name: "ZARRO_ALLOW_FILE_RESOLUTION",
             default: "true",
-            help: `when enabled, the value provided by an environment variable may be the path
- to a file to use for that configuration; for example MSBUILD_PROPERTIES=foo.json will
- instruct Zarro to read the mapping in foo.json for extra msbuild properties to pass on
+            help: `when enabled, the value provided by an environment variable may be the path
+ to a file to use for that configuration; for example MSBUILD_PROPERTIES=foo.json will
+ instruct Zarro to read the mapping in foo.json for extra msbuild properties to pass on
  where applicable.`
         });
         env.register({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.152.6",
+  "version": "1.153.2",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"
@@ -68,7 +68,7 @@
     "gulp-filter": "^6.0.0",
     "gulp-msbuild": "^0.10.0",
     "lodash.kebabcase": "^4.1.1",
-    "node-nuget-client": "^0.7.0",
+    "node-nuget-client": "^0.8.0",
     "npm-run-all": "^4.1.5",
     "plugin-error": "^1.0.1",
     "readline": "^1.3.0",