Merge 964e707 into a6bec4d

.travis.yml

@@ -1,8 +1,10 @@
 language: node_js
 node_js:
-  - "0.11"
   - "0.10"
+  - "4.0"
 
-script: 
+script:
   - make test-cov
-  - cat lcov.info | ./node_modules/coveralls/bin/coveralls.js > /dev/null 2>&1
+
+after_script:
+  - cat lcov.info | ./node_modules/coveralls/bin/coveralls.js

index.js

@@ -1,14 +1,13 @@
 var Hapi = require('hapi');
 var t = require('joi');
-
+var Inert = require('inert');
 var db = require('./db');
 
 var port = process.env.PORT || 9876;
 var server = new Hapi.Server();
 server.connection({ port: port });
-server.register({ register: require('lout') }, function(err) {
+server.register([require('vision'), require('inert'), { register: require('lout') }], function(err) {
 });
-
 // Add the routes
 server.route({
   method: 'GET',
@@ -110,6 +109,8 @@ server.route({
 });
 
 // Start the server
-server.start();
+server.start(function() {
+  console.log('Server started at %d', port); 
+});
 server.nameSpace = 'sqr';
 module.exports = server;

package.json

@@ -18,29 +18,31 @@
   },
   "homepage": "https://github.com/eiriksm/sqr",
   "dependencies": {
-    "hapi": "^8.4.0",
-    "joi": "^6.0.8",
-    "leveldown": "^1.0.6",
-    "levelup": "^1.0.0-5",
-    "lout": "^6.2.1"
+    "hapi": "^10.0.0",
+    "inert": "^3.0.1",
+    "joi": "^6.7.0",
+    "leveldown": "^1.4.1",
+    "levelup": "^1.2.1",
+    "lout": "^7.1.0",
+    "vision": "^3.0.0"
   },
   "devDependencies": {
-    "angular": "^1.3.14",
-    "angular-route": "^1.3.14",
-    "browserify": "^9.0.3",
-    "coveralls": "^2.11.2",
-    "gulp": "^3.8.11",
-    "gulp-autoprefixer": "^2.1.0",
-    "gulp-rename": "^1.2.0",
-    "gulp-sass": "^1.3.3",
-    "gulp-streamify": "0.0.5",
-    "gulp-uglify": "^1.1.0",
-    "gulp-webpack": "^1.3.0",
-    "jquery": "^2.1.3",
-    "lab": "^5.5.0",
+    "angular": "^1.4.5",
+    "angular-route": "^1.4.5",
+    "browserify": "^11.1.0",
+    "coveralls": "^2.11.4",
+    "gulp": "^3.9.0",
+    "gulp-autoprefixer": "^3.0.1",
+    "gulp-rename": "^1.2.2",
+    "gulp-sass": "^2.0.4",
+    "gulp-streamify": "1.0.2",
+    "gulp-uglify": "^1.4.1",
+    "gulp-webpack": "^1.5.0",
+    "jquery": "^2.1.4",
+    "lab": "^5.16.1",
     "node-uuid": "^1.4.3",
-    "should": "^5.2.0",
-    "supertest": "^0.15.0",
+    "should": "^7.1.0",
+    "supertest": "^1.1.0",
     "vinyl-source-stream": "^1.1.0"
   }
 }