@cerema/cadriciel 1.4.38 → 1.5.0

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/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,7 +61,11 @@ Host cadriciel
       try {
         fs.mkdirSync(userHome + '/.ssh');
       } catch (e) {}
-      var ssh = fs.readFileSync(userHome + '/.ssh/config', 'utf-8');
+      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' });
@@ -161,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

@@ -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,7 +36,11 @@ module.exports = (args) => {
       try {
         fs.mkdirSync(userHome + '/.ssh');
       } catch (e) {}
-      var ssh = fs.readFileSync(userHome + '/.ssh/config', 'utf-8');
+      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' });
@@ -53,9 +62,6 @@ 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) => {
@@ -124,7 +130,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/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/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.38",
+  "version": "1.5.0",
   "main": "index.js",
   "license": "MIT",
   "npm": ">=8.0.0",