@tangelo/tangelo-configuration-toolkit 1.5.5 → 1.8.0-beta.0

package/README.md

@@ -4,7 +4,7 @@ Tangelo Configuration Toolkit is a command-line toolkit which offers support for
 
 ## Installation
 
-The toolkit requires [NPM](https://www.npmjs.com/get-npm) on [Node.js®](https://nodejs.org/) version 12.x or 14.x. An active or maintenance LTS release is recommended. After installing Node.js, you can install the latest version of the Tangelo Configuration Toolkit globally on your system using the following command:
+The toolkit requires [NPM](https://www.npmjs.com/get-npm) on [Node.js®](https://nodejs.org/) (at least version 12.x). An active or maintenance LTS release is recommended. After installing Node.js, you can install the latest version of the Tangelo Configuration Toolkit globally on your system using the following command:
 
     npm i -g @tangelo/tangelo-configuration-toolkit
 
@@ -57,4 +57,11 @@ When passing a server name, `tct` will look for a full match with a name or a pa
 
 The `build` and `sql` commands make use of a configuration file in the repository named `tangelo-configuration-toolkit-repoconfig.json`. This contains information about the customer projects.
 
-For a new repository, using `tct build --init` also creates the repoconfig-file. For existing projects not having the repoconfig-file, you can use `tct build --config` to generate it.
+For a new repository, using `tct build --init` also creates the repoconfig-file. For existing projects not having the repoconfig-file, you can use `tct build --config` to generate it.
+
+### oXygen
+
+The `build -x` commands set projects transformation scenarios and masterfiles in the oXygen project file with the following functionality:
+- Will try to preserve manually added entries in the transformation scenarios and masterfiles
+- Will remove non existing masterfiles or masterfiles that start with a '_'
+- No masterfiles / scenarios will be added if their path match with oXygens hidden directory patterns

package/index.js

@@ -50,7 +50,7 @@ global._paths = {
   appconfig: findUp.sync(appname+'-appconfig.json'),
   repo: findUp.sync(dir => fs.existsSync(path.join(dir, '.git')) && dir, {type: 'directory'}) || '',
   tdi: 'tangelo-default-implementation',
-  gitremote: 'bitbucket.org/tangelosoftware'
+  gitremote: 'git@bitbucket.org:tangelosoftware'
 };
 _paths.repoconfig = path.join(_paths.repo, appname+'-repoconfig.json');
 _paths.apply = process.cwd().replace(_paths.repo, '').substr(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangelo/tangelo-configuration-toolkit",
-  "version": "1.5.5",
+  "version": "1.8.0-beta.0",
   "description": "Tangelo Configuration Toolkit is a command-line toolkit which offers support for developing a Tangelo configuration.",
   "bin": {
     "tct": "bin/index.js",
@@ -20,30 +20,31 @@
     "babel-core": "^6.26.3",
     "babel-preset-es2015-without-strict": "0.0.4",
     "cli-spinner": "^0.2.10",
-    "del": "^5.1.0",
+    "del": "^6.0.0",
     "event-stream": "^4.0.1",
     "find-up": "^5.0.0",
-    "fs-extra": "^9.0.1",
     "globby": "^6.1.0",
+    "fs-extra": "^10.0.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^7.0.1",
     "gulp-eol": "^0.2.0",
-    "gulp-filter": "^6.0.0",
+    "gulp-filter": "^7.0.0",
     "gulp-plumber": "^1.2.1",
     "gulp-print": "^5.0.2",
-    "gulp-sass": "^4.1.0",
+    "gulp-sass": "^5.0.0",
     "gulp-simple-rename": "^0.1.3",
-    "gulp-sourcemaps": "^2.6.5",
-    "inquirer": "^7.3.3",
-    "istextorbinary": "^5.11.0",
+    "gulp-sourcemaps": "^3.0.0",
+    "inquirer": "^8.2.0",
+    "istextorbinary": "^6.0.0",
     "minimatch": "^3.0.4",
-    "node-ssh": "^10.0.0",
+    "node-ssh": "^12.0.2",
     "object-assign-deep": "^0.4.0",
-    "replace-in-file": "^3.4.4",
+    "replace-in-file": "^6.0.0",
+    "sass": "^1.43.4",
+    "saxon-js": "^2.3.0",
     "scp2": "^0.5.0",
-    "selfupdate": "^1.1.0",
     "tiny-lr": "^2.0.0",
-    "yargs": "^16.0.3"
+    "yargs": "^16.2.0"
   },
   "repository": {
     "type": "git",

package/src/cli.js

@@ -1,10 +1,6 @@
-const fs          = require('fs-extra');
-const selfupdate  = require('selfupdate');
-const yargs       = require('yargs');
-
-
-const updateJsonFile = (path, json = {}, obj = {}) => fs.writeJsonSync(path, Object.assign(json, obj), {spaces: 2});
-
+const fs    = require('fs-extra');
+const yargs = require('yargs');
+const {getCurrentPackageVersion, getLatestPackageVersion, updatePackage} = require('./lib/npm-package-update');
 
 module.exports = function cli () {
 
@@ -17,7 +13,7 @@ module.exports = function cli () {
   .scriptName('tct')
   .usage(`${txtTitle} ${txtVersion}\n\nUsage: $0 <command> [options]`)
   .middleware(argv => { // executes before command handlers
-    if (!(['git', 'g'].includes(argv._[0]) && argv.init)) {
+    if (!(['git', 'g'].includes(argv._[0]) && (argv.init || argv.clone))) {
       if (!_paths.repo) _error('This command can only be used inside a customer git repo!');
       process.chdir(_paths.repo);
     }
@@ -30,7 +26,8 @@ module.exports = function cli () {
       init: {alias: 'i', desc: 'Create repository content structure', conflicts: ['p', 's', 'c']},
       project: {alias: 'p', desc: 'Create project configuration', conflicts: ['i', 's', 'c']},
       symlinks: {alias: 's', desc: 'Recreate symlinks to TDI', conflicts: ['p', 'i', 'c']},
-      config: {alias: 'c', desc: 'Create repo-config file', conflicts: ['p', 'i', 's'], hidden: _tdiCommit.after(_tdiCommit.stopUsingRepoconfigFile)}
+      config: {alias: 'c', desc: 'Create repo-config file', conflicts: ['p', 'i', 's'], hidden: _tdiCommit.after(_tdiCommit.stopUsingRepoconfigFile)},
+      oxygen: {alias: 'x', desc: 'Create or update oXygen project file (.xpr)', conflicts: ['p', 'i', 'c']}
     },
     handler: require('./modules/build')
   })
@@ -69,6 +66,7 @@ module.exports = function cli () {
     builder: {
       init: {alias: 'i', desc: 'Initialize repository and add submodule', conflicts: ['r']},
       reset: {alias: 'r', desc: 'Reset repository to last commit', conflicts: ['i']},
+      clone: {alias: 'c', desc: 'Clone a client repository and do basic setup'},
     },
     handler: require('./modules/git')
   })
@@ -98,6 +96,7 @@ module.exports = function cli () {
   .recommendCommands()
   .option('config', {alias: 'c', desc: 'Show loaded appconfig', global: false})
   .option('update', {alias: 'u', desc: 'Update this package', global: false})
+  .option('update-fdt', {alias: 'uf', desc: 'Update the FDT package', global: false})
   .version(false)
   .help(false)
   .example([
@@ -124,27 +123,52 @@ module.exports = function cli () {
       _write(_appconfig);
     }
 
-    if (argv.update) {
-      _info('Updating...');
-      selfupdate.update(_package, (error, version) => {
-        if (!error) updateJsonFile(_paths.appdata, _appdata, {versionLastChecked: new Date(), versionIsLatest: true});
-        _write((error||{}).message || 'Updated to version ' + version);
-      });
+    if (argv.updateTct) {
+      _info('Updating TCT...');
+      getLatestPackageVersion({package: 'TCT', version: _package.version})
+      .then(updatePackage)
+      ;
+    }
+
+    if (argv.updateFdt) {
+      _info('Updating FDT...');
+      getCurrentPackageVersion({package: 'FDT'})
+      .then(getLatestPackageVersion)
+      .then(updatePackage)
+      ;
     }
 
   }
 
 
+  let checkUpdatesDone = false;
+
   process.on('beforeExit', () => {
-    _write(); // always end with empty line
 
-    if (!argv.hasOwnProperty('update') && _appdata.versionIsLatest && new Date() - new Date(_appdata.versionLastChecked || 0) > 1000*3600*24*3) { // check every 3 days
+    if (_appdata._changed) {
+      delete _appdata._changed;
+      fs.writeJsonSync(_paths.appdata, _appdata, {spaces: 2});
+    }
+
+    _write(); // print empty line before and after update check
+
+    if (!(argv.updateTct || argv.updateFdt) && // not when doing update
+        (!_appdata.updateCheckTCT.versionAvailable || !_appdata.updateCheckFDT.versionAvailable) && // not if already known that update is available
+        ( new Date() - new Date(_appdata.updateCheckTCT.executed || 0) > 1000*3600*24*3 ||
+          new Date() - new Date(_appdata.updateCheckFDT.executed || 0) > 1000*3600*24*3
+        )  && // check every 3 days
+        !checkUpdatesDone // check if updatecheck has ran before because async calls below trigger beforeExit again
+    ) {
+      checkUpdatesDone = true;
       _info('Checking for updates...');
-      selfupdate.isUpdated(_package, (error, isUpdated) => {
-        if (!error) updateJsonFile(_paths.appdata, _appdata, {versionLastChecked: new Date(), versionIsLatest: isUpdated});
-        _write((error || isUpdated ? 'Using latest version.' : 'New version available!') + '\n');
-        process.exit(); // otherwise this event keeps being triggered
-      });
+
+      // check tct version
+      getLatestPackageVersion({package: 'TCT', version: _package.version});
+
+      // check fdt version
+      getCurrentPackageVersion({package: 'FDT'})
+      .then(getLatestPackageVersion)
+      ;
     }
   });
 

package/src/lib/gulp-batch-replace-with-filter.js

@@ -1,19 +1,19 @@
-// based on gulp-batch-replace
-
-const es = require('event-stream'), minimatch = require("minimatch"), istextorbinary = require('istextorbinary');
-
-const execReplace = (c, s, r) => Buffer.from(s instanceof RegExp ? String(c).replace(s,r) : String(c).split(s).join(r));
-
-module.exports = (arr) => {
-  return es.map((file, callback) => {
-    if(file.contents instanceof Buffer) {
-      arr.forEach(e => {
-        // exec if no glob is passed or if glob matches, and it's a text file
-        if ((!e[2] || minimatch(file.path,e[2])) && istextorbinary.isText(file.path,file)) {
-          file.contents = execReplace(file.contents, e[0], e[1]);
-        }
-      });
-    }
-    callback(null,file);
-  });
-};
+// based on gulp-batch-replace
+
+const es = require('event-stream'), minimatch = require("minimatch"), istextorbinary = require('istextorbinary');
+
+const execReplace = (c, s, r) => Buffer.from(s instanceof RegExp ? String(c).replace(s,r) : String(c).split(s).join(r));
+
+module.exports = (arr) => {
+  return es.map((file, callback) => {
+    if(file.contents instanceof Buffer) {
+      arr.forEach(e => {
+        // exec if no glob is passed or if glob matches, and it's a text file
+        if ((!e[2] || minimatch(file.path,e[2])) && istextorbinary.isText(file.path,file)) {
+          file.contents = execReplace(file.contents, e[0], e[1]);
+        }
+      });
+    }
+    callback(null,file);
+  });
+};

package/src/lib/npm-package-update.js

@@ -0,0 +1,50 @@
+const util = require('util');
+const exec = util.promisify(require('child_process').exec);
+
+
+const packageNames = {
+  TCT: '@tangelo/tangelo-configuration-toolkit',
+  FDT: '@fontoxml/fontoxml-development-tools'
+};
+
+const updateAppdata = (data) => Object.assign(_appdata, data, {_changed: true});
+
+const getCurrentPackageVersion = ({package}) => (
+  exec(`npm list -g ${packageNames[package]}`)
+  .then(r => ({package, version: r.stdout.match(/@([\d/.]+)/)[1]}))
+  .catch(e => _warn(`Failed checking current version of ${package}.`))
+);
+
+const getLatestPackageVersion = ({package, version}) => (
+  exec(`npm view -g ${packageNames[package]} version`)
+  .then(r => {
+    const versionAvailable = r.stdout.match(/([\d/.]+)/)[1];
+    if (version==versionAvailable) {
+      updateAppdata({[`updateCheck${package}`]: {executed: new Date()}});
+      _write(`Using latest version of ${package}.`);
+    }
+    else {
+      updateAppdata({[`updateCheck${package}`]: {executed: new Date(), versionAvailable}});
+      _write(`New version of ${package} available!`);
+    }
+    return {package, version, versionAvailable};
+  })
+  .catch(e => _warn(`Failed checking latest version of ${package}.`))
+);
+
+const updatePackage = ({package, version, versionAvailable}) => (
+  version!=versionAvailable &&
+  exec(`npm install -g ${packageNames[package]}`)
+  .then(r => {
+    updateAppdata({[`updateCheck${package}`]: {versionAvailable: null}});
+    _write(`Updated ${package} to version ${versionAvailable}.`);
+  })
+  .catch(e => _warn(`Failed updating latest version of ${package}.`))
+);
+
+
+module.exports = {
+  getCurrentPackageVersion,
+  getLatestPackageVersion,
+  updatePackage
+};

package/src/modules/build/index.js

@@ -1,9 +1,9 @@
 const fs        = require('fs-extra');
 const globby    = require('globby');
 const inquirer  = require('inquirer');
+const oxygen    = require('./oxygen');
 const path      = require('path');
 
-
 const createSymlink = (t, p, desc) => {
   const up = p.replace(/[^/]+/g, '..').replace(/^..\//, '');
   fs.symlink(path.join(up, _paths.tdi, t), p, 'dir', err => {
@@ -109,8 +109,9 @@ module.exports = function build (argv) {
       _repoconfig.update({customer, projects, applink: 'None'});
 
       _write(`\nFile '${_paths.repoconfig}' has been created.`);
-      _write('Check if contents was generated correctly!');
+      _repoconfig.projects
     });
   }
 
+  if (argv.oxygen) oxygen();
 };

package/src/modules/build/oxygen.js

@@ -0,0 +1,160 @@
+const fs      = require('fs-extra');
+const globby  = require('globby');
+const path    = require('path');
+const SaxonJS = require('saxon-js');
+
+const spConfigPath  = path.join(_paths.repo, _paths.tdi, 'tct/build/oxygen/stylesheetPaths.json');
+const sefFilePath   = path.join(_paths.repo, _paths.tdi, 'tct/build/oxygen/createProjectFile.sef.json');
+const cmscustomPath = 'config/cmscustom/';
+const siteStylesheetsPath = 'config/txp/site-stylesheets/';
+
+const masterFiles = new Set;
+const transformationScenarios = [];
+  
+const createProjectFile = (config) => {
+  _info('Initializing xpr file(s):');
+  const xprFiles = globby.sync(`*.xpr`);
+
+  // Copy xpr file from TDI if it does not exists yet;
+  if (xprFiles[0]) _write(`Found: ${xprFiles.join(', ')}`);
+  else {
+    const customers = new Set;
+    _repoconfig.forEach(p => customers.add(p.customer_name));
+    xprFiles.push([...customers].join(' - ') + '.xpr');
+    fs.copySync(path.join(_paths.repo,'tangelo-default-implementation/src/[customer].xpr'), path.join(_paths.repo, xprFiles[0]));
+    _write(`Created: '${xprFiles[0]}'`);
+  }
+
+  // Search for transformationScenarios/masterfiles based on TDI submodule oxygenProjectFile config
+  _info('\nSearching for transformationScenarios/masterfiles');
+  config.oxygenProjectFile.forEach(
+    pf => {
+      // Collect transformation scenarios and add them to the transformationScenarios array; add individual stylesheets to the masterFiles set.
+      if      (pf.transformation) getTransformations(pf.transformation);
+      // Add files to the masterfiles set.
+      else if (pf.masterfile)     getMasterfiles(pf.masterfile);
+    }
+  );
+  
+  // update all .xpr files with collected transformation scenarios and masterfiles.
+  transformXprFile(xprFiles);
+};
+
+const getTransformations = (config) => {
+  _repoconfig.forEach(rc => {
+    // get pathname of customer/project
+    const [customerPath, projectPath] = config.location == 'database' ? rc.path_dbconfig : rc.path_cmscustom;
+
+    // set pathname of customer/project in location glob-expression 
+    const location = path.join(
+    _paths.repo,
+    config.files.replace(/\[customer\]/, customerPath).replace(/\[project\]/, projectPath)
+      );
+
+    globby
+    .sync(`${location}`)
+    .forEach(f => {
+      // extract baseStrings from file
+      const baseStrings = fs.readFileSync(f).toString().match(RegExp(config.extracts.base, 'gm'));
+
+      if (baseStrings) {
+        baseStrings.forEach(s => {
+          // extract type, name, files info from baseString
+          const type = config.extracts.type ? s.match(RegExp(config.extracts.type))[1] : config.values.type;
+          const name = config.extracts.name ? s.match(RegExp(config.extracts.name))[1] : config.values.name;
+          const files = s.match(RegExp(config.extracts.files))[1];
+          
+          // Add transformation scenario to the transformationScenario array
+          transformationScenarios.push({
+            name: `${type}: ${name} (${rc.customer_name}, ${rc.project_name})`, // note that in createProjectFile.xsl a regex is added that matches scenarios based on this name. This to preserve manually added scenarios.
+            transformationScenario: files,
+            location: config.location == 'txp' ? siteStylesheetsPath : cmscustomPath
+          });
+          
+          // Add each non-tdi stylesheet in transformation scenario to the masterFiles set
+          files.split(',').forEach(f => {
+            const filePath = `${config.location == 'txp' ? siteStylesheetsPath : cmscustomPath}${f}`;
+            if (!f.startsWith('tdi')) masterFiles.add(filePath);
+          });
+        });
+      } else {
+        _write(`No transformation scenarios found in ${f} for '${config.extracts.base}'`);
+      }
+    });
+  });
+
+};
+
+
+const getMasterfiles = (config) => {
+  globby
+  .sync(`${path.join(_paths.repo, config.files)}`)
+  .forEach(cf => {
+    // Check if masterfile should be extracted from file
+    if (config.extracts) {
+      // extract baseStrings from file
+      const baseStrings = fs.readFileSync(cf).toString().match(RegExp(config.extracts.base,'gm'));
+
+      if (baseStrings) {
+        baseStrings.forEach(s => {
+          // extract (comma-separated) list of masterfiles
+          const filesString = s.match(RegExp(config.extracts.files))[1];
+          if (!filesString) _error(`No masterfiles found in '${baseString}' for '${config.extracts.files}'`);
+
+          // Add each non-tdi masterfile to the masterFiles set
+          filesString.split(',').forEach(f => {
+            if (!f.startsWith('tdi')){
+              const filePath = `${config.location == 'txp' ? siteStylesheetsPath : cmscustomPath}${f}`;
+              masterFiles.add(filePath);
+            }
+          });
+        });
+      } else {
+        _write(`No masterfiles found in ${cf} for '${config.extracts.base}'`);
+      };
+    } else { // Add synced file to masterfiles; strip path from c:/... hence it starts with config/cmscustom or config/txp/site-stylesheets
+      const filePath = config.location == 'txp' ? `${siteStylesheetsPath}${cf.split(siteStylesheetsPath)[1]}` : `${cmscustomPath}${cf.split(cmscustomPath)[1]}`;
+      masterFiles.add(filePath);
+    }
+  });
+
+};
+
+const transformXprFile = (xprFiles) => {
+  _info('\nUpdating xpr file(s):');
+  // create with: xslt3 -t -xsl:createProjectFile.xsl -export:createProjectFile.sef.json v -nogo'
+
+  xprFiles
+  .forEach(xprFile => {
+    // Transform xpr; add masterfiles and transformationScenarios as parameters of the stylesheet
+    _write(`${xprFile}\n`);
+    SaxonJS.transform({
+      stylesheetText: fs.readFileSync(sefFilePath),
+      stylesheetBaseURI: "createProjectFile.sef.json",
+      sourceFileName: path.join(_paths.repo, xprFile),
+      destination: "serialized",
+      stylesheetParams: {
+        "masterfiles": [...masterFiles],
+        "Q{}transformationScenarios": transformationScenarios
+      }
+    }, "async")
+    .then(output => {
+      // Write result of transformation to xpr file
+      fs.writeFileSync(path.join(_paths.repo, xprFile), output.principalResult);
+    })
+    .catch(e => _warn(`Failed to update: ${xprFile}\n ${e}`));
+  });
+};
+
+
+module.exports = function oxygen () {
+  // _info(`Set projects transformation scenarios and masterfiles in oXygen project file...`);
+  // _info(`- Will try to preserve manually added entries in the transformation scenarios and masterfiles`);
+  // _info(`- Will remove non existing masterfiles or masterfiles that start with a '_'\n`);
+
+  if (!fs.existsSync(spConfigPath) || !fs.existsSync(sefFilePath)) {
+    _error(`Cannot find required files in TDI submodule. Try updating TDI submodule.`);
+  }
+
+  createProjectFile(require(spConfigPath));
+};

package/src/modules/deploy/config.js

@@ -105,6 +105,8 @@ module.exports = {
 
     this.transferPatterns = [transferPattern, tdiPattern, ...this.giPatterns, '!**/*.crdownload']; // ignore patterns must come last
 
+    if (this.deliveryPack && transferPattern.includes(_paths.tdi)) this.transferPatterns.push(`${_paths.tdi}/src/database/create.sql`); // create.sql is called by tdi install
+
     // add time parameters to all xopus requests to overcome cache
     const ts = new Date().toISOString().replace(/-|:/g, '').substring(0,15);
     this.replaceStrings = [

package/src/modules/deploy/execute.js

@@ -1,8 +1,8 @@
 const fs            = require('fs-extra');
 const globby        = require('globby');
 const gulp          = require('gulp');
+const {NodeSSH}     = require('node-ssh');
 const path          = require('path');
-const ssh           = require('node-ssh');
 const through2      = require('through2');
 const {spawnSync}   = require('child_process');
 
@@ -15,7 +15,7 @@ const g_print       = require('gulp-print');
 const g_rename      = require('gulp-simple-rename');
 const g_replace     = require('../../lib/gulp-batch-replace-with-filter');
 const g_resolveIncl = require('../../lib/gulp-resolve-includes');
-const g_sass        = require('gulp-sass');
+const g_sass        = require('gulp-sass')(require('sass'));
 const g_scp         = require('../../lib/gulp-scp2-async');
 const g_sourcemaps  = require('gulp-sourcemaps');
 
@@ -63,7 +63,7 @@ const remote = {
   process() {
     if (!this.queue[0]) return;
 
-    const sshI = new ssh();
+    const sshI = new NodeSSH();
     sshI.connect(c.server.ftpConfig) // set up connection once
     .then(() => {
       this.do(sshI);
@@ -112,7 +112,9 @@ const createDeliveryPack = () => { // create install scripts if necessary, zip o
     _info('PowerShell script for database install created');
   }
 
-  spawnSync('powershell.exe', [`Compress-Archive -Path * -DestinationPath ../${c.deliveryPackName}`], {cwd: c.server.remotedir});
+  const result = spawnSync('powershell.exe', [`Compress-Archive -Path * -DestinationPath ../${c.deliveryPackName}`], {cwd: c.server.remotedir});
+  if (result.stderr!='') {_warn(`\nLong paths may cause zip-creation to fail; Try to set a short remotedir, for example 'C:/deliveryPacks'.`);_error(`${result.stderr}\n`);}
+
   fs.removeSync(c.server.remotedir);
   _info(`Zipped package as: ${c.deliveryPackName}`);
 };

package/src/modules/fonto/commands.js

@@ -3,7 +3,7 @@ const fs      = require('fs-extra');
 const gulp    = require('gulp');
 const g_print = require('gulp-print');
 const path    = require('path');
-const sass    = require('gulp-sass');
+const sass    = require('gulp-sass')(require('sass'));
 const wws     = require('../../lib/worker-with-spinner');
 
 
@@ -81,7 +81,7 @@ module.exports = {
       }
       _write(version+'\n');
     })
-    .then(() => cmdExec(`fdt editor upgrade --version ${version} --remove-backup --non-interactive`))
+    .then(() => cmdExec(`fdt editor upgrade --version ${version} --non-interactive`))
     ;
   },
 

package/src/modules/git/index.js

@@ -1,4 +1,5 @@
 const {execSync, spawn} = require('child_process');
+const {chdir}   = require('process');
 const inquirer  = require('inquirer');
 const path      = require('path');
 
@@ -8,12 +9,12 @@ const cmdExec = commands => new Promise(resolve => {
   commands.forEach(([command, infoTxt], i, a) => {
     promise = promise.then(() => new Promise(resolve => {
       if (infoTxt) _info(infoTxt);
-    
+
       const log = msg => {
         const line = msg.replace(/\s+$/, ''); // remove excessive whitespace
         if (line) _write(line);
       };
-    
+
       const cmdArr = command.split(/ (.+)/);
       const cp = spawn(cmdArr[0], [cmdArr[1]], {shell: true /* fixes argument breakdown when using quotes */});
       cp.stdout.setEncoding('utf8');
@@ -32,12 +33,11 @@ const cmdExec = commands => new Promise(resolve => {
   })
 });
 
-
 module.exports = function git (argv) {
-  
+
   if (argv.hasOwnProperty('init')) {
-    const remoteTdiUrl = `https://${_paths.gitremote}/${_paths.tdi}.git`;
-    const branches = 
+    const remoteTdiUrl = `${_paths.gitremote}/${_paths.tdi}.git`;
+    const branches =
       execSync('git ls-remote --heads ' + remoteTdiUrl)
       .toString()
       .match(/refs\/heads\/\S+/g)
@@ -71,7 +71,7 @@ module.exports = function git (argv) {
       });
     });
   }
-  
+
   if (argv.hasOwnProperty('reset')) {
     _info('Reset and clean repo:');
     cmdExec([
@@ -80,4 +80,31 @@ module.exports = function git (argv) {
     ]);
   }
 
+  if (argv.hasOwnProperty('clone')) {
+    _info('Clone a client repository and do basic project initialization');
+    cmdExec([
+      // Clone repository
+      ['git clone git@bitbucket.org:tangelosoftware/' + argv.clone + '.git']
+    ])
+    .then(() => {
+      // Change directory for the next commands, it should have the same name as the clone argument from commandline at this point
+      chdir('./' + argv.clone);
+      cmdExec([
+        // Retrieve TDI submodule for this client
+        ['git submodule update --init', 'Fetch submodules such as TDI'],
+        // Create symlinks for TDI
+        ['tct b -s', 'Create TDI symlinks'],
+      ]);
+    }).catch((e) => {
+      // Show warnings for missing, expected, system environment variables
+      if (!process.env.GIT_SSH) {
+        _warn(`System environment variable 'GIT_SSH' is missing. (link to putty plink.exe)`);
+      }
+      if (!process.env.GIT_SSH_COMMAND) {
+        _warn(`System environment variable 'GIT_SSH_COMMAND' is missing. (link to putty plink.exe)`);
+      }
+      // continue display stack trace
+      throw e;
+    });
+  }
 };

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.');
 
-  const filter = path.join(_paths.apply, argv.filter);
+  let filter = path.join(_paths.apply, argv.filter); // Default set filter with filter added to the command argument -f
 
   const scripts =
     globby
@@ -28,10 +28,31 @@ module.exports = function migrate (argv) {
   inquirer
   .prompt([{
     message: 'Choose a migration: ', name: 'script', type: 'list', choices: scripts, pageSize: 5, loop: false
+  },{
+    message: 'Choose filter: ', name: 'filter', type: 'list', pageSize: 5, loop: false,
+    choices: [{name: `- All`, value:argv.filter},{name:'- Choose active projects',value:'projects'}],
+    when:  argv.filter === '**' // Only show this message if no custom filter was added to the command argument -f
+  },{
+    message: 'Choose active projects: ', name: 'projects', type: 'checkbox', validate: v => !!v[0],
+    choices:  _repoconfig.map(p => ({name: `${p.customer_name} ${p.project_name}`, value: p})),
+    when: (a) => a.filter === 'projects' // Only show this message if 'Choose active projects' was chosen previously
   }])
   .then(a => {
     _write();
     _info(`Working folder set to: ${_paths.repo}`);
+    
+    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 = [];
+      a.projects.forEach(p => {
+        projectFolders.push(p.path_dbconfig ? p.path_dbconfig.join('/') : (_repoconfig.customer.dirname+'/'+p.dirname));
+        // push cmscustom path if it differs from dbconfig path
+        if (p.path_dbconfig != p.path_cmscustom) projectFolders.push(p.path_cmscustom.join('/'));
+      });
+      // Set filter to chosen active documents
+      filter = projectFolders.length == 1 ? `**/${projectFolders}/**` : `**/{${projectFolders.join(',')}}/**`;      
+    }
+
     _info(`Filter applied: ${filter}`);
     _write();
     
@@ -50,5 +71,5 @@ module.exports = function migrate (argv) {
     });
 
   });
-
+    
 };