@cerema/cadriciel 1.4.13 → 1.4.15

package/cli/global/doctor.js

@@ -29,40 +29,37 @@ module.exports = (args) => {
       console.log(' ');
       console.log(' 🏥 ' + chalk.bold('Pré-requis globaux'));
       console.log(' ');
-      const tasks = new Listr([
-        {
-          title: 'Homebrew',
-          task: () => checkInstallation('brew --version'),
-        },
-        {
-          title: 'Git',
-          task: () => checkInstallation('git --version'),
-        },
-        {
-          title: 'Java',
-          task: () => checkInstallation('java --version'),
-        },
-        {
-          title: 'Maven',
-          task: () => checkInstallation('mvn -v'),
-        },
-        {
-          title: 'Liquibase',
-          task: () =>
-            checkInstallation('liquibase --version', extractLiquibaseVersion),
-        },
-      ]);
+      const tasks = new Listr(
+        [
+          {
+            title: 'Homebrew',
+            task: () => checkInstallation('brew --version'),
+          },
+          {
+            title: 'Git',
+            task: () => checkInstallation('git --version'),
+          },
+          {
+            title: 'Java',
+            task: () => checkInstallation('java --version'),
+          },
+        ],
+        { concurrent: true, exitOnError: false }
+      );
 
-      const dockerTasks = new Listr([
-        {
-          title: 'Docker',
-          task: () => checkInstallation('docker ps'),
-        },
-        {
-          title: 'Docker Compose',
-          task: () => checkInstallation('docker-compose --version'),
-        },
-      ]);
+      const dockerTasks = new Listr(
+        [
+          {
+            title: 'Docker',
+            task: () => checkInstallation('docker ps'),
+          },
+          {
+            title: 'Docker Compose',
+            task: () => checkInstallation('docker-compose --version'),
+          },
+        ],
+        { concurrent: true, exitOnError: false }
+      );
 
       tasks
         .run()

package/cli/global/init.js

@@ -252,6 +252,7 @@ module.exports = (args) => {
       });
     });
   };
+
   return {
     info: {
       title: 'completion',

package/cli/global/install.js

@@ -1,154 +1,107 @@
 module.exports = (args) => {
-  const { exec } = require('child_process');
-  const Listr = require('listr');
+  const chalk = require('chalk-v2');
+  const ora = require('ora');
   const os = require('os');
+  const fs = require('fs');
+  const { spawn } = require('child_process');
+  const HOSTS_PATH = '/etc/hosts';
+  const MAPPING_ENTRY = '127.0.0.1 keycloak';
 
-  const executeCommand = (command) => {
-    return new Promise((resolve, reject) => {
-      exec(command, (error, stdout, stderr) => {
-        if (error) {
-          console.error(stderr);
-          reject(error);
-        } else {
-          console.log(stdout);
-          resolve(stdout);
-        }
-      });
+  function addMapping() {
+    try {
+      const hostsContent = fs.readFileSync(HOSTS_PATH, 'utf8');
+      if (!hostsContent.includes(MAPPING_ENTRY)) {
+        fs.appendFileSync(HOSTS_PATH, os.EOL + MAPPING_ENTRY);
+      }
+    } catch (e) {
+      console.error(
+        chalk.red.bold(
+          "\nVous devez lancer la commande en tant qu'administrateur.\n"
+        )
+      );
+      return process.exit(0);
+    }
+  }
+
+  const checkIfCommandExists = (command, callback) => {
+    const proc = spawn('which', [command], { shell: true });
+
+    let found = false;
+    proc.stdout.on('data', (data) => {
+      if (data.toString().trim() !== '') {
+        found = true;
+      }
+    });
+
+    proc.on('close', (code) => {
+      callback(found);
     });
   };
 
-  const isMacOS = os.platform() === 'darwin';
-  const isLinux = os.platform() === 'linux';
-  const isWindows = os.platform() === 'win32';
+  const installDockerImages = (images, ndx) => {
+    if (!ndx) {
+      ndx = 0;
+      console.log('\n💻 ' + chalk.bold('Installation des dépendances...\n'));
+    }
+    if (!images[ndx]) return console.log('\n👍 Installation terminée.');
+    const image = images[ndx];
+
+    const response = ora(`Téléchargement de l'image: ${image}`).start();
+    const dockerPull = spawn('docker', ['pull', image], { shell: true });
+
+    dockerPull.stdout.on('data', (data) => {
+      //console.log(data.toString().trim());
+    });
+
+    dockerPull.stderr.on('data', (data) => {
+      console.log(data);
+      response.fail(chalk.red('Le service Docker ne répond pas.'));
+      return process.exit(1);
+    });
 
-  const installWithChocolatey = (packageName) => {
-    return executeCommand(`choco install ${packageName} -y`);
+    dockerPull.on('close', (code) => {
+      if (code !== 0) {
+        response.fail(`Error pulling image ${image}`);
+      } else {
+        response.succeed(`Image ${image} OK.`);
+        installDockerImages(images, ndx + 1);
+      }
+    });
+  };
+
+  const setupEnvironment = (images) => {
+    checkIfCommandExists('docker', (dockerExists) => {
+      if (!dockerExists) {
+        console.error(`Docker n'est pas installé.`);
+        return;
+      }
+
+      checkIfCommandExists('git', (gitExists) => {
+        if (!gitExists) {
+          console.error(`Git n'est pas installé.`);
+          return;
+        }
+
+        installDockerImages(images);
+      });
+    });
   };
+
   return {
     info: {
       title: 'install',
-      description: `Installation des dépendances.`,
+      label: 'docker',
+      description: 'Installation des images Docker',
     },
     start: () => {
-      const tasksDocker = new Listr([
-        {
-          title: 'Docker',
-          task: () => executeCommand('brew install rancher-desktop'),
-          enabled: () => isMacOS || isLinux,
-          skip: () =>
-            executeCommand('docker ps').then(() => 'Docker est déjà installé.'),
-        },
-        {
-          title: 'Docker',
-          enabled: () => isWindows,
-          task: () => installWithChocolatey('rancher-desktop'),
-          skip: () =>
-            executeCommand('docker ps').then(() => 'Docker est déjà installé.'),
-        },
-      ]);
-      const tasks = new Listr([
-        {
-          title: 'Install Homebrew',
-          enabled: () => isMacOS || isLinux,
-          task: () =>
-            executeCommand(
-              '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"'
-            ),
-          skip: () =>
-            executeCommand('brew --version').then(
-              () => 'Homebrew est déjà installé.'
-            ),
-        },
-        {
-          title: 'Install Git',
-          enabled: () => isMacOS || isLinux,
-          task: () => executeCommand('brew install git'),
-          skip: () =>
-            executeCommand('git --version').then(
-              () => 'Git est déjà installé.'
-            ),
-        },
-        {
-          title: 'Install Java (OpenJDK 17)',
-          enabled: () => isMacOS || isLinux,
-          task: () => executeCommand('brew install openjdk@17'),
-          skip: () =>
-            executeCommand('java -version').then(
-              () => 'Java (OpenJDK 17) est déjà installé.'
-            ),
-        },
-        {
-          title: 'Install Maven',
-          enabled: () => isMacOS || isLinux,
-          task: () => executeCommand('brew install maven'),
-          skip: () =>
-            executeCommand('mvn -v').then(() => 'Maven est déjà installé.'),
-        },
-        {
-          title: 'Install Liquibase',
-          enabled: () => isMacOS || isLinux,
-          task: () => executeCommand('brew install liquibase'),
-          skip: () =>
-            executeCommand('liquibase --version').then(
-              () => 'Liquibase est déjà installé.'
-            ),
-        },
-        {
-          title: 'Install Chocolatey (Windows)',
-          enabled: () => isWindows,
-          task: () =>
-            executeCommand(
-              `@"%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\\chocolatey\\bin"`
-            ),
-          skip: () =>
-            executeCommand('choco -v').then(
-              () => 'Chocolatey est déjà installé.'
-            ),
-        },
-        {
-          title: 'Install Git (Windows)',
-          enabled: () => isWindows,
-          task: () => installWithChocolatey('git'),
-          skip: () =>
-            executeCommand('git --version').then(
-              () => 'Git est déjà installé.'
-            ),
-        },
-        {
-          title: 'Install Java (OpenJDK 17) (Windows)',
-          enabled: () => isWindows,
-          task: () => installWithChocolatey('openjdk17'),
-          skip: () =>
-            executeCommand('java -version').then(
-              () => 'Java (OpenJDK 17) est déjà installé.'
-            ),
-        },
-        {
-          title: 'Install Maven (Windows)',
-          enabled: () => isWindows,
-          task: () => installWithChocolatey('maven'),
-          skip: () =>
-            executeCommand('mvn -v').then(() => 'Maven est déjà installé.'),
-        },
-        {
-          title: 'Install Liquibase (Windows)',
-          enabled: () => isWindows,
-          task: () => installWithChocolatey('liquibase'),
-          skip: () =>
-            executeCommand('liquibase --version').then(
-              () => 'Liquibase est déjà installé.'
-            ),
-        },
-      ]);
-
-      tasks
-        .run()
-        .then(() => {
-          tasksDocker.run().catch((err) => {});
-        })
-        .catch((err) => {
-          console.error(err);
-        });
+      addMapping();
+      const dockerImagesToInstall = [
+        'postgis/postgis',
+        'dpage/pgadmin4',
+        'inbucket/inbucket:latest',
+        'quay.io/keycloak/keycloak:legacy',
+      ];
+      setupEnvironment(dockerImagesToInstall);
     },
   };
 };

package/cli/global/login.js

@@ -92,6 +92,7 @@ module.exports = (args) => {
                   try {
                     var response = await cadriciel.get('/login');
                   } catch (e) {
+                    console.log(e);
                     console.log(' ');
                     console.log(
                       chalk.red(' [AUTH]') +

package/cli.js

@@ -91,6 +91,7 @@ const loadCadricielCommands = (path) => {
 const label = (caption) => {
   if (caption === 'experimental') return chalk.red(' (' + caption + ') ');
   if (caption === 'beta') return chalk.magenta(' (' + caption + ') ');
+  if (caption === 'docker') return chalk.green(' (' + caption + ') ');
   if (caption === 'ai')
     return chalk.yellow(' (' + caption.toUpperCase() + ') ');
   return '';
@@ -199,7 +200,7 @@ const displayBanner = () => {
     }
     console.log(
       chalk.cyan(data) +
-        chalk.bold('\n CLI v ' + require('./package.json').version) +
+        chalk.bold('\n CLI v' + require('./package.json').version) +
         version_cadriciel
     );
     console.log(' ');

package/lib/cadriciel.js

@@ -29,11 +29,17 @@ class CadricielAPI {
       timeout: 10000,
       headers: { Authorization: 'Bearer ' + token },
     });
+    console.log({
+      baseURL: baseURL,
+      timeout: 10000,
+      headers: { Authorization: 'Bearer ' + token },
+    });
   }
 
   async get(url, params = {}) {
     try {
       const response = await this.client.get(url, { params });
+      console.log(response);
       return response.data;
     } catch (error) {
       throw error;

package/package.json

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

package/cli/global/_install.js

@@ -1,106 +0,0 @@
-module.exports = (args) => {
-  const chalk = require('chalk-v2');
-  const ora = require('ora');
-  const os = require('os');
-  const fs = require('fs');
-  const { spawn } = require('child_process');
-  const HOSTS_PATH = '/etc/hosts';
-  const MAPPING_ENTRY = '127.0.0.1 keycloak';
-
-  function addMapping() {
-    try {
-      const hostsContent = fs.readFileSync(HOSTS_PATH, 'utf8');
-      if (!hostsContent.includes(MAPPING_ENTRY)) {
-        fs.appendFileSync(HOSTS_PATH, os.EOL + MAPPING_ENTRY);
-      }
-    } catch (e) {
-      console.error(
-        chalk.red.bold(
-          "\nVous devez lancer la commande en tant qu'administrateur.\n"
-        )
-      );
-      return process.exit(0);
-    }
-  }
-
-  const checkIfCommandExists = (command, callback) => {
-    const proc = spawn('which', [command], { shell: true });
-
-    let found = false;
-    proc.stdout.on('data', (data) => {
-      if (data.toString().trim() !== '') {
-        found = true;
-      }
-    });
-
-    proc.on('close', (code) => {
-      callback(found);
-    });
-  };
-
-  const installDockerImages = (images, ndx) => {
-    if (!ndx) {
-      ndx = 0;
-      console.log('\n💻 ' + chalk.bold('Installation des dépendances...\n'));
-    }
-    if (!images[ndx]) return console.log('\n👍 Installation terminée.');
-    const image = images[ndx];
-
-    const response = ora(`Téléchargement de l'image: ${image}`).start();
-    const dockerPull = spawn('docker', ['pull', image], { shell: true });
-
-    dockerPull.stdout.on('data', (data) => {
-      //console.log(data.toString().trim());
-    });
-
-    dockerPull.stderr.on('data', (data) => {
-      console.log(data);
-      response.fail(chalk.red('Le service Docker ne répond pas.'));
-      return process.exit(1);
-    });
-
-    dockerPull.on('close', (code) => {
-      if (code !== 0) {
-        response.fail(`Error pulling image ${image}`);
-      } else {
-        response.succeed(`Image ${image} OK.`);
-        installDockerImages(images, ndx + 1);
-      }
-    });
-  };
-
-  const setupEnvironment = (images) => {
-    checkIfCommandExists('docker', (dockerExists) => {
-      if (!dockerExists) {
-        console.error(`Docker n'est pas installé.`);
-        return;
-      }
-
-      checkIfCommandExists('git', (gitExists) => {
-        if (!gitExists) {
-          console.error(`Git n'est pas installé.`);
-          return;
-        }
-
-        installDockerImages(images);
-      });
-    });
-  };
-  return {
-    info: {
-      title: 'install',
-      description: 'Installation des dépendances (La première fois uniquement)',
-    },
-    start: () => {
-      addMapping();
-      const dockerImagesToInstall = [
-        'postgis/postgis',
-        'dpage/pgadmin4',
-        'inbucket/inbucket:latest',
-        'quay.io/keycloak/keycloak:legacy',
-        'liquibase/liquibase',
-      ];
-      setupEnvironment(dockerImagesToInstall);
-    },
-  };
-};