@cerema/cadriciel 0.6.1 → 1.0.0

package/cmd/init.js

@@ -1,9 +1,10 @@
 module.exports = function (program) {
   var UID = require('shortid').generate();
   const inquirer = require('inquirer');
+  const path = require('path');
+  const AdmZip = require('adm-zip');
   const ora = require('ora');
   const os = require('os');
-  const unzipper = require('unzipper');
   const recursive = require('recursive-readdir');
   const fs = require('fs');
   const log = require('log-beautify');
@@ -16,17 +17,27 @@ module.exports = function (program) {
   } = require('../lib/util');
   const { S3 } = require('../lib/s3');
 
+  const unzipFile = (zipFilePath, outputPath, callback) => {
+    const zip = new AdmZip(zipFilePath);
+
+    try {
+      zip.extractAllTo(outputPath, true);
+      callback();
+    } catch (err) {
+      console.error(
+        "Une erreur s'est produite lors de la décompression :",
+        err
+      );
+    }
+  };
+
   const download = async (name, cb) => {
     var client = await S3();
     client.get('templates', `${name}.zip`, function () {
-      fs.createReadStream(`${os.tmpdir()}/${name}.zip`).pipe(
-        unzipper
-          .Extract({ path: os.tmpdir() + '/' + UID })
-          .on('close', function () {
-            DEFAULT_TEMPLATE = name;
-            fs.unlink(`${os.tmpdir()}/${name}.zip`, cb);
-          })
-      );
+      unzipFile(`${os.tmpdir()}/${name}.zip`, `${os.tmpdir()}/${UID}`, () => {
+        DEFAULT_TEMPLATE = name;
+        fs.unlink(`${os.tmpdir()}/${name}.zip`, cb);
+      });
     });
   };
 
@@ -41,7 +52,6 @@ module.exports = function (program) {
         var text = fs.readFileSync(input, 'utf-8');
         text = text.replace(/§§project§§/g, o.project);
         text = text.replace(/§§projectUpper§§/g, o.project.toUpperCase());
-        text = text.replace(/§§projectNS§§/g, capitalizeFirstLetter(o.project));
         text = text.replace(/§§projectID§§/g, capitalizeFirstLetter(o.project));
         text = text.replace(/§§pg_port§§/g, o.pg_port);
         text = text.replace(/§§inbucket_port§§/g, o.inbucket_port);
@@ -89,73 +99,7 @@ module.exports = function (program) {
             process.cwd() + '/' + o.project + '/.project',
             JSON.stringify(o)
           );
-          var gitignore = `
-##########################
-# Application specfic
-##########################
-# config/config.js
-
-##########################
-# General
-##########################
-
-#####
-# OS X temporary files
-#
-# c.f. http://www.westwind.com/reference/os-x/invisibles.html
-.DS_Store
-__MACOSX
-
-# c.f. http://www.westwind.com/reference/os-x/invisibles.html
-.Trashes
-
-# c.f. http://www.westwind.com/reference/os-x/invisibles.html
-*.swp
-
-#####
-# Node stuff
-#
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
-node_modules
-          `;
-          fs.writeFileSync(
-            process.cwd() + '/' + o.project + '/.gitignore',
-            gitignore
-          );
           spinner.succeed(`projet ${o.project} crée avec succès.`);
-          console.log('\n');
-          console.log('Prochaines étapes');
-          console.log('-----------------');
-          console.log('cd ' + o.project);
-          console.log('git init');
-          console.log('git add --all');
-          console.log('git commit -m "first commit"');
-          console.log('npm i');
-          console.log('Lancer le backend avec votre IDE préféré ;-)');
-          console.log('\n');
           console.log('\n🚀 Happy coding !\n');
         });
       });

package/lib/s3.js

@@ -1,7 +1,6 @@
 const os = require('os');
 const fs = require('fs');
 const util = require('util');
-const userHomeDir = os.homedir();
 const S3_URI = 's3.siipro.fr';
 const Minio = require('minio');
 
@@ -15,7 +14,7 @@ const S3 = async function (current_login) {
       current_login.useSSL = true;
       return new Minio.Client(current_login);
     }
-    const r = await readFile(`${userHomeDir}/.cadriciel/account.json`, 'utf-8');
+    const r = await readFile(`${os.homedir}/.cadriciel/account.json`, 'utf-8');
     if (r) return new Minio.Client(JSON.parse(r));
   };
   var client = await login(current_login);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerema/cadriciel",
-  "version": "0.6.1",
+  "version": "1.0.0",
   "main": "index.js",
   "license": "MIT",
   "npm": ">=8.0.0",
@@ -9,17 +9,19 @@
     "cadriciel": "./cli.js"
   },
   "dependencies": {
+    "adm-zip": "^0.5.10",
     "chalk-v2": "^1.0.2",
     "commander": "^10.0.0",
     "figlet": "^1.5.2",
     "inquirer": "8.2.5",
     "isbinaryfile": "^5.0.0",
     "log-beautify": "^1.2.0",
-    "minio": "",
+    "minio": "^7.0.32",
     "ora": "^5.4.1",
     "recursive-readdir": "^2.2.3",
     "shortid": "^2.2.16",
     "terminal-link": "2.1.1",
-    "unzipper": "^0.10.11"
+    "unzipper": "^0.10.11",
+    "yauzl": "^2.10.0"
   }
 }

package/gitignore

@@ -1,50 +0,0 @@
-##########################
-# Application specfic
-##########################
-# config/config.js
-
-##########################
-# General
-##########################
-
-#####
-# OS X temporary files
-#
-# c.f. http://www.westwind.com/reference/os-x/invisibles.html
-.DS_Store
-__MACOSX
-
-# c.f. http://www.westwind.com/reference/os-x/invisibles.html
-.Trashes
-
-# c.f. http://www.westwind.com/reference/os-x/invisibles.html
-*.swp
-
-#####
-# Node stuff
-#
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
-node_modules