@cerema/cadriciel 1.6.2-beta → 1.6.5

package/cli/global/doctor.js

@@ -1,94 +1,226 @@
 module.exports = (args) => {
-  const { exec } = require('child_process');
-  const Listr = require('listr');
-  const chalk = require('chalk-v2');
-  const os = require('os');
-  const platform = os.platform();
-  const checkInstallation = (command, postProcess = (output) => output) => {
-    return new Promise((resolve, reject) => {
-      exec(command, (error, stdout) => {
-        if (error) {
-          reject(new Error('Not installed'));
-        } else {
-          resolve(postProcess(stdout.trim()));
-        }
-      });
-    });
-  };
-  return {
-    info: {
-      title: 'doctor',
-      description: `Affichage des pré-requis du cadriciel.`,
-    },
-    start: () => {
-      console.log(' ');
-      
-      console.log(' 🏥 ' + chalk.bold('Pré-requis globaux'));
-      console.log(' ');
-      const myTasks = [
+    const { exec } = require('child_process');
+    const Listr = require('listr');
+    const chalk = require('chalk-v2');
+    const os = require('os');
+    const fs = require('fs');
+    const path = require('path');
+    const platform = os.platform();
+    const checkInstallation = (command, postProcess = (output) => output) => {
+        return new Promise((resolve, reject) => {
+            exec(command, (error, stdout) => {
+                if (error) {
+                    reject(new Error('Not installed'));
+                } else {
+                    resolve(postProcess(stdout.trim()));
+                }
+            });
+        });
+    };
+    const checkOneOfInstallations = (candidates = [], label = 'commande') => {
+        const tryCandidate = (index) => {
+            if (index >= candidates.length) {
+                return Promise.reject(new Error(`${label} non détecté`));
+            }
+            const candidate = candidates[index];
+            const postProcess =
+                candidate.postProcess ||
+                ((output) => `${candidate.label || candidate.command}: ${output}`);
+            return checkInstallation(candidate.command, postProcess).catch(() =>
+                tryCandidate(index + 1)
+            );
+        };
+        return tryCandidate(0);
+    };
+    const PACKAGE_MANAGERS = [
         {
-          title: 'Homebrew',
-          task: () =>  checkInstallation('brew --version'),
+            id: 'bun',
+            displayName: 'Bun',
+            command: 'bun --version',
+            detectors: ['bun.lock', 'bun.lockb'],
         },
         {
-          title: 'Pnpm',
-          task: () =>  checkInstallation('pnpm -v'),
+            id: 'pnpm',
+            displayName: 'pnpm',
+            command: 'pnpm -v',
+            detectors: ['pnpm-lock.yaml', 'pnpm-lock.yml'],
         },
         {
-          title: 'Git',
-          task: () =>  checkInstallation('git --version'),
+            id: 'yarn',
+            displayName: 'Yarn',
+            command: 'yarn -v',
+            detectors: ['yarn.lock'],
         },
         {
-          title: 'Java',
-          task: () =>  checkInstallation('java --version'),
+            id: 'npm',
+            displayName: 'npm',
+            command: 'npm -v',
+            detectors: ['package-lock.json'],
+        },
+    ];
+    const findCadricielContext = () => {
+        let currentPath = process.cwd();
+        const rootPath = path.parse(currentPath).root;
+        while (true) {
+            const versionPath = path.join(currentPath, '.cadriciel', 'version.json');
+            if (fs.existsSync(versionPath)) {
+                try {
+                    const version = JSON.parse(fs.readFileSync(versionPath, 'utf8'));
+                    return {
+                        architecture: typeof version.name === 'string' ? version.name : null,
+                        projectRoot: currentPath,
+                    };
+                } catch (error) {
+                    return {
+                        architecture: null,
+                        projectRoot: currentPath,
+                    };
+                }
+            }
+            if (currentPath === rootPath) break;
+            currentPath = path.dirname(currentPath);
+        }
+        return {
+            architecture: null,
+            projectRoot: null,
+        };
+    };
+    const detectPackageManager = (projectRoot) => {
+        const searchRoot = projectRoot || process.cwd();
+        const packageJsonPath = path.join(searchRoot, 'package.json');
+        if (fs.existsSync(packageJsonPath)) {
+            try {
+                const pkgJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+                if (pkgJson.packageManager && typeof pkgJson.packageManager === 'string') {
+                    const requested = pkgJson.packageManager.split('@')[0].trim().toLowerCase();
+                    const pm = PACKAGE_MANAGERS.find((el) => el.id === requested);
+                    if (pm) return pm;
+                }
+            } catch (error) { }
+        }
+        for (const pm of PACKAGE_MANAGERS) {
+            if (
+                pm.detectors.some((fileName) =>
+                    fs.existsSync(path.join(searchRoot, fileName))
+                )
+            ) {
+                return pm;
+            }
+        }
+        return PACKAGE_MANAGERS.find((el) => el.id === 'npm');
+    };
+    const createNodeArchitectureTasks = (projectRoot) => {
+        const detectedManager = detectPackageManager(projectRoot);
+        const tasks = [
+            {
+                title: 'Node ou Bun',
+                task: () =>
+                    checkOneOfInstallations(
+                        [
+                            { command: 'node -v', label: 'Node' },
+                            { command: 'bun --version', label: 'Bun' },
+                        ],
+                        'Node ou Bun'
+                    ),
+            },
+            {
+                title: 'npm ou Bun',
+                task: () =>
+                    checkOneOfInstallations(
+                        [
+                            { command: 'npm -v', label: 'npm' },
+                            { command: 'bun --version', label: 'Bun' },
+                        ],
+                        'npm ou Bun'
+                    ),
+            },
+        ];
+        if (detectedManager) {
+            tasks.push({
+                title: `Gestionnaire (${detectedManager.displayName})`,
+                task: () => checkInstallation(detectedManager.command),
+            });
+        }
+        tasks.push(
+            {
+                title: 'Docker',
+                task: () => checkInstallation('docker ps'),
+            },
+            {
+                title: 'Docker Compose',
+                task: () => checkInstallation('docker-compose --version'),
+            }
+        );
+        return tasks;
+    };
+    const runArchitectureDoctor = ({ architecture, projectRoot }) => {
+        if (!architecture) {
+            if (!projectRoot) {
+                console.log(' ');
+                console.log(
+                    chalk.yellow(
+                        " ⚠️  Impossible de détecter l'architecture du cadriciel (.cadriciel/version.json introuvable)."
+                    )
+                );
+            }
+            return Promise.resolve();
+        }
+        const normalized = architecture.toLowerCase();
+        if (normalized === 'node') {
+            console.log(' ');
+            console.log(' 🧱 ' + chalk.bold('Pré-requis architecture Node'));
+            console.log(' ');
+            const nodeTasks = new Listr(createNodeArchitectureTasks(projectRoot), {
+                concurrent: true,
+                exitOnError: false,
+            });
+            return nodeTasks.run().catch(() => { });
+        }
+        console.log(' ');
+        console.log(' 🧱 ' + chalk.bold('Pré-requis architecture'));
+        console.log(' ');
+        console.log(
+            chalk.yellow(
+                ` Architecture '${architecture}' détectée mais non prise en charge par ce docteur.`
+            )
+        );
+        return Promise.resolve();
+    };
+    return {
+        info: {
+            title: 'doctor',
+            description: `Affichage des pré-requis du cadriciel.`,
         },
-      ];
-      if (platform === 'linux ') myTasks.splice(0, 1);
-      if (platform === 'win32') myTasks.splice(0, 1);
+        start: () => {
+            console.log(' ');
 
-      const tasks = new Listr(myTasks, {
-        concurrent: true,
-        exitOnError: false,
-      });
+            console.log(' 🏥 ' + chalk.bold('Pré-requis globaux'));
+            console.log(' ');
+            const myTasks = [
+                {
+                    title: 'Git',
+                    task: () => checkInstallation('git --version'),
+                },
+                {
+                    title: 'Java',
+                    task: () => checkInstallation('java --version'),
+                },
+            ];
+            if (platform === 'linux') myTasks.splice(0, 1);
+            if (platform === 'win32') myTasks.splice(0, 1);
 
-      const dockerTasks = new Listr(
-        [
-          {
-            title: 'Docker',
-            task: () =>  checkInstallation('docker ps'),
-          },
-          {
-            title: 'Docker Compose',
-            task: () =>  checkInstallation('docker-compose --version'),
-          },
-        ],
-        { concurrent: true, exitOnError: false }
-      );
+            const tasks = new Listr(myTasks, {
+                concurrent: true,
+                exitOnError: false,
+            });
 
-      tasks
-        .run()
-        .then(() => {
-          console.log(' ');
-          console.log(
-            ' 📦 ' +
-              chalk.bold('Pré-requis Docker') +
-              ' (si vous utilisez docker)'
-          );
-          console.log(' ');
-          dockerTasks.run().then(()=>{
-          }).catch((err) => {});
-        })
-        .catch((err) => {
-          console.log(' ');
-          console.log(
-            ' 📦 ' +
-              chalk.bold('Pré-requis Docker') +
-              ' (si vous utilisez docker)'
-          );
-          console.log(' ');
-          dockerTasks.run().then(()=>{
-          }).catch((err) => {});
-        });
-    },
-  };
+            const architectureContext = findCadricielContext();
+
+            tasks
+                .run()
+                .catch(() => { })
+                .then(() => runArchitectureDoctor(architectureContext))
+                .catch(() => { });
+        },
+    };
 };

package/cli/global/init.js

@@ -1,252 +1,49 @@
 module.exports = (args) => {
-  const { promisify } = require('util');
-  const { exec } = require('child_process');
-  const execPromise = promisify(exec);
+  const path = require('path');
   const fs = require('fs');
-  const ora = require('ora');
+  const fse = require('fs-extra');
   const chalk = require('chalk-v2');
-  const log = require('log-beautify');
-  const inquirer = require('inquirer');
-  const path = require('path');
-  const cliProgress = require('cli-progress');
-  const userHome = require('os').homedir();
-  const error = require(path.join('..', '..', 'lib', 'message')).error;
-  const { getTemplates } = require(path.join('..', '..', 'lib', 'util'));
-  const link = (url, name) => {
-    if (!name) name = url;
-    if (url.includes('localhost')) url = 'http://' + url + '/';
-    else url = 'https://' + url + '/';
-    return (
-      '\u001b[36m\u001b]8;;' +
-      url +
-      '\u0007' +
-      name +
-      '\u001b]8;;\u0007\u001b[0m\n'
-    );
-  };
-  const sshtemplate = `
-# cadriciel -- 87c7dfbf-172a-4084-a862-4a23f35a5b79  --
-Host cadriciel
-    HostName gitlab.cerema.fr
-    User git
-    IdentityFile ~/.cadriciel/id_rsa
-    IdentitiesOnly yes
-# -----------------------------------------------------
-`;
-  const CadricielAPI = require(path.join('..', '..', 'lib', 'cadriciel'));
-  const cadriciel = new CadricielAPI();
-  var templates = [];
-  const progress = async (bar1, response, cb) => {
-    try {
-      const p = await cadriciel.get(`status/jobs/projects/${response.prj.id}`);
-      bar1.update(p.progress);
-      if (p.progress < 100)
-        setTimeout(() => {
-          progress(bar1, response, cb);
-        }, 1000);
-      else {
-        bar1.stop();
-        cb();
-      }
-    } catch (e) {
-      error('Erreur lors de la création du projet');
+
+  const sourceDir = path.resolve(__dirname, '..', 'assets', 'docker');
+
+  const copyDockerDirectory = () => {
+    const destinationDir = path.resolve(process.cwd(), 'docker');
+    if (!fs.existsSync(sourceDir)) {
+      console.error(
+        chalk.red("Répertoire source 'assets/docker' introuvable dans le CLI.")
+      );
+      process.exitCode = 1;
+      return;
     }
-  };
-  const updatePK = async () => {
-    try {
-      var pk = await cadriciel.get(`privatekey`);
-      const pkey = Buffer.from(pk.private_key, 'base64').toString();
-      fs.writeFileSync(userHome + '/.cadriciel/id_rsa', pkey);
-      fs.chmodSync(userHome + '/.cadriciel/id_rsa', 0o600);
-      try {
-        fs.mkdirSync(userHome + '/.ssh');
-      } catch (e) {}
-      try {
-        var ssh = fs.readFileSync(userHome + '/.ssh/config', 'utf-8');
-      } catch (e) {
-        var ssh = '';
-      }
-      if (!ssh.includes('87c7dfbf-172a-4084-a862-4a23f35a5b79 ')) {
-        ssh += '\n\n' + sshtemplate;
-        fs.writeFileSync(userHome + '/.ssh/config', ssh, { flag: 'a' });
-        fs.chmodSync(userHome + '/.ssh/config', 0o600);
-      }
-    } catch (e) {
-      console.log(e);
-      error(
-        "Une erreur s'est produite lors de la récupération de la clé privée"
+    if (fs.existsSync(destinationDir)) {
+      console.log(
+        chalk.yellow("Le répertoire 'docker' existe déjà dans ce projet.")
       );
+      return;
     }
-  };
-  const launch = async (answers) => {
-    const data = {
-      name: answers.project,
-      title: answers.project,
-      template: answers.template,
-      group: 'PERSO',
-      disabled: true,
-    };
     try {
-      var response = await cadriciel.post(`studio/projects`, data);
-    } catch (e) {
-      if (e.response.data.error == 'PROJECT_ALREADY_EXISTS')
-        error(
-          "Le nom du projet n'est pas disponible. Veuillez choisir un autre titre."
-        );
-      else error('Erreur lors de la création du projet');
-      return process.exit(1);
+      fse.copySync(sourceDir, destinationDir);
+      console.log(
+        chalk.green("Le répertoire 'docker' a été copié dans votre projet.")
+      );
+    } catch (error) {
+      console.error(
+        chalk.red(
+          `Erreur lors de la copie du répertoire docker: ${error.message}`
+        )
+      );
+      process.exitCode = 1;
     }
-    console.log(`${chalk.bold('\n 🚀 Création du projet en cours...')}\n`);
-    const bar1 = new cliProgress.SingleBar(
-      {},
-      cliProgress.Presets.shades_classic
-    );
-    bar1.start(100, 0);
-    progress(bar1, response, async () => {
-      console.log(' ');
-
-      const step1 = ora('📥 Téléchargement du projet en cours...').start();
-      try {
-        await updatePK();
-
-        try {
-          const git = await execPromise('git clone ' + response.prj.uri, {
-            cwd: process.cwd(),
-          });
-        } catch (e) {
-          step1.fail(chalk.red.bold(e.message.split('fatal :')[1]));
-          process.exit(1);
-        }
-
-        step1.succeed(chalk.bold('Téléchargement OK.'));
-        console.log(' ');
-        const step2 = ora('📦 Installation des dépendances...').start();
-        try {
-          try {
-            await execPromise('pnpm i', {
-              cwd: process.cwd() + '/' + response.prj.title,
-            });
-          } catch (e) {
-            try {
-              await execPromise('yarn', {
-                cwd: process.cwd() + '/' + response.prj.title,
-              });
-            } catch (e) {
-              await execPromise('npm i', {
-                cwd: process.cwd() + '/' + response.prj.title,
-              });
-            }
-          }
-
-          try {
-            await execPromise(
-              `git config --local user.email "${response.prj.owner.email}" && git config --local user.name "${response.prj.owner.name}" && git add --all && git checkout -b ${response.prj.owner.trigram} && git config pull.rebase true`,
-              {
-                cwd: process.cwd() + '/' + response.prj.title,
-              }
-            );
-            step2.succeed(
-              '🎉 ' + chalk.bold('Votre projet a été correctement installé')
-            );
-            console.log(' ');
-            console.log(`    
-      ──────────────────────────────────────────────────────────────
-      URL du projet : ${link(response.prj.url.split('https://')[1])}
-            
-             Vous trouverez votre projet dans le dossier :
-            
-             cd ${chalk.green(response.prj.title)}
-
-             🚀 ${chalk.bold("Pour lancer l'environnement de développement :")}
-
-             ${chalk.green('cad start')}
-
-             🚦 ${chalk.bold("Pour arrêter l'environnement de développement :")}
-            
-             ${chalk.green('cad stop')}
-
-             💻 ${chalk.bold('Pour manager votre projet :')}
-            
-             👉  ${link(
-               global.CACHE_URI.studio.split('://')[1],
-               global.CACHE_URI.studio.split('://')[1]
-             )}
-            
-    ──────────────────────────────────────────────────────────────`);
-            console.log(' ');
-          } catch (e) {
-            console.log(e);
-          }
-        } catch (e) {}
-      } catch (e) {
-        console.log(e);
-        step1.fail(chalk.red('Déploiement échoué'));
-        return process.exit(1);
-      }
-    });
   };
+
   return {
     info: {
-      title: 'completion',
-      description: `Démarrage d'un projet Cadriciel`,
+      title: 'init',
+      label: 'docker',
+      description: 'Initialisation du répertoire docker du projet',
     },
-    start: async () => {
-      const spinner = ora('Veuillez patienter un instant...').start();
-      try {
-        templates = await getTemplates();
-      } catch (e) {
-        console.log(e);
-        spinner.stop();
-        error('Mise à jour impossible... Vérifier votre connexion internet');
-        return process.exit(1);
-      }
-      spinner.stop();
-      var tpl = [];
-      if (!templates) return process.exit(1);
-      for (let i = 0; i < templates.length; i++) tpl.push(templates[i].title);
-      const questions = [
-        {
-          type: 'input',
-          name: 'project',
-          message: 'Nom du projet',
-          validate: (value) => {
-            if (value === '') return false;
-            else return true;
-          },
-        },
-        {
-          type: 'list',
-          name: 'template',
-          message: 'Choisissez le modèle de cadriciel',
-          choices: tpl,
-        },
-      ];
-
-      if (tpl.length == 1) questions.splice(1, 1);
-      if (process.argv[1]) {
-        if (questions.length == 1)
-          return launch({
-            project: process.argv[1],
-            template: templates[0].dir,
-          });
-      }
-      console.log(
-        '\n😃 ' + chalk.bold('Tout grand projet commence par un nom !\n')
-      );
-      inquirer
-        .prompt(questions)
-        .then((answers) => {
-          if (!answers.template) answers.template = templates[0].dir;
-          else {
-            for (let i = 0; i < templates.length; i++)
-              if (templates[i].title == answers.template)
-                answers.template = templates[i].dir;
-          }
-          launch(answers);
-        })
-        .catch((error) => {
-          log.error(error);
-        });
+    start: () => {
+      copyDockerDirectory();
     },
   };
 };