From d5a5acf7d7eb25914cdc364edb9447a91e045d97 Mon Sep 17 00:00:00 2001 From: Muhammad Saleh Date: Thu, 12 Mar 2015 00:06:35 +0200 Subject: [PATCH 1/6] Assignment one: initial server --- .gitignore | 12 ++++++++++++ index.js | 19 +++++++++++++++++++ package.json | 22 ++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100755 .gitignore create mode 100644 index.js create mode 100644 package.json diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000..d6ef641 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +.DS_STORE +*.ipr +*.iml +*.iws +web/ +lib/*.zip +version.properties +.sass-cache +swagger-ui.sublime-workspace +.idea +.project +node_modules/* diff --git a/index.js b/index.js new file mode 100644 index 0000000..66ef3b6 --- /dev/null +++ b/index.js @@ -0,0 +1,19 @@ +var Hapi = require('hapi'); +var server = new Hapi.Server(); +var packageJSON = require('./package.json'); + +server.connection({ port: 8000 }); + +server.route({ + method: 'GET', + path: '/version', + config: { + handler: function (request, reply) { + return reply({ version: packageJSON.version }); + } + } +}); + +server.start(function () { + console.log('Server running at:', server.info.uri); +}); \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..028c782 --- /dev/null +++ b/package.json @@ -0,0 +1,22 @@ +{ + "name": "hueniversity", + "version": "0.0.1", + "description": "Assignment One", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "https://github.com/muhammad-saleh/hueniversity.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/muhammad-saleh/hueniversity/issues" + }, + "homepage": "https://github.com/muhammad-saleh/hueniversity", + "dependencies": { + "hapi": "^8.3.1" + } +} From bcb0ee1c30960eda9670ae36670aa0b4eb2c4f99 Mon Sep 17 00:00:00 2001 From: Muhammad Saleh Date: Thu, 12 Mar 2015 00:10:42 +0200 Subject: [PATCH 2/6] lib folder --- lib/.gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 lib/.gitignore diff --git a/lib/.gitignore b/lib/.gitignore new file mode 100755 index 0000000..d6ef641 --- /dev/null +++ b/lib/.gitignore @@ -0,0 +1,12 @@ +.DS_STORE +*.ipr +*.iml +*.iws +web/ +lib/*.zip +version.properties +.sass-cache +swagger-ui.sublime-workspace +.idea +.project +node_modules/* From 9dfc0232a4d877e816b694fe9fdc4945b96f938b Mon Sep 17 00:00:00 2001 From: Muhammad Saleh Date: Thu, 12 Mar 2015 00:22:56 +0200 Subject: [PATCH 3/6] Now .gitignore is only at the top level, changed the server variable to a better position also created an empty index.js file inside the lib folder to be able to push it --- index.js | 2 +- lib/.gitignore | 12 ------------ lib/index.js | 0 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100755 lib/.gitignore create mode 100644 lib/index.js diff --git a/index.js b/index.js index 66ef3b6..f41747d 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,7 @@ var Hapi = require('hapi'); -var server = new Hapi.Server(); var packageJSON = require('./package.json'); +var server = new Hapi.Server(); server.connection({ port: 8000 }); server.route({ diff --git a/lib/.gitignore b/lib/.gitignore deleted file mode 100755 index d6ef641..0000000 --- a/lib/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -.DS_STORE -*.ipr -*.iml -*.iws -web/ -lib/*.zip -version.properties -.sass-cache -swagger-ui.sublime-workspace -.idea -.project -node_modules/* diff --git a/lib/index.js b/lib/index.js new file mode 100644 index 0000000..e69de29 From a31611d68634889bc3070ec22c8f7a3e2d8f9508 Mon Sep 17 00:00:00 2001 From: Muhammad Saleh Date: Thu, 12 Mar 2015 09:48:38 +0200 Subject: [PATCH 4/6] Adding one extra line to improve readability --- index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/index.js b/index.js index f41747d..96bd3bc 100644 --- a/index.js +++ b/index.js @@ -2,6 +2,7 @@ var Hapi = require('hapi'); var packageJSON = require('./package.json'); var server = new Hapi.Server(); + server.connection({ port: 8000 }); server.route({ From 574d6e329e4550b27eafca98f71750312cd8671b Mon Sep 17 00:00:00 2001 From: Muhammad Saleh Date: Mon, 16 Mar 2015 09:56:26 +0200 Subject: [PATCH 5/6] Added .gitignore from hapijs/hapi, Changed package.json to reflect the actual repo, and in index.js fixed new line after function decalartion also added the package.json object to the internals object also handled error in server.start --- .gitignore | 25 ++++++++++++++----------- index.js | 16 ++++++++++++---- package.json | 6 +++--- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index d6ef641..1118a8a 100755 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,15 @@ -.DS_STORE -*.ipr -*.iml -*.iws -web/ -lib/*.zip -version.properties -.sass-cache -swagger-ui.sublime-workspace .idea -.project -node_modules/* +*.iml +npm-debug.log +dump.rdb +node_modules +results.tap +results.xml +config.json +.DS_Store +*/.DS_Store +*/*/.DS_Store +._* +*/._* +*/*/._* +coverage.* \ No newline at end of file diff --git a/index.js b/index.js index 96bd3bc..b1d3f7a 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,7 @@ var Hapi = require('hapi'); -var packageJSON = require('./package.json'); +var internals = { + version: require('./package.json').version +}; var server = new Hapi.Server(); @@ -10,11 +12,17 @@ server.route({ path: '/version', config: { handler: function (request, reply) { - return reply({ version: packageJSON.version }); + + return reply({ version: internals.version }); } } }); -server.start(function () { - console.log('Server running at:', server.info.uri); +server.start(function (err) { + if (err) { + throw err; + } + else { + console.log('Server running at:', server.info.uri); + } }); \ No newline at end of file diff --git a/package.json b/package.json index 028c782..86a3b23 100644 --- a/package.json +++ b/package.json @@ -8,14 +8,14 @@ }, "repository": { "type": "git", - "url": "https://github.com/muhammad-saleh/hueniversity.git" + "url": "https://github.com/hueniverse/hueniversity.git" }, "author": "", "license": "ISC", "bugs": { - "url": "https://github.com/muhammad-saleh/hueniversity/issues" + "url": "https://github.com/hueniverse/hueniversity/issues" }, - "homepage": "https://github.com/muhammad-saleh/hueniversity", + "homepage": "https://github.com/hueniverse/hueniversity", "dependencies": { "hapi": "^8.3.1" } From 0dbf4a41634555dd484c42dce8a90c333008f1f4 Mon Sep 17 00:00:00 2001 From: muhammad-saleh Date: Mon, 16 Mar 2015 21:22:52 +0200 Subject: [PATCH 6/6] Used Hoek and added new lines at the end --- index.js | 10 ++++------ package.json | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index b1d3f7a..b5f19e5 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,5 @@ var Hapi = require('hapi'); +var Hoek = require('hoek'); var internals = { version: require('./package.json').version }; @@ -19,10 +20,7 @@ server.route({ }); server.start(function (err) { - if (err) { - throw err; - } - else { + + Hoek.assert(!err, err); console.log('Server running at:', server.info.uri); - } -}); \ No newline at end of file +}); diff --git a/package.json b/package.json index 86a3b23..da1907c 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ }, "homepage": "https://github.com/hueniverse/hueniversity", "dependencies": { - "hapi": "^8.3.1" + "hapi": "^8.3.1", + "hoek": "^2.11.1" } }