@cerema/cadriciel 1.4.26 → 1.4.29

package/cli.js

@@ -1,28 +1,28 @@
 #!/usr/bin/env node
-const figlet = require('figlet');
-const chalk = require('chalk-v2');
-const fs = require('fs');
-const log = require('log-beautify');
-const path = require('path');
-const { spawn } = require('child_process');
-const os = require('os');
-const userHomeDir = os.homedir();
-const boxen = require('boxen');
-
+const figlet = require('figlet'); // Importing figlet for ASCII art.
+const chalk = require('chalk-v2'); // Importing chalk for colored text output.
+const fs = require('fs'); // File system module for file operations.
+const log = require('log-beautify'); // Enhanced logging.
+const path = require('path'); // Path module for handling file paths.
+const { spawn } = require('child_process'); // For executing shell commands.
+const os = require('os'); // Operating system-related utilities.
+const userHomeDir = os.homedir(); // Fetching the user's home directory.
+const boxen = require('boxen'); // For creating boxes in the console.
+
+// Locating the '.cadriciel' directory starting from the current working directory.
 const CADRICIEL_PATH = findCadricielDir(process.cwd());
 const CADRICIEL_COMMAND = 'cad';
-global.CADRICIEL_URI = 'https://cadriciel.k8-dev.cerema.fr/api';
+//global.CADRICIEL_URI = 'https://cadriciel.k8-dev.cerema.fr/api';
+global.CADRICIEL_URI = 'http://localhost:3000/api';
 
+// Initialize command storage objects.
 var CADRICIEL_GLOBAL_COMMANDS = {};
 var CADRICIEL_COMMANDS = {};
 
-/** efface les anciens credentials s'ils existent */
-try {
-  fs.unlinkSync(`${userHomeDir}/.cadriciel/account.json`);
-} catch (e) {}
-
+// Path for version checking file.
 const VERSION_CHECK_FILE = path.join(userHomeDir, '.cadriciel_last_check.json');
 
+// Function to decide whether a version check is needed.
 const shouldCheckVersion = async () => {
   try {
     const data = fs.readFileSync(VERSION_CHECK_FILE, 'utf8');
@@ -37,11 +37,13 @@ const shouldCheckVersion = async () => {
   }
 };
 
+// Function to update the date of the last version check.
 const updateLastCheckDate = () => {
   const data = JSON.stringify({ date: new Date() });
   fs.writeFileSync(VERSION_CHECK_FILE, data, 'utf8');
 };
 
+// Function to check the current version of the package.
 const checkVersion = async () => {
   if (!(await shouldCheckVersion())) {
     return Promise.resolve(null); // Aucune version à vérifier, renvoie null
@@ -85,15 +87,15 @@ const checkVersion = async () => {
 };
 
 /**
- * Recherche récursivement le répertoire '.cadriciel' à partir du chemin donné, en remontant vers les répertoires parents.
- * @param {string} startPath - Le chemin de départ pour la recherche.
- * @returns {string|null} Le chemin du répertoire '.cadriciel' trouvé, ou null si non trouvé.
+ * Recursively searches for the '.cadriciel' directory.
+ * @param {string} startPath - Starting path for the search.
+ * @returns {string|null} Path of the found directory or null.
  */
 function findCadricielDir(startPath) {
   let currentPath = startPath;
 
   while (currentPath !== path.parse(currentPath).root) {
-    const potentialPath = path.join(currentPath, '.cadriciel/bin');
+    const potentialPath = path.join(currentPath, '.cadriciel/cli');
     if (
       fs.existsSync(potentialPath) &&
       fs.statSync(potentialPath).isDirectory()
@@ -106,6 +108,7 @@ function findCadricielDir(startPath) {
   return null;
 }
 
+// Function to load global commands.
 const loadGlobalCommands = () => {
   let dir = fs.readdirSync(__dirname + '/cli/global');
   for (let i = 0; i < dir.length; i++) {
@@ -116,18 +119,71 @@ const loadGlobalCommands = () => {
   }
 };
 
+// Function to load project specific commands.
 const loadCadricielCommands = (path) => {
   try {
-    let dir = fs.readdirSync(path);
-    for (let i = 0; i < dir.length; i++) {
-      if (dir[i].indexOf('.js') > -1)
-        CADRICIEL_COMMANDS[dir[i].split('.')[0]] = require(path + dir[i])();
+    const cli = require(path + 'cli');
+    for (let el in cli) {
+      if (cli[el].description) {
+        let subs = [];
+        for (let s in cli[el]) {
+          if (s !== 'description') subs.push({ title: s });
+        }
+        let description = '';
+        if (cli[el].description.indexOf(']') > -1) {
+          description = cli[el].description.split('] ')[1];
+          let lbl = cli[el].description
+            .split('] ')[0]
+            .replace('[', '')
+            .replace(']', '');
+          CADRICIEL_COMMANDS[el] = {
+            info: {
+              title: el,
+              description: description,
+              label: lbl.toLowerCase(),
+              sub: subs,
+            },
+          };
+        } else {
+          description = cli[el].description;
+          CADRICIEL_COMMANDS[el] = {
+            info: {
+              title: el,
+              description: cli[el].description,
+              sub: subs,
+            },
+          };
+        }
+      } else {
+        let description = '';
+        if (cli[el].indexOf(']') > -1) {
+          description = cli[el].split('] ')[1];
+          let lbl = cli[el].split('] ')[0].replace('[', '').replace(']', '');
+          CADRICIEL_COMMANDS[el] = {
+            info: {
+              title: el,
+              description: description,
+              label: lbl.toLowerCase(),
+            },
+          };
+        } else {
+          description = cli[el];
+          CADRICIEL_COMMANDS[el] = {
+            info: {
+              title: el,
+              description: description,
+            },
+          };
+        }
+      }
     }
   } catch (e) {}
 };
 
+// Function to format command labels with chalk for color coding.
 const label = (caption) => {
   if (caption === 'experimental') return chalk.red(' (' + caption + ') ');
+  if (caption === 'alpha') return chalk.cyan(' (' + caption + ') ');
   if (caption === 'beta') return chalk.magenta(' (' + caption + ') ');
   if (caption === 'docker') return chalk.green(' (' + caption + ') ');
   if (caption === 'ai')
@@ -135,6 +191,7 @@ const label = (caption) => {
   return '';
 };
 
+// Function to format command descriptions.
 const formatDescription = (description, maxLength) => {
   if (description.length <= maxLength) return description;
 
@@ -145,6 +202,7 @@ const formatDescription = (description, maxLength) => {
   return firstPart + '\n                                    ' + secondPart;
 };
 
+// Function to display commands.
 const display = (commands) => {
   const maxWidth = 30;
   const maxDescriptionLength = 50;
@@ -186,49 +244,16 @@ const display = (commands) => {
   }
 };
 
-const displaySub = (commands) => {
-  const maxWidth = 30;
-  const maxDescriptionLength = 50;
-
-  for (let el in commands) {
-    let title = el;
-
-    if (commands[el].info) {
-      let description = commands[el].info.description;
-      console.log('   ' + chalk.bold(commands[el].info.title));
-      console.log('   ' + chalk.cyan(description));
-      console.log(' ');
-
-      for (let i = 0; i < commands[el].info.sub.length; i++) {
-        let sub = commands[el].info.sub[i];
-        const formattedDesc = formatDescription(
-          sub.description,
-          maxDescriptionLength
-        );
-        const dots = '.'.repeat(maxWidth - sub.title.length);
-        console.log(
-          '   ' +
-            chalk.cyanBright(sub.title) +
-            ' ' +
-            chalk.grey(dots) +
-            ' ' +
-            label(sub.label) +
-            ' ' +
-            chalk.white(formattedDesc)
-        );
-      }
-    }
-  }
-};
-
+// Function to display the banner and the list of commands.
 const displayBanner = () => {
   figlet('Cadriciel', function (err, data) {
     if (err) {
+      console.log(err);
       log.error('Something went wrong...');
       return;
     }
     try {
-      let info = require(CADRICIEL_PATH + '/version.json');
+      let info = require(CADRICIEL_PATH + '/../version.json');
       version_cadriciel =
         ` - ${chalk.green('Cadriciel v')} ` +
         chalk.green.bold(info.version) +
@@ -258,7 +283,7 @@ const displayBanner = () => {
       console.log(`\n   Vous n'êtes pas à l'intérieur d'un projet.     `);
       console.log(' ');
     } else {
-      loadCadricielCommands(CADRICIEL_PATH + '/../cli/');
+      loadCadricielCommands(CADRICIEL_PATH + '/../');
       console.log(' ');
       display(CADRICIEL_COMMANDS);
       console.log(' ');
@@ -267,9 +292,12 @@ const displayBanner = () => {
   });
 };
 
+// Function to process entered commands.
 const processCommands = (args) => {
   const command = args[0];
-  loadCadricielCommands(CADRICIEL_PATH + '/../cli/');
+  const maxWidth = 30;
+  const maxDescriptionLength = 50;
+  loadCadricielCommands(CADRICIEL_PATH + '/../');
   if (!CADRICIEL_COMMANDS[command]) {
     if (!CADRICIEL_GLOBAL_COMMANDS[command]) {
       log.error('Commande inconnue : ' + command);
@@ -278,21 +306,142 @@ const processCommands = (args) => {
     CADRICIEL_GLOBAL_COMMANDS[command].start(args);
   } else {
     console.log(' ');
-    const cmd = `node`;
-    const fullArgs = [`${CADRICIEL_PATH}/${command}`, ...args.splice(1)];
-    const unit = require(`${CADRICIEL_PATH}/../cli/${args[0]}`)();
+    const dir = args.join('/');
+    return parseCommand(args);
+  }
+};
 
-    if (unit.info.sub) return displaySub({ unit });
+/**
+ * Displays the subcommands and their descriptions for a given command.
+ *
+ * @param {string} path - The path of the command.
+ * @param {string} title - The title of the command.
+ * @param {string} description - The description of the command.
+ * @param {object} cli - The command line interface object.
+ */
+const displaySub = (path, title, description, cli) => {
+  CADRICIEL_COMMANDS = {};
+  delete cli.description;
+  for (let el in cli) {
+    if (cli[el].description) {
+      let subs = [];
+      for (let s in cli[el]) {
+        if (s !== 'description') subs.push({ title: s });
+      }
+      let description = '';
+      if (cli[el].description.indexOf(']') > -1) {
+        description = cli[el].description.split('] ')[1];
+        let lbl = cli[el].description
+          .split('] ')[0]
+          .replace('[', '')
+          .replace(']', '');
+        CADRICIEL_COMMANDS[el] = {
+          info: {
+            title: el,
+            description: description,
+            label: lbl.toLowerCase(),
+            sub: subs,
+          },
+        };
+      } else {
+        description = cli[el].description;
+        CADRICIEL_COMMANDS[el] = {
+          info: {
+            title: el,
+            description: cli[el].description,
+            sub: subs,
+          },
+        };
+      }
+    } else {
+      let description = '';
+      if (cli[el].indexOf(']') > -1) {
+        description = cli[el].split('] ')[1];
+        let lbl = cli[el].split('] ')[0].replace('[', '').replace(']', '');
+        CADRICIEL_COMMANDS[el] = {
+          info: {
+            title: el,
+            description: description,
+            label: lbl.toLowerCase(),
+          },
+        };
+      } else {
+        CADRICIEL_COMMANDS[el] = {
+          info: {
+            title: el,
+            description: cli[el],
+          },
+        };
+      }
+    }
+  }
+  figlet('Cadriciel', function (err, data) {
+    if (err) {
+      console.log(err);
+      log.error('Something went wrong...');
+      return;
+    }
+    try {
+      let info = require(CADRICIEL_PATH + '/../version.json');
+      version_cadriciel =
+        ` - ${chalk.green('Cadriciel v')} ` +
+        chalk.green.bold(info.version) +
+        chalk.green(' (' + info.name + ')');
+    } catch (e) {
+      version_cadriciel = '';
+    }
+    console.log(
+      chalk.cyan(data) +
+        chalk.bold('\n CLI v' + require('./package.json').version) +
+        version_cadriciel
+    );
+    console.log(' ');
+    console.log(' ' + chalk.bold(description));
+    console.log(' ');
+    console.log(
+      `${chalk.bold(' Usage :')} ${chalk.cyanBright(
+        CADRICIEL_COMMAND + path + ' <commande>'
+      )} ${chalk.cyan('[<args>]')}`
+    );
+    console.log(' ');
+    display(CADRICIEL_COMMANDS);
+    console.log(' ');
+  });
+};
 
-    const child = spawn(cmd, fullArgs, {
-      stdio: 'inherit',
-      shell: true,
-    });
+// Function to execute commands.
+const ExecCommand = (p, args) => {
+  const unit = require(CADRICIEL_PATH + p);
+  const params = {
+    dir: {
+      home: `${userHomeDir}/.cadriciel`,
+      cadriciel: path.normalize(CADRICIEL_PATH + '/..'),
+      root: path.normalize(CADRICIEL_PATH + '/../..'),
+    },
+  };
+  unit(args, params);
+};
 
-    child.on('close', (code) => {});
+// Function to parse commands.
+const parseCommand = (args) => {
+  const cli = require(CADRICIEL_PATH + '/../cli');
+  let cmd = cli;
+  let arguments = [];
+  let title = '';
+  let path = '';
+  for (let i = 0; i < args.length; i++) {
+    if (!cmd[args[i]]) arguments.push(args[i]);
+    else {
+      cmd = cmd[args[i]];
+      title = args[i];
+      path += ' ' + title;
+    }
   }
+  if (cmd.description) displaySub(path, title, cmd.description, cmd);
+  else ExecCommand(path.replace(/ /g, '/'), arguments);
 };
 
+// Main function.
 checkVersion()
   .then((version) => {
     const current_version = require(__dirname + '/package.json').version;
@@ -335,9 +484,10 @@ checkVersion()
     }
   })
   .catch((error) => {
-    loadGlobalCommands();
+    console.log(error);
+    /*loadGlobalCommands();
     process.argv.shift();
     process.argv.shift();
     if (process.argv.length <= 2) return displayBanner();
-    processCommands(process.argv.splice(2));
+    processCommands(process.argv.splice(2));*/
   });

package/lib/cadriciel.js

@@ -5,9 +5,7 @@ const fs = require('fs');
 const os = require('os');
 const HomeDir = os.homedir() + '/.cadriciel';
 const { error } = require('./message');
-//var baseURL = 'http://localhost:3000/api';
-var baseURL = 'https://cadriciel.k8-dev.cerema.fr/api';
-
+var baseURL = global.CADRICIEL_URI;
 class CadricielAPI {
   constructor(token) {
     if (!token) {
@@ -24,7 +22,6 @@ class CadricielAPI {
         return process.exit(1);
       }
     }
-
     this.client = axios.create({
       baseURL: baseURL,
       timeout: 10000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerema/cadriciel",
-  "version": "1.4.26",
+  "version": "1.4.29",
   "main": "index.js",
   "license": "MIT",
   "npm": ">=8.0.0",
@@ -14,6 +14,7 @@
     "axios": "^1.5.1",
     "boxen": "5.1.2",
     "chalk-v2": "^1.0.2",
+    "cli-progress": "^3.12.0",
     "commander": "^10.0.0",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
@@ -27,6 +28,7 @@
     "ora": "^5.4.1",
     "prompts": "^2.4.2",
     "recursive-readdir": "^2.2.3",
+    "semver": "^7.5.4",
     "terminal-link": "2.1.1",
     "unzipper": "^0.10.11",
     "yauzl": "^2.10.0"

package/aqtion/.cadriciel/.settings

@@ -1,25 +0,0 @@
-{
-  "status": "OK",
-  "postgres": {
-    "database": "demo",
-    "user": "demo",
-    "password": "xvjgBut9TPvFR261",
-    "port": 30924
-  },
-  "url": {
-    "orion": "orion-szu-demo.dev.siipro.fr",
-    "pgadmin": "pgadmin-szu-demo.dev.siipro.fr",
-    "inbucket": "inbucket-szu-demo.dev.siipro.fr"
-  },
-  "inbucket": {
-    "port": 32517
-  },
-  "pgadmin": {
-    "user": "stephane.zucatti@cerema.fr",
-    "password": "kcTrLq5Xkdp0NkKQ"
-  },
-  "keycloak": {
-    "user": "admin",
-    "password": "rcmcGMtj9zLTDpFr"
-  }
-}

package/aqtion/.cadriciel/bin/build.js

@@ -1,106 +0,0 @@
-require('dotenv').config();
-//  --configuration prod
-const fs = require('fs');
-const path = require('path');
-const { spawn } = require('child_process');
-const { env } = require('process');
-
-const replaceEnvVars = (content) => {
-  const regex = /\${([^}]+)}/g;
-  return content.replace(regex, (match, p1) => {
-    return process.env[p1] || match;
-  });
-};
-
-const envsubst = (filePath) => {
-  const data = fs.readFileSync(filePath, 'utf8');
-  const updatedContent = replaceEnvVars(data);
-  return updatedContent;
-};
-
-function executeNgBuild(directory) {
-  const ngPath = path.join(directory, 'node_modules', '.bin', 'ng');
-
-  const ngBuild = spawn(ngPath, ['build', '--configuration=ci'], {
-    cwd: directory,
-    stdio: 'inherit',
-  });
-
-  ngBuild.on('error', (error) => {
-    console.error(`Error: ${error.message}`);
-  });
-
-  ngBuild.on('exit', (code) => {
-    if (code !== 0) {
-      console.error(`ng build exited with code ${code}`);
-    } else {
-      console.log('ng build completed successfully');
-    }
-  });
-}
-
-function removeDevDashboard() {
-  // copy main.module.ts to frontend
-  const tplMainmodulePath = path.join(
-    __dirname,
-    'templates',
-    'angular-prod',
-    'main.module.ts'
-  );
-  const destMainModulePath = path.join(
-    __dirname,
-    '/../../frontend/layout/main.module.ts'
-  );
-  fs.copyFileSync(tplMainmodulePath, destMainModulePath);
-  // copy shared module to frontend
-  const tplSharedModulePath = path.join(
-    __dirname,
-    'templates',
-    'angular-prod',
-    'shared.module.ts'
-  );
-  const destSharedModulePath = path.join(
-    __dirname,
-    '/../../frontend/layout/shared/shared.module.ts'
-  );
-  fs.copyFileSync(tplSharedModulePath, destSharedModulePath);
-  // delete dev routes from app/menu.json
-  const menuPath = path.join(__dirname, '/../../frontend/app/menu.json');
-  const menu = JSON.parse(fs.readFileSync(menuPath, 'utf8'));
-  const filteredArray = menu.filter((item) => item.label !== 'DEV');
-  fs.writeFileSync(menuPath, JSON.stringify(filteredArray));
-  fs.writeFileSync(__dirname + '/../../frontend/layout/api/dev.json', '{}');
-}
-
-if (!process.env.CI_ORION_URL) throw 'CI_ORION_URL is not set';
-if (!process.env.CI_DATABASE_NAME) throw 'CI_DATABASE_NAME is not set';
-if (!process.env.CI_DATABASE_PASSWORD) throw 'CI_DATABASE_PASSWORD is not set';
-if (!process.env.CI_DATABASE_USER) throw 'CI_DATABASE_USER is not set';
-if (!process.env.CI_DOMAIN) throw 'CI_DOMAIN is not set';
-if (!process.env.CI_ORION_REALM) throw 'CI_ORION_REALM is not set';
-if (!process.env.CI_ORION_URL) throw 'CI_ORION_URL is not set';
-if (!process.env.CI_PGADMIN_LOGIN) throw 'CI_PGADMIN_LOGIN is not set';
-if (!process.env.CI_PGADMIN_PASSWORD) throw 'CI_PGADMIN_PASSWORD is not set';
-
-const envFile = path.join(
-  __dirname,
-  '../../',
-  'frontend',
-  'environments',
-  'environment.prod.ts'
-);
-
-const envCi = path.join(
-  __dirname,
-  '../../',
-  'frontend',
-  'environments',
-  'environment.ci.ts'
-);
-
-const envFileContent = envsubst(envFile);
-fs.writeFileSync(envCi, envFileContent);
-console.log(envFileContent);
-
-removeDevDashboard();
-executeNgBuild(path.join(__dirname, '../../'));