cob-cli 2.46.0-beta.6 → 2.46.0-beta.8

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()
@@ -76,4 +76,4 @@ async function projectExistsInGitAccount(projectName, repoaccount) {
     } catch (e) {
         return false
     }
-}
+}

package/lib/commands/test.js

@@ -24,7 +24,7 @@ async function test (args) {
             await cmdEnv.applyCurrentCommandEnvironmentChanges()
         }
         spawned = await customUIsContinuosReload(cmdEnv, args.dashboard)
-        
+
         let key;
         do {
             key = await getKeypress()
@@ -37,11 +37,8 @@ async function test (args) {
     } finally {
         restoreChanges && await restoreChanges()
         cmdEnv && await cmdEnv.unApplyCurrentCommandEnvironmentChanges() // Repõe as configurações
-        if(spawned) spawned.forEach( spawn => {
-            spawn.kill("SIGINT");
-        })
-        process.kill(process.pid, "SIGINT");
-        // Dá tempo aos subprocessos para morrer
+        await spawned.stop();
+        // Dá tempo aos subprocessos para morrer (acho que já não é preciso)
         setTimeout(() => {
             if(!error) {
                 console.log( "\n"

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/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;
@@ -54,11 +59,33 @@ async function customUIsContinuosReload(cmdEnv, dashboard) {
         killOthers: ['failure', 'success']
     });
 
+    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 => { 
-        console.log("press any key " + "(except enter)".red + " to stop the tests... \n  ")
-        process.kill(process.pid, "SIGINT");
+        if(isStopping) return;
+
+        stopEverything();
     });
 
-    return conc.commands;
+    return {
+        stop: stopEverything
+    };
 }
 exports.customUIsContinuosReload = customUIsContinuosReload;

package/package.json

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