Merge pull request #28 from mocks-server/v1.3.0

V1.3.0

Author: javierbrea

.gitignore

@@ -9,6 +9,7 @@
 # tests
 /coverage
 /mocks
+/test/acceptance/main/fixtures/files-watch
 
 # misc
 .DS_Store

CHANGELOG.md

@@ -7,13 +7,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [To be deprecated]
 - Deprecate options "features" and "feature".
 - Remove "/features" api path.
+- Remove "features" getter from Server
+- Remove Server and Cli constructors. Use @mocks-server/core instead
 
 ## [unreleased]
 ### Added
 ### Changed
 ### Fixed
 ### Removed
 
+## [1.3.0] - 2019-11-17
+### Added
+- Add programmatic Classes end-to-end tests
+- Add files watcher end-to-end tests
+
+### Changed
+- Full refactor for making it pluggable.
+- Split code into core, cli and api main Classes, which are intended to be published separately.
+
 ## [1.2.0] - 2019-11-13
 ### Added
 - Add api acceptance tests

README.md

@@ -15,7 +15,7 @@ Please refer to the [project documentation website][website-url]:
 
 * [Get started](https://www.mocks-server.org/docs/get-started-intro)
 * [Tutorials](https://www.mocks-server.org/docs/tutorials-static)
-* [configuration](https://www.mocks-server.org/docs/configuration-command-line-arguments)
+* [Configuration](https://www.mocks-server.org/docs/configuration-command-line-arguments)
 
 ## Why a mocks server?
 

index.js

@@ -11,13 +11,13 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 "use strict";
 
-const Cli = require("./lib/Cli");
-const Server = require("./lib/Server");
-const Feature = require("./lib/features/Feature");
+const ProgrammaticCli = require("./lib/ProgrammaticCli");
+const ProgrammaticServer = require("./lib/ProgrammaticServer");
+const Behavior = require("./lib/core/mocks/Behavior");
 
 module.exports = {
-  Cli,
-  Server,
-  Feature,
-  Behavior: Feature
+  Cli: ProgrammaticCli,
+  Server: ProgrammaticServer,
+  Feature: Behavior,
+  Behavior
 };

jest.acceptance.config.js

@@ -6,6 +6,7 @@ module.exports = {
   clearMocks: true,
 
   testMatch: ["**/test/acceptance/**/?(*.)+(spec|test).js?(x)"],
+  //testMatch: ["**/test/acceptance/main/programmatic-cli.spec.js"],
 
   // Indicates whether the coverage information should be collected while executing the test
   collectCoverage: false,

jest.config.js

@@ -24,10 +24,10 @@ module.exports = {
     }
   },
 
-  // The test environment that will be used for testing
-  testEnvironment: "node",
-
   // The glob patterns Jest uses to detect test files
-  testMatch: ["**/test/unit/**/?(*.)+(spec|test).js?(x)"]
-  //testMatch: ["**/test/unit/**/options.spec.js"]
+  testMatch: ["**/test/unit/**/?(*.)+(spec|test).js?(x)"],
+  //testMatch: ["**/test/unit/core/Plugins.spec.js"],
+
+  // The test environment that will be used for testing
+  testEnvironment: "node"
 };

lib/Cli.js

@@ -0,0 +1,67 @@
+/*
+Copyright 2019 Javier Brea
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+*/
+
+"use strict";
+
+// TODO, deprecate this programmatic initialization. Use Core instead.
+
+const Core = require("./core/Core");
+const AdminApi = require("./api/Api");
+const InquirerCli = require("./cli/Cli");
+
+class ProgrammaticCli {
+  constructor(options = {}) {
+    const createInquirerCli = core => {
+      this._inquirerCli = new InquirerCli(core);
+      return this._inquirerCli;
+    };
+
+    this._core = new Core({
+      onlyProgrammaticOptions: true,
+      plugins: [AdminApi, createInquirerCli]
+    });
+    this._options = { ...options };
+    this._cliStarted = false;
+    this._coreStarted = false;
+    this._core.tracer.warn(
+      "Deprecation warning: Cli constructor will be deprecated. Use @mocks-server/core instead"
+    );
+  }
+
+  async _startCore(cliEnabled) {
+    if (!this._coreStarted) {
+      this._coreStarted = true;
+      await this._core.init(this._options);
+      this._core.settings.set("cli", cliEnabled);
+      return this._core.start();
+    }
+    return Promise.resolve();
+  }
+
+  async start() {
+    await this._startCore(true);
+    if (!this._cliStarted && !this._core.settings.get("cli")) {
+      this._core.settings.set("cli", true);
+      this._cliStarted = true;
+      return this._inquirerCli.start();
+    }
+    return Promise.resolve();
+  }
+
+  async initServer() {
+    return this._startCore(false);
+  }
+
+  stopListeningServerWatch() {
+    return this._inquirerCli.stopListeningServerWatch();
+  }
+}
+
+module.exports = ProgrammaticCli;