Rewrite for Hapi 17

Author: martinj

.eslintrc

@@ -0,0 +1,11 @@
+{
+	"extends": "@aptoma/eslint-config",
+	"parserOptions": {
+		"ecmaVersion": 2017
+	},
+	"env": {
+		"node": true,
+		"mocha": true,
+		"es6": true
+	}
+}

.gitignore

@@ -3,3 +3,4 @@ npm-debug.log
 coverage
 config/config.json
 config/config.test.json
+package-lock.json

.jshintrc

@@ -1,19 +1,7 @@
 language: node_js
 
 node_js:
-  - 0.12
-  - 4.0
-
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - g++-4.8
-
-cache:
-  directories:
-    - node_modules
+  - 8
 
 script:
   - npm run ci

.travis.yml

@@ -1,49 +1,48 @@
 'use strict';
+const promisify = require('util').promisify;
+const fs = require('fs');
+const readFile = promisify(fs.readFile);
 
-var fs = require('fs');
+module.exports = {
+	name: 'route-status',
+	async register(server, options) {
+		const data = {version: options.version};
+		options.pre = options.pre || [];
 
-exports.register = function (plugin, options, next) {
-	var data = {version: options.version};
-	options.pre = options.pre || [];
-
-	if (!options.revisionFile) {
-		return done(data);
-	}
+		if (!options.revisionFile) {
+			return done(data);
+		}
 
-	fs.exists(options.revisionFile, function (exists) {
-		if (!exists) {
+		const ex = await exists(options.revisionFile);
+		if (!ex) {
 			return done(data);
 		}
 
-		fs.readFile(options.revisionFile, {encoding: 'utf-8'}, function (err, rev) {
-			if (err) {
-				return next(err);
-			}
+		const rev = await readFile(options.revisionFile, {encoding: 'utf-8'});
+		data.revision = rev.trim();
 
-			data.revision = rev.trim();
-			done(data);
-		});
-	});
-
-	function done(data) {
-		plugin.route({
-			method: 'GET',
-			path: '/status',
-			config: {
-				auth: false,
-				handler: function (req, reply) {
-					reply(data);
-				},
-				pre: options.pre,
-				description: 'Show status',
-				tags: ['api']
-			}
-		});
+		return done(data);
 
-		next();
+		function done(data) {
+			server.route({
+				method: 'GET',
+				path: '/status',
+				config: {
+					auth: false,
+					handler() {
+						return data;
+					},
+					pre: options.pre,
+					description: 'Show status',
+					tags: ['api']
+				}
+			});
+		}
 	}
 };
 
-exports.register.attributes = {
-	name: 'route-status'
-};
+const exists = (path) => new Promise((resolve) => {
+	fs.exists(path, (exists) => {
+		resolve(exists);
+	});
+});

index.js

@@ -9,27 +9,29 @@
     "url": "[email protected]:aptoma/hapi-route-status.git"
   },
   "scripts": {
-    "test": "NODE_ENV=test jscs test/ *.js && jshint test/ *.js && istanbul cover -i '*.js' _mocha -- -u exports -R spec 'test/**/*.test.js'",
-    "watch": "mocha --watch 'test/**/*.js' --timeout 500",
-    "ci": "NODE_ENV=test npm test --coverage && istanbul report cobertura",
-    "release": "npm test && release-it -n -i patch",
-    "release:minor": "npm test && release-it -n -i minor",
-    "release:major": "npm test && release-it -n -i major"
+    "lint": "eslint --ext '.js' *.js",
+    "watch": "mocha --watch 'test/**/*.js' '*.js' --timeout 500",
+    "test": "npm run lint && NODE_ENV=test istanbul cover -i '*.js' _mocha -- -u exports -R spec --timeout 3000 'test/**/*.test.js'",
+    "mocha-only-detect": "mocha-only-detector-glob **/*.test.js",
+    "ci": "npm test --coverage && istanbul report cobertura",
+    "changelog": "git log `git describe --tags --abbrev=0`..HEAD --pretty=format:\"  * %s\"",
+    "release": "npm run ci && release-it -n -i patch",
+    "release:minor": "npm run ci && release-it -n -i minor",
+    "release:major": "npm run ci && release-it -n -i major"
+  },
+  "engines": {
+    "node": ">=8.x.x"
   },
   "license": "UNLICENSED",
   "devDependencies": {
-    "hapi": "^10.1.0",
-    "istanbul": "^0.3.8",
-    "jscs": "^1.11.3",
-    "jshint": "^2.6.3",
-    "mocha": "^2.2.1",
+    "hapi": "^17.1.1",
+    "istanbul": "^0.4.5",
+    "mocha": "^4.0.1",
     "release-it": "^2.0.3",
-    "should": "^7.0.1"
+    "should": "^13.1.3"
   },
-  "jscsConfig": {
-    "preset": "yandex",
-    "disallowMultipleVarDecl": "exceptUndefined",
-    "maximumLineLength": null,
-    "validateIndentation": "\t"
+  "dependencies": {
+    "@aptoma/eslint-config": "^7.0.1",
+    "eslint": "^4.12.1"
   }
 }

package.json

@@ -1,39 +1,34 @@
 'use strict';
-var Hapi = require('hapi');
-var status = require('../');
-var should = require('should');
+const Hapi = require('hapi');
+const plugin = require('../');
+require('should');
 
-describe('Status Route Plugin', function () {
-	var server = new Hapi.Server();
-	server.connection();
+describe('Status Route Plugin', () => {
+	const server = new Hapi.Server({debug: {request: '*'}});
 
-	it('should successfully load', function (done) {
-		server.register({
-			register: status,
+
+	it('should successfully load', async () => {
+		await server.register({
+			plugin,
 			options: {
 				version: '1.0.0'
 			}
-		}, function (err) {
-			should.not.exist(err);
-			done();
 		});
 	});
 
-	it('should register routes', function () {
-		var table = server.connections[0].table();
+	it('should register routes', () => {
+		const table = server.table();
 		table.should.have.length(1);
 		table[0].path.should.equal('/status');
 	});
 
-	it('should return version', function (done) {
-		var options = {
+	it('should return version', async () => {
+		const options = {
 			method: 'GET',
 			url: '/status'
 		};
-		server.inject(options, function (res) {
-			res.statusCode.should.equal(200);
-			res.result.should.have.property('version', '1.0.0');
-			done();
-		});
+		const res = await server.inject(options);
+		res.statusCode.should.equal(200);
+		res.result.should.have.property('version', '1.0.0');
 	});
 });