zarro 1.124.1 → 1.124.3

package/gulp-tasks/modules/alter-package-json-version.js

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
             }
             validateVersioningStrategy(opts.strategy);
             try {
-                const json = await readTextFile(opts.packageJsonPath), indent = guessIndent(json), index = JSON.parse(json), currentVersion = index.version || "0.0.0", incremented = await incrementVersion(currentVersion, opts.strategy, opts.zero, opts.incrementBy);
+                const json = await readTextFile(opts.packageJsonPath), indent = guessIndent(json), index = JSON.parse(json), currentVersion = index.version || "0.0.0", incremented = incrementVersion(currentVersion, opts.strategy, opts.zero, opts.incrementBy);
                 index.version = incremented;
                 const newJson = JSON.stringify(index, null, indent);
                 if (opts.dryRun) {

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

@@ -1,14 +1,22 @@
 "use strict";
 (function () {
     const Git = require("simple-git");
-    async function gitSha(forRepo) {
+    async function fetchGitSha(forRepo) {
         const git = new Git(forRepo);
         const log = await git.log({ maxCount: 1 });
         return log.latest.hash;
     }
-    async function shortSha(forRepo) {
-        const fullHash = await gitSha(forRepo);
-        return fullHash.substring(0, 7);
+    // this is a bit of an hax: we're hoping that we get some
+    // time between when this is fired off and when it's required
+    // but the consumers of this can't do async :| so this is
+    // as good as it gets, I guess.
+    let currentGitSha = "";
+    fetchGitSha().then(result => currentGitSha = result);
+    function currentGitSHA() {
+        return currentGitSha;
     }
-    module.exports = { shortSha, gitSha };
+    function currentShortSHA() {
+        return currentGitSha.substring(0, 7);
+    }
+    module.exports = { currentShortSHA, currentGitSHA, fetchGitSha };
 })();

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

@@ -13,7 +13,7 @@
                     return;
                 }
                 if ((dependency.$.id || "").match(packageMatch)) {
-                    const newVersion = await incrementVersion(dependency.$.version, env.resolve("VERSION_INCREMENT_STRATEGY"), env.resolveFlag("VERSION_INCREMENT_ZERO"), env.resolveNumber("PACK_INCREMENT_VERSION_BY"));
+                    const newVersion = incrementVersion(dependency.$.version, env.resolve("VERSION_INCREMENT_STRATEGY"), env.resolveFlag("VERSION_INCREMENT_ZERO"), env.resolveNumber("PACK_INCREMENT_VERSION_BY"));
                     gutil.log(gutil.colors.yellow(`${packageId}: dependency ${dependency.$.id} version incremented to: ${newVersion}`));
                     dependency.$.version = newVersion;
                 }

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

@@ -8,7 +8,7 @@
         }
     };
     // FIXME: proper types plz
-    function incrementPackageVersionInCsProj(xml, file) {
+    async function incrementPackageVersionInCsProj(xml, file) {
         debug(JSON.stringify(xml, null, 2));
         const packageVersionPropGroup = xml.Project.PropertyGroup.filter((g) => !!g.PackageVersion)[0];
         if (!packageVersionPropGroup) {
@@ -63,7 +63,7 @@
         });
         return xml;
     }
-    function incrementPackageVersionInNuspec(xml, file) {
+    async function incrementPackageVersionInNuspec(xml, file) {
         const meta = xml.package.metadata[0], packageName = meta.id[0], node = meta.version, current = node[0];
         const newVersion = incrementVersion(current);
         node[0] = newVersion;
@@ -71,12 +71,12 @@
         return xml;
     }
     function incrementPackageVersion() {
-        return editXml((xml, file) => {
+        return editXml(async (xml, file) => {
             if (xml.package) {
-                return incrementPackageVersionInNuspec(xml, file);
+                return await incrementPackageVersionInNuspec(xml, file);
             }
             else if (xml.Project) {
-                return incrementPackageVersionInCsProj(xml, file);
+                return await incrementPackageVersionInCsProj(xml, file);
             }
             throw new ZarroError(`Don't know how to increment package version in document:\n\n${JSON.stringify(xml)}`);
         }, xmlOpts);

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

@@ -1,7 +1,7 @@
 "use strict";
 (function () {
     const { ZarroError } = requireModule("zarro-error");
-    const { shortSha } = requireModule("git-sha");
+    const { currentShortSHA } = requireModule("git-sha");
     function zeroFrom(parts, startIndex) {
         for (let i = startIndex; i < parts.length; i++) {
             parts[i] = 0;
@@ -19,7 +19,7 @@
         "minor": 1,
         "patch": 2
     };
-    module.exports = async function incrementVersion(version, strategy, zeroLowerOrder = true, incrementBy = 1) {
+    module.exports = function incrementVersion(version, strategy, zeroLowerOrder = true, incrementBy = 1) {
         const dashedParts = version.split("-"), parts = dashedParts[0].split(".").map(i => parseInt(i));
         let toIncrement = incrementLookup[(strategy || "").toLowerCase()];
         if (toIncrement === undefined) {
@@ -35,7 +35,7 @@
         if (strategy != "prerelease") {
             return result;
         }
-        const sha = await shortSha();
+        const sha = currentShortSHA();
         return `${result}-${timestamp()}-${sha}`;
     };
     function timestamp() {

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

@@ -381,6 +381,9 @@ module.exports = function _env(env) {
     default: ""
   });
 
+  if (!!process.env.PACKAGE_TARGET_FOLDER) {
+    throw new Error(`env var PACKAGE_TARGET_FOLDER has been renamed to PACK_TARGET_FOLDER`);
+  }
   env.register({
     name: "PACK_TARGET_FOLDER",
     help: "Folder to serve as output for package build tasks",

package/gulp-tasks/pack.js

@@ -17,7 +17,7 @@ const getToolsFolder = requireModule("get-tools-folder"),
 
 env.associate(
   [
-    "PACKAGE_TARGET_FOLDER",
+    "PACK_TARGET_FOLDER",
     "DOTNET_CORE",
     "PACK_INCLUDE_CSPROJ",
     "PACK_EXCLUDE_CSPROJ",
@@ -34,7 +34,7 @@ gulp.task(
   "Creates nupkgs from all nuspec files in this repo",
   ["prepack"],
   () => {
-    const target = env.resolve("PACKAGE_TARGET_FOLDER"),
+    const target = env.resolve("PACK_TARGET_FOLDER"),
       isDotnetCore = env.resolveFlag("DOTNET_CORE"),
       incrementVersion = env.resolveFlag("PACK_INCREMENT_VERSION")
       packerFn = isDotnetCore ? packWithDotnetCore : packWithNuget;
@@ -116,7 +116,7 @@ gulp.task(
   "clean-packages",
   "Removes any existing package artifacts",
   async () => {
-    const packageFolder = process.env.PACKAGE_TARGET_FOLDER || "packages";
+    const packageFolder = env.resolve("PACK_TARGET_FOLDER");
     await del(packageFolder);
     await fs.ensureDirectoryExists(packageFolder);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.124.1",
+  "version": "1.124.3",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"
@@ -61,7 +61,7 @@
     "undertaker-forward-reference": "^1.0.2",
     "vinyl": "^2.2.1",
     "which": "^2.0.2",
-    "xml2js": "^0.4.23",
+    "xml2js": "^0.5.0",
     "yafs": "^1.23.0"
   },
   "files": [