specmatic 0.68.0 → 0.68.1

package/dist/bin/core.js

@@ -6,38 +6,38 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _execSh = _interopRequireDefault(require("exec-sh"));
 var _path = _interopRequireDefault(require("path"));
-var _config = require("../config");
-var _logger = _interopRequireDefault(require("../common/logger"));
 var _child_process = require("child_process");
 var _fs = _interopRequireDefault(require("fs"));
+var _config = require("../config");
+var _logger = _interopRequireDefault(require("../common/logger"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-var callSpecmaticCli = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(function* (args) {
-    var specmaticJarPath = yield getSpecmaticJarPath();
-    _logger.default.debug("CLI: Specmatic jar path: ".concat(specmaticJarPath));
-    var cliArgs = (args || process.argv).slice(2).join(' ');
-    _logger.default.info("CLI: Running with args \"".concat(cliArgs, "\""));
-    (0, _execSh.default)("java -jar ".concat(specmaticJarPath, " ").concat(cliArgs), {}, err => {
-      if (err) {
-        _logger.default.info('CLI: Finished with non zero exit code: ', err.code);
-        process.exitCode = err.code;
-      } else {
-        _logger.default.info('CLI: Finished');
-        process.exitCode = 0;
-      }
-    });
+var callSpecmaticCli = args => {
+  var rootPath = _path.default.resolve(__dirname, '..', '..');
+  var specmaticJarPath = _path.default.resolve(rootPath, _config.specmaticJarName);
+  _logger.default.debug("CLI: Specmatic jar path: ".concat(specmaticJarPath));
+  var cliArgs = (args || process.argv).slice(2).join(' ');
+  _logger.default.info("CLI: Running with args \"".concat(cliArgs, "\""));
+  (0, _execSh.default)("java -jar ".concat(specmaticJarPath, " ").concat(cliArgs), {}, err => {
+    if (err) {
+      _logger.default.info('CLI: Finished with non zero exit code: ', err.code);
+      process.exitCode = err.code;
+    } else {
+      _logger.default.info('CLI: Finished');
+      process.exitCode = 0;
+    }
   });
-  return function callSpecmaticCli(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+};
 function getSpecmaticJarPath() {
   return new Promise((resolve, _reject) => {
     var specmaticJarPath = _path.default.resolve(_config.specmaticJarPathLocal);
     resolve(specmaticJarPath);
   }).then(specmaticJarPath => {
+    //Get current directory
+    console.log("Script basename: ".concat(__dirname));
+    var rootPath = _path.default.resolve(__dirname, '..', '..');
+    var specmaticJarPath2 = _path.default.resolve(rootPath, _config.specmaticJarName);
+    console.log("Script jar path: ".concat(specmaticJarPath2));
+    console.log("Script jar path exists? ".concat(_fs.default.existsSync(specmaticJarPath2)));
     if (!_fs.default.existsSync(specmaticJarPath)) {
       return getGlobalSpecmaticJarPath();
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "specmatic",
-  "version": "0.68.0",
+  "version": "0.68.1",
   "description": "Node wrapper for Specmatic",
   "main": "dist/index.js",
   "scripts": {

package/src/bin/__tests__/core.ts

@@ -16,19 +16,20 @@ beforeEach(() => {
 test('pass all wrapper arguments to the jar', async () => {
     jest.spyOn(fs, 'existsSync').mockReturnValue(true);
     const testArgs = ['node', 'index.js', 'stub', '*.specmatic', '--data', 'src/mocks', '--host', 'localhost', '--port', '8000'];
-    await callSpecmaticCli(testArgs);
-    expect(execSh.mock.calls[0][0]).toBe(`java -jar ${path.resolve(specmaticJarPathLocal)} ${testArgs.slice(2).join(' ')}`);
+    callSpecmaticCli(testArgs);
+    const specmaticJarPath = path.resolve(__dirname, '..', '..', '..', specmaticJarName);
+    expect(execSh.mock.calls[0][0]).toBe(`java -jar ${path.resolve(specmaticJarPath)} ${testArgs.slice(2).join(' ')}`);
     expect(execSh).toHaveBeenCalledTimes(1);
 });
 
-test('look for jar in specmatic globally installled directory when run from global install', async () => {
-    jest.spyOn(fs, 'existsSync').mockReturnValue(false);
-    const testArgs = ['node', 'index.js', 'stub', '*.specmatic', '--data', 'src/mocks', '--host', 'localhost', '--port', '8000'];
-    const NPM_GLOBAL_PATH = '/npm/global/path';
-    setTimeout(() => {
-        execMock.mock.calls[0][1](0, NPM_GLOBAL_PATH);
-    }, 0);
-    await callSpecmaticCli(testArgs);
-    expect(execSh.mock.calls[0][0]).toBe(`java -jar ${path.resolve(NPM_GLOBAL_PATH, 'specmatic', specmaticJarName)} ${testArgs.slice(2).join(' ')}`);
-    expect(execSh).toHaveBeenCalledTimes(1);
-});
+// test('look for jar in specmatic globally installled directory when run from global install', async () => {
+//     jest.spyOn(fs, 'existsSync').mockReturnValue(false);
+//     const testArgs = ['node', 'index.js', 'stub', '*.specmatic', '--data', 'src/mocks', '--host', 'localhost', '--port', '8000'];
+//     const NPM_GLOBAL_PATH = '/npm/global/path';
+//     setTimeout(() => {
+//         execMock.mock.calls[0][1](0, NPM_GLOBAL_PATH);
+//     }, 0);
+//     await callSpecmaticCli(testArgs);
+//     expect(execSh.mock.calls[0][0]).toBe(`java -jar ${path.resolve(NPM_GLOBAL_PATH, 'specmatic', specmaticJarName)} ${testArgs.slice(2).join(' ')}`);
+//     expect(execSh).toHaveBeenCalledTimes(1);
+// });

package/src/bin/core.ts

@@ -1,12 +1,13 @@
 import execSh from 'exec-sh';
 import path from 'path';
-import { specmaticJarPathLocal, specmaticJarName } from '../config';
-import logger from '../common/logger';
 import { exec } from 'child_process';
 import fs from 'fs';
+import { specmaticJarPathLocal, specmaticJarName } from '../config';
+import logger from '../common/logger';
 
-const callSpecmaticCli = async (args?: string[]) => {
-    const specmaticJarPath = await getSpecmaticJarPath();
+const callSpecmaticCli = (args?: string[]) => {
+    const rootPath = path.resolve(__dirname, '..', '..');
+    const specmaticJarPath = path.resolve(rootPath, specmaticJarName);
     logger.debug(`CLI: Specmatic jar path: ${specmaticJarPath}`);
     const cliArgs = (args || process.argv).slice(2).join(' ');
     logger.info(`CLI: Running with args "${cliArgs}"`);
@@ -26,6 +27,12 @@ function getSpecmaticJarPath() {
         let specmaticJarPath = path.resolve(specmaticJarPathLocal);
         resolve(specmaticJarPath);
     }).then(specmaticJarPath => {
+        //Get current directory
+        console.log(`Script basename: ${__dirname}`);
+        const rootPath = path.resolve(__dirname, '..', '..');
+        const specmaticJarPath2 = path.resolve(rootPath, specmaticJarName);
+        console.log(`Script jar path: ${specmaticJarPath2}`);
+        console.log(`Script jar path exists? ${fs.existsSync(specmaticJarPath2)}`);
         if (!fs.existsSync(specmaticJarPath)) {
             return getGlobalSpecmaticJarPath();
         } else {