@cerema/cadriciel 1.4.29 → 1.4.31

package/cli/global/init.js

@@ -11,12 +11,7 @@ module.exports = (args) => {
   const cliProgress = require('cli-progress');
   const userHome = require('os').homedir();
   const error = require(path.join('..', '..', 'lib', 'message')).error;
-  const { getAccount, getTemplates } = require(path.join(
-    '..',
-    '..',
-    'lib',
-    'util'
-  ));
+  const { getTemplates } = require(path.join('..', '..', 'lib', 'util'));
   const link = (url, name) => {
     if (!name) name = url;
     if (url.includes('localhost')) url = 'http://' + url + '/';
@@ -133,7 +128,7 @@ Host cadriciel
 
           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 --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,
               }

package/cli/global/load.js

@@ -0,0 +1,214 @@
+module.exports = (args) => {
+  const { promisify } = require('util');
+  const { exec } = require('child_process');
+  const execPromise = promisify(exec);
+  const chalk = require('chalk-v2');
+  const path = require('path');
+  const ora = require('ora');
+  const fs = require('fs');
+  const inquirer = require('inquirer');
+  const userHome = require('os').homedir();
+  const { error } = require(path.join('..', '..', 'lib', 'message'));
+  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 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) {}
+      var ssh = fs.readFileSync(userHome + '/.ssh/config', 'utf-8');
+      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"
+      );
+    }
+  };
+  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 = [];
+
+  /** loading the project */
+  const load = async (uri, title) => {
+    console.log(' ');
+    const step1 = ora('📥 Téléchargement du projet en cours...').start();
+    const git = await execPromise('git clone ' + uri, {
+      cwd: process.cwd(),
+    });
+    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() + '/' + title,
+        });
+      } catch (e) {
+        try {
+          await execPromise('yarn', {
+            cwd: process.cwd() + '/' + title,
+          });
+        } catch (e) {
+          await execPromise('npm i', {
+            cwd: process.cwd() + '/' + title,
+          });
+        }
+      }
+
+      const user = await cadriciel.get('account');
+      const url = uri
+        .replace('cadriciel:', 'gitlab.cerema.fr/')
+        .replace('git@', 'https://')
+        .replace('.git', '');
+      try {
+        await execPromise(
+          `git config --local user.email "${user.info.email}" && git config --local user.name "${user.info.name}" && git add --all && git checkout -b ${user.trigram} && git config pull.rebase true`,
+          {
+            cwd: process.cwd() + '/' + title,
+          }
+        );
+        step2.succeed(
+          '🎉 ' + chalk.bold('Votre projet a été correctement installé')
+        );
+        console.log(' ');
+
+        console.log(`    
+      ──────────────────────────────────────────────────────────────
+      URL du projet : ${link(url.split('https://')[1])}
+            
+             Vous trouverez votre projet dans le dossier :
+            
+             cd ${chalk.green(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('studio.k8-dev.cerema.fr', 'studio.k8-dev.cerema.fr')}
+            
+    ──────────────────────────────────────────────────────────────`);
+        console.log(' ');
+      } catch (e) {}
+    } catch (e) {
+      console.log(e);
+      step1.fail(chalk.red('Déploiement échoué'));
+      return process.exit(1);
+    }
+  };
+  return {
+    info: {
+      title: 'load',
+      description: `Charge un projet Cadriciel`,
+    },
+    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);
+      }
+      await updatePK();
+
+      const response = await cadriciel.get('studio/projects');
+      spinner.stop();
+      let myProjects = [];
+      let DSIProjects = [];
+      for (let i = 0; i < response.myProjects.length; i++) {
+        let description = response.myProjects[i].description;
+        if (!description)
+          description = response.myProjects[i].name_with_namespace;
+        description = new inquirer.Separator(description);
+        const uri = response.myProjects[i].uri.replace(/@.*?:/, '@cadriciel:');
+        myProjects.push({
+          name: response.myProjects[i].name,
+          value: {
+            title: response.myProjects[i].name,
+            uri: uri,
+          },
+        });
+        myProjects.push(new inquirer.Separator(description));
+      }
+      for (let i = 0; i < response.cerema.length; i++) {
+        let description = response.cerema[i].description;
+        if (!description) description = response.cerema[i].name_with_namespace;
+        description = new inquirer.Separator(description);
+        const uri = response.cerema[i].ssh_url_to_repo.replace(
+          /@.*?:/,
+          '@cadriciel:'
+        );
+        DSIProjects.push({
+          name: response.cerema[i].name,
+          value: { title: response.cerema[i].name, uri: uri },
+        });
+        DSIProjects.push(new inquirer.Separator(description));
+      }
+      if (args.length > 1) {
+        const prj = args[1];
+        if (prj.indexOf('dsi/') > -1) {
+          const t = DSIProjects.filter((p) => p.name == prj.split('dsi/')[1]);
+          if (t.length > 0) return load(t[0].value.uri, t[0].value.title);
+          return error('Projet introuvable');
+        } else {
+          const t = myProjects.filter((p) => p.name == prj);
+          if (t.length > 0) return load(t[0].value.uri, t[0].value.title);
+          return error('Projet introuvable');
+        }
+      } else {
+        const q = {
+          type: 'list',
+          name: 'choice',
+          message: 'Choisissez un projet existant:',
+          choices: [
+            new inquirer.Separator(' '),
+            new inquirer.Separator('=== Mes projets ==='),
+            ...myProjects,
+            new inquirer.Separator(' '),
+            new inquirer.Separator('=== Projets DSI ==='),
+            ...DSIProjects,
+          ],
+        };
+        inquirer.prompt([q]).then((answers) => {
+          load(answers.choice.uri, answers.choice.title);
+        });
+      }
+    },
+  };
+};

package/cli/global/upgrade.js

@@ -0,0 +1,89 @@
+const ora = require('ora');
+
+module.exports = (args) => {
+  const fs = require('fs');
+  const os = require('os');
+  const path = require('path');
+  const userHomeDir = os.homedir();
+  const log = require('log-beautify');
+  const sep = path.sep;
+  const { nanoid } = require('nanoid');
+  const AdmZip = require('adm-zip');
+  const UID = nanoid();
+  const fse = require('fs-extra');
+  const chalk = require('chalk-v2');
+
+  var DEFAULT_TEMPLATE = '';
+  const unzipFile = (zipFilePath, outputPath, callback) => {
+    const zip = new AdmZip(zipFilePath);
+    try {
+      zip.extractAllTo(outputPath, true);
+      callback();
+    } catch (err) {
+      console.error(
+        "Une erreur s'est produite lors de la décompression :",
+        err
+      );
+    }
+  };
+  const download = async (name, cb) => {
+    const CadricielAPI = require(path.join('..', '..', 'lib', 'cadriciel'));
+    const cadriciel = new CadricielAPI();
+    await cadriciel.downloadFile(
+      '/template?key=' + name + '.zip',
+      `${os.tmpdir()}${sep}${name}.zip`
+    );
+    unzipFile(
+      `${os.tmpdir()}${sep}${name}.zip`,
+      `${os.tmpdir()}${sep}${UID}`,
+      () => {
+        DEFAULT_TEMPLATE = name;
+        fs.unlink(`${os.tmpdir()}${sep}${name}.zip`, cb);
+      }
+    );
+  };
+  async function updateCadriciel(srcDir, destDir) {
+    try {
+      const storeDir = path.join(destDir, '.store');
+
+      // Sauvegarde de .store
+      const backupDir = path.join(os.tmpdir(), 'backup_store');
+      await fse.copy(storeDir, backupDir);
+
+      // Suppression de xxx/.cadriciel
+      await fse.remove(path.join(destDir));
+
+      // Copie de yyy/.cadriciel vers xxx/.cadriciel
+      await fse.copy(srcDir, path.join(destDir));
+
+      // Restauration de .store
+      await fse.copy(backupDir, storeDir);
+
+      // Suppression du dossier de sauvegarde
+      await fse.remove(backupDir);
+    } catch (error) {
+      console.error('Erreur lors de la mise à jour de .cadriciel:', error);
+    }
+  }
+
+  return {
+    info: {
+      title: '---',
+      description: 'upgrade cadriciel framework',
+    },
+    start: () => {
+      var spinner = ora('📥 Téléchargement du patch...').start();
+      const info = require(`${process.cwd()}/.cadriciel/version.json`);
+      const title = 'cadriciel-' + info.name;
+      download(title, async () => {
+        spinner.succeed(chalk.bold('Téléchargement OK.'));
+        spinner = ora('📥 Application du patch...').start();
+        const dir1 = `${os.tmpdir()}${sep}${UID}/§§project§§/.cadriciel`;
+        const dir2 = `${process.cwd()}/.cadriciel`;
+        await updateCadriciel(dir1, dir2);
+        spinner.succeed(chalk.bold('Application du patch OK.'));
+        console.log(' ');
+      });
+    },
+  };
+};

package/cli.js

@@ -12,8 +12,8 @@ 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 = 'http://localhost:3000/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 = {};
@@ -110,12 +110,14 @@ function findCadricielDir(startPath) {
 
 // Function to load global commands.
 const loadGlobalCommands = () => {
+  let args = process.argv;
+  //args.shift();
   let dir = fs.readdirSync(__dirname + '/cli/global');
   for (let i = 0; i < dir.length; i++) {
     if (dir[i].indexOf('.js') > -1)
       CADRICIEL_GLOBAL_COMMANDS[dir[i].split('.')[0]] = require(__dirname +
         '/cli/global/' +
-        dir[i])();
+        dir[i])(args);
   }
 };
 
@@ -209,37 +211,38 @@ const display = (commands) => {
 
   for (let el in commands) {
     let title = el;
-
-    if (commands[el].info) {
-      let description = commands[el].info.description;
-      if (commands[el].info.sub) {
-        title += ' <subcommand>';
-        const sc = [];
-        for (let i = 0; i < commands[el].info.sub.length; i++) {
-          sc.push(commands[el].info.sub[i].title);
+    if (commands[el].info.title != '---') {
+      if (commands[el].info) {
+        let description = commands[el].info.description;
+        if (commands[el].info.sub) {
+          title += ' <subcommand>';
+          const sc = [];
+          for (let i = 0; i < commands[el].info.sub.length; i++) {
+            sc.push(commands[el].info.sub[i].title);
+          }
+          description += chalk.white(' ');
+          description += chalk.grey(' (subcommands: ');
+          description += chalk.cyan(sc.join(', '));
+          description += chalk.grey(')');
         }
-        description += chalk.white(' ');
-        description += chalk.grey(' (subcommands: ');
-        description += chalk.cyan(sc.join(', '));
-        description += chalk.grey(')');
+        const dots = '.'.repeat(maxWidth - title.length);
+
+        const formattedDesc = formatDescription(
+          description,
+          maxDescriptionLength
+        );
+
+        console.log(
+          '   ' +
+            chalk.cyanBright(title) +
+            ' ' +
+            chalk.grey(dots) +
+            ' ' +
+            label(commands[el].info.label) +
+            ' ' +
+            chalk.white(formattedDesc)
+        );
       }
-      const dots = '.'.repeat(maxWidth - title.length);
-
-      const formattedDesc = formatDescription(
-        description,
-        maxDescriptionLength
-      );
-
-      console.log(
-        '   ' +
-          chalk.cyanBright(title) +
-          ' ' +
-          chalk.grey(dots) +
-          ' ' +
-          label(commands[el].info.label) +
-          ' ' +
-          chalk.white(formattedDesc)
-      );
     }
   }
 };
@@ -297,17 +300,20 @@ const processCommands = (args) => {
   const command = args[0];
   const maxWidth = 30;
   const maxDescriptionLength = 50;
+
   loadCadricielCommands(CADRICIEL_PATH + '/../');
-  if (!CADRICIEL_COMMANDS[command]) {
-    if (!CADRICIEL_GLOBAL_COMMANDS[command]) {
+
+  if (CADRICIEL_GLOBAL_COMMANDS[command]) {
+    CADRICIEL_GLOBAL_COMMANDS[command].start(args);
+  } else {
+    if (CADRICIEL_COMMANDS[command]) {
+      console.log(' ');
+      const dir = args.join('/');
+      return parseCommand(args);
+    } else {
       log.error('Commande inconnue : ' + command);
       return displayBanner();
     }
-    CADRICIEL_GLOBAL_COMMANDS[command].start(args);
-  } else {
-    console.log(' ');
-    const dir = args.join('/');
-    return parseCommand(args);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerema/cadriciel",
-  "version": "1.4.29",
+  "version": "1.4.31",
   "main": "index.js",
   "license": "MIT",
   "npm": ">=8.0.0",
@@ -19,6 +19,7 @@
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "figlet": "^1.5.2",
+    "fs-extra": "^11.2.0",
     "inquirer": "8.2.5",
     "isbinaryfile": "^5.0.0",
     "jsonwebtoken": "^9.0.2",