cob-cli 2.38.2 → 2.39.1

package/bin/cob-cli.js

@@ -11,6 +11,7 @@ const customize        = require("../lib/commands/customize");
 const test             = require("../lib/commands/test");
 const deploy           = require("../lib/commands/deploy");
 const updateFromServer = require("../lib/commands/updateFromServer");
+const getDefs          = require("../lib/commands/getDefs");
 const { upgradeRepo }  = require("../lib/commands/upgradeRepo");
 
 /*******************************************/
@@ -78,4 +79,10 @@ program
     .description('Upgrade current repository to the last cob-cli version structure')
     .action( upgradeRepo );
     
+program
+    .command('getDefs')
+    .option('-e --environment <name>', 'environment to use')
+    .description('Updates local copy with definitions on server')
+    .action( getDefs );
+    
 program.parse(process.argv);

package/lib/commands/customize.js

@@ -7,7 +7,6 @@ const axios = require("axios");
 const git = require("simple-git");
 const ncp = require("ncp");
 const { Transform } = require("stream");
-const fg = require("fast-glob");
 const fs = require("fs-extra");
 
 const customizationsVersionsFile = "customizations.json";
@@ -151,7 +150,7 @@ async function applyCustomizations(customizationRepos) {
       await customization.actions(customizationRepo.name, answers, copyAndMerge);
     } else {
       // Default actions
-      await copyAndMerge(customizationRepo.name, customizationDir, answers);
+      copyAndMerge(customizationRepo.name, customizationDir, answers);
     }
 
     // Update customizations.json file
@@ -160,7 +159,7 @@ async function applyCustomizations(customizationRepos) {
 }
 
 /* ************************************************************************ */
-async function copyAndMerge(customizationRepoName, source, substitutions = {}) {
+function copyAndMerge(customizationRepoName, source, substitutions = {}) {
   console.log("\n  Copying template files for " + colors.blue(customizationRepoName) + "...");
 
   let excludedFiles = RegExp(
@@ -178,62 +177,54 @@ async function copyAndMerge(customizationRepoName, source, substitutions = {}) {
   // Source is on cob-cli customizationRepo and Destination on the server repo
   const target = process.cwd() // Always copy to directory where command is being executed, ie, the root directory of the server repo
   const substitutionRegex = /__(((?!word).)*)__/g;
-  return new Promise((resolve, reject) => {  
-    ncp(
-      source,
-      target,
-      {
-        clobber: true,
-        filter: (src) => src.match(excludedFiles) == null,
-        rename: function(target) {
-          // Don't rename __MERGE__ templates, they will be handled by the merge method
-          if (target.match(/__MERGE__/)) return target;
-          
-          //get finalTarget from target with any existing substitution
-          const finalTarget = target.replace(substitutionRegex, (match,g1) => substitutions[g1] ? substitutions[g1] : match);
-          
-          //if the directory of finalTarget doesn't exists it means that a replacement ocurred on the dirpath (ie, there was a /__.+__/ was on the dirpath), in which case we need to create the desired directory and remove the one just created by ncp
-          if (!fs.existsSync(path.dirname(finalTarget))) {
-            fs.mkdirSync(path.dirname(finalTarget), { recursive: true })
-            fs.rmdirSync(target.substring(0,target.lastIndexOf("__")+2), { recursive: true,force: false }) //NOTE: won't handle more than 1 substitution on the same dirpath
-          }
-          return finalTarget;
-        },
-        transform(read, write) {
-          const replaceVarsTransformFunction = new Transform({
-              transform: (chunk, encoding, done) => {
-                if(/\ufffd/.test(chunk) === true) {
-                  // If chunk is binary don't change anything
-                  done(null, chunk)
-                } else {
-                  // Otherwise change any existing substitution
-                  done(null,chunk.toString().replace(substitutionRegex, (match,g1) => substitutions[g1] ? substitutions[g1] : match))
-                }
-              }
-          })
-          read.pipe(replaceVarsTransformFunction).pipe(write)
+  ncp(
+    source,
+    target,
+    {
+      clobber: true,
+      filter: (src) => src.match(excludedFiles) == null,
+      rename: function(target) {
+        // Don't rename __MERGE__ templates, they will be handled by the merge method
+        if (target.match(/__MERGE__/)) {
+          setTimeout(()=>mergeFiles(customizationRepoName, target),200)
+          return target
+        };
+        
+        //get finalTarget from target with any existing substitution
+        const finalTarget = target.replace(substitutionRegex, (match,g1) => substitutions[g1] ? substitutions[g1] : match);
+        
+        //if the directory of finalTarget doesn't exists it means that a replacement ocurred on the dirpath (ie, there was a /__.+__/ was on the dirpath), in which case we need to create the desired directory and remove the one just created by ncp
+        if (!fs.existsSync(path.dirname(finalTarget))) {
+          fs.mkdirSync(path.dirname(finalTarget), { recursive: true })
+          fs.rmdirSync(target.substring(0,target.lastIndexOf("__")+2), { recursive: true,force: false }) //NOTE: won't handle more than 1 substitution on the same dirpath
         }
+        return finalTarget;
       },
-      async (error) => {
-        // If no error occurred then proced with merging files
-        if(!error) {
-          await mergeFiles(customizationRepoName);
-          resolve();
-        } else {
-          reject(error.map((e) => e.message).join("\n"))
-        }
+      transform(read, write) {
+        const replaceVarsTransformFunction = new Transform({
+            transform: (chunk, encoding, done) => {
+              if(/\ufffd/.test(chunk) === true) {
+                // If chunk is binary don't change anything
+                done(null, chunk)
+              } else {
+                // Otherwise change any existing substitution
+                done(null,chunk.toString().replace(substitutionRegex, (match,g1) => substitutions[g1] ? substitutions[g1] : match))
+              }
+            }
+        })
+        read.pipe(replaceVarsTransformFunction).pipe(write)
       }
-    )
-  });
+    },
+    (error) => {
+      if(error) {
+        console.log(error.map((e) => e.message).join("\n"))
+      }
+    }
+  )
 }
 
 /* ************************************************************************ */
-async function mergeFiles(block) {
-  const mergeFiles = await fg(["**/*.__MERGE__.*"], {
-    onlyFiles: false,
-    dot: true,
-  });
-  for (let mergeFile of mergeFiles) {
+function mergeFiles(block,mergeFile) {
     let prodFile = mergeFile.replace(/\.__MERGE__/, "");
     let blockMark = block == undefined ? "" : block;
     if (!fs.existsSync(prodFile)) {
@@ -266,7 +257,6 @@ async function mergeFiles(block) {
     fs.writeFileSync(prodFile, prodFileContent);
 
     fs.unlinkSync(mergeFile);
-  }
 }
 
 /* ************************************************************************ */

package/lib/commands/getDefs.js

@@ -0,0 +1,20 @@
+require('colors');
+const { getCurrentCommandEnviroment } = require("../task_lists/common_enviromentHandler");
+const { checkRepoVersion } = require("../commands/upgradeRepo");
+const path = require('path');
+const spawn = require('child_process').spawn;
+
+async function getDefs(args) {
+    try {
+        checkRepoVersion()
+        const cmdEnv = await getCurrentCommandEnviroment(args)
+
+        console.log(`Getting definitions from ${cmdEnv.serverStr} to branch ${cmdEnv.branchStr} ...` );
+        const getDefs = spawn(path.resolve(__dirname,"..","task_lists","getDefs.sh"),[cmdEnv.server, cmdEnv.name, path.resolve(__dirname) ]) 
+        getDefs.stdout.on('data', function (data) { console.log("  " + data.toString()); });
+        getDefs.on('exit', function () { console.log('Done!'); });
+    } catch(err) {
+        console.error("\n",err.message);
+    }
+}
+module.exports = getDefs;

package/lib/task_lists/getDefs.sh

@@ -0,0 +1,19 @@
+IFS=$'\n'
+SERVER=${1}
+ENVIRONMENT=${2}
+COBCLIPATH=${3}
+
+echo "mkdir -p recordm/definitions/\\c"
+mkdir -p recordm/definitions/
+
+echo "rm -f recordm/definitions/$ENVIRONMENT\\c"
+rm -f recordm/definitions/$ENVIRONMENT/*
+
+DIR=recordm/definitions/$ENVIRONMENT
+echo "mkdir -p $DIR"
+mkdir -p $DIR
+
+for def in $(ssh $SERVER "curl -sS -b ~/.cob-cookie http://localhost:40280/recordm/definitions" | jq .[] -c | node $COBCLIPATH/../../node_modules/cmd-line-importer/processor.js --transformer "JSON.stringify([entry.id,entry.name])"); do 
+    echo " getting def: $def ...\\c"
+    ssh $SERVER "curl -sS -b ~/.cob-cookie http://localhost:40280/recordm/definitions/$(echo $def | jq '.[0]')" | jq --sort-keys . | grep -v "\"defaultValue\":" > $DIR/$(echo $def | jq .[1] | tr -d '"').json    
+done

package/lib/task_lists/test_otherFilesContiousReload.js

@@ -64,7 +64,6 @@ async function otherFilesContiousReload(cmdEnv) {
         ignoreInitial: true
     });
     watcher.process.on('all', async (eventType, changedFile) => {
-        console.log(eventType, changedFile);
         // Não é preciso fazer nada para directorias que só existem no servidor
         let product = changedFile.split("/")[0];
         let productDir = resolveCobPath(cmdEnv.server, "serverLive", product).split(":")[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.38.2",
+  "version": "2.39.1",
   "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,6 +18,7 @@
   "dependencies": {
     "@webpack-cli/serve": "^2.0.1",
     "axios": "^0.21.1",
+    "cmd-line-importer": "^1.0.0",
     "colors": "^1.4.0",
     "commander": "^5.1.0",
     "concurrently": "^5.3.0",