zarro 1.129.0 → 1.130.0

package/gulp-tasks/modules/env.js

@@ -28,7 +28,8 @@ const
     explode,
     overrideDefault,
     resolveNumber,
-    resolveFlag
+    resolveFlag,
+    resolveWithFallback
   };
 
 const positives = [ "1", "yes", "true" ];
@@ -252,24 +253,40 @@ function resolve() {
   return result;
 }
 
+function resolveWithFallback(
+  varName,
+  fallback
+) {
+  return resolveInternal(varName, false, fallback);
+}
+
 function resolveFirst(names, ignoreDefault) {
   return names
     .reduce((acc, cur) =>
-      acc === undefined
-        ? resolveInternal(cur, ignoreDefault)
-        : acc,
+        acc === undefined
+          ? resolveInternal(cur, ignoreDefault)
+          : acc,
       undefined
     );
 }
 
-function resolveInternal(name, ignoreDefault) {
+function firstDefined() {
+  const args = Array.from(arguments);
+  for (const arg of args) {
+    if (arg !== undefined) {
+      return arg;
+    }
+  }
+}
+
+function resolveInternal(name, ignoreDefault, overrideDefault) {
   if (Array.isArray(name)) {
     // attempt to resolve the first defined variable
-    const firstDefined = resolveFirst(name, true);
+    const firstDefinedVar = resolveFirst(name, true);
     // if that doesn't work, get the first default value
-    return firstDefined === undefined
+    return firstDefinedVar === undefined
       ? resolveFirst(name, false)
-      : firstDefined;
+      : firstDefinedVar;
   }
 
   const target = registeredEnvironmentVariables[name] || {},
@@ -282,8 +299,9 @@ function resolveInternal(name, ignoreDefault) {
     overrideValues = overrides
       .map(s => process.env[s])
       .filter(s => s !== undefined),
-    initialValue =
-      (!ignoreDefault && process.env[name] === undefined) ? target.default : process.env[name];
+    initialValue = (!ignoreDefault && process.env[name] === undefined)
+      ? firstDefined(overrideDefault, target.default)
+      : process.env[name];
   if (overrideValues.length === 0) {
     return initialValue;
   }

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

@@ -270,6 +270,12 @@ module.exports = function _env(env) {
     default: "master"
   });
 
+  env.register({
+    name: "GIT_DEFAULT_UPSTREAM",
+    help: "The default upstream (typically origin) against which verification is done",
+    default: "origin"
+  });
+
   env.register({
     name: "GIT_VERIFY_BRANCH",
     help: "The fully-qualified branch name to use when verifying (defaults to checked out branch)"

package/gulp-tasks/verify-up-to-date.js

@@ -12,13 +12,16 @@
         if (os.platform() === "darwin") {
             console.warn(chalk.redBright(`up-to-date verification is experimental on OSX! Please report errors to davydm@gmail.com`));
         }
-        const remoteInfos = (await readAllGitRemotes()) || [], remotes = remoteInfos.map(r => r.name), mainBranch = env.resolve("GIT_MAIN_BRANCH") || await resolveDefaultVerifyTarget(remotes), verifyBranch = env.resolve("GIT_VERIFY_BRANCH") || await readCurrentBranch();
+        const remoteInfos = (await readAllGitRemotes()) || [], remotes = remoteInfos.map(r => r.name), mainBranch = env.resolve("GIT_MAIN_BRANCH") || await resolveDefaultVerifyTarget(remotes), defaultUpstream = env.resolveWithFallback("GIT_DEFAULT_UPSTREAM", remotes[0]), verifyBranch = env.resolve("GIT_VERIFY_BRANCH") || await readCurrentBranch();
         if (!mainBranch) {
             throw new ZarroError(`Can't determine main branch (try setting env: GIT_MAIN_BRANCH)`);
         }
         if (!verifyBranch) {
             throw new ZarroError(`Can't determine branch to verify (try setting env: GIT_VERIFY_BRANCH)`);
         }
+        if (!defaultUpstream) {
+            throw new ZarroError(`Can't determine upstream to find main branch (try setting env: GIT_DEFAULT_UPSTREAM)`);
+        }
         if (remotes.length && !env.resolveFlag("SKIP_FETCH_ON_VERIFY")) {
             const lastFetch = await readLastFetchTime(), fetchRecentPeriod = env.resolveNumber("GIT_FETCH_RECENT_TIME") * 1000, now = Date.now();
             let recentEnough = false;
@@ -51,7 +54,7 @@
                 log.info(`${taskName} :: skipping fetch: was last done at ${lastFetch}`);
             }
         }
-        const verifyResult = await readGitCommitDeltaCount(mainBranch || "master", verifyBranch);
+        const verifyResult = await readGitCommitDeltaCount(`${defaultUpstream}/${mainBranch}`, verifyBranch);
         // TODO: get the delta count & chuck if behind
         const aheadS = verifyResult.ahead === 1 ? "" : "s", behindS = verifyResult.behind === 1 ? "" : "s", message = `${chalk.yellow(verifyBranch)} is ${chalk.green(verifyResult.ahead)} commit${aheadS} ahead and ${chalk.red(verifyResult.behind)} commit${behindS} behind ${chalk.cyanBright(mainBranch)}`;
         log.info(`${taskName} :: ${message}`);

package/package.json

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

package/types.d.ts

@@ -98,6 +98,7 @@ declare global {
     "GIT_OVERRIDE_BRANCH" |
     "GIT_BRANCH" |
     "GIT_MAIN_BRANCH" |
+    "GIT_DEFAULT_UPSTREAM" |
     "GIT_VERIFY_BRANCH" |
     "GIT_OVERRIDE_REMOTE" |
     "GIT_REMOTE" |
@@ -168,6 +169,7 @@ declare global {
     resolveNumber(name: NumericEnvVar): number;
     resolveFlag(name: FlagEnvVar): boolean;
     associate(varName: AnyEnvVar | AnyEnvVar[], tasks: string | string[]): void;
+    resolveWithFallback<T>(varName: AnyEnvVar, fallback: T): T;
 
     // these are generated on the js output by register-environment-variables
     // -> included here to avoid typos: use env.CONSTANT_NAME when you want
@@ -231,6 +233,7 @@ declare global {
     UPDATE_SUBMODULES_TO_LATEST: FlagEnvVar;
     ENFORCE_VERIFICATION: FlagEnvVar;
     GIT_MAIN_BRANCH: StringEnvVar;
+    GIT_DEFAULT_UPSTREAM: StringEnvVar;
     GIT_VERIFY_BRANCH: StringEnvVar;
     SKIP_FETCH_ON_VERIFY: FlagEnvVar;
     GIT_FETCH_TIMEOUT: NumericEnvVar;