@cerema/cadriciel 1.4.11 → 1.4.13

package/cli/global/_install.js

@@ -24,7 +24,7 @@ module.exports = (args) => {
   }
 
   const checkIfCommandExists = (command, callback) => {
-    const proc = spawn('which', [command]);
+    const proc = spawn('which', [command], { shell: true });
 
     let found = false;
     proc.stdout.on('data', (data) => {
@@ -47,7 +47,7 @@ module.exports = (args) => {
     const image = images[ndx];
 
     const response = ora(`Téléchargement de l'image: ${image}`).start();
-    const dockerPull = spawn('docker', ['pull', image]);
+    const dockerPull = spawn('docker', ['pull', image], { shell: true });
 
     dockerPull.stdout.on('data', (data) => {
       //console.log(data.toString().trim());

package/cli/global/install.js

@@ -33,18 +33,17 @@ module.exports = (args) => {
       const tasksDocker = new Listr([
         {
           title: 'Docker',
-          task: () => executeCommand('docker ps'),
+          task: () => executeCommand('brew install rancher-desktop'),
+          enabled: () => isMacOS || isLinux,
           skip: () =>
-            executeCommand('docker ps').then(
-              () => 'Docker is already installed'
-            ),
+            executeCommand('docker ps').then(() => 'Docker est déjà installé.'),
         },
         {
-          title: 'Docker Compose',
+          title: 'Docker',
+          enabled: () => isWindows,
+          task: () => installWithChocolatey('rancher-desktop'),
           skip: () =>
-            executeCommand('docker-compose --version').then(
-              () => 'Docker Compose is already installed'
-            ),
+            executeCommand('docker ps').then(() => 'Docker est déjà installé.'),
         },
       ]);
       const tasks = new Listr([
@@ -57,7 +56,7 @@ module.exports = (args) => {
             ),
           skip: () =>
             executeCommand('brew --version').then(
-              () => 'Homebrew is already installed'
+              () => 'Homebrew est déjà installé.'
             ),
         },
         {
@@ -66,7 +65,7 @@ module.exports = (args) => {
           task: () => executeCommand('brew install git'),
           skip: () =>
             executeCommand('git --version').then(
-              () => 'Git is already installed'
+              () => 'Git est déjà installé.'
             ),
         },
         {
@@ -75,7 +74,7 @@ module.exports = (args) => {
           task: () => executeCommand('brew install openjdk@17'),
           skip: () =>
             executeCommand('java -version').then(
-              () => 'Java (OpenJDK 17) is already installed'
+              () => 'Java (OpenJDK 17) est déjà installé.'
             ),
         },
         {
@@ -83,7 +82,7 @@ module.exports = (args) => {
           enabled: () => isMacOS || isLinux,
           task: () => executeCommand('brew install maven'),
           skip: () =>
-            executeCommand('mvn -v').then(() => 'Maven is already installed'),
+            executeCommand('mvn -v').then(() => 'Maven est déjà installé.'),
         },
         {
           title: 'Install Liquibase',
@@ -91,7 +90,7 @@ module.exports = (args) => {
           task: () => executeCommand('brew install liquibase'),
           skip: () =>
             executeCommand('liquibase --version').then(
-              () => 'Liquibase is already installed'
+              () => 'Liquibase est déjà installé.'
             ),
         },
         {
@@ -103,7 +102,7 @@ module.exports = (args) => {
             ),
           skip: () =>
             executeCommand('choco -v').then(
-              () => 'Chocolatey is already installed'
+              () => 'Chocolatey est déjà installé.'
             ),
         },
         {
@@ -112,7 +111,7 @@ module.exports = (args) => {
           task: () => installWithChocolatey('git'),
           skip: () =>
             executeCommand('git --version').then(
-              () => 'Git is already installed'
+              () => 'Git est déjà installé.'
             ),
         },
         {
@@ -121,7 +120,7 @@ module.exports = (args) => {
           task: () => installWithChocolatey('openjdk17'),
           skip: () =>
             executeCommand('java -version').then(
-              () => 'Java (OpenJDK 17) is already installed'
+              () => 'Java (OpenJDK 17) est déjà installé.'
             ),
         },
         {
@@ -129,7 +128,7 @@ module.exports = (args) => {
           enabled: () => isWindows,
           task: () => installWithChocolatey('maven'),
           skip: () =>
-            executeCommand('mvn -v').then(() => 'Maven is already installed'),
+            executeCommand('mvn -v').then(() => 'Maven est déjà installé.'),
         },
         {
           title: 'Install Liquibase (Windows)',
@@ -137,14 +136,19 @@ module.exports = (args) => {
           task: () => installWithChocolatey('liquibase'),
           skip: () =>
             executeCommand('liquibase --version').then(
-              () => 'Liquibase is already installed'
+              () => 'Liquibase est déjà installé.'
             ),
         },
       ]);
 
-      tasks.run().catch((err) => {
-        console.error(err);
-      });
+      tasks
+        .run()
+        .then(() => {
+          tasksDocker.run().catch((err) => {});
+        })
+        .catch((err) => {
+          console.error(err);
+        });
     },
   };
 };

package/cli.js

@@ -25,7 +25,9 @@ try {
 const checkVersion = async () => {
   return new Promise((resolve, reject) => {
     const packageName = '@cerema/cadriciel';
-    const child = spawn('npm', ['view', packageName, 'version']);
+    const child = spawn('npm', ['view', packageName, 'version'], {
+      shell: true,
+    });
 
     let version = '';
 
@@ -245,6 +247,7 @@ const processCommands = (args) => {
 
     const child = spawn(cmd, fullArgs, {
       stdio: 'inherit',
+      shell: true,
     });
 
     child.on('close', (code) => {});

package/package.json

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