cob-cli 2.43.0 → 2.43.1

package/lib/task_lists/common_syncFiles.js

@@ -26,6 +26,8 @@ exports.testEquality = testEquality;
 async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = [], args = []) {
     let changes = [];
     let products = cmdEnv.products.length ? cmdEnv.products : COB_PRODUCTS;
+    // we need to recheck, because it can exist in head but not in the commit we're testing
+    let hasRsyncFilter = cmdEnv.rsyncFilter && fs.lstatSync(cmdEnv.rsyncFilter, {throwIfNoEntry: false})?.isFile();
     let requests = products.map(product => {
         return new Promise(async (resolve, reject) => {
             let fromPath = resolveCobPath(cmdEnv.server, from, product);
@@ -52,7 +54,7 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = [], ar
                         "--chmod=g+w",
                         "--perms",
                         "--filter='merge " + path.resolve(__dirname,"rsyncFilter-pre.txt") + "'",
-                        cmdEnv.rsyncFilter ? "--filter='merge " + cmdEnv.rsyncFilter + "'" : "",
+                        hasRsyncFilter ? "--filter='merge " + cmdEnv.rsyncFilter + "'" : "",
                         "--filter='merge " + path.resolve(__dirname,"rsyncFilter-post.txt") + "'",
                         executionType == _syncFiles.COPY ? "-v" : "--dry-run"
                     ].concat(productExtraOptions),
@@ -101,7 +103,7 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = [], ar
                             reject(new Error(err));;
                         } else {
                             if (args.verbose > 1)
-                                console.log("warning".yellow + "rsync '" + (product).blue + "': attempt " + (count + 1) + " failed with code " + err.exitCode);
+                                console.log("warning".yellow + " rsync '" + (product).blue + "': attempt " + (count + 1) + " failed with code " + err.exitCode);
                         }
                     });
                 count++;

package/lib/task_lists/deploy_validate.js

@@ -18,7 +18,7 @@ function validateDeployConditions(cmdEnv, args) {
         {   title: "find out SHA for last-deploy on specified server",         skip: ()  => args.force,                 task: (ctx)  => getLastDeployedSha(cmdEnv.server).then(lastSha => _handleGetLastDeployedSha(ctx, cmdEnv, lastSha)) }, 
         {   title: "git checkout SHA-for-last-deploy",                         skip: ctx => args.force || !ctx.lastSha, task: (ctx)  => git().checkout(ctx.lastSha) }, 
         {   title: "Apply last enviroment specifics".bold,                     skip: ctx => args.force || !ctx.lastSha, task: ()     => cmdEnv.applyLastEnvironmentDeployedToServerChanges() },
-        {   title: "Check last-deploy == serverLive".bold,                     skip: ctx => args.force || !ctx.lastSha, task: (ctx)  => testEquality(cmdEnv, "localCopy", "serverLive").then( changes => _handleTestEquality(ctx, changes)) },
+        {   title: "Check last-deploy == serverLive".bold,                     skip: ctx => args.force || !ctx.lastSha, task: (ctx)  => testEquality(cmdEnv, "localCopy", "serverLive", args).then( changes => _handleTestEquality(ctx, changes)) },
         {   title: "Undo last enviroment specifics".bold,                      skip: ctx => args.force || !ctx.lastSha, task: ()     => cmdEnv.unApplyLastEnvironmentDeployedToServerChanges() },
         {   title: "git checkout branch-for-HEAD",                             skip: ctx => args.force || !ctx.lastSha, task: (ctx)  => git().checkout(ctx.currentBranch) },
         {   title: "report problems",                                          enabled: ctx => ctx.err,                 task: (ctx)  => {throw new Error(ctx.err)} },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.43.0",
+  "version": "2.43.1",
   "description": "A command line utility to help Cult of Bits partners develop with higher speed and reusing common code and best practices.",
   "preferGlobal": true,
   "repository": {

package/.tap/processinfo/0db03a1d-f054-4ba8-9873-7efb81723721.json

@@ -1,32 +0,0 @@
-{
-  "date": "2023-10-19T08:52:33.010Z",
-  "argv": [
-    "/Users/jnelas/.nvm/versions/node/v16.18.0/bin/node",
-    "/Users/jnelas/reps/cob/cob-cli/test/test_common_environmentHandler.js"
-  ],
-  "execArgv": [
-    "--loader=file:///Users/jnelas/reps/cob/cob-cli/node_modules/@isaacs/ts-node-temp-fork-for-pr-2009/esm.mjs",
-    "--loader=file:///Users/jnelas/reps/cob/cob-cli/node_modules/@tapjs/mock/dist/esm/legacy-loader.mjs",
-    "--no-warnings",
-    "--enable-source-maps",
-    "--loader=file:///Users/jnelas/reps/cob/cob-cli/node_modules/@tapjs/processinfo/dist/esm/loader-legacy.mjs"
-  ],
-  "NODE_OPTIONS": "\"--loader=file:///Users/jnelas/reps/cob/cob-cli/node_modules/@tapjs/processinfo/dist/esm/loader-legacy.mjs\" \"--no-warnings\"",
-  "cwd": "/Users/jnelas/reps/cob/cob-cli",
-  "pid": 12082,
-  "ppid": 12080,
-  "parent": null,
-  "uuid": "0db03a1d-f054-4ba8-9873-7efb81723721",
-  "files": [
-    "/Users/jnelas/reps/cob/cob-cli/test/test_common_environmentHandler.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/common_enviromentHandler.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/common_releaseManager.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/common_helpers.js"
-  ],
-  "sources": {},
-  "root": "0db03a1d-f054-4ba8-9873-7efb81723721",
-  "externalID": "test/test_common_environmentHandler.js",
-  "code": 0,
-  "signal": null,
-  "runtime": 1840.771843
-}

package/.tap/processinfo/9d97e24f-ae90-4c49-af20-075bbcc46260.json

@@ -1,38 +0,0 @@
-{
-  "date": "2023-10-19T08:52:33.000Z",
-  "argv": [
-    "/Users/jnelas/.nvm/versions/node/v16.18.0/bin/node",
-    "/Users/jnelas/reps/cob/cob-cli/lib/commands/test.js"
-  ],
-  "execArgv": [
-    "--loader=file:///Users/jnelas/reps/cob/cob-cli/node_modules/@isaacs/ts-node-temp-fork-for-pr-2009/esm.mjs",
-    "--loader=file:///Users/jnelas/reps/cob/cob-cli/node_modules/@tapjs/mock/dist/esm/legacy-loader.mjs",
-    "--no-warnings",
-    "--enable-source-maps",
-    "--loader=file:///Users/jnelas/reps/cob/cob-cli/node_modules/@tapjs/processinfo/dist/esm/loader-legacy.mjs"
-  ],
-  "NODE_OPTIONS": "\"--loader=file:///Users/jnelas/reps/cob/cob-cli/node_modules/@tapjs/processinfo/dist/esm/loader-legacy.mjs\" \"--no-warnings\"",
-  "cwd": "/Users/jnelas/reps/cob/cob-cli",
-  "pid": 12081,
-  "ppid": 12080,
-  "parent": null,
-  "uuid": "9d97e24f-ae90-4c49-af20-075bbcc46260",
-  "files": [
-    "/Users/jnelas/reps/cob/cob-cli/lib/commands/test.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/test_validate.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/common_helpers.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/common_releaseManager.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/common_syncFiles.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/test_otherFilesContiousReload.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/test_syncFile.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/test_customUIsContinuosReload.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/task_lists/common_enviromentHandler.js",
-    "/Users/jnelas/reps/cob/cob-cli/lib/commands/upgradeRepo.js"
-  ],
-  "sources": {},
-  "root": "9d97e24f-ae90-4c49-af20-075bbcc46260",
-  "externalID": "lib/commands/test.js",
-  "code": 0,
-  "signal": null,
-  "runtime": 290.537245
-}

package/.tap/repl_history

@@ -1,2 +0,0 @@
-f
-w

package/.tap/test-results/lib/webpack/fake_customizations2.js.tap

@@ -1 +0,0 @@
-[CoB] Starting live-reload

package/.tap/test-results/test/test_common_environmentHandler.js.tap

@@ -1,40 +0,0 @@
-TAP version 14
-# Subtest: smoke
-    ok 1 - should match pattern
-    1..1
-ok 1 - smoke # time=33.202ms
-
-# Subtest: there's an ENV file, but no default
-    ok 1 - should match pattern
-    ok 2 - should be equal
-    ok 3 - should match pattern
-    ok 4 - should match pattern
-    ok 5 - should be equal
-    1..5
-ok 2 - there's an ENV file, but no default # time=266.343ms
-
-# Subtest: there's an ENV and a default
-    ok 1 - should match pattern
-    ok 2 - should match pattern
-    ok 3 - should match pattern
-    ok 4 - should be equal
-    1..4
-ok 3 - there's an ENV and a default # time=411.658ms
-
-# Subtest: there's multiple ENVs but no default
-    ok 1 - should match pattern
-    ok 2 - should match pattern
-    ok 3 - should match pattern
-    ok 4 - should be equal
-    1..4
-ok 4 - there's multiple ENVs but no default # time=274.577ms
-
-# Subtest: there's multiple ENVs and a default
-    ok 1 - should match pattern
-    ok 2 - should match pattern
-    ok 3 - should match pattern
-    ok 4 - should be equal
-    1..4
-ok 5 - there's multiple ENVs and a default # time=403.779ms
-
-1..5