@tangelo/tangelo-configuration-toolkit 1.11.2 → 1.12.1

package/src/modules/version/index.js

@@ -1,174 +1,158 @@
-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 --all --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`,
-    value: `${_git.commitLocalTdi.date.toLocaleDateString(`en-gb`,{day:'numeric',month:'short',year:'numeric',hour:'2-digit',minute:'2-digit'})}`
-  });
-  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.find}`.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);
-
+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 = () => {
+  // Version info TDI submodule
+  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 --all --contains ${_git.commitTdi.local().hash}`, path.join(_paths.repo, _paths.tdi)).match(/release\/[^\s]+/gsm);
+  if (!releaseBranches) _error('Could not retrieve TDI release branches');
+  // Get the first possible branch; prefer release/5.1 over release/5.2:
+  releaseBranches.sort((a, b) => a.name > b.name ? 1 : -1);
+  const firstBranch = {name: releaseBranches[0]};
+  // Get number of commits behind
+  firstBranch.commitsBehind = execGitCommand(`rev-list HEAD...origin/${firstBranch.name} --count`, path.join(_paths.repo, _paths.tdi));
+
+  // Create table rows for TDI submodule info
+  gitSubmoduleInfo.addRow({
+    property: 'Commit date',
+    value: _git.commitTdi.local().date.toLocaleDateString('en-gb', {day: 'numeric', month: 'short', year: 'numeric', hour: '2-digit', minute: '2-digit'})
+  });
+  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.find.toString().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 || '';
+          const 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,
+                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 => {
+        versionInfo.addRow({ // Add empty row after project
+          path: '',
+          sort: `${p}_3`,
+          type: '',
+          version: ''
+        });
+        versionInfo.addRow({ // Add row with project name
+          path: `-- ${p}:`,
+          sort: `${p}_1`,
+          type: '',
+          version: ''
+        }, {
+          color: 'yellow'
+        });
+      });
+    } else
+    if (sorting=='type') {
+      types.forEach(t => {
+        versionInfo.addRow({ // Add empty row after type
+          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);
+
 };

package/tct-workspace.code-workspace

@@ -1,7 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		}
-	]
-}