cob-cli 2.45.0 → 2.46.0-beta.10

package/bin/handleAutoComplete.js

@@ -15,11 +15,19 @@ completion.init()
 
 // add to system profiles
 if (~process.argv.indexOf('--setup')) {
+    if (process.platform === 'win32') {
+        // we exit cleanly so that postinstall completes successfuly
+        process.exit(0)
+    }
     console.log("Setting up...")
     completion.setupShellInitFile()
 }
 // remove from system profiles
 if (~process.argv.indexOf('--cleanup')) {
+    if (process.platform === 'win32') {
+        // we exit cleanly so that uninstall completes successfuly
+        process.exit(0)
+    }
     console.log("Cleaning...")
     completion.cleanupShellInitFile()
-}
+}

package/lib/commands/getDefs.js

@@ -10,11 +10,11 @@ async function getDefs(args) {
         const cmdEnv = await getCurrentCommandEnviroment(args)
 
         console.log(`Getting definitions from ${cmdEnv.serverStr} to branch ${cmdEnv.branchStr} ...` );
-        const getDefs = spawn(path.resolve(__dirname,"..","task_lists","getDefs.sh"),[cmdEnv.server, cmdEnv.name, path.resolve(__dirname) ]) 
+        const getDefs = spawn(path.resolve(__dirname,"..","task_lists","getDefs.sh"),[cmdEnv.serverHTTPs, cmdEnv.name, path.resolve(__dirname) ])
         getDefs.stdout.on('data', function (data) { console.log("  " + data.toString()); });
         getDefs.on('exit', function () { console.log('Done!'); });
     } catch(err) {
         console.error("\n",err.message);
     }
 }
-module.exports = getDefs;
+module.exports = getDefs;

package/lib/commands/init.js

@@ -16,7 +16,7 @@ async function init(servername,args) {
     let initTasks;
     if(await projectExistsInGitAccount(projectName,args.repoaccount) ) {
         console.log("\nRepo cloned!".green);
-    } else if( projectPathOkFor(projectName) && await notInsideGitRepo() && await validCobServer(cmdEnv.server)) {
+    } else if( projectPathOkFor(projectName) && await notInsideGitRepo() && await validCobServer(cmdEnv.serverHTTPs)) {
         console.log("\nCreating project", projectName.bold.blue );
         initTasks = newProjectTasks(cmdEnv, projectName, repo, args )
         initTasks.run()
@@ -71,9 +71,18 @@ async function validCobServer(server) {
 /* ************************************ */
 async function projectExistsInGitAccount(projectName, repoaccount) {
     try {
-        await git().clone(repoaccount + projectName);
+        let cloneConfs = []
+        if(process.platform === 'win32'){
+            // on windows we force the usage of lf as line-endings
+            // so that rsync doesn't think all files have changed
+            cloneConfs = [
+                '--config', 'core.autocrlf=input',
+                '--config',  'core.eol=lf' 
+            ]
+        }
+        await git().clone(repoaccount + projectName, cloneConfs);
         return true;
     } catch (e) {
         return false
     }
-}
+}

package/lib/commands/test.js

@@ -10,6 +10,7 @@ const { checkRepoVersion } = require("../commands/upgradeRepo");
 async function test (args) {    
     let restoreChanges, error = "";
     let cmdEnv
+    let spawned
     try {
         checkRepoVersion()
         console.log("Start testing… ")
@@ -22,8 +23,8 @@ async function test (args) {
         } else {
             await cmdEnv.applyCurrentCommandEnvironmentChanges()
         }
-        customUIsContinuosReload(cmdEnv, args.dashboard)
-        
+        spawned = await customUIsContinuosReload(cmdEnv, args.dashboard)
+
         let key;
         do {
             key = await getKeypress()
@@ -36,8 +37,8 @@ async function test (args) {
     } finally {
         restoreChanges && await restoreChanges()
         cmdEnv && await cmdEnv.unApplyCurrentCommandEnvironmentChanges() // Repõe as configurações
-        process.kill(process.pid, "SIGINT");
-        // Dá tempo aos subprocessos para morrer
+        spawned && await spawned.stop();
+        // Dá tempo aos subprocessos para morrer (acho que já não é preciso)
         setTimeout(() => {
             if(!error) {
                 console.log( "\n"
@@ -49,4 +50,4 @@ async function test (args) {
         }, 2000);
     }
 }
-module.exports = test
+module.exports = test

package/lib/task_lists/common_enviromentHandler.js

@@ -15,7 +15,8 @@ async function getCurrentCommandEnviroment(args, newServername) {
 
     const defaultEnvironmentServerName = newServername ? newServername : _getDefaultServerForEnvironment(environmentName);
     const servername = args.servername ? args.servername : defaultEnvironmentServerName;
-    const server = _getServerFQDN(servername)
+    const server = _getServerSSHFQDN(servername)
+    const serverHTTPs = _getServerHTTPsFQDN(servername)
     const currentBranch = newServername ? "master" : await getCurrentBranch();
 
     const lastEnvironmentDeployedToServer = await _getLastEnvironmentDeployed(server)
@@ -47,6 +48,7 @@ async function getCurrentCommandEnviroment(args, newServername) {
         name: environmentName,
         servername: servername,
         server: server,
+        serverHTTPs: serverHTTPs,
         serverStr: serverStr,
         currentBranch: currentBranch,
         branchStr: branchStr,
@@ -117,10 +119,15 @@ function _getDefaultServerForEnvironment(environmentName) {
 }
 
 /* ************************************ */
-function _getServerFQDN(servername) {
+function _getServerSSHFQDN(servername) {
     return servername + ".cultofbits.pt";
 }
 
+/* ************************************ */
+function _getServerHTTPsFQDN(servername) {
+    return servername + ".cultofbits.com";
+}
+
 /* ************************************ */
 async function _getLastEnvironmentDeployed(server) {
     try {
@@ -140,4 +147,4 @@ async function _setLastEnvironmentDeployed(server, environmentName) {
 async function _setupEnvironment(environmentName, servername, server) {
     await fs.mkdirs("environments/" + environmentName);
     await fs.writeFile("environments/" + environmentName + "/server", servername);
-}
+}

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_customUIsContinuosReload.js

@@ -2,12 +2,17 @@ const execa = require('execa');
 const path = require('path');
 const concurrently = require('concurrently');
 const fs= require('fs');
+const util  = require('util');
+const child_process = require('child_process');
+const exec = util.promisify(child_process.exec);
+
 
 async function customUIsContinuosReload(cmdEnv, dashboard) {
     process.env.dash_dir = dashboard
-    process.env.server = "https://" + cmdEnv.server
+    process.env.server = "https://" + cmdEnv.serverHTTPs
 
     let commands = []
+    let isStopping = false;
 
     let dashboardPath = path.resolve(".") + "/recordm/customUI/" + dashboard;
     let dashboardPathIsDirectory = false;
@@ -47,14 +52,40 @@ async function customUIsContinuosReload(cmdEnv, dashboard) {
         prefixColor: "blue" 
     }) 
 
-    concurrently( commands, {
+    const conc = concurrently( commands, {
         prefix: 'name',
         inputStream: process.stdin,
         handleInput: false,
         killOthers: ['failure', 'success']
-    }).catch( err => { 
-        console.log("press any key " + "(except enter)".red + " to stop the tests... \n  ")
-        process.kill(process.pid, "SIGINT");
-    })
+    });
+
+    const stopEverything = async function(){
+        isStopping = true;
+        for(const spawn of conc.commands) {
+            // console.log("\n killing spawn [" + spawn.pid + "] " + spawn.command )
+        
+            // win32 seems to not kill child processes, and concurrently wraps executions with a cmd.exe shell
+            if (process.platform === 'win32') {
+                try {
+                    await exec(`taskkill /PID ${spawn.pid} /T /F`)
+                } catch (err) {
+                    console.error("error trying to taskkill process tree", err)
+                }
+
+            } else {
+                spawn.kill("SIGINT");
+            }
+        }
+    }
+
+    conc.result.catch( _err => { 
+        if(isStopping) return;
+
+        stopEverything();
+    });
+
+    return {
+        stop: stopEverything
+    };
 }
-exports.customUIsContinuosReload = customUIsContinuosReload;
+exports.customUIsContinuosReload = customUIsContinuosReload;

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.45.0",
+  "version": "2.46.0-beta.10",
   "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": {
@@ -9,8 +9,8 @@
   },
   "main": "./bin/cob-cli.js",
   "scripts": {
-    "postinstall": "bin/cob-cli.js --setup",
-    "uninstall": "bin/cob-cli.js --cleanup"
+    "postinstall": "node bin/cob-cli.js --setup",
+    "uninstall": "node bin/cob-cli.js --cleanup"
   },
   "bin": {
     "cob-cli": "bin/cob-cli.js"
@@ -22,7 +22,7 @@
     "cmd-line-importer": "^1.0.0",
     "colors": "^1.4.0",
     "commander": "^5.1.0",
-    "concurrently": "^5.3.0",
+    "concurrently": "^8.0.0",
     "execa": "^4.0.3",
     "fast-glob": "^3.2.5",
     "file-cookie-store": "^0.2.1",