Merge pull request #7 from wercker/update-code-and-readme-for-oow

Update code and readme for oow

Author: rikgibson

.gitignore

@@ -1,2 +1,3 @@
 .wercker
 node_modules
+package-lock.json

README.md

@@ -1,13 +1,46 @@
 # getting-started-nodejs
 
-Node.js sample application for wercker built with Express
+[![wercker status](https://app.wercker.com/status/7b1a402dd00d57fc9abddf9eb5161675/s "wercker status")](https://app.wercker.com/project/bykey/7b1a402dd00d57fc9abddf9eb5161675)
 
-Uses the default Node.js [Docker container](https://registry.hub.docker.com/u/library/node/) from the Docker Hub.
+A sample application in Javascript on NodeJS for Wercker.
 
-Note: this sample application only runs on the Ewok stack on wercker
+This application uses the `node` container obtained from the [Docker Hub](https://hub.docker.com/_/node/)
 
-[![wercker status](https://app.wercker.com/status/7b1a402dd00d57fc9abddf9eb5161675/s "wercker status")](https://app.wercker.com/project/bykey/7b1a402dd00d57fc9abddf9eb5161675)
+## Setup
+Clone this repo and cd into the directory:
+
+```
+git clone https://github.com/wercker/getting-started-nodejs.git
+cd getting-started-nodejs
+```
+
+## Running
+You can run the sample app in a couple of different ways. The first is to simply launch the executable:
+```
+node app.js
+```
+
+Now point your browser at `http://localhost:8080` to see:
+```
+{"cities":["San Francisco","Amsterdam","Berlin","New York","Tokyo"]}
+```
+
+The second, and more useful, way is to use the `wercker dev` command to launch the binary within a Docker container, using the base image defined in the `box/id` property at the top of the `wercker.yml`, like so:
+```
+wercker dev --expose-ports
+```
+The `dev` target inside `wercker.yml` uses the `internal/watch` step to dynamically reload the runtime container when sourcefile changes are detected, which allows you to quickly test changes without having to kill/rebuild/relaunch the container. For instance, add another city to the array on `app.js:6' like so:
+
+```
+res.write(JSON.stringify({"cities" : ["San Francisco", "Amsterdam", "Berlin", "New York", "Tokyo", "London"]}));
+```
+
+and then refresh your browser pointing to `http://localhost:8080` to see:
+```
+{"cities":["San Francisco","Amsterdam","Berlin","New York","Tokyo","London"]}}
+```
 
 ---
-Sign up for wercker [here](http://wercker.com)
-Learn more on our [dev center](http://devcenter.wercker.com)
+Sign up for Wercker: http://www.wercker.com
+
+Learn more at: http://devcenter.wercker.com

app.js

@@ -3,11 +3,11 @@ var app = express();
 
 app.get('/', function(req, res){
     res.writeHead(200, { 'Content-Type': 'application/json' });
-    res.write(JSON.stringify({cities : ["San Francisco","Amsterdam", "Berlin", "New York", "Palo ALto", "San Mateo"]}));
+    res.write(JSON.stringify({cities : ["San Francisco", "Amsterdam", "Berlin", "New York", "Tokyo"]}));
     res.end();
 });
 
-var port = process.env.PORT || 5000;
+var port = process.env.PORT || 8080;
 app.listen(port);
 
 module.exports = app;

package.json

@@ -1,17 +1,17 @@
 {
-    "name": "getting-started-nodejs",
-    "version": "0.0.1",
-    "engines" : {
+  "name": "getting-started-nodejs",
+  "version": "0.0.1",
+  "engines": {
     "node": "0.6.x"
-    },
-    "dependencies": {
-      "express": "3.x",
-      "nodeunit": "0.7.4",
-      "supertest" : "0.4.0",
-      "mocha" : "1.6.0"
-    },
-    "scripts": {
-      "test": "./node_modules/mocha/bin/mocha",
-      "start": "app.js"
-    }
+  },
+  "dependencies": {
+    "express": "3.x",
+    "nodeunit": "0.7.4",
+    "supertest": "0.4.0",
+    "mocha": "1.6.0"
+  },
+  "scripts": {
+    "test": "./node_modules/mocha/bin/mocha",
+    "start": "app.js"
   }
+}

wercker.yml

@@ -1,4 +1,8 @@
-box: node:4.2.6-slim
+box: 
+  id: node:latest
+  ports: 
+    - "8080"
+    
 dev:
   steps:
     - npm-install