@cerema/cadriciel 0.5.3 → 0.5.5

package/cmd/init.js

@@ -1,4 +1,5 @@
 module.exports = function (program) {
+  var UID = require('shortid').generate();
   const inquirer = require('inquirer');
   const ora = require('ora');
   const os = require('os');
@@ -14,14 +15,13 @@ module.exports = function (program) {
     getTemplates,
   } = require('../lib/util');
   const { S3 } = require('../lib/s3');
-  var DEFAULT_TEMPLATE;
 
   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() + '/' + name })
+          .Extract({ path: os.tmpdir() + '/' + UID })
           .on('close', function () {
             DEFAULT_TEMPLATE = name;
             fs.unlink(`${os.tmpdir()}/${name}.zip`, cb);
@@ -29,6 +29,7 @@ module.exports = function (program) {
       );
     });
   };
+
   const changefs = (o, files, ndx, cb) => {
     if (!files[ndx]) return cb();
 
@@ -50,9 +51,7 @@ module.exports = function (program) {
         var output =
           OUTPUT_DIRECTORY +
           '/' +
-          input
-            .split(DEFAULT_TEMPLATE + '/')[1]
-            .replace(/§§project§§/g, o.project);
+          input.split(UID + '/')[1].replace(/§§project§§/g, o.project);
         var dir = require('path').dirname(output);
         fs.mkdirSync(dir, { recursive: true });
         fs.writeFileSync(output, text);
@@ -63,9 +62,7 @@ module.exports = function (program) {
         var output =
           OUTPUT_DIRECTORY +
           '/' +
-          input
-            .split(DEFAULT_TEMPLATE + '/')[1]
-            .replace(/§§project§§/g, o.project);
+          input.split(UID + '/')[1].replace(/§§project§§/g, o.project);
         var dir = require('path').dirname(output);
         fs.mkdirSync(dir, { recursive: true });
         fs.copyFileSync(input, output);
@@ -73,33 +70,31 @@ module.exports = function (program) {
       }
     });
   };
+
   const createProject = async (o) => {
     const account = await getAccount();
     var spinner = ora('Téléchargement du cadriciel').start();
-    return download(o.template.name, function () {
+    return download(o.template.dir, function () {
       spinner.succeed();
       spinner = ora('Création du projet ' + o.project).start();
-      console.log(`${os.tmpdir()}/${o.template.name}`);
-      recursive(
-        `${os.tmpdir()}/${o.template.name}`,
-        async function (err, files) {
-          spinner.succeed();
-          changefs(o, files, 0, function () {
-            fs.rmSync(os.tmpdir() + '/' + o.project, {
-              recursive: true,
-              force: true,
-            });
-            fs.writeFileSync(
-              process.cwd() + '/' + o.project + '/.project',
-              JSON.stringify(o)
-            );
-            spinner.succeed(`projet ${o.project} crée avec succès.`);
-            console.log('\n🚀 Happy coding !\n');
+      recursive(`${os.tmpdir()}/${UID}`, async function (err, files) {
+        spinner.succeed();
+        changefs(o, files, 0, function () {
+          fs.rmSync(os.tmpdir() + '/' + UID, {
+            recursive: true,
+            force: true,
           });
-        }
-      );
+          fs.writeFileSync(
+            process.cwd() + '/' + o.project + '/.project',
+            JSON.stringify(o)
+          );
+          spinner.succeed(`projet ${o.project} crée avec succès.`);
+          console.log('\n🚀 Happy coding !\n');
+        });
+      });
     });
   };
+
   const init = async (str, options) => {
     const templates = await getTemplates();
     var tpl = [];
@@ -119,43 +114,7 @@ module.exports = function (program) {
         name: 'template',
         message: 'Choisissez le modèle de cadriciel',
         choices: tpl,
-      } /*,
-      {
-        type: 'number',
-        name: 'pgport',
-        initial: 5433,
-        message: 'Spécifiez le port de PostGres',
-      },
-      {
-        type: 'number',
-        name: 'pgadmin',
-        initial: 8888,
-        message: 'Spécifiez le port de PgAdmin',
       },
-      {
-        type: 'number',
-        name: 'inbucket_port',
-        initial: 8889,
-        message: 'Spécifiez le port de FakeSMTP',
-      },
-      {
-        type: 'number',
-        name: 'keycloak_port',
-        initial: 8890,
-        message: 'Spécifiez le port de Keycloak',
-      },
-      {
-        type: 'input',
-        name: 'pgadmin_email',
-        initial: 'admin@cerema.fr',
-        message: 'Login',
-      },
-      {
-        type: 'password',
-        name: 'pgadmin_password',
-        initial: 'CeremaRulez!',
-        message: 'Mot de passe',
-      },*/,
     ];
     inquirer
       .prompt(questions)
@@ -168,7 +127,7 @@ module.exports = function (program) {
           return log.error('Ce projet existe déjà !');
         } catch (e) {}
 
-        OUTPUT_DIRECTORY = process.cwd();
+        OUTPUT_DIRECTORY = `${process.cwd()}`;
         createProject(response);
       })
       .catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerema/cadriciel",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "main": "index.js",
   "license": "MIT",
   "npm": ">=8.0.0",
@@ -9,19 +9,16 @@
     "cadriciel": "./cli.js"
   },
   "dependencies": {
-    "axios": "^1.2.3",
     "chalk-v2": "^1.0.2",
     "commander": "^10.0.0",
     "figlet": "^1.5.2",
-    "handlebars": "^4.7.7",
     "inquirer": "8.2.5",
     "isbinaryfile": "^5.0.0",
     "log-beautify": "^1.2.0",
     "minio": "^7.0.32",
     "ora": "^5.4.1",
-    "prompts": "^2.4.2",
     "recursive-readdir": "^2.2.3",
-    "shelljs": "^0.8.5",
+    "shortid": "^2.2.16",
     "terminal-link": "2.1.1",
     "unzipper": "^0.10.11"
   }

package/cmd/info.js

@@ -1,33 +0,0 @@
-module.exports = function (program) {
-  const fs = require('fs');
-  function info() {
-    var text = fs.readFileSync(process.cwd() + '/.project', 'utf-8');
-    var p = JSON.parse(text);
-    //console.log(p);
-    console.log('---');
-    console.log('Serveur PGAdmin');
-    var link = terminalLink(
-      'http://127.0.0.1:' + p.pgadmin_port,
-      'http://127.0.0.1:' + p.pgadmin_port
-    );
-    console.log(link);
-    console.log('\nServeur FakeSMTP');
-    link = terminalLink(
-      'http://127.0.0.1:' + p.inbucket_port,
-      'http://127.0.0.1:' + p.inbucket_port
-    );
-    console.log(link);
-    console.log('\nServeur KeyCloak (ORION)');
-    link = terminalLink(
-      'http://127.0.0.1:' + p.keycloak_port,
-      'http://127.0.0.1:' + p.keycloak_port
-    );
-    console.log(link);
-  }
-  program
-    .command('info')
-    .description('Affichage des informations des services')
-    .action((str, options) => {
-      info();
-    });
-};