@tangelo/tangelo-configuration-toolkit 1.10.4 → 1.11.0

package/index.js

@@ -80,7 +80,7 @@ global._git = {
   user: execGitCommand(`config --get user.email`, _paths.repo),
   commitLocal: execGitCommand(`log -1 --format=%D;%H;%cd --date=iso-strict`, _paths.repo, ['branch', 'hash', 'date']),
   commitLocalTdi: {
-    hash: execGitCommand('rev-parse HEAD', path.join(_paths.repo, _paths.tdi)),
+    ...execGitCommand(`log -1 --format=%D;%H;%cd --date=short`, path.join(_paths.repo, _paths.tdi),['tags', 'hash', 'date']),
     after (commitHash) {
       return execGitCommand(`merge-base --is-ancestor ${commitHash} ${this.hash}`, path.join(_paths.repo, _paths.tdi), null, 0);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.10.4",
+  "version": "1.11.0",
   "description": "Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.",
   "bin": {
     "tct": "bin/index.js",
@@ -21,6 +21,7 @@
     "@babel/preset-env": "^7.16.11",
     "cli-spinner": "^0.2.10",
     "compare-versions": "^4.1.1",
+    "console-table-printer": "^2.11.1",
     "del": "^6.0.0",
     "event-stream": "^4.0.1",
     "find-up": "^5.0.0",

package/src/cli.js

@@ -92,6 +92,15 @@ module.exports = function cli () {
       remove: {alias: 'r', desc: 'Remove project configuration', conflicts: ['i', 'c', 'g']}
     },
     handler: require('./modules/sql')
+  }).command({
+    command: 'versions',
+    aliases: ['v'],
+    desc: 'Show version information',
+    builder: {
+      find: {alias: 'f', desc: `Find all version information          [choices: "sort-project"(default),"sort-type"]`},
+      server: {alias: 's', desc: 'Pass server name (set in config file)', default: _appconfig.defaultServer}
+    },
+    handler: require('./modules/version')
   })
   .recommendCommands()
   .option('config', {alias: 'c', desc: 'Show loaded appconfig', global: false})

package/src/modules/deploy/config.js

@@ -65,8 +65,8 @@ module.exports = {
     if (ftpConfig.host && !(ftpConfig.port && ftpConfig.parallel && ftpConfig.username)) _error('Config is incomplete!');
 
     this.localTransfer  = !ftpConfig.host;
-    this.envDev         = /\.dev\.tangelo\.nl$/.test(ftpConfig.host);
     this.deliveryPack   = serverConfig.mode == 'delivery-pack';
+    this.envDev         = this.localTransfer && !this.deliveryPack || /\.dev\.tangelo\.nl$/.test(ftpConfig.host);
 
     if (this.deliveryPack) {
       const dateStr = new Date().toISOString().replace(/(.*)T(\d+):(\d+):(\d+).*/g, '$1_$2$3$4');

package/src/modules/deploy/execute.js

@@ -44,6 +44,7 @@ const remote = {
       sshI.execCommand(command[0])
       .then(result => {
         if (result.stderr) _warn(result.stderr);
+        else if (command[1] === '') _write(result.stdout);
         else _info(command[1] || command[0], true);
 
         executing--;

package/src/modules/migrate/index.js

@@ -6,7 +6,7 @@ const path      = require('path');
 module.exports = function migrate (argv) {
   if (_isPre51) _error('This command only works when using branch release/5.1 and up.');
 
-  let filter = path.join(_paths.apply, argv.filter); // Default set filter with filter added to the command argument -f
+  let filter = path.join(_paths.apply, argv.filter).toFws(); // Default set filter with filter added to the command argument -f
 
   const scripts =
     globby
@@ -24,10 +24,17 @@ module.exports = function migrate (argv) {
       value: s
     }))
   ;
-
+  
+  // Search scriptname set in commandline in scripts and return in cmdlScript if found
+  const cmdlScript = Object.values(scripts).filter(s => s.name === `${argv.execute}`)[0];
+  if (cmdlScript) {
+    _info(`Migration: ${cmdlScript.name}`);
+  };
+  
   inquirer
   .prompt([{
-    message: 'Choose a migration: ', name: 'script', type: 'list', choices: scripts, pageSize: 5, loop: false
+    message: 'Choose a migration: ', name: 'script', type: 'list', choices: scripts, pageSize: 5, loop: false,
+    when: !(cmdlScript) // Only show choice for migration when no script is set in commandline
   },{
     message: 'Choose filter: ', name: 'filter', type: 'list', pageSize: 5, loop: false,
     choices: [{name: `- All`, value:argv.filter},{name:'- Choose active projects',value:'projects'}],
@@ -41,6 +48,11 @@ module.exports = function migrate (argv) {
     _write();
     _info(`Working folder set to: ${_paths.repo}`);
     
+    if (cmdlScript) {
+      // Set script to execute to script entered in commandline
+      a.script = cmdlScript.value;
+    }
+
     if (a.filter === 'projects' && _repoconfig.length > a.projects.length) {
       // push paths of chosen active documents to projectFolders (only if not all projects are chosen)
       const projectFolders = [];

package/src/modules/version/index.js

@@ -0,0 +1,174 @@
+const {execSync}           = require('child_process');
+const fs                   = require('fs-extra');
+const globby               = require('globby');
+const path                 = require('path');
+const {Table}              = require('console-table-printer');
+const execGitCommand       = require('../../lib/exec-git-command');
+const c                    = require('../deploy/config');
+const {remote}             = require('../deploy/execute');
+
+const getGitInfo = (argv) => {
+  // Version info TDI submodule
+  
+  const branchInfo = [];
+  const gitSubmoduleInfo = new Table({
+    columns: [
+      { name: 'property', title: 'TDI - submodule', alignment: 'left'},
+      { name: 'value', alignment: 'left'}
+    ],
+  });
+  
+  // Fetch all
+  execGitCommand(`fetch -pf --all`, path.join(_paths.repo, _paths.tdi));
+
+  // Get branches containing TDI HEAD commit
+  const releaseBranches = execGitCommand(`branch --contains ${_git.commitLocalTdi.hash}`, path.join(_paths.repo, _paths.tdi)).match(/release\/[^\s]+/gsm);
+  if (releaseBranches) {
+    releaseBranches.forEach(b => {
+      // Get number of commits behind
+      const count = execGitCommand(`rev-list HEAD...origin/${b} --count`, path.join(_paths.repo, _paths.tdi));
+      // _info(`debug: [${b}]:${count}`);
+      // Push number of commits behind to branchInfo
+      branchInfo.push({name:b,commitsBehind:count});
+    });
+  }
+  
+  // Get the first possible branch; prefer release/5.1 over release/5.2:
+  const firstBranch = branchInfo.sort((a, b) => a.name > b.name ? 1 : -1)[0];
+
+  // Create table rows for TDI submodule info
+  gitSubmoduleInfo.addRow({
+    property: `Commit date (DD-MM-YYYY)`,
+    value: `${_git.commitLocalTdi.date.toLocaleDateString('nl-nl')}`
+  });
+  if (firstBranch) {
+    gitSubmoduleInfo.addRow({
+      property: `Branch`,
+      value: `${firstBranch.name}`
+    });
+    gitSubmoduleInfo.addRow({
+      property: `Commits behind`,
+      value: `${firstBranch.commitsBehind}`
+    });
+  } else {
+    gitSubmoduleInfo.addRow({
+      property: `Branch could not be determined`,
+      value: ``
+    });
+  }
+
+  // Print TDI submodule info
+  gitSubmoduleInfo.printTable();
+}
+
+const getFileExtractInfo = (argv) => {
+  // version info miscellaneous
+  const sorting = `${argv.info}`.includes(`sort-type`) ? `type` : `project`;
+  const projects = new Set;
+  const types = new Set;
+  const versionInfoConfigPath  = path.join(_paths.repo, _paths.tdi, 'tct/version/versionInfo.js');
+  const versionInfo = new Table({
+    columns: [
+      { name: 'path', alignment: 'left'},
+      { name: 'type', alignment: 'left'},
+      { name: 'version', alignment: 'left'},
+      { name: 'sort'}
+    ],
+    disabledColumns: ['sort'],
+    sort: (a, b) => a.sort.toLowerCase() > b.sort.toLowerCase() ? 1 : -1
+  });
+
+  if (fs.existsSync(versionInfoConfigPath)) {
+    const config = require(`${versionInfoConfigPath}`);
+
+    config.forEach(v => {
+      const location = path.join(_paths.repo,v.glob);
+
+      globby
+      .sync(`${location}`)
+      .forEach(f => {
+        const filePathExtract = f.match(/.*(?<path>(cmscustom|site-stylesheets)\/(?<customer>[^\/]*)\/(?<project>[^\/]*)\/.*)/);
+        const path = filePathExtract.groups.path ? filePathExtract.groups.path : '';
+        const customer = filePathExtract.groups.customer ? filePathExtract.groups.customer : '';
+        const project = filePathExtract.groups.project ? filePathExtract.groups.project : '';
+
+        const fileContent = fs.readFileSync(f).toString();
+        v.extracts.forEach(e => {
+          const extract = fileContent.match(e.regex);
+          if (extract) {
+            projects.add(project); // Store the projects where versioninfo is found
+            types.add(e.type); // Store the types for which versioninfo is found
+            versionInfo.addRow( // Create row with version information to output
+              { path: `${path}`
+              , sort: `${sorting==`project` ? project : e.type}_2${sorting==`project` ? e.type : extract.groups.version}` // Output is sorted on project or type: '_2' ensures it is rendered after the empty row and the row with the project name
+              , type: `${e.type}`
+              , version: `${extract.groups.version}`
+              }
+            );
+          }
+        });
+      })
+    });
+
+    if (sorting==`project`) {
+      /* For projects containing version information */
+      projects.forEach(p => {
+        /* Add empty row after project */
+        versionInfo.addRow(
+          { path: ``
+          , sort: `${p}_3`
+          , type: ``
+          , version: ``
+          }
+        )
+        /* Add row with project name */
+        versionInfo.addRow(
+          { path: `-- ${p}:`
+          , sort: `${p}_1`
+          , type: ``
+          , version: ``
+          }, 
+          { color: 'yellow' }
+        )
+      });
+    } else 
+    if (sorting==`type`) {
+      types.forEach(t => {
+        /* Add empty row after type */
+        versionInfo.addRow(
+          { path: ``
+          , sort: `${t}_3`
+          , type: ``
+          , version: ``
+          }
+        )
+      });
+    }
+    versionInfo.printTable();
+  } else {
+    _warn(`Version info of miscellaneous items cannot be extracted:\nCannot find required files in TDI submodule. Try updating TDI submodule.`);
+  }
+}
+
+const getServerInfo = (argv) => {
+  // Remote server info
+  // common setup
+  _write();
+  c.setServer(argv.server);
+
+  if (!c.envDev) {
+    _info(`Remote version info for '${c.server.ftpConfig.host}':\n`)
+    remote.add('sudo ~root/scripts/version.sh', '').process();
+  } else {
+    _info(`For development environments no server version information is available. Check rancher / database for this information.\nAdd the --server option with a non-dev environment to see version information for that server.`);
+  }
+}
+
+module.exports = function version (argv) {
+  _info(`Version information of this git repository\n`)
+
+  getGitInfo(argv);
+  getFileExtractInfo(argv);
+  getServerInfo(argv);
+
+};