@cerema/cadriciel 1.4.1 → 1.4.2

package/cli/global/install.js

@@ -1,35 +1,107 @@
 module.exports = (args) => {
-  const { execSync } = require('child_process');
+  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 getCommandOutput = (command) => {
+  function addMapping() {
     try {
-      const output = execSync(command, { encoding: 'utf-8' });
-      return output.trim(); // Remove new line and trailing space
-    } catch (error) {
-      // If there's an error (like the command not found), we'll assume it's not installed
-      return 'Not installed';
+      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]);
+
+    let found = false;
+    proc.stdout.on('data', (data) => {
+      if (data.toString().trim() !== '') {
+        found = true;
+      }
+    });
+
+    proc.on('close', (code) => {
+      callback(found);
+    });
   };
 
-  const getSoftwareVersions = () => {
-    const softwareChecks = {
-      Homebrew: 'brew -v',
-      Git: 'git --version',
-      Docker: 'docker --version',
-      Java: 'java -version 2>&1 | head -n 1', // Java version gets printed to stderr
-      Maven: 'mvn -v | head -n 1',
-      //Liquibase: 'liquibase --version',
-      Nodejs: 'node --version',
-    };
-
-    const versions = {};
-
-    for (const [software, command] of Object.entries(softwareChecks)) {
-      versions[software] = getCommandOutput(command);
+  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]);
+
+    dockerPull.stdout.on('data', (data) => {
+      //console.log(data.toString().trim());
+    });
 
-    return versions;
+    dockerPull.stderr.on('data', (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);
+      }
+    });
   };
 
-  //console.log(getSoftwareVersions());
+  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 = [
+        'postgres:15',
+        'cerema/cadriciel:1.0.0',
+        'dpage/pgadmin4',
+        'inbucket/inbucket:latest',
+        'quay.io/keycloak/keycloak:legacy',
+        'liquibase/liquibase',
+      ];
+      setupEnvironment(dockerImagesToInstall);
+    },
+  };
 };

package/package.json

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

package/_install.js

@@ -1,107 +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]);
-
-    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]);
-
-    dockerPull.stdout.on('data', (data) => {
-      //console.log(data.toString().trim());
-    });
-
-    dockerPull.stderr.on('data', (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 = [
-        'postgres:15',
-        'cerema/cadriciel:1.0.0',
-        'dpage/pgadmin4',
-        'inbucket/inbucket:latest',
-        'quay.io/keycloak/keycloak:legacy',
-        'liquibase/liquibase',
-      ];
-      setupEnvironment(dockerImagesToInstall);
-    },
-  };
-};