cob-cli 2.39.5 → 2.39.7

package/lib/commands/customize.js

@@ -10,12 +10,13 @@ const { Transform } = require("stream");
 const fs = require("fs-extra");
 
 const customizationsVersionsFile = "customizations.json";
+const filesToMerge = [] ; // don't move this to the copyAndMerge method; it will behave erratically
 
 /* ************************************************************************ */
 async function customize(filter, args) {
   try {
     console.log("Customize...");
-    
+
     if (args.cache && (filter || args.local || args.update)) throw new Error("\nError: ".red + " incompatible options. Use --cache as single argument\n");
     if (args.update && filter ) throw new Error("\nError: ".red + " incompatible options. Use --update without a <filter> \n");
 
@@ -28,13 +29,13 @@ async function customize(filter, args) {
       if(args.cache) {
         console.log( colors.green("\nDone"), " - All configuration were downloaded to your local cache and you can now use the --local flag for any customization" );
         // For --cache argument all work is done, just return
-        return 
+        return
       }
     }
     await applyCustomizations(customizations)
 
     console.log( colors.green("\nDone"), "\nCheck changes to your git working tree and try:" );
-    console.log( "\tcob-cli test\n" );  
+    console.log( "\tcob-cli test\n" );
   } catch (err) {
     console.error("\n", err.message);
   }
@@ -45,7 +46,7 @@ module.exports = customize;
 async function getCustomizationsList(filter, args) {
   const { xdgData } = await import("xdg-basedir");
   const cacheCustomizationsFile = path.resolve(xdgData,"cob-cli","customizations.json")
-  
+
   let customizationRepos;
   let customizationNameQuery = "customize. " + (filter ? filter : "");
   if (args.local) {
@@ -53,7 +54,7 @@ async function getCustomizationsList(filter, args) {
     if (filter) {
       customizationRepos = customizationRepos.filter(customizationRepo => customizationRepo.name.indexOf(filter) != -1)
     }
-  } else {    
+  } else {
     // Get list of relevant customizations from github
     const response = await axios.get( "https://api.github.com/search/repositories?q=" + customizationNameQuery + "+in:name+org:cob", { headers: { Accept: "application/json", "Accept-Encoding": "identity" } } )
     customizationRepos = response.data.items
@@ -64,7 +65,7 @@ async function getCustomizationsList(filter, args) {
 
   //Filter customizations according to argument flags
   let relevantRepoNames = [];
-  
+
   if (args.update) {
     // If --update then filter is existing customizations
     let customizationsVersions = {};
@@ -75,23 +76,23 @@ async function getCustomizationsList(filter, args) {
     relevantRepoNames = Object.keys(customizationsVersions)
 
   } else if (!args.cache) {
-    // Otherwise, if not --cache, asks for customizations to apply 
+    // Otherwise, if not --cache, asks for customizations to apply
     let answer = await inquirer.prompt([
       {
         type: "checkbox",
         name: "customizations",
         message: "What customization do you want to apply?",
         choices: customizationRepos.map((customizationRepo) => customizationRepo.name).sort(),
-        validate: (answers) => answers.length > 0 
+        validate: (answers) => answers.length > 0
       },
     ]);
     relevantRepoNames = answer.customizations
   }
-  
+
   //Return the full customizationRepo info for relevant repos
   return customizationRepos
-          .sort( (c1, c2) => c1.name > c2.name)
-          .filter( customizationRepo => relevantRepoNames.length == 0 || relevantRepoNames.indexOf(customizationRepo.name) >= 0);
+      .sort( (c1, c2) => c1.name > c2.name)
+      .filter( customizationRepo => relevantRepoNames.length == 0 || relevantRepoNames.indexOf(customizationRepo.name) >= 0);
 }
 
 /* ************************************************************************ */
@@ -101,11 +102,11 @@ async function downloadCustomizationFiles(customizationRepos, args) {
   const cacheDir = path.resolve(xdgData,"cob-cli")
   if (!fs.existsSync(cacheDir)) fs.mkdirSync(cacheDir, { recursive: true });
 
-  if(args.cache) { 
+  if(args.cache) {
     const cacheCustomizationsFile = path.resolve(cacheDir, "customizations.json")
     fs.writeFileSync(cacheCustomizationsFile, JSON.stringify(customizationRepos, null, 2), (err) =>  {
-        if(err) throw new Error("\nError: ".red + " problem writing " + cacheCustomizationsFile + ":", err.message);
-      }
+          if(err) throw new Error("\nError: ".red + " problem writing " + cacheCustomizationsFile + ":", err.message);
+        }
     );
   }
 
@@ -130,9 +131,9 @@ async function downloadCustomizationFiles(customizationRepos, args) {
 /* ************************************************************************ */
 async function applyCustomizations(customizationRepos) {
   console.log("\n  Applying " + customizationRepos.map( c => colors.blue(c.name)) + " customization ...");
-  
+
   const { xdgData } = await import("xdg-basedir");
-  for (let customizationRepo of customizationRepos) { 
+  for (let customizationRepo of customizationRepos) {
     const customizationDir = path.resolve( xdgData, "cob-cli", customizationRepo.name);
     const customizationFile = path.resolve( customizationDir, "customize.js");
     if (!fs.existsSync(customizationFile)) throw new Error("\nError: ".red + " no customize.js file found\n");
@@ -163,47 +164,48 @@ function copyAndMerge(customizationRepoName, source, substitutions = {}) {
   console.log("\n  Copying template files for " + colors.blue(customizationRepoName) + "...");
 
   let excludedFiles = RegExp(
-    "(" +
-    source + "/\\.git.*" +
-    "|" +
-    source + "/README.*" +
-    "|" +
-    source + "/customize.js" +
-    "|" +
-    source + ".*/node_modules/" +
-    ")"
+      "(" +
+      source + "/\\.git.*" +
+      "|" +
+      source + "/.*\\.DS_Store" +
+      "|" +
+      source + "/README.*" +
+      "|" +
+      source + "/customize.js" +
+      "|" +
+      source + ".*/node_modules/" +
+      ")"
   );
 
   // 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;
-  let filesToMerge = []
   ncp(
-    source,
-    target,
-    {
-      clobber: true,
-      filter: (src) => src.match(excludedFiles) == null,
+      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__/)) {
-          const newTmpName = target.replace(/__MERGE__/, customizationRepoName+"__MERGE__")
-          filesToMerge.push(newTmpName)
-          return newTmpName
-        };
-        
-        //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({
+          // Don't rename __MERGE__ templates, they will be handled by the merge method
+          if (target.match(/__MERGE__/)) {
+            const newTmpName = target.replace(/__MERGE__/, customizationRepoName+"__MERGE__")
+            filesToMerge.push(newTmpName)
+            return newTmpName
+          };
+
+          //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
@@ -213,67 +215,64 @@ function copyAndMerge(customizationRepoName, source, substitutions = {}) {
                 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"))
-      } else {
-        // Only run this on the last call 
-        for(let file of filesToMerge) {
-          //Allow a little time for file to be written to disk
-          setTimeout(() => mergeFiles(customizationRepoName, file), 200)
+          })
+          read.pipe(replaceVarsTransformFunction).pipe(write)
+        }
+      },
+      (error) => {
+        if(error) {
+          console.log(error.map((e) => e.message).join("\n"))
+        } else {
+          while(filesToMerge.length > 0) {
+            let file = filesToMerge.pop();
+            //Allow a little time for file to be written to disk
+            setTimeout( () => mergeFiles(customizationRepoName, file), 200)
+          }
         }
       }
-    }
   )
 }
 
 /* ************************************************************************ */
 function mergeFiles(block,mergeFile) {
-    if (!fs.existsSync(mergeFile)) {
-      //Already processed 
-      return 
-    }
+  if (!fs.existsSync(mergeFile)) {
+    //Already processed
+    return
+  }
 
-    let prodFileRexp =  new RegExp(block + "__MERGE__.");
-    let prodFile = mergeFile.replace(prodFileRexp, "");
-    let blockMark = block == undefined ? "" : block;
-    if (!fs.existsSync(prodFile)) {
-      // If prod file does not exist creates it
-      console.log("  Creating " + prodFile);
-      fs.closeSync(fs.openSync(prodFile, "w"));
-    } else {
-      fs.open(prodFile, "a+",(err, fd) => {
-        fs.fdatasync(fd /*, optional callback here */);
-      })
-      console.log("  Merging " + prodFile + " " + block);
-    }
-    let prodFileContent = fs.readFileSync(prodFile).toString();
-    let mergeFileContent = fs.readFileSync(mergeFile).toString();
-    // With comments we support JS, CSS, GROOVY
-    let startStr = "/* COB-CLI START " + blockMark + " */\n";
-    let endStr = "\n/* COB-CLI END " + blockMark + " */";
-
-    if (prodFileContent.indexOf(startStr) < 0) {
-      // If previous customization does not exist
-      prodFileContent = startStr + mergeFileContent + endStr + "\n" + prodFileContent;
-    } else {
-      // If previous customization exists
-      let beforeMerge = prodFileContent.indexOf(startStr);
-      let afterMerge = prodFileContent.indexOf(endStr) + endStr.length;
-      prodFileContent =
+  let prodFileRexp =  new RegExp(block + "__MERGE__.");
+  let prodFile = mergeFile.replace(prodFileRexp, "");
+  let blockMark = block == undefined ? "" : block;
+  if (!fs.existsSync(prodFile)) {
+    // If prod file does not exist creates it
+    console.log("  Creating " + prodFile);
+    fs.closeSync(fs.openSync(prodFile, "w"));
+  } else {
+    console.log("  Merging " + prodFile + " " + block);
+  }
+  let prodFileContent = fs.readFileSync(prodFile).toString();
+  let mergeFileContent = fs.readFileSync(mergeFile).toString();
+  // With comments we support JS, CSS, GROOVY
+  let startStr = "/* COB-CLI START " + blockMark + " */";
+  let endStr = "\n/* COB-CLI END " + blockMark + " */";
+
+  if (prodFileContent.indexOf(startStr) < 0) {
+    // If previous customization does not exist
+    prodFileContent = startStr + "\n" + mergeFileContent + endStr + "\n" + prodFileContent;
+  } else {
+    // If previous customization exists
+    let beforeMerge = prodFileContent.indexOf(startStr);
+    let afterMerge = prodFileContent.indexOf(endStr) + endStr.length;
+    prodFileContent =
         prodFileContent.substring(0, beforeMerge) +
-        startStr +
+        startStr + "\n" +
         mergeFileContent +
         endStr +
         prodFileContent.substring(afterMerge);
-    }
-    fs.writeFileSync(prodFile, prodFileContent);
+  }
+  fs.writeFileSync(prodFile, prodFileContent);
 
-    fs.unlinkSync(mergeFile);
+  fs.unlinkSync(mergeFile);
 }
 
 /* ************************************************************************ */
@@ -290,10 +289,10 @@ function updateCustomizationsVersions(customizationKey, version) {
   }
 
   fs.writeFileSync(
-    customizationsVersionsFile,
-    JSON.stringify(customizationsVersions, null, 2),
-    (err) => {
-      if (err) console.log( "Error writing " + customizationsVersionsFile + ":", err.message );
-    }
+      customizationsVersionsFile,
+      JSON.stringify(customizationsVersions, null, 2),
+      (err) => {
+        if (err) console.log( "Error writing " + customizationsVersionsFile + ":", err.message );
+      }
   );
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.39.5",
+  "version": "2.39.7",
   "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": {