cob-cli 2.44.0 → 2.46.0-beta.1

package/.tool-versions

@@ -0,0 +1 @@
+nodejs 16.20.2

package/bin/cob-cli.js

@@ -40,7 +40,7 @@ program
     .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', increaseVerbosity, 0)
-    .description('Initializes a server customization repository. Use <servername>.cultofbits.com (i.e. name without the FQDN)')
+    .description('Initializes a server customization repository. Use <servername>.cultofbits.pt (i.e. name without the FQDN)')
     .action( init );
 
 program
@@ -60,7 +60,7 @@ program
     .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)')
-    .option('-s --servername <servername>', 'use <servername>.cultofbits.com (i.e. name without the FQDN)')
+    .option('-s --servername <servername>', 'use <servername>.cultofbits.pt (i.e. name without the FQDN)')
     .description('Test the customization')
     .action( test );
 
@@ -69,7 +69,7 @@ program
     .option('-f --force', 'skips comparisons')
     .option('-e --environment <name>', 'environment to use')
     .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
-    .option('-s --servername <servername>', 'use <servername>.cultofbits.com (i.e. name without the FQDN)')
+    .option('-s --servername <servername>', 'use <servername>.cultofbits.pt (i.e. name without the FQDN)')
     .description('Deploy customization to the server')
     .action( deploy );
 
@@ -77,7 +77,7 @@ program
     .command('updateFromServer')
     .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('-s --servername <servername>', 'use <servername>.cultofbits.pt (i.e. name without the FQDN)')
     .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
     .action( updateFromServer );
 

package/bin/handleAutoComplete.js

@@ -1,5 +1,9 @@
 const path = require('path');
 
+if(process.platform === 'win32'){
+   return;
+}
+
 /* Autocomplete Component*/
 var omelette = require('omelette');
 const commandStructure = {
@@ -22,4 +26,4 @@ if (~process.argv.indexOf('--setup')) {
 if (~process.argv.indexOf('--cleanup')) {
     console.log("Cleaning...")
     completion.cleanupShellInitFile()
-}
+}

package/lib/task_lists/common_enviromentHandler.js

@@ -118,7 +118,7 @@ function _getDefaultServerForEnvironment(environmentName) {
 
 /* ************************************ */
 function _getServerFQDN(servername) {
-    return servername + ".cultofbits.com";
+    return servername + ".cultofbits.pt";
 }
 
 /* ************************************ */

package/lib/task_lists/common_helpers.js

@@ -31,7 +31,14 @@ async function checkWorkingCopyCleanliness(testNotDetached=true) {
 /* ************************************ */
 function checkConnectivity(server) {
     const execa = require('execa');
-    return execa('ssh', ["-o", "StrictHostKeyChecking=no", "-o", "PreferredAuthentications=publickey", "-o", "BatchMode=yes", "-o", "ConnectTimeout=15", server, "test -w /etc/recordm/services/com.cultofbits.web.integration.properties && exit || exit 1"])
+    return execa('ssh', [
+        "-o", "StrictHostKeyChecking=no",
+        "-o", "PreferredAuthentications=publickey",
+        "-o", "BatchMode=yes",
+        "-o", "ConnectTimeout=15",
+        server,
+        "test -w /etc/recordm/services/com.cultofbits.web.integration.properties && exit || exit 1"
+    ])
 }
 
 /* ************************************ */

package/lib/task_lists/common_syncFiles.js

@@ -5,7 +5,7 @@ const { getKeypress } = require("../task_lists/common_helpers");
 
 /* ************************************ */
 const COB_PRODUCTS = ["recordm", "integrationm", "recordm-importer", "reportm", "userm", "confm", "others"];
-const DEBUG = false;
+
 _syncFiles.TEST = "Test equality";
 _syncFiles.DIFF = "Get differences";
 _syncFiles.COPY = "Copy";
@@ -45,29 +45,35 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = [], ar
             while (count < RSYNC_RETRIES) {
                 if (args.verbose > 2)
                     console.log("rsync".bold +" '" + (product).blue + "': attempt " + (count + 1));
-                await execa('rsync',
-                    [
-                        fromPath,
-                        toPath,
-                        "-acvi",
-                        "--delete",
-                        "--chmod=g+w",
-                        "--no-perms",
-                        "--no-t",
-                        "--filter='merge " + path.resolve(__dirname,"rsyncFilter-pre.txt") + "'",
-                        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" } }
-                )
+                const rsyncArgs = [
+                    fromPath,
+                    toPath,
+                    "-acvi",
+                    "--delete",
+                    "--chmod=g+w",
+                    "--no-perms",
+                    "--no-t",
+                    "--filter='merge " + path.resolve(__dirname,"rsyncFilter-pre.txt") + "'",
+                    hasRsyncFilter ? "--filter='merge " + cmdEnv.rsyncFilter + "'" : "",
+                    "--filter='merge " + path.resolve(__dirname,"rsyncFilter-post.txt") + "'",
+                    executionType == _syncFiles.COPY ? "-v" : "--dry-run"
+                ].concat(productExtraOptions)
+                if (args.verbose > 3) {
+                    console.log('rsync', rsyncArgs.join(' '))
+                }
+                await execa('rsync', rsyncArgs, {
+                    shell: true,
+                    env: { "RSYNC_RSH": "ssh -o ConnectTimeout=30 -o ServerAliveInterval=30 -o ServerAliveCountMax=30" }
+                })
                     .then((value) => {
-                        if (args.verbose > 2)
+                        if (args.verbose > 3)
                             console.log("rsync".bold +" '" + (product).blue + "': " + "success".green + " " + value.stdout);
 
                         let result = _formatRsyncOutput(product, value.stdout);
                         if (args.verbose > 2)
                             console.log("rsync '" + product + "': success " + result);
+                        else if (args.verbose > 1)
+                            console.log("rsync '" + product + "': success ");
                         changes = changes.concat(result);
                         count = RSYNC_RETRIES;
 
@@ -92,7 +98,7 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = [], ar
                               .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)
+                               if (args.verbose > 1)
                                   console.log("rsync '" + product + "': success ");
                                count = RSYNC_RETRIES;
                                resolve();

package/lib/task_lists/test_otherFilesContiousReload.js

@@ -1,4 +1,5 @@
 const chokidar = require('chokidar');
+const path = require('path');
 const fs = require('fs-extra');
 const execa = require('execa');
 const git = require('simple-git');
@@ -63,7 +64,8 @@ async function otherFilesContiousReload(cmdEnv) {
         usePolling: true,
         ignoreInitial: true
     });
-    watcher.process.on('all', async (eventType, changedFile) => {
+    watcher.process.on('all', async (eventType, changedFileNative) => {
+        let changedFile = changedFileNative.split(path.sep).join(path.posix.sep)
         // Não é preciso fazer nada para directorias que só existem no servidor
         let product = changedFile.split("/")[0];
         let productDir = resolveCobPath(cmdEnv.server, "serverLive", product).split(":")[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.44.0",
+  "version": "2.46.0-beta.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/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  compilerOptions": {
+    "module": "commonjs",
+    "target": "ESNext",
+    "checkJs": false
+  },
+  "exclude": [
+    "node_modules"
+  ]
+}