@cerema/cadriciel 1.4.37 → 1.4.39

package/cli/global/doctor.js

@@ -15,13 +15,6 @@ module.exports = (args) => {
       });
     });
   };
-
-  const extractLiquibaseVersion = (output) => {
-    const versionLine = output
-      .split('\n')
-      .find((line) => line.startsWith('Liquibase Version:'));
-    return versionLine ? versionLine.trim() : 'Version not found';
-  };
   return {
     info: {
       title: 'doctor',
@@ -29,27 +22,29 @@ module.exports = (args) => {
     },
     start: () => {
       console.log(' ');
+      
       console.log(' 🏥 ' + chalk.bold('Pré-requis globaux'));
       console.log(' ');
       const myTasks = [
         {
           title: 'Homebrew',
-          task: () => checkInstallation('brew --version'),
+          task: () =>  checkInstallation('brew --version'),
         },
         {
           title: 'Pnpm',
-          task: () => checkInstallation('pnpm -v'),
+          task: () =>  checkInstallation('pnpm -v'),
         },
         {
           title: 'Git',
-          task: () => checkInstallation('git --version'),
+          task: () =>  checkInstallation('git --version'),
         },
         {
           title: 'Java',
-          task: () => checkInstallation('java --version'),
+          task: () =>  checkInstallation('java --version'),
         },
       ];
       if (platform === 'linux ') myTasks.splice(0, 1);
+      if (platform === 'win32') myTasks.splice(0, 1);
 
       const tasks = new Listr(myTasks, {
         concurrent: true,
@@ -60,11 +55,11 @@ module.exports = (args) => {
         [
           {
             title: 'Docker',
-            task: () => checkInstallation('docker ps'),
+            task: () =>  checkInstallation('docker ps'),
           },
           {
             title: 'Docker Compose',
-            task: () => checkInstallation('docker-compose --version'),
+            task: () =>  checkInstallation('docker-compose --version'),
           },
         ],
         { concurrent: true, exitOnError: false }
@@ -80,9 +75,20 @@ module.exports = (args) => {
               ' (si vous utilisez docker)'
           );
           console.log(' ');
-          dockerTasks.run().catch((err) => {});
+          dockerTasks.run().then(()=>{
+          }).catch((err) => {});
         })
-        .catch((err) => {});
+        .catch((err) => {
+          console.log(' ');
+          console.log(
+            ' 📦 ' +
+              chalk.bold('Pré-requis Docker') +
+              ' (si vous utilisez docker)'
+          );
+          console.log(' ');
+          dockerTasks.run().then(()=>{
+          }).catch((err) => {});
+        });
     },
   };
 };

package/cli/global/init.js

@@ -61,12 +61,17 @@ Host cadriciel
       try {
         fs.mkdirSync(userHome + '/.ssh');
       } catch (e) {}
+      try {
       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) {
+      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(

package/cli/global/load.js

@@ -10,6 +10,11 @@ module.exports = (args) => {
   const userHome = require('os').homedir();
   const { error } = require(path.join('..', '..', 'lib', 'message'));
   const { getTemplates } = require(path.join('..', '..', 'lib', 'util'));
+
+  const CadricielAPI = require(path.join('..', '..', 'lib', 'cadriciel'));
+  const cadriciel = new CadricielAPI();
+  var templates = [];
+
   const link = (url, name) => {
     if (!name) name = url;
     if (url.includes('localhost')) url = 'http://' + url + '/';
@@ -31,12 +36,17 @@ module.exports = (args) => {
       try {
         fs.mkdirSync(userHome + '/.ssh');
       } catch (e) {}
+      try {
       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) {
+      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(
@@ -53,9 +63,7 @@ Host cadriciel
     IdentitiesOnly yes
 # -----------------------------------------------------
     `;
-  const CadricielAPI = require(path.join('..', '..', 'lib', 'cadriciel'));
-  const cadriciel = new CadricielAPI();
-  var templates = [];
+
 
   /** loading the project */
   const load = async (uri, title) => {

package/cli/global/upgrade.js

@@ -77,11 +77,18 @@ module.exports = (args) => {
       description: 'upgrade cadriciel framework',
     },
     start: () => {
+      console.log(' ');
       var spinner = ora('📥 Téléchargement du patch...').start();
       try {
-        var info = require(`${process.cwd()}/.cadriciel/version.json`);
+        var info = require(path.join(process.cwd(),'.cadriciel','version.json'));
       } catch (e) {
-        var info = require(`${process.cwd()}/.cadriciel/bin/version.json`);
+        try {
+        var info = require(path.join(process.cwd(),'.cadriciel','bin','version.json'));
+      } catch (e) {
+        spinner.fail('upgrade doit être lancé à partir de votre projet.');
+        console.log(' ');
+        return;
+      }
       }
       const title = 'cadriciel-' + info.name;
       download(title, async () => {

package/lib/cadriciel.js

@@ -5,28 +5,24 @@ const fs = require('fs');
 const os = require('os');
 const HomeDir = os.homedir() + '/.cadriciel';
 const { error } = require('./message');
+const https = require('https');
 var baseURL = global.CADRICIEL_URI;
 class CadricielAPI {
   constructor(token) {
+    const httpsAgent = new https.Agent({
+      rejectUnauthorized: false,
+    });
     if (!token) {
       try {
         token = fs.readFileSync(HomeDir + '/account', 'utf-8');
         token = token.replace(/\n/g, '');
-      } catch (e) {
-        /*console.log(e);
-        console.log(
-          chalk.bold('  [AUTH] ') +
-            chalk.red(
-              ' Vous devez être authentifié pour utiliser cette fonctionnalité.'
-            )
-        );
-        return process.exit(1);*/
-      }
+      } catch (e) {}
     }
     this.client = axios.create({
       baseURL: baseURL,
       timeout: 10000,
       headers: { Authorization: 'Bearer ' + token },
+      httpsAgent: httpsAgent,
     });
   }
 

package/package.json

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