Merge pull request outmoded#73 from wpreul/master

Updating to work with hapi 6

README.md

@@ -11,14 +11,15 @@ the web page in real-time. To enable the debug console in a **hapi** application
 
 ```javascript
 var Hapi = require('hapi');
+var Tv = require('tv');
 
 var server = new Hapi.Server();
 var options = {
   endpoint: '/debug/console',
   queryKey: 'debug'
 };
 
-server.pack.require('./tv', options, function (err) {
+server.pack.register({ plugin: Tv, options: options }, function (err) {
 
   if (!err) {
     server.start();

lib/index.js

@@ -1,9 +1,9 @@
 // Load modules
 
+var Handlebars = require('handlebars');
+var Hoek = require('hoek');
 var Url = require('url');
 var Ws = require('ws');
-var Hoek = require('hoek');
-var Handlebars = require('handlebars');
 
 
 // Declare internals
@@ -26,7 +26,7 @@ exports.register = function (plugin, options, next) {
 
     plugin.views({
         engines: { html: { module: Handlebars } },
-        path: './templates'
+        path: __dirname + '/../templates'
     });
 
     plugin.route({
@@ -118,3 +118,7 @@ exports.register = function (plugin, options, next) {
     });
 };
 
+
+exports.register.attributes = {
+    pkg: require('../package.json')
+};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tv",
   "description": "Interactive debug console plugin for hapi",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "author": "Eran Hammer <[email protected]> (http://hueniverse.com)",
   "contributors":[
     "Wyatt Preul <[email protected]>",
@@ -29,7 +29,7 @@
     "hapi": ">=2.x.x"
   },
   "devDependencies": {
-    "hapi": "5.x.x",
+    "hapi": "6.x.x",
     "lab": "3.x.x"
   },
   "scripts": {

test/index.js

@@ -3,6 +3,7 @@
 var Lab = require('lab');
 var Hapi = require('hapi');
 var Ws = require('ws');
+var Tv = require('../');
 
 
 // Declare internals
@@ -34,7 +35,7 @@ describe('Tv', function () {
             }
         });
 
-        server.pack.require('../', { port: 0 }, function (err) {
+        server.pack.register({ plugin: Tv, options: { port: 0 } }, function (err) {
 
             expect(err).to.not.exist;
 
@@ -82,7 +83,7 @@ describe('Tv', function () {
             }
         });
 
-        server.pack.require('../', { port: 0, host: 'localhost' }, function (err) {
+        server.pack.register({ plugin: Tv, options: { port: 0, host: 'localhost' }}, function (err) {
 
             expect(err).to.not.exist;
 
@@ -137,7 +138,7 @@ describe('Tv', function () {
             }
         });
 
-        server.pack.require('../', { host: '127.0.0.1', port: 0 }, function (err) {
+        server.pack.register({plugin: Tv, options: { host: '127.0.0.1', port: 0 } }, function (err) {
 
             expect(err).to.not.exist;
             done();