@tangelo/tangelo-configuration-toolkit 1.11.2 → 1.12.1

package/src/modules/git/index.js

@@ -30,16 +30,16 @@ const cmdExec = commands => new Promise(resolve => {
   });
   promise.then(()=> {
     resolve();
-  })
+  });
 });
 
 module.exports = function git (argv) {
 
-  if (argv.hasOwnProperty('init')) {
+  if (argv.init) {
     const remoteTdiUrl = `${_paths.gitremote}/${_paths.tdi}.git`;
     let branches;
 
-    try { branches = execSync('git ls-remote --heads ' + remoteTdiUrl, {encoding: 'UTF-8'}) }
+    try { branches = execSync('git ls-remote --heads ' + remoteTdiUrl, {encoding: 'UTF-8'}); }
     catch (e) { _error(' '); } // execSync already prints an error to the console
 
     branches = branches
@@ -54,28 +54,28 @@ module.exports = function git (argv) {
       })
     ;
     inquirer
-    .prompt([{
-      message: 'Choose a branch for TDI submodule: ', name: 'branch', type: 'list',
-      choices: branches, pageSize: 3, loop: false
-    }])
-    .then(a => {
-      _write();
-      cmdExec([
-        ['git init', 'Initialize repo:'],
-        [`git remote add origin git@${_paths.gitremote.replace(/\//, ':')}/${path.basename(process.cwd())}.git`],
-        [`git submodule add -b ${a.branch} ${remoteTdiUrl}`, 'Add TDI submodule:'],
-        ['git commit -m "added tdi submodule"', 'Commit:']
-      ])
-      .then(() => {
-        _info(`Next steps:
+      .prompt([{
+        message: 'Choose a branch for TDI submodule: ', name: 'branch', type: 'list',
+        choices: branches, pageSize: 3, loop: false
+      }])
+      .then(a => {
+        _write();
+        cmdExec([
+          ['git init', 'Initialize repo:'],
+          [`git remote add origin git@${_paths.gitremote.replace(/\//, ':')}/${path.basename(process.cwd())}.git`],
+          [`git submodule add -b ${a.branch} ${remoteTdiUrl}`, 'Add TDI submodule:'],
+          ['git commit -m "added tdi submodule"', 'Commit:']
+        ])
+          .then(() => {
+            _info(`Next steps:
           1. Go to https://bitbucket.org/repo/create?workspace=tangelosoftware and create a repository named "${path.basename(process.cwd())}", with options for including README/.gitignore disabled.
           2. Open this folder in Sourcetree (ctrl+O), and push master branch to origin.
         `.replace(/^\s{8}/gm, ''));
+          });
       });
-    });
   }
 
-  if (argv.hasOwnProperty('reset')) {
+  if (argv.reset) {
     _info('Reset and clean repo:');
     cmdExec([
       ['git reset --hard'],
@@ -83,31 +83,33 @@ module.exports = function git (argv) {
     ]);
   }
 
-  if (argv.hasOwnProperty('clone')) {
+  if (argv.clone) {
+    if (argv.clone === true) _error('Pass a repository name!');
+
     _info('Clone a client repository and do basic project initialization');
     cmdExec([
       // Clone repository
       ['git clone git@bitbucket.org:tangelosoftware/' + argv.clone + '.git']
     ])
-    .then(() => {
+      .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([
+        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) => {
+          ['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;
-    });
+        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

@@ -10,78 +10,78 @@ module.exports = function migrate (argv) {
 
   const scripts =
     globby
-    .sync(_paths.tdi + '/tct/migrate/*.js')
-    .map(s => s.match(/([^\/]+)$/)[1].replace('.js', ''))
-    .sort((a, b) => {
-      const aRelease = /^\d+-\d+/.test(a), bRelease = /^\d+-\d+/.test(b);
-      if (aRelease && bRelease) return a > b ? -1 : 1;
-      if (aRelease) return -1;
-      if (bRelease) return 1;
-      return a > b ? 1 : -1;
-    })
-    .map(s => ({
-      name: s.replace(/(\d+)-(\d+)-?(.*)/, (m, p1, p2 ,p3) => `${p1} -> ${p2}${p3 ? ` (${p3})` : ''}`),
-      value: s
-    }))
+      .sync(_paths.tdi + '/tct/migrate/*.js')
+      .map(s => s.match(/([^/]+)$/)[1].replace('.js', ''))
+      .sort((a, b) => {
+        const aRelease = /^\d+-\d+/.test(a), bRelease = /^\d+-\d+/.test(b);
+        if (aRelease && bRelease) return a > b ? -1 : 1;
+        if (aRelease) return -1;
+        if (bRelease) return 1;
+        return a > b ? 1 : -1;
+      })
+      .map(s => ({
+        name: s.replace(/(\d+)-(\d+)-?(.*)/, (m, p1, p2, p3) => `${p1} -> ${p2}${p3 ? ` (${p3})` : ''}`),
+        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,
-    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'}],
-    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 (cmdlScript) {
+    .prompt([{
+      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'}],
+      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 (cmdlScript) {
       // Set script to execute to script entered in commandline
-      a.script = cmdlScript.value;
-    }
+        a.script = cmdlScript.value;
+      }
 
-    if (a.filter === 'projects' && _repoconfig.length > a.projects.length) {
+      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.join('/') != p.path_cmscustom.join('/')) projectFolders.push(p.path_cmscustom.join('/'));
-      });
-      // Set filter to chosen active documents
-      filter = projectFolders.length == 1 ? `**/${projectFolders}/**` : `**/{${projectFolders.join(',')}}/**`;      
-    }
-
-    _info(`Filter applied: ${filter}`);
-    _write();
-    
-    inquirer
-    .prompt([{message: 'Continue?', name: 'confirm', type: 'confirm'}])
-    .then(({confirm}) => {
-      if (!confirm) return;
+        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.join('/') != p.path_cmscustom.join('/')) projectFolders.push(p.path_cmscustom.join('/'));
+        });
+        // Set filter to chosen active documents
+        filter = projectFolders.length == 1 ? `**/${projectFolders}/**` : `**/{${projectFolders.join(',')}}/**`;
+      }
 
+      _info(`Filter applied: ${filter}`);
       _write();
-      const startTime = new Date();
-      
-      const scriptPath = path.join(_paths.repo, _paths.tdi, 'tct/migrate', a.script);
-      require(scriptPath).forEach(step => require('./steps')(step, argv.dry, filter));
-      
-      _perf(startTime);
+
+      inquirer
+        .prompt([{message: 'Continue?', name: 'confirm', type: 'confirm'}])
+        .then(({confirm}) => {
+          if (!confirm) return;
+
+          _write();
+          const startTime = new Date();
+
+          const scriptPath = path.join(_paths.repo, _paths.tdi, 'tct/migrate', a.script);
+          require(scriptPath).forEach(step => require('./steps')(step, argv.dry, filter));
+
+          _perf(startTime);
+        });
+
     });
 
-  });
-    
 };

package/src/modules/migrate/steps.js

@@ -2,14 +2,14 @@ const fs        = require('fs-extra');
 const globby    = require('globby');
 const minimatch = require('minimatch');
 const path      = require('path');
-const rif      = require('replace-in-file');
+const rif       = require('replace-in-file');
 
 
 const getPaths = (search, filter) =>
   globby
-  .sync(search, {dot: true, ignore: [_paths.tdi + '/**','**/cmscustom/tdi/**']})
-  .filter(p => !filter || minimatch(p, filter)
-);
+    .sync(search, {dot: true, ignore: [_paths.tdi + '/**', '**/cmscustom/tdi/**']})
+    .filter(p => !filter || minimatch(p, filter)
+    );
 
 
 module.exports = function steps (step, dry, filter) {
@@ -17,6 +17,10 @@ module.exports = function steps (step, dry, filter) {
   const {deletePaths, renamePaths, replaceInFiles, customAction, applyFilter = true} = step;
   const setFilter = applyFilter && filter;
 
+  if (Array.isArray(step)) {
+    step.forEach(substep => require('./steps')(substep, dry, filter));
+  }
+
   if (deletePaths) {
     deletePaths.forEach(curpath => {
       _info(`Deleting paths: ${curpath}`);
@@ -48,9 +52,10 @@ module.exports = function steps (step, dry, filter) {
       }
 
       let filesModCount = 0;
-      for (let i=0; i<20 && !dry && r.files[0]; i++) { // execute repeatedly for modified files only (with safety limit of 20)
+      for (let i=0; i<20 && r.files[0]; i++) { // execute repeatedly for modified files only (with safety limit of 20)
         r.files = rif.sync(r).filter(f => f.hasChanged).map(f => f.file);
         if (i==0) filesModCount = r.files.length; // save count only after first run (after this only subsets are processed)
+        if (dry) break;
       }
 
       _write('Files modified:', filesModCount);
@@ -59,7 +64,7 @@ module.exports = function steps (step, dry, filter) {
 
   if (!dry && customAction) {
     customAction.forEach(([dirpath, actionFn]) => {
-      getPaths(dirpath,setFilter).forEach(p => actionFn(p));
+      getPaths(dirpath, setFilter).forEach(p => actionFn(p));
     });
   }
 

package/src/modules/sql/index.js

@@ -6,7 +6,7 @@ const inquirer    = require('inquirer');
 
 const runSqlScript = (path, db, un, pw) => {
   const connect = db ? `${un}/${pw}@${db}` : '/nolog';
-  const [dir, script] = path.split(/\/([^\/]+)$/);
+  const [dir, script] = path.split(/\/([^/]+)$/);
   _info('Running in new window:');
   _write(path);
   if (!fs.existsSync(path)) _error('Path does not exist!');
@@ -20,35 +20,35 @@ const checkLog = (logFilePath, remove=true) => {
     // Check for ORA- error messages
     if (logFile.match(RegExp(`ORA-`, 'gm'))) {
       // Select each ORA- error message and up to 6 lines before (the lines before may not contain ORA- themselves)
-      const errors = logFile.match(RegExp(`((?![^\n]*ORA-)[^\n]*\n){0,6}ORA-[^\n\r]*`,`gms`));
-      _info(`${errors.length} error(s) during SQL script:\n`)
+      const errors = logFile.match(RegExp(`((?![^\n]*ORA-)[^\n]*\n){0,6}ORA-[^\n\r]*`, `gms`));
+      _info(`${errors.length} error(s) during SQL script:\n`);
       // Print each error + lines before:
       errors.forEach((e, i) => {
-        _info(`Tail of error ${i+1}:\n`)
+        _info(`Tail of error ${i+1}:\n`);
         _warn(`${e.trim()}\n`);
-      })
+      });
     }
     if (remove) {
       // remove log file
       fs.removeSync(logFilePath);
     }
   }
-}
+};
 
 module.exports = function sql (argv) {
 
-  if ((argv.install || argv.configure) && _git.commitLocal.date < _git.commitRemote.date) {
-    _warn(`You're not deploying from the most recent git commit!\n`)
+  if ((argv.install || argv.configure) && _git.commitLocal().date < _git.commitRemote().date) {
+    _warn(`You're not deploying from the most recent git commit!\n`);
   }
 
   if (argv.install) {
     // tdi
     const dir = `${_paths.tdi}/${_isPre51 ? 'sources' : 'src'}/database/tdi/${_isPre42 ? 'install/' : ''}`;
     runSqlScript(dir + 'install.sql');
-    checkLog(dir + 'tdi-install.log',false);
+    checkLog(dir + 'tdi-install.log', false);
     // custom
     runSqlScript('database/install.sql');
-    checkLog('database/install.log',false);
+    checkLog('database/install.log', false);
   }
 
   if (argv.configure) {
@@ -58,38 +58,38 @@ module.exports = function sql (argv) {
       const file  = cwd + 'tmp-config-loader.sql';
 
       inquirer
-      .prompt([
-        {
-          message: 'Choose projects: ', name: 'projects', type: 'checkbox', validate: v => !!v[0],
-          choices:
+        .prompt([
+          {
+            message: 'Choose projects: ', name: 'projects', type: 'checkbox', validate: v => !!v[0],
+            choices:
             _repoconfig.projects
-            ? _repoconfig.projects.map(p => ({name: p.name, value: p})) // when using repoconfig file (old)
-            : _repoconfig.map(p => ({name: `${p.customer_name} ${p.project_name}`, value: p}))
-        },
-        {message: 'Database TNS name: ', name: 'db', default: _appconfig.defaultDatabase},
-        {message: 'TANCMS password: ', name: 'pw', default: 'tancms'}
-      ])
-      .then(a => {
-        _write();
-
-        const script = [`define l_env = ${a.pw=='tancms' ? 'dev' : 'prd'}`, 'set verify off define off'];
-
-        script.push(`spool install-config.log`);
-        a.projects.forEach(p => {
-          const dir = p.path_dbconfig ? p.path_dbconfig.join('/') : (_repoconfig.customer.dirname+'/'+p.dirname);
-          script.push('prompt ', `prompt Loading configuration for: ${p.name}`);
-          script.push(...globby.sync(`${dir}/*_install.sql`, {cwd}).map(s => `@${s}`));
+              ? _repoconfig.projects.map(p => ({name: p.name, value: p})) // when using repoconfig file (old)
+              : _repoconfig.map(p => ({name: `${p.customer_name} ${p.project_name}`, value: p}))
+          },
+          {message: 'Database TNS name: ', name: 'db', default: _appconfig.defaultDatabase},
+          {message: 'TANCMS password: ', name: 'pw', default: 'tancms'}
+        ])
+        .then(a => {
+          _write();
+
+          const script = [`define l_env = ${a.pw=='tancms' ? 'dev' : 'prd'}`, 'set verify off define off'];
+
+          script.push(`spool install-config.log`);
+          a.projects.forEach(p => {
+            const dir = p.path_dbconfig ? p.path_dbconfig.join('/') : (_repoconfig.customer.dirname+'/'+p.dirname);
+            script.push('prompt ', `prompt Loading configuration for: ${p.name}`);
+            script.push(...globby.sync(`${dir}/*_install.sql`, {cwd}).map(s => `@${s}`));
+          });
+
+          script.push(`spool off`);
+          script.push('prompt ', 'pause Press ENTER to exit', 'exit');
+
+          fs.writeFileSync(file, script.join('\n'));
+          runSqlScript(file, a.db, 'tancms', a.pw);
+          fs.removeSync(file);
+          checkLog(cwd + 'install-config.log');
         });
 
-        script.push(`spool off`);
-        script.push('prompt ', 'pause Press ENTER to exit', 'exit');
-
-        fs.writeFileSync(file, script.join('\n'));
-        runSqlScript(file, a.db, 'tancms', a.pw);
-        fs.removeSync(file);
-        checkLog(cwd + 'install-config.log');
-      });
-
     }
     else _error('No projects defined in repo config!');