v 1.3.12

README.md

@@ -281,6 +281,12 @@ mockettaro -r services
 This project is licensed under the MIT License - see the [License](/LICENSE) file for details
 
 ## Changelog
+### 1.3.12
+- Used standard paths for bin and lib
+- Fixed default params for MockettaroProgram
+- Divided tests per class
+- Added bin Unit 
+- Added separate unit test to prevent cache test issues
 ### 1.3.11
 - Minor fixes
 - Completed jsdoc

bin/.eslintrc.json

@@ -0,0 +1,5 @@
+{
+    "rules": {
+        "no-process-exit": "off"
+    }
+}

bin/mockettaro.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+const { mockettaroProgram } = require('../lib/mockettaro-program.class');
+mockettaroProgram().catch(() => process.exit(1));

examples/mocks/cities/Florence.GET.code

@@ -0,0 +1 @@
+200

examples/mocks/cities/Florence.GET.json

@@ -0,0 +1,9 @@
+{
+    "name": "Florence",
+    "originalName": "Firenze",
+    "population": 380885,
+    "area": 102.41,
+    "metropolitanCity": true,
+    "region": "Tuscany",
+    "dialingCode": "055"
+}

index.js

@@ -1,3 +1,3 @@
-const mockettaro = require('./dist/mockettaro.class');
+const mockettaro = require('./lib/mockettaro.class');
 
 module.exports.mockettaro = mockettaro;

dist/mockettaro-program.class.js → lib/mockettaro-program.class.js

@@ -20,7 +20,7 @@ class MockettaroProgram {
      * @example MockettaroProgram.FOLDER_MATCHER
      */
     static get FOLDER_MATCHER() {
-        return /^(?:(?:[a-z]:|\.{0,2})?(\\|\/))?([^!#$%&+={}[\]\n]+(\\|\/))*[^!#$%&+={}[\]\n]+$/i;
+        return /^(?:(?:[a-z]:|\.{1,2})?[\\/])?([^!#$%&+={}[\]\n]+[\\/])*[^!#$%&+={}[\]\n]+$/i;
     }
 
     /**
@@ -179,8 +179,13 @@ class MockettaroProgram {
      * @param {string|Function} cwd Current Working Directory
      * @returns {Promise<number>} Returns the copy process final status
      */
-    constructor({argv = process.argv, cwd = process.cwd()}) {
-
+    constructor({
+        argv = process.argv,
+        cwd = process.cwd()
+    } = {
+        argv: process.argv,
+        cwd: process.cwd()
+    }) {
         const program = this.constructor.cmdParser(...argv)
 
         if (program.verbose && program.silent) {
@@ -190,7 +195,6 @@ class MockettaroProgram {
         const mockettaro = require('./mockettaro.class');
         const logger = require("@marketto/js-logger").global();
         const server = require('express')();
-        const path = require('path');
 
         const {port, resource, folder, responseDelay, cacheLifetime, silent, verbose} = program;
         server.use(`/${resource}`, mockettaro({
@@ -206,10 +210,11 @@ class MockettaroProgram {
         return new Promise((resolve, reject) => {
             try {
                 const serverInstance = server.listen(port, () => {
-                    logger.info(`Mockettaro serving ${path.join(cwd, folder)} content @ localhost:${port}/${resource}`);
+                    logger.info(`Mockettaro serving ${folder} content @ localhost:${port}/${resource}`);
                     resolve(serverInstance);
                 });
             } catch (err) {
+                logger.error(err);
                 reject(err);
             }
         });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mockettaro",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "description": "Node Rest Mock Server",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "docs": "jsdoc . -c jsdoc.json"
   },
   "bin": {
-    "mockettaro": "./commandline.js"
+    "mockettaro": "./bin/mockettaro.js"
   },
   "repository": {
     "type": "git",

sonar-project.properties

@@ -1,4 +1,4 @@
-sonar.projectVersion=1.3.11
+sonar.projectVersion=1.3.12
 sonar.sourceEncoding=UTF-8
 sonar.sources=./
 sonar.exclusions=**/node_modules/**,**/examples/**,**/test/**,**/coverage/**

test/bin.test.js

@@ -0,0 +1,27 @@
+const chai = require('chai');
+const logger = require("@marketto/js-logger").global();
+
+chai.use(require('chai-things'));
+chai.should();
+
+logger.config = { error: true, info: false, debug: false, warn: false };
+
+describe('Commandline', () => {
+    const { exec } = require('child_process');
+    const pkgjson = require('../package.json');
+
+    it('Should return package version', done => {
+        exec(`node ${pkgjson.bin.mockettaro} -v`, (err, stdout, stderr) => {
+            (!err).should.be.true;
+            (!stderr).should.be.true;
+            stdout.should.match(new RegExp(`\\s*${pkgjson.version}\\s*`));
+            if (err) {
+                logger.error(err);
+            }
+            if (stderr) {
+                logger.error(err);
+            }
+            done();
+        });
+    });
+});