Merge changes for integrationg with Travis CI and Coveralls master
authorSimeon Aladjem <simeon.aladjem@miracl.com>
Wed, 30 Nov 2016 10:41:29 +0000 (12:41 +0200)
committerSimeon Aladjem <simeon.aladjem@miracl.com>
Wed, 30 Nov 2016 10:41:29 +0000 (12:41 +0200)
.gitignore
.travis.yml [new file with mode: 0644]
README.md
VERSION [new file with mode: 0644]
package.json

index 2cc3e2a..51db044 100644 (file)
@@ -5,3 +5,7 @@ bower_components/
 nbproject/
 test/coverage.html
 mocha.json
+
+target
+coverage
+htmlcov
diff --git a/.travis.yml b/.travis.yml
new file mode 100644 (file)
index 0000000..ed09a06
--- /dev/null
@@ -0,0 +1,45 @@
+language: node_js
+
+sudo: false
+
+branches:
+  except:
+    - release
+
+branches:
+  only:
+    - master
+    - develop
+    - travis
+
+node_js:
+  - "4"
+  - "5"
+  - "6"
+  - "node"
+  - "iojs"
+
+matrix:
+  allow_failures:
+    - node_js: nightly
+
+addons:
+  apt:
+    packages:
+    - build-essential
+
+before_install:
+  - if [ -n "$GH_USER" ]; then git config --global github.user ${GH_USER}; fi;
+  - if [ -n "$GH_TOKEN" ]; then git config --global github.token ${GH_TOKEN}; fi;
+
+install:
+  - if [ "$TRAVIS_NODE_VERSION" = "node" ]; then npm install istanbul coveralls --save; fi;
+  - npm install express --save
+  - npm install
+
+script:
+  - npm run-script test_basic
+  - if [ "$TRAVIS_NODE_VERSION" = "node" ]; then ./node_modules/.bin/istanbul cover ./; fi;
+
+after_success:
+  - if [ "$TRAVIS_NODE_VERSION" = "node" ]; then cat ./coverage/lcov.info | ./node_modules/.bin/coveralls; fi
index 0a44c3d..1280271 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,17 @@
 # Headless Milagro Client Library
 
+[![Master Build Status](https://travis-ci.org/miracl/incubator-milagro-mfa-js-lib.svg?branch=master)](https://travis-ci.org/miracl/incubator-milagro-mfa-js-lib)
+[![Master Coverage Status](https://coveralls.io/repos/github/miracl/incubator-milagro-mfa-js-lib/badge.svg?branch=master)](https://coveralls.io/github/miracl/incubator-milagro-mfa-js-lib?branch=master)
+
+* **category**:    Library
+* **copyright**:   2016 MIRACL UK LTD
+* **license**:     ASL 2.0 - http://www.apache.org/licenses/LICENSE-2.0
+* **link**:        https://github.com/apache/incubator-milagro-mfa-js-lib
+
+## Description
+
+NodeJS client for Milagro
+
 ## Requirement for build & testing
 
 1. Nodejs
@@ -394,4 +406,4 @@ this method always succeeds.
 ![*](./M-Pin SDK - Registration flow.png)
 
 ##### User Authentication
-![*](./M-Pin SDK - Authentication flow.png)
\ No newline at end of file
+![*](./M-Pin SDK - Authentication flow.png)
diff --git a/VERSION b/VERSION
new file mode 100644 (file)
index 0000000..524cb55
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.1.1
index c3f8c00..b54d209 100644 (file)
@@ -4,8 +4,9 @@
   "description": "Mpin frontend library.",
   "main": "index.js",
   "scripts": {
-    "test": "mocha -R mocha-bamboo-reporter",
-    "test2": "mocha test --require blanket --reporter html-cov > test/coverage.html"
+    "test": "mocha --reporter mocha-bamboo-reporter",
+    "test2": "mocha test --require blanket --reporter html-cov > test/coverage.html",
+    "test_basic": "mocha"
   },
   "repository": {
     "type": "git",
@@ -18,7 +19,6 @@
   "author": "Mpin",
   "license": "ISC",
   "devDependencies": {
-    "blanket": "^1.2.1",
     "chai": "^3.4.1",
     "mocha": "^2.3.4",
     "sinon": "^1.17.2",