@cerema/cadriciel 1.4.39 → 1.5.1

package/cli/global/doc.js

@@ -6,7 +6,7 @@ module.exports = (args) => {
       description: `Documentation du cadriciel`,
     },
     start: async () => {
-      var url = 'https://docs.k8-dev.cerema.fr/';
+      var url = 'https://docs.cerema.dev/';
       var start =
         process.platform == 'darwin'
           ? 'open'

package/cli/global/init.js

@@ -62,16 +62,15 @@ Host cadriciel
         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);
-    }
+        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(
@@ -166,7 +165,7 @@ Host cadriciel
 
              💻 ${chalk.bold('Pour manager votre projet :')}
             
-             👉  ${link('studio.k8-dev.cerema.fr', 'studio.k8-dev.cerema.fr')}
+             👉  ${link('studio.cerema.dev', 'studio.cerema.dev')}
             
     ──────────────────────────────────────────────────────────────`);
             console.log(' ');

package/cli/global/load.js

@@ -37,16 +37,15 @@ module.exports = (args) => {
         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);
-    }
+        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(
@@ -64,7 +63,6 @@ Host cadriciel
 # -----------------------------------------------------
     `;
 
-
   /** loading the project */
   const load = async (uri, title) => {
     console.log(' ');
@@ -103,12 +101,29 @@ Host cadriciel
         .replace('git@', 'https://')
         .replace('.git', '');
       try {
+        const cwd = process.cwd() + '/' + title;
+        // Configurer l'utilisateur Git
         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,
-          }
+          `git config --local user.email "${user.info.email}" && git config --local user.name "${user.info.name}"`,
+          { cwd }
         );
+
+        // Vérifier si la branche existe sur le serveur
+        try {
+          await execPromise(
+            `git fetch origin ${user.trigram}:${user.trigram}`,
+            { cwd }
+          );
+          // La branche existe et a été créée localement, basculer dessus
+          await execPromise(`git checkout ${user.trigram}`, { cwd });
+        } catch (error) {
+          // La branche n'existe pas sur le serveur, la créer localement et la pousser
+          await execPromise(`git checkout -b ${user.trigram}`, { cwd });
+          await execPromise(`git push -u origin ${user.trigram}`, { cwd });
+        }
+
+        // Configurer le rebase automatique pour les pulls
+        await execPromise('git config pull.rebase true', { cwd });
         step2.succeed(
           '🎉 ' + chalk.bold('Votre projet a été correctement installé')
         );
@@ -132,7 +147,7 @@ Host cadriciel
 
              💻 ${chalk.bold('Pour manager votre projet :')}
             
-             👉  ${link('studio.k8-dev.cerema.fr', 'studio.k8-dev.cerema.fr')}
+             👉  ${link('studio.cerema.dev', 'studio.cerema.dev')}
             
     ──────────────────────────────────────────────────────────────`);
         console.log(' ');

package/cli.js

@@ -12,7 +12,7 @@ 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.cerema.dev/api';
 //global.CADRICIEL_URI = 'http://localhost:3000/api';
 
 // Initialize command storage objects.

package/package.json

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