cob-cli 2.52.0-beta-1 → 2.52.0

package/lib/task_lists/common_syncFiles.js

@@ -2,10 +2,9 @@ const execa = require('execa');
 const path = require('path');
 const fs = require('fs-extra');
 const { getKeypress } = require("../task_lists/common_helpers");
-const { getRsyncSsh, getServerAddress } = require("./common_helpers");
 
 /* ************************************ */
-const COB_PRODUCTS = ["recordm", "integrationm", "recordm-importer", "reportm", "userm", "confm", "others", "authm"];
+const COB_PRODUCTS = ["recordm", "integrationm", "recordm-importer", "reportm", "userm", "confm", "others", "authm", "public"];
 
 _syncFiles.TEST = "Test equality";
 _syncFiles.DIFF = "Get differences";
@@ -33,7 +32,6 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = [], ar
         return new Promise(async (resolve, reject) => {
             let fromPath = resolveCobPath(cmdEnv.server, from, product);
             let toPath = resolveCobPath(cmdEnv.server, to, product);
-            if (toPath.startsWith('.') && !fs.existsSync(toPath)) fs.mkdirSync(toPath)
             let productExtraOptions = extraOptions.map( option => option.replace(/=.*\|/,"="))
             productExtraOptions = productExtraOptions.filter( option => option.indexOf("|") < 0 )
 
@@ -66,7 +64,7 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = [], ar
                 }
                 await execa('rsync', rsyncArgs, {
                     shell: true,
-                    env: { "RSYNC_RSH": getRsyncSsh() }
+                    env: { "RSYNC_RSH": "ssh -o ConnectTimeout=30 -o ServerAliveInterval=30 -o ServerAliveCountMax=30" }
                 })
                     .then((value) => {
                         if (args.verbose > 3)
@@ -171,19 +169,18 @@ function resolveCobPath(server, type, product) {
             return "./" + product + "/";
 
         case "serverInitial":
-            return getServerAddress(server) + ":/opt/" + product + "/etc.default/";
+            return server + ":/opt/" + product + "/etc.default/";
 
         case "serverLive":
             switch (product) {
+                case "public":
+                    return server + ":/usr/share/cob/"
                 case "recordm-importer":
                 case "others":
-                    return getServerAddress(server) + ':' + "/opt/" + product + "/";
+                    return server + ':' + "/opt/" + product + "/";
                 default:
-                    return getServerAddress(server) + ':' + "/etc/" + product + "/";
+                    return server + ':' + "/etc/" + product + "/";
             }
-
-        case "staging":
-            return ".staging/" + product + "/";
     }
 }
 exports.resolveCobPath = resolveCobPath;

package/lib/task_lists/test_customUIsContinuosReload.js

@@ -1,28 +1,11 @@
 const execa = require('execa');
 const path = require('path');
-const net = require('net');
 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);
 
-function findPort(preferred = 8040) {
-    return new Promise((resolve) => {
-        const server = net.createServer();
-        server.listen(preferred, '0.0.0.0', () => {
-            server.close(() => resolve(preferred));
-        });
-        server.on('error', () => {
-            const fallback = net.createServer();
-            fallback.listen(0, '0.0.0.0', () => {
-                const port = fallback.address().port;
-                fallback.close(() => resolve(port));
-            });
-        });
-    });
-}
-
 
 async function customUIsContinuosReload(cmdEnv, dashboard) {
     process.env.dash_dir = dashboard
@@ -39,9 +22,6 @@ async function customUIsContinuosReload(cmdEnv, dashboard) {
         throw new Error("Aborted: ".red + " dashboard " + dashboard.bold + " does not exist.\n  ")
     }
 
-    const dashPort = await findPort(8041);
-    process.env.dash_port = dashPort;
-
     if(dashboardPathIsDirectory) {
         // If we have a dashboard to serve run it from local dashboard directory on 8081 with vue-cli-service
         // it will use its vue.config.js
@@ -51,15 +31,13 @@ async function customUIsContinuosReload(cmdEnv, dashboard) {
         commands.push( {
             command: [
                 "cd " + dashboardPath + ";",
-                "node_modules/.bin/vue-cli-service serve --port " + dashPort + " 2>/dev/null"
-            ].join(" "),
+                "node_modules/.bin/vue-cli-service serve --port 8041 2>/dev/null" 
+            ].join(" "), 
             name: 'dashboard server',
-            prefixColor: "red"
+            prefixColor: "red" 
         })
     }
 
-    const port = await findPort(8040);
-
     console.log( "\n" + (" NOTE: Press " + "O".bold.red + " to open default browser, " + "CTRL+C".bold.red + " or " + "Q".bold.red + " to stop the tests... ").yellow.bold + "\n\n" )
 
     const insideCobCliPath = path.resolve(__dirname, '../../node_modules/.bin/webpack-dev-server');
@@ -72,9 +50,8 @@ async function customUIsContinuosReload(cmdEnv, dashboard) {
             webpackDevServerPath,
             "--config",
             path.resolve(__dirname, "../webpack/webpack.config.js"),
-            "--mode=development",
-            "--port", port
-        ].join(" "),
+            "--mode=development"
+        ].join(" "), 
         name: 'customUIs server',
         prefixColor: "blue" 
     }) 
@@ -105,20 +82,14 @@ async function customUIsContinuosReload(cmdEnv, dashboard) {
         }
     }
 
-    let notifyFailure;
-    const failurePromise = new Promise((_, reject) => { notifyFailure = reject; });
-
-    conc.result.catch( _err => {
+    conc.result.catch( _err => { 
         if(isStopping) return;
 
         stopEverything();
-        notifyFailure(new Error('processes-failed'));
     });
 
     return {
-        stop: stopEverything,
-        failed: failurePromise,
-        port
+        stop: stopEverything
     };
 }
 exports.customUIsContinuosReload = customUIsContinuosReload;

package/lib/task_lists/test_otherFilesContiousReload.js

@@ -7,7 +7,6 @@ const { SERVER_COB_CLI_DIRECTORY } = require("./common_helpers");
 const { confirmExecutionOfChanges, resolveCobPath } = require("./common_syncFiles");
 const { syncFile } = require("./test_syncFile");
 const { getLastDeployedSha } = require("./common_releaseManager");
-const { getSshArgs } = require("./common_helpers");
 
 const IN_PROGRESS_TEST_FILE = "test.in.execution"
 const SERVER_IN_PROGRESS_TEST_FILE = SERVER_COB_CLI_DIRECTORY + IN_PROGRESS_TEST_FILE
@@ -19,7 +18,7 @@ async function otherFilesContiousReload(cmdEnv) {
     let changedFiles = new Set()
 
     let currentTestsFilesList = []
-    await execa('ssh', [...getSshArgs(cmdEnv.server), "cat " + SERVER_IN_PROGRESS_TEST_FILE])
+    await execa('ssh', [cmdEnv.server, "cat " + SERVER_IN_PROGRESS_TEST_FILE])
     .then( value => currentTestsFilesList = value.stdout.split("\n").map(l => l.substring(0,l.indexOf(" "))) )
     .catch( () => { } ) /* grep returns error if no match and execa throws an excepcions when return is error */
     
@@ -30,7 +29,22 @@ async function otherFilesContiousReload(cmdEnv) {
     let restoreChanges = async () => {
         if(watcher.process) watcher.process.close();
         if(changedFiles.size > 0) {
-            await restoreServerFilesToLastDeployed(cmdEnv, changedFiles);
+            console.log("\nRestoring changed files...".yellow);
+            let stash = true;
+            await git().env('LC_ALL', 'C').stash(["--include-untracked"]).then( value => value.indexOf("Saved") == 0 || (stash = false))
+            let lastSha = await getLastDeployedSha(cmdEnv.server)
+            await git().checkout(lastSha)
+            
+            await cmdEnv.applyLastEnvironmentDeployedToServerChanges()
+            for(let changedFile of changedFiles) {
+                await removeFileFromCurrentTest(cmdEnv.server, changedFile);
+            }
+            await cmdEnv.unApplyLastEnvironmentDeployedToServerChanges()
+
+            await execa('ssh', [cmdEnv.server,"find " + SERVER_IN_PROGRESS_TEST_FILE + " -size 0 -delete "]) //Remove file if empty
+
+            await git().checkout("-")
+            if (stash) await git().stash(["pop"])
         }
         fs.unlinkSync("."+IN_PROGRESS_TEST_FILE)
     }
@@ -57,7 +71,7 @@ async function otherFilesContiousReload(cmdEnv) {
         let productDir = resolveCobPath(cmdEnv.server, "serverLive", product).split(":")[1];
         let productScopeFilePath = changedFile.substring(changedFile.indexOf("/") + 1); // remove o directorio inicial do producto
 
-        let isRemoteFile = () => execa('ssh', [...getSshArgs(cmdEnv.server), "[[ -f " + productDir + productScopeFilePath + " ]] && echo 'file' || echo '' " ])
+        let isRemoteFile = () => execa('ssh', [cmdEnv.server, "[[ -f " + productDir + productScopeFilePath + " ]] && echo 'file' || echo '' " ])
             .then( r => {
                 return r.stdout == "file"
             }).catch( () => {
@@ -100,45 +114,10 @@ async function otherFilesContiousReload(cmdEnv) {
 }
 exports.otherFilesContiousReload = otherFilesContiousReload
 
-/* ************************************ */
-async function restoreServerFilesToLastDeployed(cmdEnv, changedFiles) {
-    console.log("\nRestoring changed files...".yellow);
-
-    // Clean up any env-swap markers left by applyCurrentCommandEnvironmentChanges before
-    // stashing. These files are gitignored, so git stash --include-untracked ignores them.
-    // If they survive into _undoSpecific(lastEnv) they create ghost env files that are
-    // untracked at lastSha, causing "git checkout -" to abort.
-    await cmdEnv.unApplyCurrentCommandEnvironmentChanges();
-
-    let stashed = false;
-    await git().env('LC_ALL', 'C').stash(["--include-untracked"])
-        .then(value => { stashed = value.indexOf("Saved") === 0; })
-        .catch(() => {});
-
-    const lastSha = await getLastDeployedSha(cmdEnv.server);
-    if (!lastSha) throw new Error("Cannot restore server files: no previous deploy found on server.");
-    await git().checkout(lastSha);
-
-    await cmdEnv.applyLastEnvironmentDeployedToServerChanges();
-
-    for (const changedFile of changedFiles) {
-        await removeFileFromCurrentTest(cmdEnv.server, changedFile);
-    }
-
-    await cmdEnv.unApplyLastEnvironmentDeployedToServerChanges();
-
-    await execa('ssh', [...getSshArgs(cmdEnv.server), "find " + SERVER_IN_PROGRESS_TEST_FILE + " -size 0 -delete"])
-        .catch(() => {});
-
-    await git().checkout("-");
-    if (stashed) await git().stash(["pop"]);
-}
-exports.restoreServerFilesToLastDeployed = restoreServerFilesToLastDeployed
-
 /* ************************************ */
 async function addFileToCurrentTest(server, changedFile, changedFiles, changeType, restoreChanges) {
     let inUse = "";
-    await execa('ssh', [...getSshArgs(server), "grep -F '" + changedFile + " ' " + SERVER_IN_PROGRESS_TEST_FILE ])
+    await execa('ssh', [server, "grep -F '" + changedFile + " ' " + SERVER_IN_PROGRESS_TEST_FILE ])
         .then( value => inUse = value.stdout )
         .catch( () => { } ) /* grep returns error if no match and execa throws an excepcions when return is error */
         .finally( async () => {
@@ -154,7 +133,7 @@ async function addFileToCurrentTest(server, changedFile, changedFiles, changeTyp
 
             if(!changedFiles.has(changedFile)) {
                 const user = require("os").userInfo().username;
-                execa('ssh', [...getSshArgs(server), "echo '" + changedFile + " by " + user + "' >> " + SERVER_IN_PROGRESS_TEST_FILE]);
+                execa('ssh', [server, "echo '" + changedFile + " by " + user + "' >> " + SERVER_IN_PROGRESS_TEST_FILE]);
                 changedFiles.add(changedFile);
             }
             console.log(" " + changeType.replace(/(e)([^e]*)$/, "ed$2 ") + changedFile);
@@ -164,14 +143,13 @@ async function addFileToCurrentTest(server, changedFile, changedFiles, changeTyp
 /* ************************************ */
 async function removeFileFromCurrentTest(server, changedFile) {
     await syncFile(server, changedFile);
-    await execa('ssh', [...getSshArgs(server), "sed -i '/" + changedFile.split("/").join("\\/") + "/d'  " + SERVER_IN_PROGRESS_TEST_FILE]).catch( () => {/* ignore files removed by user */} );
+    await execa('ssh', [server, "sed -i '/" + changedFile.split("/").join("\\/") + "/d'  " + SERVER_IN_PROGRESS_TEST_FILE]).catch( () => {/* ignore files removed by user */} );
     console.log(" reset ".brightGreen + changedFile);
 }
-exports.removeFileFromCurrentTest = removeFileFromCurrentTest
 
 /* ************************************ */
 function checkNoTestsRunningOnServer(server) {
-    return execa('ssh', [...getSshArgs(server), "cat " + SERVER_IN_PROGRESS_TEST_FILE])
+    return execa('ssh', [server, "cat " + SERVER_IN_PROGRESS_TEST_FILE])
             .then(value => {
                 throw new Error(
                         "Aborted:".red + " there are tests running with files changed on the server:\n  "

package/lib/task_lists/test_syncFile.js

@@ -2,7 +2,6 @@ const execa = require('execa');
 const fs = require('fs-extra');
 const path = require('path');
 const { resolveCobPath } = require("./common_syncFiles");
-const { getSshArgs, getRsyncSsh } = require("./common_helpers");
 
 const DEBUG = false;
 const RSYNC_RETRIES = 10;
@@ -19,7 +18,7 @@ async function syncFile(server, localFile) {
 
     let count = 0;
     while (count < RSYNC_RETRIES) {
-        await execa('ssh', [...getSshArgs(server), "mkdir -p " + remoteFileDir]).catch({});
+        await execa('ssh', [server, "mkdir -p " + remoteFileDir]).catch({});
         await execa('rsync', [localFile, remoteProductPath + productScopeFilePath,
             "-acz",
             "--prune-empty-dirs",
@@ -29,17 +28,17 @@ async function syncFile(server, localFile) {
             "--no-t",
             "--filter='merge " + path.resolve(__dirname,"rsyncFilter-pre.txt") + "'",
             "--filter='merge " + path.resolve(__dirname,"rsyncFilter-post.txt") + "'"],
-           { shell: true, env: { "RSYNC_RSH": getRsyncSsh() } })
+           { shell: true, env: { "RSYNC_RSH": "ssh -o ConnectTimeout=30 -o ServerAliveInterval=30 -o ServerAliveCountMax=30" } })
             .then(count = RSYNC_RETRIES)
             .catch(async (err) => {
                 // exitCode 23 indicam que o ficheiro não existe na origem. Temod de apagar no destino.
                 if (err.exitCode == 23) {
-                    await execa('ssh', [...getSshArgs(server), "rm -fd " + remoteProductPath.split(":")[1] + productScopeFilePath]).catch({});
+                    await execa('ssh', [server, "rm -fd " + remoteProductPath.split(":")[1] + productScopeFilePath]).catch({});
 
                     let localFileDir = localFile.substring(0, localFile.lastIndexOf("/"));
                     if (!fs.existsSync(localFileDir)) {
                         if (DEBUG) console.log(remoteFileDir + " needs to be removed");
-                        await execa('ssh', [...getSshArgs(server), "rm -rf " + remoteFileDir]).catch({});
+                        await execa('ssh', [server, "rm -rf " + remoteFileDir]).catch({});
                     }
                     count = RSYNC_RETRIES;
                 } else if ((count + 1)> RSYNC_RETRIES) {

package/lib/task_lists/test_validate.js

@@ -9,7 +9,6 @@ const { checkConnectivity } = require("./common_helpers");
 const { getCurrentBranch, getLastDeployedSha } = require("./common_releaseManager");
 const { testEquality } = require("./common_syncFiles");
 const { SERVER_IN_PROGRESS_TEST_FILE } = require("../task_lists/test_otherFilesContiousReload");
-const { getSshArgs } = require("./common_helpers");
 
 
 async function validateTestingConditions(cmdEnv, args) {
@@ -80,7 +79,7 @@ async function _handleTestEquality(ctx, changes, server) {
         let offendingFiles = changes.map(f => f.substring(17)) //17 é a posição onde começa o nome dos ficheiros em cada linha
         let problemFiles = [];
         for(let changedFile of offendingFiles) {
-            await execa('ssh', [...getSshArgs(server), "grep -F " + changedFile + " " + SERVER_IN_PROGRESS_TEST_FILE ])
+            await execa('ssh', [server, "grep -F " + changedFile + " " + SERVER_IN_PROGRESS_TEST_FILE ])
             .catch( () => { 
                 try {
                     if (fs.lstatSync(changedFile.trim()).isFile()) {
@@ -95,7 +94,7 @@ async function _handleTestEquality(ctx, changes, server) {
         if(problemFiles.length > 0)  throw new Error("Aborted:".red + " server was changed since last deploy:\n   " + problemFiles.join("\n   ") +  "\n" );
 
         let inTest = "";
-        await execa('ssh', [...getSshArgs(server), "cat " + SERVER_IN_PROGRESS_TEST_FILE])
+        await execa('ssh', [server, "cat " + SERVER_IN_PROGRESS_TEST_FILE])
         .then( value => inTest = value.stdout )
         .catch( () => { } ) /* grep returns error if no match and execa throws an excepcions when return is error */
         .finally( async () => {

package/lib/task_lists/updateFromServer_validate.js

@@ -8,7 +8,7 @@ function validateUpdateFromServerConditions(cmdEnv) {
     return new Listr([
         {   title: "Check connectivity and permissions".bold,      task: () => checkConnectivity(cmdEnv.server) },
         {   title: "Check there's no cob-cli test' running".bold,  task: () => checkNoTestsRunningOnServer(cmdEnv.server) },
-        {   title: "Check git status".bold,                        task: () => checkWorkingCopyCleanliness() },
-    ])
+        {   title: "Check git status".bold,                        task: () => checkWorkingCopyCleanliness() }, 
+   ])
 }
-exports.validateUpdateFromServerConditions = validateUpdateFromServerConditions
+exports.validateUpdateFromServerConditions = validateUpdateFromServerConditions

package/lib/webpack/webpack.config.js

@@ -36,7 +36,7 @@ module.exports = env => {
       },
       proxy: {
         [ "**/" + process.env.dash_dir + "/**"]: {
-          target: "http://localhost:" + (process.env.dash_port || 8041),
+          target: "http://localhost:8041",
           secure: false
         },
         [ "/docs/**"]: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.52.0-beta-1",
+  "version": "2.52.0",
   "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": {
@@ -18,7 +18,6 @@
   "dependencies": {
     "@webpack-cli/serve": "^2.0.1",
     "axios": "^0.21.1",
-    "axios-cookiejar-support": "^5.0.5",
     "chokidar": "^3.5.3",
     "cmd-line-importer": "^1.0.0",
     "colors": "^1.4.0",
@@ -29,14 +28,11 @@
     "file-cookie-store": "^0.2.1",
     "fs-extra": "^9.0.1",
     "inquirer": "^7.3.3",
-    "js-yaml": "^4.1.0",
     "listr": "^0.14.3",
     "ncp": "^2.0.0",
     "omelette": "^0.4.15-1",
     "open": "^8.4.0",
     "simple-git": "^3.15.1",
-    "tar": "^7.4.3",
-    "tough-cookie": "^5.1.2",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^4.11.1",

package/lib/commands/cleanup.js

@@ -1,116 +0,0 @@
-require('colors');
-const git = require('simple-git');
-const fs = require('fs-extra');
-const fg = require('fast-glob');
-const execa = require('execa');
-const Listr = require('listr');
-const UpdaterRenderer = require('listr-update-renderer');
-const verboseRenderer = require('listr-verbose-renderer');
-const { getCurrentCommandEnviroment } = require("../task_lists/common_enviromentHandler");
-const { SERVER_COB_CLI_DIRECTORY } = require("../task_lists/common_helpers");
-const { restoreServerFilesToLastDeployed } = require("../task_lists/test_otherFilesContiousReload");
-const { loadOperationState, clearOperationState } = require("../task_lists/common_operationState");
-const { checkRepoVersion } = require("../commands/upgradeRepo");
-const { getSshArgs } = require("../task_lists/common_helpers");
-
-const LOCAL_TEST_LOCK_FILE = ".test.in.execution";
-const SERVER_TEST_LOCK_FILE = SERVER_COB_CLI_DIRECTORY + "test.in.execution";
-
-async function cleanup(args) {
-    try {
-        checkRepoVersion()
-
-        const savedState = loadOperationState();
-        if (!savedState && !args.environment) {
-            console.log("No saved state and no explicit environment, aborting".bold);
-            return;
-        }
-        if (savedState) {
-            if (!args.environment) args.environment = savedState.environment;
-            if (!args.servername)  args.servername  = savedState.servername;
-        }
-
-        console.log("Cleaning up interrupted test/deploy state...".bold)
-
-        const cmdEnv = await getCurrentCommandEnviroment(args)
-        console.log(`  environment: ${cmdEnv.name.bold}  server: ${cmdEnv.serverStr}`)
-
-        await new Listr([
-            {
-                title: "Undo environment-specific file changes".bold,
-                skip: async () => {
-                    const backupFiles = await fg(
-                        ['**/*.ENV__ORIGINAL_BACKUP__.*', '**/*.ENV__DELETE__.*'],
-                        { onlyFiles: false, dot: true }
-                    );
-                    return backupFiles.length === 0 ? "No environment-specific changes found" : false;
-                },
-                task: () => cmdEnv.unApplyCurrentCommandEnvironmentChanges()
-            },
-            {
-                // Runs after the local env undo so the working tree is clean before
-                // stashing and checking out the last-deployed SHA.
-                title: "Restore server files to last deployed version".bold,
-                skip: () => args.localOnly ? "Skipping server restore (--localOnly)" : false,
-                task: async () => {
-                    let changedFiles = [];
-                    try {
-                        const result = await execa('ssh', [...getSshArgs(cmdEnv.server), "cat " + SERVER_TEST_LOCK_FILE]);
-                        changedFiles = result.stdout.split("\n")
-                            .map(l => l.split(" ")[0].trim())
-                            .filter(f => f);
-                    } catch (error) {
-                        if (error.exitCode === 255) {
-                            throw new Error(`SSH connection to '${cmdEnv.server}' failed: ${error.shortMessage}`);
-                        }
-                        /* no test.in.execution on server = nothing to restore */
-                    }
-
-                    if (changedFiles.length === 0) return;
-
-                    await restoreServerFilesToLastDeployed(cmdEnv, changedFiles);
-                }
-            },
-            {
-                title: "Restore git branch from detached HEAD".bold,
-                skip: async () => {
-                    const branch = await git().revparse(["--abbrev-ref", "HEAD"]);
-                    return branch.trim() !== "HEAD" ? "Not in detached HEAD state" : false;
-                },
-                task: () => git().checkout("-")
-            },
-            {
-                title: "Remove local test lock file".bold,
-                skip: () => !fs.existsSync(LOCAL_TEST_LOCK_FILE) ? "No local test lock file found" : false,
-                task: () => fs.unlinkSync(LOCAL_TEST_LOCK_FILE)
-            },
-            {
-                title: "Remove server test lock file".bold,
-                skip: () => args.localOnly ? "Skipping server cleanup (--localOnly)" : false,
-                task: () => execa('ssh', [...getSshArgs(cmdEnv.server), "rm -f " + SERVER_TEST_LOCK_FILE])
-                    .catch(() => {}) // non-critical if server unreachable
-            },
-        ], {
-            renderer: args.verbose ? verboseRenderer : UpdaterRenderer,
-            collapse: false
-        }).run()
-
-        clearOperationState()
-
-        // Inform about stashes — don't auto-pop since user may have unrelated stashes
-        const stashList = await git().stash(["list"]);
-        if (stashList) {
-            console.log("\n" + "Note:".yellow.bold
-                + " Stashed changes detected (may be from the interrupted operation):")
-            console.log(stashList.split("\n").slice(0, 3).map(l => "  " + l).join("\n"))
-            console.log("Run " + "git stash pop".yellow + " if you want to restore your uncommitted changes.\n")
-        }
-
-        console.log("\nDone!".green, "\nYou can now run 'cob-cli test' or 'cob-cli deploy' again.\n")
-
-    } catch(err) {
-        console.error("\n", err.message)
-    }
-}
-
-module.exports = cleanup;

package/lib/commands/package.js

@@ -1,20 +0,0 @@
-require('colors');
-const { checkRepoVersion } = require("../commands/upgradeRepo");
-const { getCurrentCommandEnviroment } = require("../task_lists/common_enviromentHandler");
-const { executeTasks } = require("../task_lists/package_execute");
-
-async function package(args) {
-    try {
-        checkRepoVersion()
-        const cmdEnv = await getCurrentCommandEnviroment(args)
-        if(args.resync) args.force = true;
-
-        await executeTasks(cmdEnv, args).run();
-
-        console.log("\nDone!".green, "\nEnjoy!")
-
-    } catch(err) {
-        console.error("\n",err.message);
-    }
-}
-module.exports = package;

package/lib/commands/tagDefs.js

@@ -1,67 +0,0 @@
-require('colors');
-const { getCurrentCommandEnviroment } = require("../task_lists/common_enviromentHandler");
-const { promptCredentials, readYamlFile } = require("../task_lists/common_helpers.js");
-const { tagDefinitions } = require("../task_lists/tagDefs_execute.js");
-const { checkRepoVersion } = require("../commands/upgradeRepo");
-const axios = require('axios');
-const tough = require('tough-cookie');
-const axiosCookieJarSupport = require('axios-cookiejar-support')
-const path = require('path')
-const FileCookieStore = require('file-cookie-store');
-
-async function tagDefs(args) {
-    try {
-        checkRepoVersion()
-        const cmdEnv = await getCurrentCommandEnviroment(args)
-
-        axiosCookieJarSupport.wrapper(axios)
-        axios.defaults.ignoreCookieErrors = true
-        axios.defaults.withCredentials = true
-        const cookieJar = new tough.CookieJar()
-        axios.defaults.jar = cookieJar
-
-        if( args.cookie ) {
-            const p = path.resolve(args.cookie);
-            const cookieFile = new FileCookieStore(p, {auto_sync: false, force_parse: true});
-            try{
-                let c = await new Promise((resolve, reject) => {
-                    cookieFile.findCookie(`${cmdEnv.servername}.cultofbits.com`, '/', 'cobtoken', (err, result) => {
-                        if(err != null) reject(err);
-                        else resolve(result)
-                    })
-                });
-                if(!c){
-                    throw Error( `couldn't find a cookie for ${cmdEnv.servername} in ${p}`)
-                }
-                cookieJar.setCookie(c.toString(), `https://${cmdEnv.servername}.cultofbits.com`)
-            } catch(e){
-                console.error(e)
-                return
-            }
-
-        } else {
-
-            const credentials = await promptCredentials()
-
-            await axios.post(`https://${cmdEnv.servername}.cultofbits.com/recordm/security/auth`, credentials, {
-                headers: {
-                    "Content-Type": "application/json",
-                },
-            })
-        }
-
-        const solutions = await readYamlFile("solutions.yml")
-
-        for (const solution of solutions) {
-            console.log("\nStarting to tag Defs of solution " + solution.name, solution.definitions)
-            if (solution.definitions) {
-                await tagDefinitions(cmdEnv.servername, solution.name, solution.definitions, args)
-            }
-        }
-
-    } catch (err) {
-        console.error("\n", err.message);
-    }
-}
-
-module.exports = tagDefs;

package/lib/task_lists/common_definitions.js

@@ -1,26 +0,0 @@
-const axios = require("axios");
-
-async function getFilteredDefinitions(servername, defConfigs) {
-    const uri = `https://${servername}.cultofbits.com/recordm/recordm/definitions`
-    const response = await axios.get( uri );
-
-    if(response.status != 200){
-        throw new Error(`HTTP Error Response: ${response.status} ${response.statusText}`);
-    }
-
-    let result = defConfigs.flatMap(c => {
-        return response.data.filter(def => match(c.filter, def))
-            .map(m => ({...m, ...c}))
-    });
-
-    return result
-}
-
-function match(query, definition) {
-    // simple matching for now
-    return definition.name.includes(query) || definition.description?.includes(query)
-}
-
-module.exports = {
-    getFilteredDefinitions: getFilteredDefinitions
-}

package/lib/task_lists/common_operationState.js

@@ -1,28 +0,0 @@
-const fs = require('fs-extra');
-const fg = require('fast-glob');
-const STATE_FILE = ".git/cob-cli-state";
-
-function saveOperationState(environment, servername) {
-    try { fs.writeJsonSync(STATE_FILE, { environment, servername }); } catch {}
-}
-
-function loadOperationState() {
-    try { return fs.readJsonSync(STATE_FILE); } catch { return null; }
-}
-
-function clearOperationState() {
-    try { fs.unlinkSync(STATE_FILE); } catch {}
-}
-
-async function checkNoInterruptedRun() {
-    const stateExists = !!loadOperationState();
-    const envBackupFiles = await fg(['**/*.ENV__ORIGINAL_BACKUP__.*', '**/*.ENV__DELETE__.*'], { onlyFiles: false, dot: true });
-    if (stateExists || envBackupFiles.length > 0) {
-        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"
-        );
-    }
-}
-
-module.exports = { saveOperationState, loadOperationState, clearOperationState, checkNoInterruptedRun };