cob-cli 2.42.3 → 2.43.1

package/bin/cob-cli.js

@@ -15,6 +15,10 @@ const getDefs          = require("../lib/commands/getDefs");
 const generateMermaid  = require("../lib/commands/generateMermaid");
 const { upgradeRepo }  = require("../lib/commands/upgradeRepo");
 
+const increaseVerbosity = function(_dummy, previous){
+   return previous + 1;
+}
+
 /*******************************************/
 program
     .description('CoB Command line to simplify server customizations')
@@ -35,7 +39,7 @@ program
     .arguments('<servername>')
     .option('-l --legacy <folder>','import git history from legacy ClientConfs. <folder> should be path to server files inside ClienConfs.')
     .option('-a --repoaccount <account url>', 'Specify git account to use', "git@gitlab.com:cob/")
-    .option('-V --verbose', 'verbose execution of tasks')
+    .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
     .description('Initializes a server customization repository. Use <servername>.cultofbits.com (i.e. name without the FQDN)')
     .action( init );
 
@@ -51,7 +55,7 @@ program
 
 program
     .command('test')
-    .option('-V --verbose', 'verbose execution of tasks')
+    .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
     .option('-e --environment <name>', 'environment to use')
     .option('-d --dashboard <name>', 'Aditionally specify a VUE dashboard to test')
     .option('-l --localOnly', 'test only localFiles (customUI)')
@@ -63,7 +67,7 @@ program
     .command('deploy')
     .option('-f --force', 'skips comparisons')
     .option('-e --environment <name>', 'environment to use')
-    .option('-V --verbose', 'verbose execution of tasks')
+    .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
     .option('-s --servername <servername>', 'use <servername>.cultofbits.com (i.e. name without the FQDN)')
     .description('Deploy customization to the server')
     .action( deploy );
@@ -73,6 +77,7 @@ program
     .description('Updates local copy with current files on server, in case of changes made out of standard process.')
     .option('-e --environment <name>', 'environment to use')
     .option('-s --servername <servername>', 'use <servername>.cultofbits.com (i.e. name without the FQDN)')
+    .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
     .action( updateFromServer );
 
 program

package/lib/commands/updateFromServer.js

@@ -13,7 +13,7 @@ async function updateFromServer(args) {
 
         console.log("\nOk to proceed. Getting files from server's live directories...");
         await cmdEnv.applyCurrentCommandEnvironmentChanges()
-        let changes = await copyFiles(cmdEnv, "serverLive", "localCopy") 
+        let changes = await copyFiles(cmdEnv, "serverLive", "localCopy", args) 
         await cmdEnv.unApplyCurrentCommandEnvironmentChanges()
 
         if(changes.length == 0) {
@@ -28,4 +28,4 @@ async function updateFromServer(args) {
         console.error("\n",err.message);
     }
 }
-module.exports = updateFromServer;
+module.exports = updateFromServer;

package/lib/task_lists/common_syncFiles.js

@@ -11,21 +11,23 @@ _syncFiles.DIFF = "Get differences";
 _syncFiles.COPY = "Copy";
 
 /* ************************************ */
-function copyFiles(cmdEnv, from, to) {
-    return _syncFiles(_syncFiles.COPY, cmdEnv, from, to);
+function copyFiles(cmdEnv, from, to, args) {
+    return _syncFiles(_syncFiles.COPY, cmdEnv, from, to, [], args);
 } 
 exports.copyFiles = copyFiles;
 
 /* ************************************ */
-async function testEquality(cmdEnv, from, to) {
-    return (await _syncFiles(_syncFiles.TEST, cmdEnv, from, to)).filter( f => !f.endsWith("/"))
+async function testEquality(cmdEnv, from, to, args) {
+    return (await _syncFiles(_syncFiles.TEST, cmdEnv, from, to, [], args)).filter( f => !f.endsWith("/"))
 }
 exports.testEquality = testEquality;
 
 /* ************************************ */
-async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = []) {
+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);
@@ -41,8 +43,8 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = []) {
             let count = 0;
             const RSYNC_RETRIES = 10;
             while (count < RSYNC_RETRIES) {
-                if (DEBUG)
-                    console.log("rsync '" + product + "': attempt " + (count + 1));
+                if (args.verbose > 2)
+                    console.log("rsync".bold +" '" + (product).blue + "': attempt " + (count + 1));
                 await execa('rsync',
                     [
                         fromPath,
@@ -52,18 +54,18 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = []) {
                         "--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),
                     { shell: true, env: { "RSYNC_RSH": "ssh -o ConnectTimeout=30 -o ServerAliveInterval=30 -o ServerAliveCountMax=30" } }
                 )
                     .then((value) => {
-                        if (DEBUG)
-                            console.log("rsync '" + product + "': success " + value.stdout);
+                        if (args.verbose > 2)
+                            console.log("rsync".bold +" '" + (product).blue + "': " + "success".green + " " + value.stdout);
 
                         let result = _formatRsyncOutput(product, value.stdout);
-                        if (DEBUG)
+                        if (args.verbose > 2)
                             console.log("rsync '" + product + "': success " + result);
                         changes = changes.concat(result);
                         count = RSYNC_RETRIES;
@@ -76,6 +78,10 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = []) {
                           * mudar ctime dos ficheiros (que sejam de outro owner)
                           */
                         if (err.exitCode == 23) {
+                            if(args.verbose > 1){
+                               console.log("warning".yellow + " :" + (product).blue + ": got some output on stderr: ")
+                               err.stderr.split("\n").forEach((err) => console.log("warning".yellow + " :" + (product).blue + ": " + err) )
+                            }
                             const relevantErrors = err.stderr
                               .split("\n")
                               .filter(line => !/^rsync: failed to set times on/.test(line))
@@ -85,6 +91,8 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = []) {
                               .filter(line => !/write error: Broken pipe/.test(line) && !fs.existsSync(to)) // quando não existe localmente dir base
                            ;
                             if(relevantErrors.length == 0){
+                               if (args.verbose > 2)
+                                  console.log("rsync '" + product + "': success ");
                                count = RSYNC_RETRIES;
                                resolve();
                             } else {
@@ -94,8 +102,8 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = []) {
                         } else if (count > RSYNC_RETRIES) {
                             reject(new Error(err));;
                         } else {
-                            if (DEBUG)
-                                console.log("rsync '" + product + "': attempt " + (count + 1) + " failed with code " + err.exitCode);
+                            if (args.verbose > 1)
+                                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/lib/task_lists/test_validate.js

@@ -21,7 +21,7 @@ async function validateTestingConditions(cmdEnv, args) {
             {   title: "git stash --include-untracked",         skip: ctx => !ctx.lastSha, task: (ctx)  => git().env('LC_ALL', 'C').stash(["--include-untracked"]).then( value => value.indexOf("Saved") == 0 && (ctx.stash = true)) },
             {   title: "git checkout SHA for last-deploy",      skip: ctx => !ctx.lastSha, task: (ctx)  => git().checkout(ctx.lastSha) },
             {   title: "Apply last enviroment specifics".bold,  skip: ctx => !ctx.lastSha, task: ()     => cmdEnv.applyLastEnvironmentDeployedToServerChanges() },
-            {   title: "Check last-deploy == serverLive".bold,  skip: ctx => !ctx.lastSha, task: (ctx)  => testEquality(cmdEnv, "serverLive", "localCopy").then( changes => _handleTestEquality(ctx, changes, cmdEnv.server).catch( err => ctx.err = err.message )  ) },
+            {   title: "Check last-deploy == serverLive".bold,  skip: ctx => !ctx.lastSha, task: (ctx)  => testEquality(cmdEnv, "serverLive", "localCopy", args).then( changes => _handleTestEquality(ctx, changes, cmdEnv.server).catch( err => ctx.err = err.message )  ) },
             {   title: "Undo last enviroment specifics".bold,   skip: ctx => !ctx.lastSha, task: ()     => cmdEnv.unApplyLastEnvironmentDeployedToServerChanges() },
             {   title: "git checkout branch-for-HEAD",          skip: ctx => !ctx.lastSha, task: (ctx)  => git().checkout(ctx.currentBranch) },
             {   title: "git stash pop",                         skip: ctx => !ctx.stash,   task: ()     => git().stash(["pop"]) },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.42.3",
+  "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