Merge pull request #13 from hadiindrawan/dev

add import env feature

Author: hadiindrawan

index.js

@@ -3,6 +3,7 @@ import fs from 'fs'
 import inquirer from 'inquirer';
 import { exec } from 'child_process';
 import generate from './lib/generate.js';
+import generateEnv from './lib/generate_env.js';
 
 let eslintConfig = 
 `{
@@ -32,10 +33,14 @@ function existModuleType() {
     }
 }
 
-function validateInput(input) {
+function validateInputJson(input) {
     return input.includes('json') ? true : 'Please type correct answer, the file must be json format!'
 }
 
+function validateInputEnvName(input) {
+    return /[A-Z]/.test(input) ? 'Input must be lowercase!' : true
+}
+
 function generateCommand() {
     inquirer
         .prompt([
@@ -44,7 +49,7 @@ function generateCommand() {
                 name: 'jsonFileQ',
                 message: 'Input your json file to be generate (example.json):',
                 default: 'example.json',
-                validate: validateInput
+                validate: validateInputJson
             }
         ])
         .then((answers) => {
@@ -63,10 +68,44 @@ function generateCommand() {
         })
 }
 
+function generateEnvCommand() {
+    inquirer
+        .prompt([
+            {
+                type: 'input',
+                name: 'jsonFileQ',
+                message: 'Input your json file to be generate (example.json):',
+                default: 'example-env.json',
+                validate: validateInputJson
+            },
+            {
+                type: 'input',
+                name: 'envQ',
+                message: 'Input your environment name:',
+                default: 'dev',
+                validate: validateInputEnvName
+            }
+        ])
+        .then((answers) => {
+            //Print message indicating environment test generation has started..
+            console.log(`${'\x1b[34m'}Generating environment test..${'\x1b[0m'}`)
+
+            //Call the generate function to generate environment tests.
+            generateEnv(answers.jsonFileQ.includes('"') ? answers.jsonFileQ.replace(/"/g, '') : answers.jsonFileQ, answers.envQ)
+        })
+        .catch((err) => {
+            console.log(err);
+            console.log('Please type correct answer!');
+            generateEnvCommand()
+        })
+}
+
 const argRunner = process.argv[process.argv.length - 1]
 
 if (argRunner == 'generate') {
     generateCommand()
+} else if (argRunner == 'env-generate') {
+    generateEnvCommand()
 } else {
     exec('npm list --json', (error, stdout) => {
         if (error) {
@@ -129,7 +168,7 @@ if (argRunner == 'generate') {
                         name: 'jsonFileQ',
                         message: 'Type your json file to be generate (example.json):',
                         default: 'example.json',
-                        validate: validateInput
+                        validate: validateInputJson
                     }
                 ])
                 .then((answers) => {

lib/component/runner.js

@@ -16,8 +16,9 @@ async function writeRunner(element, testPath, runPath, moduleType) {
     if (element.hasOwnProperty('item')) {
         asyncForEach(element.item, async (item) => {
             if (!item.hasOwnProperty('item')) {
-                let namet = (item.name).toLowerCase().replace(/\s/g, '');
-                namet = namet.replace(/\//g, '');
+                let namet = (item.name).toLowerCase().replace(/\s/g, '')
+                namet = namet.replace(/\//g, '')
+                namet = namet.replace('-', '_')
                 let method = item.request.method
 
                 if (moduleType == "Javascript modules (import/export)") {

lib/component/tests.js

@@ -70,11 +70,12 @@ let data = [
     isFileExisted(path, method + '_' + name + '.spec.js')
         .then((data) => {
             if (!data[0]) {
-                // _postman_isSubFolder
-                console.log(`${'\x1b[32m'}ø  Generate Test ${path + '/' + method + '_' + name + '.spec.js'} completed successfully${'\x1b[0m'}`)
                 // create file test
                 fs.writeFile(path + '/' + method + '_' + name + '.spec.js',
                     code, function (err) { if (err) throw err; });
+                    
+                // _postman_isSubFolder
+                console.log(`${'\x1b[32m'}ø  Generate Test ${path + '/' + method + '_' + name + '.spec.js'} completed successfully${'\x1b[0m'}`)
             } else {
                 // file was existed
                 console.log(`${'\x1b[33m'}ø The request of ${element.name} has already created${'\x1b[0m'}`)

lib/generate_env.js

@@ -0,0 +1,42 @@
+import fs from 'fs'
+import isFileExisted from './utils/check_dir.js';
+import asyncForEach from './utils/foreach.js';
+import waitFor from './utils/wait.js';
+
+async function generateEnv(file, envName) {
+    let envStr = ''
+
+    fs.readFile(file, (err, data) => {
+        if (err) throw err;
+        let items = JSON.parse(data).values;
+
+        let first
+        asyncForEach(items, async (data) => {
+            if (data.enabled) {
+                if (first === false) envStr += '\r\n'
+                    envStr += data.key + '=' + data.value
+                    first = false;
+            }
+        })
+    })
+
+    await waitFor(100)
+
+    // check if pages file exists
+    isFileExisted(process.cwd(), '.env.' + envName)
+        .then((data) => {
+            if (!data[0]) {
+                // create file test
+                fs.writeFile('.env.' + envName,
+                    envStr, function (err) { if (err) throw err; });
+                
+                // _postman_isSubFolder
+                console.log(`${'\x1b[32m'}ø  Generate environment file completed successfully${'\x1b[0m'}`)
+            } else {
+                console.log(`${'\x1b[33m'}ø The environment file has already created${'\x1b[0m'}`);
+            }
+        })
+        .catch((err) => console.log(err));
+}
+
+export default generateEnv

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "dot-generator-mocha",
-  "version": "1.3.7",
+  "name": "@dot.indonesia/po-gen",
+  "version": "1.4.3",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",