Merge pull request #26 from makeomatic/feat/codecov

Feat/codecov

.istanbul.yml

@@ -0,0 +1,6 @@
+instrumentation:
+  root: src
+
+reporting:
+  reports:
+    - lcovonly

README.md

@@ -1,5 +1,11 @@
 # Microservice for handling users over AMQP transport layer
 
+[![npm version](https://badge.fury.io/js/ms-users.svg)](https://badge.fury.io/js/ms-users)
+[![Build Status](https://semaphoreci.com/api/v1/projects/27a0c3e3-ba64-49e1-a1be-7655eae716b9/632945/shields_badge.svg)](https://semaphoreci.com/makeomatic/ms-users)
+[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)](https://github.com/semantic-release/semantic-release)
+[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
+[![codecov.io](https://codecov.io/github/makeomatic/ms-users/coverage.svg?branch=master)](https://codecov.io/github/makeomatic/ms-users?branch=master)
+
 ## Installation
 
 `npm i ms-users -S`

package.json

@@ -1,18 +1,18 @@
 {
   "name": "ms-users",
-  "version": "0.9.3",
   "description": "Core of the microservice for handling users",
   "main": "./lib/index.js",
   "scripts": {
     "compile": "./node_modules/.bin/babel -d ./lib ./src",
     "rebuild": "if [ \"$SKIP_REBUILD\" != \"1\" ]; then npm rebuild; fi",
     "prepublish": "npm run compile",
     "test": "./test/docker.sh",
-    "start": "node ./bin/mservice.js | ./node_modules/.bin/bunyan -o short"
+    "start": "node ./bin/mservice.js | ./node_modules/.bin/bunyan -o short",
+    "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/makeomatic/ms-users.git"
+    "url": "https://github.com/makeomatic/ms-users.git"
   },
   "author": "Vitaly Aminev <[email protected]>",
   "license": "MIT",
@@ -54,17 +54,24 @@
     "babel-preset-stage-0": "^6.3.13",
     "babel-register": "^6.3.13",
     "chai": "^3.4.1",
+    "codecov.io": "^0.1.6",
     "cz-conventional-changelog": "^1.1.5",
     "eslint": "^1.10.3",
     "eslint-config-airbnb": "^2.1.1",
     "eslint-plugin-mocha": "^1.1.0",
     "faker": "^3.0.1",
+    "isparta": "^4.0.0",
+    "istanbul": "^0.4.0",
     "json": "^9.0.3",
     "mocha": "^2.3.3",
     "mocha-multi": "^0.7.2",
+    "semantic-release": "^4.3.5",
     "server-destroy": "^1.0.1",
     "sinon": "^1.17.2"
   },
+  "release": {
+    "verifyConditions": []
+  },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"

test/aggregate-report.js

@@ -0,0 +1,17 @@
+const fs = require('fs');
+const glob = require('glob');
+const istanbul = require('istanbul');
+const reporter = new istanbul.Reporter();
+const collector = new istanbul.Collector();
+
+reporter.addAll(['lcov', 'html', 'text-summary']);
+
+glob.sync('./coverage/**/coverage*.json').forEach(file => {
+  process.stdout.write('adding file: ' + file + '\n');
+  collector.add(JSON.parse(fs.readFileSync(file)));
+});
+
+reporter.write(collector, true, () => {
+  process.stdout.write('report combined...\n');
+  process.exit(0);
+});

test/config.js

@@ -1,6 +1,6 @@
 require('chai').config.includeStack = true;
 const { expect } = require('chai');
-const Users = require('../lib');
+const Users = require('../src');
 
 global.Promise = require('bluebird');
 

test/docker.sh

@@ -1,11 +1,14 @@
 #!/bin/bash
 
 export NODE_ENV=development
+BIN=./node_modules/.bin
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DC="$DIR/docker-compose.yml"
 PATH=$PATH:$DIR/.bin/
 COMPOSE=$(which docker-compose)
-MOCHA=./node_modules/.bin/mocha
+MOCHA=$BIN/_mocha
+COVER="$BIN/isparta cover"
+NODE=$BIN/babel-node
 TESTS=test/suites/*.js
 
 if [ -z "$NODE_VER" ]; then
@@ -28,6 +31,17 @@ trap finish EXIT
 export IMAGE=makeomatic/alpine-node:$NODE_VER
 $COMPOSE -f $DC up -d
 $COMPOSE -f $DC run --rm tester npm run rebuild
+
+echo "cleaning old coverage"
+rm -rf ./coverage
+
+echo "running tests"
 for fn in $TESTS; do
-  $COMPOSE -f $DC run --rm tester $MOCHA $fn || exit 1
+  $COMPOSE -f $DC run --rm tester /bin/sh -c "$NODE $COVER --dir ./coverage/${fn##*/} $MOCHA -- $fn" || exit 1
 done
+
+echo "started generating combined coverage"
+$COMPOSE -f $DC run --rm tester node ./test/aggregate-report.js
+
+echo "uploading coverage report from ./coverage/lcov.info"
+cat ./coverage/lcov.info | $BIN/codecov

test/suites/activate.js

@@ -1,11 +1,11 @@
 /* global inspectPromise */
 const { expect } = require('chai');
-const redisKey = require('../../lib/utils/key.js');
+const redisKey = require('../../src/utils/key.js');
 const URLSafeBase64 = require('urlsafe-base64');
 
 describe('#activate', function activateSuite() {
   const headers = { routingKey: 'users.activate' };
-  const emailValidation = require('../../lib/utils/send-email.js');
+  const emailValidation = require('../../src/utils/send-email.js');
   const email = '[email protected]';
 
   beforeEach(global.startService);

test/suites/crypt.js

@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 
 describe('encrypt/decrypt suite', function cryptoSuite() {
-  const emailValidation = require('../../lib/utils/send-email.js');
+  const emailValidation = require('../../src/utils/send-email.js');
 
   beforeEach(global.startService);
   afterEach(global.clearRedis);

test/suites/list.js

@@ -1,6 +1,6 @@
 /* global inspectPromise */
 const { expect } = require('chai');
-const redisKey = require('../../lib/utils/key.js');
+const redisKey = require('../../src/utils/key.js');
 const ld = require('lodash');
 
 describe('#list', function listSuite() {

test/suites/login.js

@@ -1,13 +1,13 @@
 /* global inspectPromise */
 const { expect } = require('chai');
-const redisKey = require('../../lib/utils/key.js');
+const redisKey = require('../../src/utils/key.js');
 const ld = require('lodash');
 
 describe('#login', function loginSuite() {
   const headers = { routingKey: 'users.login' };
   const user = { username: '[email protected]', password: 'nicepassword', audience: '*.localhost' };
   const userWithValidPassword = { username: '[email protected]', password: 'nicepassword1', audience: '*.localhost' };
-  const scrypt = require('../../lib/utils/scrypt.js');
+  const scrypt = require('../../src/utils/scrypt.js');
 
   before(function test() {
     return scrypt.hash(userWithValidPassword.password).then(pass => {

test/suites/requestPassword.js

@@ -1,6 +1,6 @@
 /* global inspectPromise */
 const { expect } = require('chai');
-const redisKey = require('../../lib/utils/key.js');
+const redisKey = require('../../src/utils/key.js');
 
 describe('#requestPassword', function requestPasswordSuite() {
   const headers = { routingKey: 'users.requestPassword' };

test/suites/updatePassword.js

@@ -1,13 +1,13 @@
 /* global inspectPromise */
 const { expect } = require('chai');
-const redisKey = require('../../lib/utils/key.js');
+const redisKey = require('../../src/utils/key.js');
 
 describe('#updatePassword', function updatePasswordSuite() {
   const headers = { routingKey: 'users.updatePassword' };
   const username = '[email protected]';
   const password = '123';
   const audience = '*.localhost';
-  const emailValidation = require('../../lib/utils/send-email.js');
+  const emailValidation = require('../../src/utils/send-email.js');
 
   beforeEach(global.startService);
   afterEach(global.clearRedis);

test/suites/users.js

@@ -3,7 +3,7 @@ const chai = require('chai');
 const { expect } = chai;
 
 describe('configuration suite', function ConfigurationSuite() {
-  const Users = require('../../lib');
+  const Users = require('../../src');
 
   it('must throw on invalid configuration', function test() {
     expect(function throwOnInvalidConfiguration() {

test/suites/verify.js

@@ -36,7 +36,7 @@ describe('#verify', function verifySuite() {
   });
 
   describe('valid token', function suite() {
-    const jwt = require('../../lib/utils/jwt.js');
+    const jwt = require('../../src/utils/jwt.js');
 
     beforeEach(function pretest() {
       return this.users.router({ username: '[email protected]', password: '123', audience: 'test' }, { routingKey: 'users.register' });