Merge pull request #4 from mocks-server/v1.0.2

V1.0.2

.travis.yml

@@ -5,26 +5,25 @@ node_js:
 
 cache:
   directories:
-    - "node_modules"
-    - "$HOME/.sonar/cache"
+    - ~/.npm
+    - node_modules
+    - ~/.sonar/cache
 
 addons:
   sonarcloud:
-    organization: "javierbrea"
-    token:
-      secure: "$SONAR_TOKEN"
+    organization: "mocks-server"
     branch:
       name: "$TRAVIS_CURRENT_BRANCH"
 
 script:
   - npm run lint
   - npm run test-ci
   - npm run coveralls
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sonar-scanner; fi'
+  - sonar-scanner -Dsonar.login=${SONAR_TOKEN}
 
 deploy:
   provider: npm
-  email: "devops@xbyorange.com"
+  email: "javier.brea@gmail.com"
   api_key: "$NPM_TOKEN"
   on:
     tags: true

CHANGELOG.md

@@ -10,6 +10,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 ### Removed
 
+## [1.0.2] - 2019-11-08
+### Changed
+- Project forked from xbyorange/mocks-server. Fixed license. Read NOTICE for further details
+
+### Fixed
+- Fix some minor Sonar bugs and code smells.
+
 ## [1.0.1] - 2019-06-04
 ### Fixed
 - Upgrade dependencies to fix potential security vulnerability

LICENSE

@@ -175,27 +175,5 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
+   Copyright 2019 Javier Brea and contributors
+   Copyright 2019 XbyOrange

NOTICE

@@ -0,0 +1,6 @@
+mocks-server. Main distribution
+Copyright 2019 Javier Brea
+
+Portions of this software were developed at XbyOrange company.
+  XByOrange npm-file-link v1.0.1, distributed under The Apache Software License, Version 2.0.
+  Github repository "xbyorange/mocks-server" (https://github.com/XbyOrange/mocks-server), branch master, commit 961ca6702569091ed863679a8e675788c6f4fded. The  original project files were wrongly licensed because an error of the main maintainer, Javier Brea, who received instructions from the XbyOrange company about licensing it as Apache2.0, but didn't include the appropiate license header in all repository files by error. The error has been fixed and license headers has been added to all original files, as it was the real intention of the XbyOrange company.

bin/mocks-server

@@ -2,3 +2,13 @@
 "use strict";
 
 require("../lib/start").start();
+
+/*
+Copyright 2019 XbyOrange
+
+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.
+*/

index.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const Cli = require("./lib/Cli");

lib/Cli.js

@@ -1,3 +1,14 @@
+/*
+Copyright 2019 Javier Brea
+Copyright 2019 XbyOrange
+
+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";
 
 const chalk = require("chalk");
@@ -132,7 +143,9 @@ class Cli {
         if (!input || !input.length) {
           return Promise.resolve(featuresNames);
         }
-        return Promise.resolve(featuresNames.filter(feature => feature.includes(input)));
+        return Promise.resolve(
+          featuresNames.filter(currentFeature => currentFeature.includes(input))
+        );
       }
     });
     this._features.current = feature;

lib/Server.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const path = require("path");

lib/Settings.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 class Settings {

lib/api/Api.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const express = require("express");

lib/api/Features.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const express = require("express");

lib/api/Settings.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const express = require("express");

lib/base-cli/Inquirer.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const chalk = require("chalk");

lib/base-cli/index.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const { Inquirer } = require("./Inquirer");

lib/common/constants.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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.
+*/
+
 module.exports = {
   FUNCTION_TYPE: "function",
   WATCH_RELOAD: "watch-reload"

lib/common/helpers.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const stringToBoolean = val => {

lib/common/options.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const commander = require("commander");

lib/common/tracer.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const winston = require("winston");

lib/features/Feature.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const { cloneDeep, map, sum } = require("lodash");

lib/features/Features.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const Boom = require("boom");

lib/middlewares.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const bodyParser = require("body-parser");

lib/start.js

@@ -1,3 +1,13 @@
+/*
+Copyright 2019 XbyOrange
+
+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";
 
 const Boom = require("boom");

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@xbyorange/mocks-server",
-  "version": "1.0.1",
+  "name": "@mocks-server/main",
+  "version": "1.0.2",
   "description": "Mocks server with extensible fixtures groupables in predefined behaviors. Behavior can be changed using CLI or REST API",
   "keywords": [
     "mocks",
@@ -14,9 +14,9 @@
     "testing",
     "development"
   ],
-  "author": "XByOrange",
+  "author": "Javier Brea",
   "license": "Apache-2.0",
-  "repository": "https://github.com/XbyOrange/mocks-server",
+  "repository": "https://github.com/mocks-server/main",
   "publishConfig": {
     "access": "public"
   },

sonar-project.properties

@@ -1,11 +1,16 @@
-sonar.organization=javierbrea
-sonar.projectKey=xbyorange-mocks-server
-sonar.projectVersion=1.0.1
+sonar.organization=mocks-server
+sonar.projectKey=mocks-server-main
+sonar.projectVersion=1.0.2
 
-sonar.sources=lib,test
-sonar.exclusions=node_modules/**
+sonar.javascript.file.suffixes=.js
+sonar.sourceEncoding=UTF-8
+sonar.exclusions=node_modules/**,*.config.js
 sonar.test.exclusions=test/**/*
 sonar.coverage.exclusions=test/**/*
 sonar.cpd.exclusions=test/**
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
 sonar.host.url=https://sonarcloud.io
+
+sonar.issue.ignore.multicriteria=j1
+sonar.issue.ignore.multicriteria.j1.ruleKey=javascript:S4144
+sonar.issue.ignore.multicriteria.j1.resourceKey=test/**/*