From 2822d0deff6dec7c23004efc4bd1e2557324d7c1 Mon Sep 17 00:00:00 2001 From: Xabier de Zuazo Date: Sat, 15 Nov 2014 17:51:49 +0100 Subject: [PATCH 1/5] version bumped to 0.4.0 WiP --- README.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3e4ee47..e53962e 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ node.js bridge library to communicate with java applications through JMX. [![NPM version](https://badge.fury.io/js/jmx.png)](http://badge.fury.io/js/jmx) [![Code Climate](http://img.shields.io/codeclimate/github/onddo/node-jmx.svg)](https://codeclimate.com/github/onddo/node-jmx) -[![Build Status](http://img.shields.io/travis/onddo/node-jmx/0.3.0.svg)](https://travis-ci.org/onddo/node-jmx) -[![Coverage Status](http://img.shields.io/coveralls/onddo/node-jmx/0.3.0.svg)](https://coveralls.io/r/onddo/node-jmx?branch=0.3.0) +[![Build Status](http://img.shields.io/travis/onddo/node-jmx.svg)](https://travis-ci.org/onddo/node-jmx) +[![Coverage Status](http://img.shields.io/coveralls/onddo/node-jmx.svg)](https://coveralls.io/r/onddo/node-jmx?branch=master) ## Requirements diff --git a/package.json b/package.json index 3ab17b6..b1d60d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jmx", - "version": "0.3.0", + "version": "0.4.0-dev", "description": "Bridge library to communicate with java applications through JMX.", "homepage": "http://onddo.github.io/node-jmx", "bugs": "https://github.com/onddo/node-jmx/issues", From 87c9b184f531a95a5befccee800441c42b7fc0ca Mon Sep 17 00:00:00 2001 From: Xabier de Zuazo Date: Sun, 16 Nov 2014 04:17:11 +0100 Subject: [PATCH 2/5] remove jshint dependency --- .travis.yml | 1 + Makefile | 4 ++-- README.md | 3 ++- package.json | 3 --- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e100ef..ac00b1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,3 +9,4 @@ before_install: - echo -e "127.0.0.1 localhost\n127.0.0.1 travis001.onddo.com" | sudo tee -a /etc/hosts - sudo hostname 'travis001.onddo.com' - hostname | sudo tee /etc/hostname + - npm install -g jshint diff --git a/Makefile b/Makefile index afa94f5..26a5a03 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,9 @@ NO_JSHINT_VER=v0.8. JSHINT_ARGS=index.js lib test style: - node --version | grep -Fq '$(NO_JSHINT_VER)' && true || ./node_modules/.bin/jshint $(JSHINT_ARGS) + node --version | grep -Fq '$(NO_JSHINT_VER)' && true || jshint $(JSHINT_ARGS) -test: style +test: node --version | grep -Fq '$(COV_NODE_VER)' && ! test -z $(TRAVIS_JOB_ID) && $(MAKE) test-no-coveralls test-coveralls || $(MAKE) test-no-coveralls lib-cov: diff --git a/README.md b/README.md index e53962e..b8ecb2a 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,8 @@ client.on("error", function(err) { ## Testing ```bash -$ make test +$ npm install jshint +$ make style test ``` You will need to set the `JAVA_HOME` environment variable if the java binary is not in your *PATH*. diff --git a/package.json b/package.json index b1d60d0..dc9632e 100644 --- a/package.json +++ b/package.json @@ -40,8 +40,5 @@ "jscoverage" : "~0.5.9", "mocha-lcov-reporter" : "0.0.1", "coveralls": "2.11.2" - }, - "optionalDependencies": { - "jshint": "= 2.5.10" } } From 263958553e0e92da414db8c00a59a83a64d7f53a Mon Sep 17 00:00:00 2001 From: Xabier de Zuazo Date: Sun, 16 Nov 2014 04:19:55 +0100 Subject: [PATCH 3/5] travis.yml: ignore jshint install error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ac00b1f..12ecece 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,4 @@ before_install: - echo -e "127.0.0.1 localhost\n127.0.0.1 travis001.onddo.com" | sudo tee -a /etc/hosts - sudo hostname 'travis001.onddo.com' - hostname | sudo tee /etc/hostname - - npm install -g jshint + - npm install -g jshint || true From a6d5711d5a021df558d97c83201f3b901a300881 Mon Sep 17 00:00:00 2001 From: Xabier de Zuazo Date: Sun, 16 Nov 2014 14:24:46 +0100 Subject: [PATCH 4/5] README: install jshint globally --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8ecb2a..c7f4aa2 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,7 @@ client.on("error", function(err) { ## Testing ```bash -$ npm install jshint +$ npm install -g jshint $ make style test ``` From 26120e0372ca16c69158311447fcf8df49b2f861 Mon Sep 17 00:00:00 2001 From: Xabier de Zuazo Date: Sun, 16 Nov 2014 14:25:07 +0100 Subject: [PATCH 5/5] package.json: run jshint with tests --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc9632e..a2e6ceb 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/onddo/node-jmx/issues", "main": "index.js", "scripts": { - "test": "make test" + "test": "make style test" }, "repository": { "type": "git",