Repository: incubator-milagro-mfa-js-lib Updated Branches: refs/heads/master e76a1757e -> 848277ae5
Merge changes for integrationg with Travis CI and Coveralls Project: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-js-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-js-lib/commit/848277ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-js-lib/tree/848277ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-js-lib/diff/848277ae Branch: refs/heads/master Commit: 848277ae587856134a761f48f719422842a39eb3 Parents: e76a175 Author: Simeon Aladjem <[email protected]> Authored: Wed Nov 30 12:08:05 2016 +0200 Committer: Simeon Aladjem <[email protected]> Committed: Wed Nov 30 12:08:48 2016 +0200 ---------------------------------------------------------------------- .gitignore | 4 ++++ .travis.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++ README.md | 14 +++++++++++++- VERSION | 1 + package.json | 6 +++--- 5 files changed, 66 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-js-lib/blob/848277ae/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 2cc3e2a..51db044 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,7 @@ bower_components/ nbproject/ test/coverage.html mocha.json + +target +coverage +htmlcov http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-js-lib/blob/848277ae/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ed09a06 --- /dev/null +++ b/.travis.yml @@ -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 http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-js-lib/blob/848277ae/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 0a44c3d..cade827 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,17 @@ # Headless Milagro Client Library +[](https://travis-ci.org/miracl/milagro-mfa-js-lib?branch=master) +[](https://coveralls.io/github/miracl/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.  ##### User Authentication - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-js-lib/blob/848277ae/VERSION ---------------------------------------------------------------------- diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..524cb55 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.1.1 http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-js-lib/blob/848277ae/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index c3f8c00..b54d209 100644 --- a/package.json +++ b/package.json @@ -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",
