cob-cli 2.32.0 → 2.33.1

package/lib/commands/customize.js

@@ -1,7 +1,7 @@
 const inquirer = require('inquirer');
 const colors = require("colors");
 const path = require("path");
-const { checkVersion } = require("./upgradeRepo");
+const { checkRepoVersion } = require("./upgradeRepo");
 const { checkWorkingCopyCleanliness } = require("../task_lists/common_helpers");
 const axios = require("axios");
 const git = require("simple-git");
@@ -16,23 +16,26 @@ const customizationsVersionsFile = "customizations.json";
 async function customize(filter, args) {
   try {
     console.log("Customize...");
-    if (!args.cache) checkVersion();
-    if (!args.force && !args.cache) await checkWorkingCopyCleanliness();
-
-    if (args.cache) {
-      await cacheAllCustomizations(filter, args);
-  
-    } else if (args.update) {
-      await updatePreviouslyAppliedCostumizations(filter, args);
-
-    } else {
-      const customizationRepo = await getCustomizationRepo(filter, args);
-      await applyCustomization(customizationRepo, args);
-  
-      console.log( colors.green("\nDone"), "\nCheck changes to your git working tree and try:" );
-      console.log( "\tcob-cli test\n" );
+    
+    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");
+
+    if (!args.cache) checkRepoVersion();
+    if (!args.cache && !args.force) await checkWorkingCopyCleanliness();
+
+    const customizations = await getCustomizationsList(filter, args)
+    if(!args.local) {
+      await downloadCustomizationFiles(customizations,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 
+      }
     }
+    await applyCustomizations(customizations)
 
+    console.log( colors.green("\nDone"), "\nCheck changes to your git working tree and try:" );
+    console.log( "\tcob-cli test\n" );  
   } catch (err) {
     console.error("\n", err.message);
   }
@@ -40,50 +43,7 @@ async function customize(filter, args) {
 module.exports = customize;
 
 /* ************************************************************************ */
-async function updatePreviouslyAppliedCostumizations(filter, args) {
-  if (filter || args.cache) {
-    throw new Error("\nError: ".red + " incompatible options. Use of --update with filter or --cache.\n");
-  }
-  console.log("Updating all installed customizations...");
-
-  let customizationsVersions = {};
-  if(fs.existsSync(customizationsVersionsFile)) {
-    const customizationsVersionsRawData = fs.readFileSync(customizationsVersionsFile);
-    customizationsVersions = JSON.parse(customizationsVersionsRawData);
-  }
-
-  const customizationRepos = await getCustomizationRepo(null, args);  
-  for (let customizationRepo of customizationRepos) {
-    if(customizationsVersions[customizationRepo.name]) {
-      await applyCustomization(customizationRepo, args);
-    }
-  }
-}
-
-/* ************************************************************************ */
-async function cacheAllCustomizations(filter, args) {
-  if (filter || args.local || args.update) {
-    throw new Error("\nError: ".red + " incompatible options. Use --cache as single argument\n");
-  }
-  
-  console.log("Caching all customizations...");
-  const customizationRepos = await getCustomizationRepo(null, args);  
-  for (let customizationRepo of customizationRepos) {
-    await downloadCustomizationFiles(customizationRepo);
-  }
-
-  const { xdgData } = await import("xdg-basedir");
-  const cacheCustomizationsFile = path.resolve(xdgData, "cob-cli", "customizations.json")
-  fs.writeFileSync(cacheCustomizationsFile,
-    JSON.stringify(customizationRepos, null, 2),
-    (err) =>  {
-      if(err) throw new Error("\nError: ".red + " problem writing " + cacheCustomizationsFile + ":", err.message);
-    }
-  );
-}
-
-/* ************************************************************************ */
-async function getCustomizationRepo(filter, args) {
+async function getCustomizationsList(filter, args) {
   const { xdgData } = await import("xdg-basedir");
   const cacheCustomizationsFile = path.resolve(xdgData,"cob-cli","customizations.json")
   
@@ -100,100 +60,108 @@ async function getCustomizationRepo(filter, args) {
     customizationRepos = response.data.items
   }
 
-  //If the goal is to cache or update customizations just return all customizations
-  if (args.cache || args.update) {
-    return customizationRepos;
-  } 
-
-
   // Throw error if there's no customization
   if (customizationRepos.length == 0) throw new Error("\nError: ".red + " no customization found\n");
+
+  //Filter customizations according to argument flags
+  let relevantRepoNames = [];
   
-  // Otherwise asks for customization to apply
-  let answer = await inquirer.prompt([
-    {
-      type: "list",
-      name: "customization",
-      message: "What customization do you want to apply?",
-      choices: customizationRepos.map((customizationRepo) => customizationRepo.name).sort(),
-    },
-  ]);
+  if (args.update) {
+    // If --update then filter is existing customizations
+    let customizationsVersions = {};
+    if(fs.existsSync(customizationsVersionsFile)) {
+      const customizationsVersionsRawData = fs.readFileSync(customizationsVersionsFile);
+      customizationsVersions = JSON.parse(customizationsVersionsRawData);
+    }
+    relevantRepoNames = Object.keys(customizationsVersions)
 
-  //Return the full customizationRepo info
-  return customizationRepos.find((customizationRepo) => customizationRepo.name == answer.customization);
+  } else if (!args.cache) {
+    // 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 
+      },
+    ]);
+    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);
 }
 
 /* ************************************************************************ */
-async function downloadCustomizationFiles(customizationRepo) {
+async function downloadCustomizationFiles(customizationRepos, args) {
   const { xdgData } = await import("xdg-basedir");
   const baseDir = process.cwd();
   const cacheDir = path.resolve(xdgData,"cob-cli")
   if (!fs.existsSync(cacheDir)) fs.mkdirSync(cacheDir, { recursive: true });
 
-  process.chdir(cacheDir);
-  if (!fs.existsSync(path.resolve(cacheDir,customizationRepo.name))) {
-    console.log("  git clone " + customizationRepo.clone_url);
-    await git().clone(customizationRepo.clone_url);
-  } else {
-    console.log("  git pull " + customizationRepo.clone_url);
-    process.chdir(customizationRepo.name);
-    try {
-      await git().pull();
-    } catch (error) { }
+  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);
+      }
+    );
+  }
+
+  for (const customizationRepo of customizationRepos) {
+    process.chdir(cacheDir);
+    if (!fs.existsSync(path.resolve(cacheDir,customizationRepo.name))) {
+      console.log("  git clone " + customizationRepo.clone_url);
+      await git().clone(customizationRepo.clone_url);
+
+    } else {
+      console.log("  git pull " + customizationRepo.clone_url);
+      process.chdir(customizationRepo.name);
+      try {
+        await git().pull();
+      } catch (error) { }
+    }
   }
   process.chdir(baseDir);
+
 }
 
 /* ************************************************************************ */
-async function applyCustomization(customizationRepo, args) {
-  console.log("\nApplying " + customizationRepo.name + " customization ...");
-
-  // Get customization info from convention defined file (customize.js)
-  if (!args.local) await downloadCustomizationFiles(customizationRepo);
+async function applyCustomizations(customizationRepos) {
+  console.log("\n  Applying " + customizationRepos.map( c => colors.blue(c.name)) + " customization ...");
   
   const { xdgData } = await import("xdg-basedir");
-  const customizationPath = path.resolve( xdgData, "cob-cli", customizationRepo.name);
-  const customizationFile = path.resolve( customizationPath, "customize.js");
-  if (!fs.existsSync(customizationFile))
-    throw new Error("\nError: ".red + " no customize.js file found\n");
+  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");
 
-  let customization = (await import(customizationFile)).default;
+    let customization = (await import(customizationFile)).default;
 
-  // Asks questions, if configuration exists
-  let answers = {};
-  if (customization.questions) {
-    answers = await inquirer.prompt(customization.questions);
-  }
+    // Asks questions, if question configuration exists
+    let answers = {};
+    if (customization.questions) {
+      answers = await inquirer.prompt(customization.questions);
+    }
 
-  // Apply specific customization, if it exists, otherwise use default actions
-  if (customization.actions) {
-    customization.actions(customizationRepo.name, answers, copyAndMerge);
-  } else {
-    // Default actions
-    await copyAndMerge(customizationRepo.name, answers);
-  }
+    // Apply specific customization, if actions exist, otherwise use default actions
+    if (customization.actions) {
+      customization.actions(customizationRepo.name, answers, copyAndMerge);
+    } else {
+      // Default actions
+      await copyAndMerge(customizationRepo.name, customizationDir, answers);
+    }
 
-  // Update customizations.json file
-  updateCustomizationsVersions(customizationRepo.name, customization.version);
+    // Update customizations.json file
+    updateCustomizationsVersions(customizationRepo.name, customization.version);
+  }
 }
 
 /* ************************************************************************ */
-async function copyAndMerge(customizationRepoName, substitutions = {}) {
-  // https://www.npmtrends.com/copyfiles-vs-cpx-vs-ncp-vs-npm-build-tools
-  // https://www.npmjs.com/package/ncp
-  // https://www.npmjs.com/package/copyfiles
-
-  let source 
-  if(customizationRepoName.indexOf("/") == 0) {
-    // Based of customizationRepoName starting with "/" we assume this is already a fullpath
-    source = customizationRepoName;
-  } else {
-    // Otherwise assume customizationRepoName on standard cob-cli xdgData path
-    const { xdgData } = await import("xdg-basedir");
-    source = path.resolve( xdgData, "cob-cli", customizationRepoName);
-  }
-
-  console.log("  Copying template files ...");
+async function copyAndMerge(customizationRepoName, source, substitutions = {}) {
+  console.log("\n  Copying template files for " + colors.blue(customizationRepoName) + "...");
 
   let excludedFiles = RegExp(
     "(" +

package/lib/commands/deploy.js

@@ -3,11 +3,11 @@ const { getCurrentCommandEnviroment } = require("../task_lists/common_enviroment
 const { confirmExecutionOfChanges } = require("../task_lists/common_syncFiles");
 const { validateDeployConditions } = require("../task_lists/deploy_validate");
 const { executeTasks } = require("../task_lists/deploy_execute");
-const { checkVersion } = require("../commands/upgradeRepo");
+const { checkRepoVersion } = require("../commands/upgradeRepo");
 
 async function deploy(args) {
     try {
-        checkVersion()
+        checkRepoVersion()
         const cmdEnv = await getCurrentCommandEnviroment(args)
         if(args.resync) args.force = true;
 

package/lib/commands/test.js

@@ -5,13 +5,13 @@ const { customUIsContinuosReload } = require("../task_lists/test_customUIsContin
 const { otherFilesContiousReload } = require("../task_lists/test_otherFilesContiousReload");
 const { getCurrentCommandEnviroment } = require("../task_lists/common_enviromentHandler");
 const { getKeypress } = require("../task_lists/common_helpers");
-const { checkVersion } = require("../commands/upgradeRepo");
+const { checkRepoVersion } = require("../commands/upgradeRepo");
 
 async function test (args) {    
     let restoreChanges, error = "";
     let cmdEnv
     try {
-        checkVersion()
+        checkRepoVersion()
         console.log("Start testing… ")
         cmdEnv = await getCurrentCommandEnviroment(args)
 

package/lib/commands/updateFromServer.js

@@ -2,11 +2,11 @@ require('colors');
 const { getCurrentCommandEnviroment } = require("../task_lists/common_enviromentHandler");
 const { copyFiles } = require("../task_lists/common_syncFiles");
 const { validateUpdateFromServerConditions } = require("../task_lists/updateFromServer_validate");
-const { checkVersion } = require("../commands/upgradeRepo");
+const { checkRepoVersion } = require("../commands/upgradeRepo");
 
 async function updateFromServer(args) {
     try {
-        checkVersion()
+        checkRepoVersion()
         const cmdEnv = await getCurrentCommandEnviroment(args)
 
         await validateUpdateFromServerConditions(cmdEnv).run()

package/lib/commands/upgradeRepo.js

@@ -36,7 +36,7 @@ async function upgradeRepo() {
 exports.upgradeRepo = upgradeRepo;
 
 /* ************************************ */
-function checkVersion() {
+function checkRepoVersion() {
     let repoVersion = _getRepoVersion();
     if(repoVersion == 9999 ) {
         throw new Error("Error:".red + " not on a root of a cob-cli repo. Check your path. \n")
@@ -50,7 +50,7 @@ function checkVersion() {
         throw new Error("Error:".red + " your cob-cli repo is outdated. Run " + "cob-cli upgradeRepo".bold.blue + "\n")
     }
 }
-exports.checkVersion = checkVersion;
+exports.checkRepoVersion = checkRepoVersion;
 
 /* ************************************ */
 function setVersion() {

package/lib/webpack/webpack.config.js

@@ -23,21 +23,12 @@ module.exports = env => {
       hot:false,
       port: 8040,
       host: "0.0.0.0",
-      devMiddleware: {
-        stats: {
-          maxModules: 0 // Set the maximum number of modules to be shown
-        }
-      },
       setupMiddlewares: (middlewares, devServer) => {
-        middlewares.push({
-          name: 'hello-world-test-one',
-          // `path` is optional
-          path: '*',
+        middlewares.unshift({
+          name: 'redirect-localhost:8080/-to-localhost:8080/record/',
           middleware: (req, res, next) => {
             // Permite usar / ou /DASH_BOARD/ quando acedido directamente
-            if(req.url != "/") {
-              return next();
-            }    
+            if(req.url != "/")  return next();
             res.redirect(`/recordm/`);
           },
         });

package/package.json

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