cob-cli 2.54.0-beta-1 → 2.55.0-beta-1

package/bin/cob-cli.js

@@ -74,7 +74,14 @@ program
     .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
     .option('-s --servername <servername>', 'use <servername>.cultofbits.pt (i.e. name without the FQDN)')
     .description('Deploy customization to the server')
-    .action( deploy );
+    .action( async (args) => {
+        try {
+            await deploy(args)
+        } catch (err) {
+            console.error("\n", err.message);
+            process.exitCode = 1;
+        }
+    });
 
 program
     .command('cleanup')

package/lib/commands/deploy.js

@@ -4,24 +4,18 @@ const { confirmExecutionOfChanges } = require("../task_lists/common_syncFiles");
 const { validateDeployConditions } = require("../task_lists/deploy_validate");
 const { executeTasks } = require("../task_lists/deploy_execute");
 const { checkRepoVersion } = require("../commands/upgradeRepo");
-const { saveOperationState, clearOperationState, checkNoInterruptedRun } = require("../task_lists/common_operationState");
+const { saveOperationState, clearOperationState } = require("../task_lists/common_operationState");
 
 async function deploy(args) {
     checkRepoVersion()
     const cmdEnv = await getCurrentCommandEnviroment(args)
-    await checkNoInterruptedRun()
-    saveOperationState(cmdEnv.name, cmdEnv.servername)
     if(args.resync) args.force = true;
 
     console.log(`Checking conditions to deploy ${cmdEnv.branchStr} to ${cmdEnv.serverStr}...` );
 
-    try {
-        await validateDeployConditions(cmdEnv,args).run()
-    } catch (err) {
-        // we should clear the operation state
-        clearOperationState();
-        throw err
-    }
+    await validateDeployConditions(cmdEnv,args).run()
+
+    saveOperationState(cmdEnv.name, cmdEnv.servername)
 
     await cmdEnv.applyCurrentCommandEnvironmentChanges()
     let changes = [];

package/lib/commands/test.js

@@ -25,16 +25,18 @@ async function test (args) {
         checkRepoVersion()
         console.log("Start testing… ")
         cmdEnv = await getCurrentCommandEnviroment(args)
-        await checkNoInterruptedRun()
-        saveOperationState(cmdEnv.name, cmdEnv.servername)
-        stateSaved = true
 
         if(!args.localOnly) {
             await validateTestingConditions(cmdEnv, args)
+            saveOperationState(cmdEnv.name, cmdEnv.servername)
+            stateSaved = true
             await cmdEnv.applyCurrentCommandEnvironmentChanges()
             envChangesApplied = true
             restoreChanges = await otherFilesContiousReload(cmdEnv)
         } else {
+            await checkNoInterruptedRun()
+            saveOperationState(cmdEnv.name, cmdEnv.servername)
+            stateSaved = true
             await cmdEnv.applyCurrentCommandEnvironmentChanges()
             envChangesApplied = true
         }

package/lib/task_lists/common_helpers.js

@@ -15,6 +15,7 @@ function getSshArgs(server) {
 
     if (process.env.COB_SSH_PORT)     args.push("-p", process.env.COB_SSH_PORT);
     if (process.env.COB_SSH_IDENTITY) args.push("-i", process.env.COB_SSH_IDENTITY);
+    if (process.env.COB_SSH_ARGS)     process.env.COB_SSH_ARGS.split(" ").forEach(a => args.push('-o', a))
 
     const target = process.env.COB_SSH_USER ? `${process.env.COB_SSH_USER}@${server}` : server;
     args.push(target);
@@ -33,6 +34,7 @@ function getRsyncSsh() {
 
     if (process.env.COB_SSH_IDENTITY) cmd += ` -i '${process.env.COB_SSH_IDENTITY}'`;
     if (process.env.COB_SSH_PORT)     cmd += ` -p ${process.env.COB_SSH_PORT}`;
+    if (process.env.COB_SSH_ARGS)     cmd += " " + process.env.COB_SSH_ARGS.split(" ").map(a => `-o ${a}`).join(" ")
 
     return cmd;
 }

package/lib/task_lists/common_operationState.js

@@ -15,12 +15,28 @@ function clearOperationState() {
 }
 
 async function checkNoInterruptedRun() {
-    const stateExists = !!loadOperationState();
+    const savedState = loadOperationState();
     const envBackupFiles = await fg(['**/*.ENV__ORIGINAL_BACKUP__.*', '**/*.ENV__DELETE__.*'], { onlyFiles: false, dot: true });
-    if (stateExists || envBackupFiles.length > 0) {
+    if (savedState || envBackupFiles.length > 0) {
+        const details = [];
+        if (savedState) {
+            details.push(
+                "  saved state: environment " + (savedState.environment || "?").bold
+                + ", server " + (savedState.servername || "?").bold
+            );
+        }
+        if (envBackupFiles.length > 0) {
+            details.push("  leftover environment backup files (" + envBackupFiles.length + "):");
+            envBackupFiles.slice(0, 5).forEach(f => details.push("    " + f));
+            if (envBackupFiles.length > 5) {
+                details.push("    ... and " + (envBackupFiles.length - 5) + " more");
+            }
+        }
+
         throw new Error(
-            "\nAborted:".red + " found traces of a previous interrupted test/deploy.\n"
-            + "Run " + "cob-cli cleanup".yellow + " to restore the repo to a clean state first.\n"
+            "Aborted:".red + " found traces of a previous interrupted test/deploy.\n"
+            + details.join("\n") + "\n\n"
+            + "Run " + "cob-cli cleanup".yellow + " to restore the repo to a clean state first."
         );
     }
 }

package/lib/task_lists/deploy_validate.js

@@ -7,10 +7,12 @@ const { checkWorkingCopyCleanliness, checkConnectivity } = require("./common_hel
 const { getCurrentBranch, getLastDeployedSha } = require("./common_releaseManager");
 const { testEquality } = require("./common_syncFiles");
 const { checkNoTestsRunningOnServer } = require("./test_otherFilesContiousReload")
+const { checkNoInterruptedRun } = require("./common_operationState");
 
 
 function validateDeployConditions(cmdEnv, args) {
     return new Listr([
+        {   title: "Check no previous interrupted run".bold,                                                            task: ()     => checkNoInterruptedRun() },
         {   title: "Check connectivity and permissions".bold,                                                           task: ()     => checkConnectivity(cmdEnv.server) },
         {   title: "Check git status".bold,                                                                             task: ()     => checkWorkingCopyCleanliness(false) },
         {   title: "Check there's no 'cob-cli test' running on server".bold,                                            task: ()     => checkNoTestsRunningOnServer(cmdEnv.server) },

package/lib/task_lists/test_validate.js

@@ -10,11 +10,13 @@ const { getCurrentBranch, getLastDeployedSha } = require("./common_releaseManage
 const { testEquality } = require("./common_syncFiles");
 const { SERVER_IN_PROGRESS_TEST_FILE } = require("../task_lists/test_otherFilesContiousReload");
 const { getSshArgs } = require("./common_helpers");
+const { checkNoInterruptedRun } = require("./common_operationState");
 
 
 async function validateTestingConditions(cmdEnv, args) {
     console.log("Checking test conditions for", cmdEnv.serverStr );
     let result = await new Listr([
+            {   title: "Check no previous interrupted run".bold,                           task: ()     => checkNoInterruptedRun() },
             {   title: "Check connectivity and permissions".bold,                          task: ()     => checkConnectivity(cmdEnv.server) },
             {   title: "Check there's no other 'cob-cli test' running locally".bold,       task: ()     => _checkNoTestsRunningLocally() },
             {   title: "find out branch-for-HEAD",                                         task: (ctx)  => getCurrentBranch().then( currentBranch => ctx.currentBranch = currentBranch) },

package/package.json

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