zarro 1.167.0 → 1.168.2

package/gulp-tasks/modules/gulp-increment-nuget-package-version.js

@@ -12,8 +12,10 @@
         debug(JSON.stringify(xml, null, 2));
         const packageVersionPropGroup = xml.Project.PropertyGroup.filter((g) => !!g.PackageVersion)[0];
         if (!packageVersionPropGroup) {
-            debug("No PropertyGroup found with PackageVersion node");
-            return xml;
+            // if we got in here, then something wants to increment
+            // the package version, but we can't unless the correct
+            // structure is found in the project
+            throw new ZarroError(`Unable to increment package version in '${file.path}': no PropertyGroup containing a PackageVersion node was found.`);
         }
         const node = packageVersionPropGroup.PackageVersion;
         const newVersion = incrementVersion(node[0], env.resolveFlag("BETA")

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

@@ -10,10 +10,11 @@
         await dotnetCli.nugetPush(opts);
     }
     async function nugetPush(packageFile, sourceName, options) {
+        var _a;
         const nugetPushSource = sourceName ||
             env.resolve(env.NUGET_PUSH_SOURCE, env.NUGET_SOURCE) ||
             "nuget.org";
-        const apiKey = resolveNugetApiKey(nugetPushSource);
+        const apiKey = (_a = options === null || options === void 0 ? void 0 : options.apiKey) !== null && _a !== void 0 ? _a : resolveNugetApiKey(nugetPushSource);
         options = options || {};
         options.skipDuplicates = options.skipDuplicates === undefined
             ? env.resolveFlag("NUGET_IGNORE_DUPLICATE_PACKAGES")

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({
@@ -720,6 +720,11 @@
             help: "comma-delimited list of nuget sources if you don't want to use the defaults",
             default: env.resolve("NUGET_SOURCE")
         });
+        env.register({
+            name: "NUGET_PUSH_PACKAGES",
+            help: "comma-delimited list of packages to push, either relative to the PACK_TARGET_FOLDER, or relative to the project root. If left empty, assume all packages under PACK_TARGET_FOLDER.",
+            default: ""
+        });
         env.register({
             name: "NUGET_PUSH_SOURCE",
             help: "Specifically: nuget source to push to. Will fall back on NUGET_SOURCE or first of NUGET_SOURCES.",

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

@@ -0,0 +1,54 @@
+"use strict";
+(function () {
+    const { ls, FsEntities, fileExists } = require("yafs"), path = require("path");
+    async function resolveNugetPushPackageFiles() {
+        const env = requireModule("env"), packRoot = env.resolve(env.PACK_TARGET_FOLDER), pushMask = env.resolveArray(env.NUGET_PUSH_PACKAGES);
+        if (pushMask.length === 0) {
+            return await enumeratePackagesIn(packRoot);
+        }
+        const collected = [];
+        for (const mask of pushMask) {
+            const maskFiles = await findFilesFor(mask);
+            collected.push(...maskFiles);
+        }
+        return collected;
+    }
+    async function findFilesFor(mask) {
+        if (await fileExists(mask)) {
+            return [path.resolve(mask)];
+        }
+        const env = requireModule("env"), maskContainer = path.dirname(mask), searchContainers = path.isAbsolute(mask)
+            ? [maskContainer]
+            : [maskContainer, `${env.resolve(env.PACK_TARGET_FOLDER)}/${maskContainer}`], files = await lsAll(searchContainers);
+        const maskHasFolders = mask.includes("/") || mask.includes("\\"), leaf = path.basename(mask), start = leaf.startsWith("*") ? ".*" : "^", end = leaf.endsWith("*") ? ".*" : "", regexed = mask.replace(/\*/g, ".*").replace(/\\/g, "\\/"), nupkgRe = /\.nupkg$/i, maskRe = new RegExp(`${start}${regexed}${end}`);
+        return files.filter((f) => {
+            const toTest = maskHasFolders
+                ? f
+                : path.basename(f);
+            return nupkgRe.test(toTest) && maskRe.test(toTest);
+        });
+    }
+    async function lsAll(dirs) {
+        const result = [];
+        for (const dir of dirs) {
+            const files = await ls(dir, {
+                entities: FsEntities.files,
+                recurse: false,
+                fullPaths: true
+            });
+            result.push(...files);
+        }
+        return result;
+    }
+    async function enumeratePackagesIn(packRoot) {
+        return await ls(packRoot, {
+            entities: FsEntities.files,
+            match: /\.nupkg$/,
+            recurse: false,
+            fullPaths: true
+        });
+    }
+    module.exports = {
+        resolveNugetPushPackageFiles
+    };
+})();

package/gulp-tasks/nuget-push.js

@@ -0,0 +1,11 @@
+"use strict";
+(function () {
+    const gulp = requireModule("gulp");
+    gulp.task("nuget-push", async () => {
+        const env = requireModule("env"), runInParallel = requireModule("run-in-parallel"), nugetPush = requireModule("nuget-push"), { resolveNugetPushPackageFiles } = requireModule("resolve-nuget-push-package-files"), packageFiles = await resolveNugetPushPackageFiles(), nugetSrc = env.resolve("NUGET_PUSH_SOURCE");
+        const actions = packageFiles.map(file => {
+            return async () => await nugetPush(file, nugetSrc);
+        });
+        await runInParallel(2, ...actions);
+    });
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.167.0",
+  "version": "1.168.2",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"
@@ -13,7 +13,7 @@
     "verify-submodules": "node index.js verify-submodules",
     "verify-no-debugger": "node index.js @",
     "clean-cache": "rimraf .jest-cache",
-    "pretest": "run-s clean-cache build verify-submodules",
+    "pretest": "run-s clean-cache build",
     "test": "jest",
     "quick-test": "jest -o --no-cache",
     "clear-console": "console-cls",