@cerema/cadriciel 1.4.6 → 1.4.9

package/cli/global/install.js

@@ -89,18 +89,18 @@ module.exports = (args) => {
   return {
     info: {
       title: 'install',
-      description:
-        'Installation des dépendances (La première fois uniquement).)',
+      description: 'Installation des dépendances (La première fois uniquement)',
     },
     start: () => {
       addMapping();
       const dockerImagesToInstall = [
-        'cerema/postgres',
-        'cerema/cadriciel:1.0.0',
+        'postgres:15',
+        'cerema/cadriciel:1.1.0',
         'dpage/pgadmin4',
         'inbucket/inbucket:latest',
         'quay.io/keycloak/keycloak:legacy',
         'liquibase/liquibase',
+        'cerema/angular',
       ];
       setupEnvironment(dockerImagesToInstall);
     },

package/cli.js

@@ -145,10 +145,44 @@ 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)
+        );
+      }
+    }
+  }
+};
+
 const displayBanner = () => {
   figlet('Cadriciel', function (err, data) {
     if (err) {
-      console.log(err);
       log.error('Something went wrong...');
       return;
     }
@@ -188,7 +222,7 @@ const displayBanner = () => {
       display(CADRICIEL_COMMANDS);
       console.log(' ');
     }
-    console.log();
+    console.log(' ');
   });
 };
 
@@ -205,6 +239,9 @@ const processCommands = (args) => {
     console.log(' ');
     const cmd = `node`;
     const fullArgs = [`${CADRICIEL_PATH}/${command}`, ...args.splice(1)];
+    const unit = require(`${CADRICIEL_PATH}/../cli/${args[0]}`)();
+
+    if (unit.info.sub) return displaySub({ unit });
 
     const child = spawn(cmd, fullArgs, {
       stdio: 'inherit',
@@ -241,16 +278,22 @@ checkVersion()
 
       console.log(framedMessage);
       loadGlobalCommands();
-      processCommands(process.argv.splice(2));
-      if (process.argv.length <= 2) return displayBanner();
+      process.argv.shift();
+      process.argv.shift();
+      if (process.argv.length <= 0) return displayBanner();
+      processCommands(process.argv);
     } else {
       loadGlobalCommands();
-      processCommands(process.argv.splice(2));
-      if (process.argv.length <= 2) return displayBanner();
+      process.argv.shift();
+      process.argv.shift();
+      if (process.argv.length <= 0) return displayBanner();
+      processCommands(process.argv);
     }
   })
   .catch((error) => {
     loadGlobalCommands();
-    processCommands(process.argv.splice(2));
+    process.argv.shift();
+    process.argv.shift();
     if (process.argv.length <= 2) return displayBanner();
+    processCommands(process.argv.splice(2));
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerema/cadriciel",
-  "version": "1.4.6",
+  "version": "1.4.9",
   "main": "index.js",
   "license": "MIT",
   "npm": ">=8.0.0",