zarro 1.180.3 → 1.180.5

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

@@ -28,7 +28,7 @@
     quiet = !!quiet;
     const
       git = gitFactory(where),
-      more = where ? ` (${ where })` : "";
+      more = (where && where !== ".") ? ` (${ where })` : "";
     if (dryRun) {
       gutil.log(gutil.colors.green(`dry run: whould push local commits now${ more }...`));
       return Promise.resolve();

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

@@ -530,6 +530,11 @@
             help: "Flag: should package version be incremented before packing?",
             default: "true"
         });
+        env.register({
+            name: "PACK_INCREMENT_BETA_VERSION",
+            help: "Flag: should the package version be incremented for a BETA package before packing?",
+            default: "true"
+        });
         env.register({
             name: "PACK_SYNC_PROJECT_VERSION",
             help: "Flag: should the project version be synchronised with the package version when packing?",
@@ -540,6 +545,11 @@
             help: "Number (default 1): increment the selected version number by this value",
             default: "1"
         });
+        env.register({
+            name: "RELEASE_TAG_AND_PUSH",
+            help: "Flag: commit, tag and push after a release",
+            default: "true"
+        });
         env.register({
             name: "PACK_BASE_PATH",
             help: "Base path to pack nuget packages from"

package/gulp-tasks/pack.js

@@ -19,7 +19,9 @@
         "PACK_VERSION"
     ], ["pack"]);
     gulp.task("pack", "Creates nupkgs from all nuspec files in this repo", ["prepack"], () => {
-        const target = env.resolve("PACK_TARGET_FOLDER"), isDotnetCore = env.resolveFlag("DOTNET_CORE"), incrementVersion = env.resolveFlag("PACK_INCREMENT_VERSION"), packerFn = isDotnetCore ? packWithDotnetCore : packWithNuget;
+        const target = env.resolve("PACK_TARGET_FOLDER"), isDotnetCore = env.resolveFlag("DOTNET_CORE"), isBeta = env.resolveFlag("BETA"), incrementVersion = isBeta
+            ? env.resolveFlag(env.PACK_INCREMENT_BETA_VERSION)
+            : env.resolveFlag(env.PACK_INCREMENT_VERSION), packerFn = isDotnetCore ? packWithDotnetCore : packWithNuget;
         debug({
             isDotnetCore,
             incrementVersion

package/gulp-tasks/release-npm.js

@@ -1,6 +1,6 @@
 "use strict";
 (function () {
-    const gitFactory = require("simple-git"), spawn = requireModule("spawn"), gulp = requireModule("gulp"), gutil = requireModule("gulp-util"), ZarroError = requireModule("zarro-error"), { ask } = requireModule("ask"), readGitInfo = requireModule("read-git-info"), env = requireModule("env"), readPackageVersion = requireModule("read-package-version"), { runTask } = requireModule("run-task"), { withEnvironment } = requireModule("temporary-environment"), alterPackageJsonVersion = requireModule("alter-package-json-version");
+    const gitFactory = require("simple-git"), spawn = requireModule("spawn"), gulp = requireModule("gulp"), gutil = requireModule("gulp-util"), log = requireModule("log"), ZarroError = requireModule("zarro-error"), { ask } = requireModule("ask"), readGitInfo = requireModule("read-git-info"), env = requireModule("env"), readPackageVersion = requireModule("read-package-version"), { runTask } = requireModule("run-task"), { withEnvironment } = requireModule("temporary-environment"), alterPackageJsonVersion = requireModule("alter-package-json-version");
     async function rollBackPackageJson() {
         await alterPackageJsonVersion({ loadUnsetFromEnvironment: true, incrementBy: -1 });
     }
@@ -62,6 +62,9 @@
             await rollBackPackageJson();
             throw e;
         }
+        if (!env.resolveFlag(env.RELEASE_TAG_AND_PUSH)) {
+            log.info(`Skipping commit/tag/push: version increment will not be retained in version control`);
+        }
         if (dryRun) {
             gutil.log(gutil.colors.yellow(`would commit all updated files`));
             await rollBackPackageJson();

package/gulp-tasks/release-nuget.js

@@ -34,6 +34,9 @@
                 }));
             }
         }
+        if (!env.resolveFlag(env.RELEASE_TAG_AND_PUSH)) {
+            log.info(`Skipping commit/tag/push: version increment will not be retained in version control`);
+        }
         if (!version) {
             log.warn(`Unable to determine version to tag at - set '${env.GIT_TAG}' to manually override.`);
             return;

package/package.json

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

package/types.d.ts

@@ -491,6 +491,7 @@ declare global {
     "NO_COLOR" |
     "NUGET_IGNORE_DUPLICATE_PACKAGES" |
     "PACK_INCREMENT_VERSION" |
+    "PACK_INCREMENT_BETA_VERSION" |
     "PACK_SYNC_PROJECT_VERSION" |
     "PACK_INCLUDE_EMPTY_DIRECTORIES" |
     "PACK_INCLUDE_SYMBOLS" |
@@ -520,6 +521,7 @@ declare global {
     "NPM_PUBLISH_SKIP_OTP" |
     "SKIP_NUGET_UPDATE" |
     "PACK_INCREMENT_MINOR_ON_FIRST_PRERELEASE" |
+    "RELEASE_TAG_AND_PUSH" |
     "BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE" |
     "UPGRADE_PACKAGES_PROGRESS" |
     "UPGRADE_PACKAGES_PRERELEASE" |
@@ -673,6 +675,7 @@ declare global {
     NO_COLOR: FlagEnvVar;
     NUGET_IGNORE_DUPLICATE_PACKAGES: FlagEnvVar;
     PACK_INCREMENT_VERSION: FlagEnvVar;
+    PACK_INCREMENT_BETA_VERSION: FlagEnvVar;
     PACK_SYNC_PROJECT_VERSION: FlagEnvVar;
     PACK_INCLUDE_EMPTY_DIRECTORIES: FlagEnvVar;
     PACK_INCLUDE_SYMBOLS: FlagEnvVar;
@@ -702,6 +705,7 @@ declare global {
     NPM_PUBLISH_SKIP_OTP: FlagEnvVar;
     SKIP_NUGET_UPDATE: FlagEnvVar;
     PACK_INCREMENT_MINOR_ON_FIRST_PRERELEASE: FlagEnvVar;
+    RELEASE_TAG_AND_PUSH: FlagEnvVar;
     BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE: FlagEnvVar;
     UPGRADE_PACKAGES_PROGRESS: FlagEnvVar;
     UPGRADE_PACKAGES_PRERELEASE: FlagEnvVar;