From 79ca7d3302990f0accdf97c5decdaecf9a64ba1c Mon Sep 17 00:00:00 2001 From: Jade Meskill Date: Tue, 18 Oct 2016 17:20:51 -0700 Subject: [PATCH] v1.3.3 add beekeeper webhook --- .travis.yml | 19 ++++++++++++++----- Dockerfile | 1 + package.json | 27 ++++++++++++++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index e692d20..87760bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,24 @@ language: node_js node_js: -- '5' + - '5' before_script: -- npm install -g codeclimate-test-reporter + - npm install -g codeclimate-test-reporter after_script: -- codeclimate-test-reporter < coverage/lcov.info + - codeclimate-test-reporter < coverage/lcov.info deploy: provider: npm email: serveradmin@octoblu.com api_key: - secure: im/ePR/KJ3BN4GpnRZ2k4uhrVmfHgnSuOFEYgmx8ehfctO5oLYGhNnsR/z36zGtldt5njG0OYMztMTtmw6HYpsOt2wG0tJYwluAGICwJ9+6y+1u85wZuP7Mm2c2NIWDXZrigPkUUlmMJX07Eo8qGfRoP7fL99VVfAPDHRaoWZdgJijfel9LCyjxucl7Y2dgdF7U2kluN6PTKfujsJQJTdaAEkZIzOtCTrn6Eq5G0lcilB1s/s91OWOmKHrlkvDUZtuhrKkejbXHEOxe+QMW9V/TaofJclFxd38baZpZWx3fYJiSQzjHx2M3oJ6RW0gOwwSReEwKif6HPTyyv8XY7KclgONtpsmJeZcYC5AmCjoqbtr8Eq+ld4d7tWL7An7q5NuUghBKm7WRAqb2gcowtHz0NcceEp8YfnEqzdgoRXQ5JgJXu6Yg/T+xixanxyXPaxRhv+HhiLDBMJgq7YviGBY2G0QI7TB5UV9P4WmHcmBkWM8ABezZdEoYjYce7b1avIEf2Mm8WuQb9d+H48IGwNr0u/A/0X1VeeGyQl6DpAEKdiT8fnOg5MBhQjw1iHtc+bnU++CVJZIUTcZwOVqFr+x5H03AhMJfrWKlF8udEvCdbXzt6GD3Ui7kkagl34U8zJuyhfj3gu3HuCPEkyealUAgXWzQbycV8LWw777cOojk= - on: + secure: >- + im/ePR/KJ3BN4GpnRZ2k4uhrVmfHgnSuOFEYgmx8ehfctO5oLYGhNnsR/z36zGtldt5njG0OYMztMTtmw6HYpsOt2wG0tJYwluAGICwJ9+6y+1u85wZuP7Mm2c2NIWDXZrigPkUUlmMJX07Eo8qGfRoP7fL99VVfAPDHRaoWZdgJijfel9LCyjxucl7Y2dgdF7U2kluN6PTKfujsJQJTdaAEkZIzOtCTrn6Eq5G0lcilB1s/s91OWOmKHrlkvDUZtuhrKkejbXHEOxe+QMW9V/TaofJclFxd38baZpZWx3fYJiSQzjHx2M3oJ6RW0gOwwSReEwKif6HPTyyv8XY7KclgONtpsmJeZcYC5AmCjoqbtr8Eq+ld4d7tWL7An7q5NuUghBKm7WRAqb2gcowtHz0NcceEp8YfnEqzdgoRXQ5JgJXu6Yg/T+xixanxyXPaxRhv+HhiLDBMJgq7YviGBY2G0QI7TB5UV9P4WmHcmBkWM8ABezZdEoYjYce7b1avIEf2Mm8WuQb9d+H48IGwNr0u/A/0X1VeeGyQl6DpAEKdiT8fnOg5MBhQjw1iHtc+bnU++CVJZIUTcZwOVqFr+x5H03AhMJfrWKlF8udEvCdbXzt6GD3Ui7kkagl34U8zJuyhfj3gu3HuCPEkyealUAgXWzQbycV8LWw777cOojk= + 'on': tags: true branches: true +notifications: + webhooks: + - 'https://beekeeper.octoblu.com/webhooks/travis:ci' +after_success: + - npm run coverage + - 'npm run mocha:json' + - 'bash <(curl -s https://codecov.io/bash)' + - 'bash <(curl -s https://codecov.octoblu.com/bash)' diff --git a/Dockerfile b/Dockerfile index da120b0..9712a31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ FROM node:5 MAINTAINER Octoblu, Inc. EXPOSE 80 +HEALTHCHECK CMD curl --fail http://localhost:80/healthcheck || exit 1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/package.json b/package.json index d36f9ed..3bbada6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "data-forwarder-elasticsearch", - "version": "1.3.2", + "version": "1.3.3", "description": "Put some description here", "keywords": [], "homepage": "https://github.com/octoblu/elasticsearch", @@ -16,7 +16,10 @@ }, "scripts": { "start": "node command.js", - "test": "istanbul cover _mocha -- -R spec --require coffee-coverage/register-istanbul" + "test": "istanbul cover _mocha -- -R spec --require coffee-coverage/register-istanbul", + "coverage": "nyc npm test", + "mocha:json": "env NPM_ENV=test mocha --reporter json > coverage/mocha.json", + "test:watch": "mocha -w -R mocha-multi --reporter-options spec=-,mocha-osx-reporter=-" }, "devDependencies": { "@octoblu/shmock": "^0.7.2", @@ -29,7 +32,10 @@ "passport-strategy": "^1.0.0", "request": "^2.66.0", "sinon": "^1.17.4", - "sinon-chai": "^2.8.0" + "sinon-chai": "^2.8.0", + "nyc": "^8.3.0", + "mocha-osx-reporter": "^0.1.2", + "mocha-multi": "^0.9.1" }, "dependencies": { "body-parser": "^1.14.1", @@ -54,5 +60,16 @@ "node": ">=0.8.0", "npm": ">=1.2.10" }, - "license": "MIT" -} \ No newline at end of file + "license": "MIT", + "nyc": { + "cache": true, + "reporter": [ + "text-summary", + "lcov", + "json" + ], + "extension": [ + ".coffee" + ] + } +}