@cerema/cadriciel 1.4.30 → 1.4.32

package/cli/global/init.js

@@ -128,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

@@ -91,7 +91,7 @@ Host cadriciel
         .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 --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,
           }

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

@@ -211,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)
-      );
     }
   }
 };
@@ -299,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.30",
+  "version": "1.4.32",
   "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",