Merge branch 'dev' into wip/alarm-types-update

.gitignore

@@ -11,4 +11,7 @@ static/bower_components/
 .DS_Store
 
 .vagrant
-/iisnode
+/iisnode
+
+# istanbul output
+coverage/

.travis.yml

@@ -2,10 +2,13 @@ language: node_js
 node_js:
    - "0.10"
    - "0.11"
+matrix:
+   allow_failures:
+     - node_js: "0.11"
 services:
   - mongodb
 before_script:
   - sleep 10
   - echo mongo mongo_travis
 script:
-  - make test
+  - make travis

Makefile

@@ -3,32 +3,23 @@ TESTS=tests/*.js
 MONGO_CONNECTION?=mongodb://localhost/test_db
 CUSTOMCONNSTR_mongo_settings_collection?=test_settings
 CUSTOMCONNSTR_mongo_collection?=test_sgvs
-
-BLANKET=--require blanket 
+MONGO_SETTINGS=MONGO_CONNECTION=${MONGO_CONNECTION} \
+	CUSTOMCONNSTR_mongo_collection=${CUSTOMCONNSTR_mongo_collection} \
+	CUSTOMCONNSTR_mongo_settings_collection=${CUSTOMCONNSTR_mongo_settings_collection}
 
 all: test
 
 travis-cov:
-	NODE_ENV=test node_modules/.bin/mocha ${BLANKET} -R 'travis-cov' ${TESTS}
-
-coveralls:
 	NODE_ENV=test \
-	./node_modules/.bin/mocha ${BLANKET} -R mocha-lcov-reporter \
-     ${TESTS} | ./coverall.sh
-
-coverhtml:
-	./node_modules/.bin/mocha ${BLANKET} -R html-cov  ${TESTS} > tests/coverage.html
+	${MONGO_SETTINGS} \
+	istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -vvv -R tap ${TESTS} && \
+	cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && \
+	rm -rf ./coverage
 
 test:
-	MONGO_CONNECTION=${MONGO_CONNECTION} \
-	CUSTOMCONNSTR_mongo_collection=${CUSTOMCONNSTR_mongo_collection} \
-	CUSTOMCONNSTR_mongo_settings_collection=${CUSTOMCONNSTR_mongo_settings_collection} \
+	${MONGO_SETTINGS} \
     mocha --verbose -vvv -R tap ${TESTS}
 
-precover:
-	./node_modules/.bin/mocha ${BLANKET} ${SHOULD} -R html-cov ${TESTS} | w3m -T text/html
-
-
-travis: test travis-cov coveralls coverhtml
+travis: test travis-cov
 
 .PHONY: test

README.md

@@ -1,13 +1,14 @@
 cgm-remote-monitor (a.k.a. Nightscout)
 ======================================
 
-[![Build Status](https://travis-ci.org/nightscout/cgm-remote-monitor.png)](https://travis-ci.org/nightscout/cgm-remote-monitor)
-[![Dependency Status](https://david-dm.org/nightscout/cgm-remote-monitor.png)](https://david-dm.org/nightscout/cgm-remote-monitor)
-[![Gitter chat](https://badges.gitter.im/nightscout.png)](https://gitter.im/nightscout/public)
-[![Stories in  Ready](https://badge.waffle.io/nightscout/cgm-remote-monitor.png?label=ready&title=Ready)](https://waffle.io/nightscout/cgm-remote-monitor)
-[![Stories in Progress](https://badge.waffle.io/nightscout/cgm-remote-monitor.png?label=in+progress&title=In+Progress)](https://waffle.io/nightscout/cgm-remote-monitor)
+[![Build Status][build-img]][build-url]
+[![Dependency Status][dependency-img]][dependency-url]
+[![Coverage Status][coverage-img]][coverage-url]
+[![Gitter chat][gitter-img]][gitter-url]
+[![Stories in Ready][ready-img]][waffle]
+[![Stories in Progress][progress-img]][waffle]
 
-[![Deploy to Heroku](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
+[![Deploy to Heroku][heroku-img]][heroku-url]
 
 This acts as a web-based CGM (Continuous Glucose Monitor) to allow
 multiple caregivers to remotely view a patient's glucose data in
@@ -19,7 +20,22 @@ autoregressive second order model.  Alarms are generated for high and
 low values, which can be cleared by any watcher of the data.
 
 Community maintained fork of the
-[original cgm-remote-monitor](https://github.com/rnpenguin/cgm-remote-monitor).
+[original cgm-remote-monitor][original].
+
+[build-img]: https://img.shields.io/travis/nightscout/cgm-remote-monitor.svg
+[build-url]: https://travis-ci.org/nightscout/cgm-remote-monitor
+[dependency-img]: https://img.shields.io/david/nightscout/cgm-remote-monitor.svg
+[dependency-url]: https://david-dm.org/nightscout/cgm-remote-monitor
+[coverage-img]: https://img.shields.io/coveralls/nightscout/cgm-remote-monitor/coverage.svg
+[coverage-url]: https://coveralls.io/r/nightscout/cgm-remote-monitor?branch=coverage
+[gitter-img]: https://img.shields.io/badge/Gitter-Join%20Chat%20%E2%86%92-1dce73.svg
+[gitter-url]: https://gitter.im/nightscout/public
+[ready-img]: https://badge.waffle.io/nightscout/cgm-remote-monitor.svg?label=ready&title=Ready
+[waffle]: https://waffle.io/nightscout/cgm-remote-monitor
+[progress-img]: https://badge.waffle.io/nightscout/cgm-remote-monitor.svg?label=in+progress&title=In+Progress
+[heroku-img]: https://www.herokucdn.com/deploy/button.png
+[heroku-url]: https://heroku.com/deploy
+[original]: https://github.com/rnpenguin/cgm-remote-monitor
 
 Install
 ---------------

package.json

@@ -29,7 +29,7 @@
     "postinstall": "node node_modules/bower/bin/bower install"
   },
   "engines": {
-    "node": ">=0.10 <0.12"
+    "node": "~0.10.0"
   },
   "dependencies": {
     "body-parser": "^1.4.3",
@@ -46,8 +46,10 @@
     "git-rev": "git://github.com/bewest/git-rev.git"
   },
   "devDependencies": {
-    "supertest": "~0.13.0",
+    "coveralls": "~2.11.2",
+    "istanbul": "~0.3.5",
+    "mocha": "~1.20.1",
     "should": "~4.0.4",
-    "mocha": "~1.20.1"
+    "supertest": "~0.13.0"
   }
 }