zarro 1.182.0 → 1.183.1

package/gulp-tasks/modules/dotnet-cli.js

@@ -507,6 +507,15 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         if (!opts.apiKey) {
             throw new ZarroError("apiKey was not specified");
         }
+        const o = opts;
+        // the dotnet cli mentions --skip-duplicate, which makes
+        // sense for a single package, however, as an outer caller
+        // potentially acting on multiple packages will use the
+        // pluralized version, and since I've just spent 1/2 an hour
+        // figuring this out... let's add some boilerplating.
+        if (o.skipDuplicate !== undefined && o.skipDuplicates === undefined) {
+            o.skipDuplicates = o.skipDuplicate;
+        }
         const args = [
             "nuget",
             "push",
@@ -525,7 +534,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         pushIfSet(args, opts.timeout, "--timeout");
         pushFlag(args, opts.disableBuffering, "--disable-buffering");
         pushFlag(args, opts.noSymbols, "--no-symbols");
-        pushFlag(args, opts.skipDuplicate, "--skip-duplicate");
+        pushFlag(args, opts.skipDuplicates, "--skip-duplicate");
         pushFlag(args, opts.noServiceEndpoint, "--no-service-endpoint");
         pushFlag(args, opts.forceEnglishOutput, "--force-english-output");
         pushAdditionalArgs(args, opts);

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

@@ -7,7 +7,7 @@
         return !!executable.match(/^dotnet(:?\.exe)?$/i);
     }
     async function pushWithDotnet(opts) {
-        await dotnetCli.nugetPush(opts);
+        return await dotnetCli.nugetPush(opts);
     }
     async function nugetPush(packageFile, sourceName, options) {
         const nugetPushSource = sourceName ||

package/gulp-tasks/nuget-push.js

@@ -1,7 +1,9 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const exec_step_1 = require("exec-step");
 (function () {
     gulp.task("nuget-push", "Pushes the latest versions of packages in the package build dir", async () => {
-        const { ctx } = require("exec-step"), debug = requireModule("debug")(__filename), path = require("path"), nugetPush = requireModule("nuget-push"), { ls, FsEntities } = require("yafs"), env = requireModule("env"), folder = env.resolve(env.PACK_TARGET_FOLDER), versionRe = /^(?<id>[A-Za-z\.]+)\.(?<version>\d\.\d\.\d)(-(?<tag>.*))?\.nupkg$/, packages = await ls(folder, {
+        const SystemError = requireModule("system-error"), { ctx } = require("exec-step"), debug = requireModule("debug")(__filename), path = require("path"), nugetPush = requireModule("nuget-push"), { ls, FsEntities } = require("yafs"), env = requireModule("env"), folder = env.resolve(env.PACK_TARGET_FOLDER), versionRe = /^(?<id>[A-Za-z\.]+)\.(?<version>\d\.\d\.\d)(-(?<tag>.*))?\.nupkg$/, packages = await ls(folder, {
             recurse: false,
             entities: FsEntities.files,
             match: versionRe
@@ -28,7 +30,20 @@
             return;
         }
         for (const file of toPush) {
-            await ctx.exec(`⬆️ pushing ${file}`, async () => await nugetPush(path.join(folder, file)));
+            await ctx.exec(`⬆️ pushing ${file}`, async () => {
+                const result = await nugetPush(path.join(folder, file));
+                if (SystemError.isError(result)) {
+                    throw result;
+                }
+                if (SystemError.isResult(result)) {
+                    const res = result;
+                    const io = res.stderr.concat(res.stdout);
+                    const isConflict = io.find(s => s.includes("409"));
+                    if (isConflict) {
+                        throw new exec_step_1.ExecStepOverrideMessage(`${path.basename(file)} NOT pushed: this version already exists at the registry.`, new Error('dummy'), false);
+                    }
+                }
+            });
         }
     });
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.182.0",
+  "version": "1.183.1",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "index.js"
@@ -61,7 +61,7 @@
     "decompress": "^4.2.1",
     "del": "^5.1.0",
     "event-stream": "^4.0.1",
-    "exec-step": "^0.14.0",
+    "exec-step": "^0.15.0",
     "fancy-log": "^1.3.3",
     "gulp": "^5.0.0",
     "gulp-debug": "^4.0.0",

package/types.d.ts

@@ -987,7 +987,7 @@ declare global {
 
   type GitTagFromCsProj = (options?: GitTagOptions) => Stream;
   type GitFetch = (all: boolean) => Promise<void>;
-  type NugetPush = (packageFile: string, sourceName?: string, options?: NugetPushOpts) => Promise<void>;
+  type NugetPush = (packageFile: string, sourceName?: string, options?: NugetPushOpts) => Promise<SystemError | SystemResult | undefined>;
 
   interface ParseNugetVersion {
     parseNugetVersion(versionStringOrFileName: string): Version;
@@ -1539,7 +1539,7 @@ declare global {
     symbolApiKey?: string;
     disableBuffering?: boolean;
     noSymbols?: boolean;
-    skipDuplicate?: boolean;
+    skipDuplicates?: boolean;
     noServiceEndpoint?: boolean;
     forceEnglishOutput?: boolean;
     source?: string;