Merge lp:~dstroppa/charms/precise/node-app/refactor-hooks into lp:charms/node-app

[Daniele Stroppa]

Hooks have been re-written in JS

[Marco Ceppi (marcoceppi)]

# Review

- I don't understand what expose_app is for, how does this differ from juju expose node-app?

- Excellent use of app_user, however it's not being used in the upstart script. Consider using the following as a reference: https://gist.github.com/marcoceppi/8458344

- I really like the way lib/charm.js is shaping up, I'm confident this will be a key part in helping other node.js authors write hooks/charms in node.js Along the same vein I think methods like installPackage, installApp, updateApp, configureApp, etc are fantastic, but don't seem inheriently a part of Charm itself. As an opinion it might be better served breaking the two apart. Charm to emulate all the core juju functions in node then a seperat App module with these methods.

- The charm needs more logging to juju-log, most of the comments you have in the final callbacks are great, sending them to juju-log will notify the user what's going on and help debug issues

- juju unexpose (and expose) aren't executed from the charm but instead by the user, as a result the mongodb-relations-departed and stop hooks need to be updated. Instead the charm needs to tell juju /what/ports to open by calling `open-port` and `close-port` These won't explicitly open or close the ports, but tells juju what ports to open in the firewall when the user run juju expose/unexpose.

# Knitpick

- I really like the idea of a polling_schedule, as an alternative it might be nice to have a push_url, where the user could specify a token as a configuration option, then have a url like http://ip:2222/update?key=<key-they-set> so they could have github push notifications on updates and other repositories instead of a constant polling. Just an idea.

- Having config/config.js where it is, I thought it was something the user filled out. I fear other users may also make this assumption. I'm not sure of a better place just making you aware of the perception.

- You'll want to update the maintainer field in the metadata.yaml file

- Again, not sure if this is a common practice in node, but relation_set seems to take a list of keys and values, would it be better served as an object of key: val pairs?

Sorry this review was so...breif...in words. I honestly love the direction of the charm so far and understand it's still under development. These were things that popped out at me doing a comb through the charm. Let me know if you have any question, happy to discuss these points further.

I'm going to move the merge request to Work In Progress, feel free to email me when you'd like another look or just move the merge to "Needs Review"

[lp:~dstroppa/charms/precise/node-app/refactor-hooks]

58. By Daniele Stroppa on 2014-01-17

Changes after review: moved app specific method into lib/app.js, updated upstart script, new icon

[Daniele Stroppa (dstroppa)]

Comments inline.

>
> - I don't understand what expose_app is for, how does this differ from
> juju expose node-app?
>

It's actually not different, and seeing your other comment below (" juju
unexpose (and expose) aren't executed from the charm but instead by the
user") I've removed this.

> - Excellent use of app_user, however it's not being used in the upstart
> script. Consider using the following as a reference:
> https://gist.github.com/marcoceppi/8458344

Modified the upstart script according to this reference.

- I really like the way lib/charm.js is shaping up, I'm confident this will
> be a key part in helping other node.js authors write hooks/charms in
> node.js Along the same vein I think methods like installPackage,
> installApp, updateApp, configureApp, etc are fantastic, but don't seem
> inheriently a part of Charm itself. As an opinion it might be better served
> breaking the two apart. Charm to emulate all the core juju functions in
> node then a seperat App module with these methods.
>

This is actually a good point. I've moved out of lib/charm.js all methods
that are app related (now in lib/app.js)

>
> - The charm needs more logging to juju-log, most of the comments you have
> in the final callbacks are great, sending them to juju-log will notify the
> user what's going on and help debug issues
>

Agreed, added logging to juju-log.

>
> - juju unexpose (and expose) aren't executed from the charm but instead by
> the user, as a result the mongodb-relations-departed and stop hooks need to
> be updated. Instead the charm needs to tell juju /what/ports to open by
> calling `open-port` and `close-port` These won't explicitly open or close
> the ports, but tells juju what ports to open in the firewall when the user
> run juju expose/unexpose.
>

Done.

>
> # Knitpick
>
> - I really like the idea of a polling_schedule, as an alternative it might
> be nice to have a push_url, where the user could specify a token as a
> configuration option, then have a url like http://ip:2222/update?key=<key-they-set>
> so they could have github push notifications on updates and other
> repositories instead of a constant polling. Just an idea.
>
> - Having config/config.js where it is, I thought it was something the user
> filled out. I fear other users may also make this assumption. I'm not sure
> of a better place just making you aware of the perception.
>
> - You'll want to update the maintainer field in the metadata.yaml file
>

Done :)

>
> - Again, not sure if this is a common practice in node, but relation_set
> seems to take a list of keys and values, would it be better served as an
> object of key: val pairs?
>

Agreed, that's a better way.

>
> Sorry this review was so...breif...in words. I honestly love the direction
> of the charm so far and understand it's still under development. These were
> things that popped out at me doing a comb through the charm. Let me know if
> you have any question, happy to discuss these points further.
>
> I'm going to move the merge request to Work In Progress, feel free to
> email me when you'd like another look or just move the merge to "Needs
> Review"
> --
>
> https://code.launchpad.net/~dstro...

[lp:~dstroppa/charms/precise/node-app/refactor-hooks]

59. By Daniele Stroppa on 2014-01-24

Adding Amulet tests

Unmerged revisions

59. By Daniele Stroppa on 2014-01-24

Adding Amulet tests

58. By Daniele Stroppa on 2014-01-17

Changes after review: moved app specific method into lib/app.js, updated upstart script, new icon

57. By Daniele Stroppa on 2013-12-31

Fixing relation-set and website-relation-changed hook

56. By Daniele Stroppa on 2013-12-20

Added flag to expose the app or use proxy

55. By Daniele Stroppa on 2013-12-20

code cleanup, added close-port on stop

54. By Daniele Stroppa on 2013-12-20

mongodb-relation-changed, config-changed hooks tested

53. By Daniele Stroppa on 2013-12-13

Testing/Debuggin hooks

52. By Daniele Stroppa on 2013-12-06

Hooks debugging - install hook fixed

51. By Daniele Stroppa on 2013-11-29

Hooks debugging

50. By Daniele Stroppa on 2013-11-22

Hooks Debugging/Testing

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-01-24 18:05:39 +0000
@@ -0,0 +1,3 @@
+.idea
+node-app.iml
+hooks.old

=== added directory 'config'
=== modified file 'config.yaml'
--- config.yaml	2013-03-08 13:06:46 +0000
+++ config.yaml	2014-01-24 18:05:39 +0000
@@ -10,10 +10,10 @@
   app_scm:
     type: string
     default: git
-    description: Repository type (git/bzr/...)
+    description: Repository type (git/bzr/subversion/mercurial)
   app_url:
     type: string
-    default: "http://github.com/mmm/testnode.git"
+    default: "https://github.com/dstroppa/testnode.git"
     description: Application repository URL
   app_branch:
     type: string

=== added file 'config/config.js'
--- config/config.js	1970-01-01 00:00:00 +0000
+++ config/config.js	2014-01-24 18:05:39 +0000
@@ -0,0 +1,10 @@
+{
+    'name': '',
+    'listen_port': 0,
+    'database': {
+        'mongo_host': '',
+        'mongo_port': '',
+        'mongo_replset': ''
+    },
+
+}
\ No newline at end of file

=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2014-01-24 18:05:39 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+var app = require('../lib/app')();
+var charm = require('../lib/charm')();
+var util = require('util');
+
+charm.config_get_all(function(config) {
+    app.updateApp(config, function() {
+        app.configureApp(config, function() {
+            // app updated and configured successfully
+            charm.log(util.format('%s updated and configured successfully.', config.app_name));
+        });
+    });
+});
\ No newline at end of file

=== removed file 'hooks/config-changed'
--- hooks/config-changed	2013-04-04 12:42:58 +0000
+++ hooks/config-changed	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-#!/bin/bash
-
-set -eu # -x for verbose logging to juju debug-log
-
-umask 002
-
-install_root=`config-get install_root`
-app_name=`config-get app_name`
-app_dir="$install_root/$app_name"
-app_user=`config-get app_user`
-app_branch=`config-get app_branch`
-app_port=`config-get app_port`
-app_node_env=`config-get app_node_env`
-cron_schedule=`config-get polling_schedule`
-
-update_app() {
-    cd $app_dir
-
-    is_branch=false
-
-    # Always fetch latest if branch requested
-    if git checkout origin/${app_branch}; then # is a local branch
-	git fetch origin && git checkout origin/${app_branch}
-        is_branch=true
-    else # tag/commit ref?
-	if ! git checkout ${app_branch}; then # commit does not exist locally
-	    git fetch origin
-	    if ! git checkout origin/${app_branch}; then # not a new remote branch, is a commit ref/tag
-		git checkout $app_branch
-            else
-                is_branch=true
-            fi
-	fi
-    fi
-}
-
-configure_app() {
-  juju-log "Configuring ${app_name}..."
-
-  # If Procfile found, use it with foreman module to create upstart script
-  if [ -f ${app_dir}/Procfile ]; then
-    juju-log "Using Procfile to configure ${app_name} using foreman..."
-
-    if [ -f /etc/juju_nodejs_app_${app_name}_mongodb.env ]; then
-	mongodb_config=`cat /etc/juju_nodejs_app_${app_name}_mongodb.env`
-    else
-	mongodb_config='""'
-    fi
-
-    cat > /etc/juju_nodejs_app_${app_name}.env <<EOS
-{
-    "name": "${app_name}"
-    , "node_env": "${app_node_env}"
-    , "mongo": ${mongodb_config}
-}
-EOS
-
-    cd $app_dir # foreman export uses this as root
-    nf export -j ${app_dir}/Procfile -e /etc/juju_nodejs_app_${app_name}.env -a ${app_name} -u ${app_user} -p ${app_port} -o /etc/init -t upstart
-  else
-    config_file_path=${app_dir}/config/config.js
-    if [ -f $config_file_path ]; then
-      juju-log "Writing $app_name config file $config_file_path"
-      sed -i "s/name.*/name\" : \"${app_name}\"/" $config_file_path
-      sed -i "s/listen_port.*/listen_port\" : \"${app_port}\"/" $config_file_path
-    fi
-  fi
-}
-
-install_cronjob() {
-    update_cron_job_filename=/opt/bin/update_node-app_from_SCM.sh
-
-    if [ $is_branch ]; then
-	if [ ! -d `dirname $update_cron_job_filename` ]; then
-            mkdir -p `dirname $update_cron_job_filename`
-	fi
-
-	cat > $update_cron_job_filename <<EOS
-
-#!/usr/bin/env bash
-
-cd \${app_dir}
-
-old_commit=\`git rev-parse origin/\${app_branch}\`
-
-echo "Checking for updates to \${app_name} branch \${app_branch} commit \${old_commit}"
-git fetch origin
-
-new_commit=\`git rev-parse origin/\${app_branch}\`
-
-if [ \$old_commit != \$new_commit ]; then
-    echo "Found new latest commit \${new_commit}"
-
-    git checkout origin/\${app_branch}
-    npm update && npm install
-    sudo service \${app_name} restart
-else
-    echo 'No updates found';
-fi
-EOS
-
-	chmod u=rwx,g=r,o=r $update_cron_job_filename
-        chown ${app_user} $update_cron_job_filename
-
-	cat > $update_cron_d_file <<EOF
-app_branch=$app_branch
-app_name=$app_name
-app_dir=$app_dir
-
-$cron_schedule $app_user $update_cron_job_filename
-EOF
-        chmod u=rwx,g=r,o=r $update_cron_d_file
-    else
-        juju-log "Ignoring polling for new code as commit/tag specified"
-
-	if [ -f $update_cron_d_file ]; then
-	    rm $update_cron_d_file
-	fi
-    fi
-}
-
-update_app
-configure_app
-
-update_cron_d_file=/etc/cron.d/${app_name} # TODO: what happens if app_name changes?
-
-if [ "$cron_schedule" != "" ]; then
-    install_cronjob
-elif [ -f $update_cron_d_file ]; then
-    rm $update_cron_d_file
-fi
-
-npm update && npm install
-
-chown -Rf ${app_user}.${app_user} ${app_dir}
-
-service ${app_name} restart

=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2014-01-24 18:05:39 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -eu # -x for verbose logging to juju debug-log
+
+umask 002
+
+install_node() {
+  juju-log "Installing node..."
+  add-apt-repository ppa:chris-lea/node.js
+  apt-get update
+  apt-get -y install -qq nodejs build-essential curl
+}
+[[ -x /usr/bin/node ]] || install_node
+
+modules=( mustache uid-number vasync )
+for module in ${modules[@]}; do
+  npm install $module
+done
+
+./hooks/install-app
\ No newline at end of file

=== removed file 'hooks/install'
--- hooks/install	2013-03-26 21:18:19 +0000
+++ hooks/install	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-set -eu # -x for verbose logging to juju debug-log
-
-umask 002
-
-install_root=`config-get install_root`
-app_name=`config-get app_name`
-app_dir="$install_root/$app_name"
-app_user=`config-get app_user`
-app_scm=`config-get app_scm`
-app_url=`config-get app_url`
-app_branch=`config-get app_branch`
-app_port=`config-get app_port`
-
-apt-get -y install -qq git-core
-
-install_node() {
-  juju-log "Installing node..."
-  add-apt-repository ppa:chris-lea/node.js
-  apt-get update
-  apt-get -y install -qq nodejs build-essential curl
-}
-[[ -x /usr/bin/node ]] || install_node
-
-install_app() {
-  juju-log "Installing ${app_name}..."
-  git clone ${app_url} ${app_dir} -b ${app_branch}
-  chown -Rf ${app_user}.${app_user} ${app_dir}
-
-  if [ -f ${app_dir}/package.json ]; then
-    cd ${app_dir} && npm install
-  fi
-
-  # If Procfile found, use it with foreman module
-  if [ -f ${app_dir}/Procfile ]; then
-    npm install -g foreman
-  else
-    cat > /etc/init/${app_name}.conf <<EOS
-description "${app_name} node.js server"
- 
-start on (net-device-up
-          and local-filesystems
-          and runlevel [2345])
-stop on runlevel [!2345]
- 
-expect fork
-respawn
- 
-script
-  export HOME=/
-  export NODE_PATH=/usr/lib/node
-  #exec sudo -u ${app_user} /usr/bin/node ${app_dir}/server.js >> /var/log/${app_name}.log 2>&1 &
-  exec /usr/bin/node ${app_dir}/server.js >> /var/log/${app_name}.log 2>&1 &
-end script
-EOS
-  fi
-}
-[[ -d ${app_dir} ]] || install_app
-
-juju-log "Delaying app startup until mongodb joins" 
-#juju-log "starting app"
-#service ${app_name} restart || service ${app_name} start
-

=== added file 'hooks/install-app'
--- hooks/install-app	1970-01-01 00:00:00 +0000
+++ hooks/install-app	2014-01-24 18:05:39 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+var app = require('../lib/app')();
+var charm = require('../lib/charm')();
+var util = require('util');
+
+charm.config_get_all(function(config) {
+    app.installPackage(config.app_scm, function() {
+        app.installApp(config, function() {
+            // All done
+            charm.log(util.format('%s installed successfully.', config.app_name));
+        });
+    });
+});
\ No newline at end of file

=== added file 'hooks/mongodb-relation-changed'
--- hooks/mongodb-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/mongodb-relation-changed	2014-01-24 18:05:39 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+
+var app = require('../lib/app')();
+var charm = require('../lib/charm')();
+var util = require('util');
+
+charm.config_get_all(function(config) {
+    app.reconfigureApp(config, function() {
+        //all done
+        charm.log(util.format('%s configured and started successfully', config.app_name));
+    });
+});

=== removed file 'hooks/mongodb-relation-changed'
--- hooks/mongodb-relation-changed	2013-02-21 11:40:29 +0000
+++ hooks/mongodb-relation-changed	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-set -eu 
-
-# Get the database settings; if not set, wait for this hook to be
-# invoked again
-host=`relation-get private-address`
-if [ -z "$host" ] ; then
-    exit 0 # wait for future handshake from database service unit
-fi
-
-relation_port=`relation-get port`
-port=${relation_port:-27017}
-
-replset=`relation-get replset`
-
-install_root=`config-get install_root`
-app_name=`config-get app_name`
-app_dir="$install_root/$app_name"
-
-configure_app() {
-  juju-log "configuring ${app_name} to work with the mongodb service"
-
-  config_file_path=$app_dir/config/config.js
-
-  if [ -f ${app_dir}/Procfile ]; then
-    cat > /etc/juju_nodejs_app_${app_name}_mongodb.env <<EOF
-{
-  "host": "${host}"
-, "port": ${port}
-, "replset": "${replset}"
-}
-EOF
-    MY_DIR=`dirname $0`
-    $MY_DIR/config-changed
-  elif [ -f $config_file_path ]; then
-    juju-log "Writing $app_name config file $config_file_path"
-    sed -i "s/mongo_host.*/mongo_host\" : \"${host}\"/" $config_file_path
-    sed -i "s/mongo_port.*/mongo_port\" : ${port}/" $config_file_path
-    sed -i "s/mongo_replset.*/mongo_replset\" : \"${replset}\"/" $config_file_path
-  fi
-
-  app_port=`config-get app_port`
-  open-port $app_port/TCP
-}
-configure_app
-
-juju-log "(re)starting app"
-service ${app_name} restart || service ${app_name} start
-

=== added file 'hooks/mongodb-relation-departed'
--- hooks/mongodb-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/mongodb-relation-departed	2014-01-24 18:05:39 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+var app = require('../lib/app')();
+var charm = require('../lib/charm')();
+var util = require('util');
+
+charm.config_get_all(function(config) {
+    app.exec('service', [config.app_name, 'status'], function(ret) {
+        app.exec('service', [config.app_name, 'stop'], function(ret) {
+            charm.close_port([config.app_port + '/TCP']);
+            charm.log(util.format('%s stopped successfully.', config.app_name));
+        });
+    });
+});

=== removed file 'hooks/mongodb-relation-departed'
--- hooks/mongodb-relation-departed	2011-12-03 00:08:39 +0000
+++ hooks/mongodb-relation-departed	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-app_name=`config-get app_name`
-service ${app_name} status && service ${app_name} stop

=== modified file 'hooks/start'
--- hooks/start	2011-09-07 12:30:23 +0000
+++ hooks/start	2014-01-24 18:05:39 +0000
@@ -1,3 +1,9 @@
-#!/bin/bash
-
-# delay startup until mongo joins
+#!/usr/bin/env node
+
+var charm = require('../lib/charm')();
+
+charm.config_get_all(function(config) {
+    // delay start until mongo joins
+    // app.exec('service', [config.app_name, 'start'], function(ret) {
+    //});
+});
\ No newline at end of file

=== added file 'hooks/stop'
--- hooks/stop	1970-01-01 00:00:00 +0000
+++ hooks/stop	2014-01-24 18:05:39 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+var app = require('../lib/app')();
+var charm = require('../lib/charm')();
+var util = require('util');
+
+charm.config_get_all(function(config) {
+    app.exec('service', [config.app_name, 'status'], function(ret) {
+        app.exec('service', [config.app_name, 'stop'], function(ret) {
+            charm.close_port([config.app_port + '/TCP']);
+            charm.log(util.format('%s stopped successfully.', config.app_name));
+        });
+    });
+});
\ No newline at end of file

=== removed file 'hooks/stop'
--- hooks/stop	2011-12-03 00:08:39 +0000
+++ hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-app_name=`config-get app_name`
-service ${app_name} status && service ${app_name} stop
-

=== removed symlink 'hooks/upgrade-charm'
=== target was u'install'
=== added file 'hooks/website-relation-changed'
--- hooks/website-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/website-relation-changed	2014-01-24 18:05:39 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+var charm = require('../lib/charm')();
+var util = require('util');
+
+charm.config_get_all(function(config) {
+    charm.unit_get('private-address', function(hostname) {
+        charm.relation_set({'port' : config.app_port, 'hostname' : hostname}, function() {
+            // relation successfully changed
+            charm.log(util.format('%s website relation successfully set up.', config.app_name));
+        });
+    });
+});
+

=== removed file 'hooks/website-relation-changed'
--- hooks/website-relation-changed	2012-02-09 21:37:03 +0000
+++ hooks/website-relation-changed	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-relation-set port=`config-get app_port` hostname=`unit-get private-address`
-

=== modified file 'icon.svg'
--- icon.svg	2013-09-18 14:44:20 +0000
+++ icon.svg	2014-01-24 18:05:39 +0000
@@ -7,17 +7,27 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="96"
    height="96"
    id="svg6517"
    version="1.1"
-   inkscape:version="0.48+devel r12505"
-   sodipodi:docname="nodejs.svg">
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="icon.svg">
   <defs
      id="defs6519">
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
     <filter
        style="color-interpolation-filters:sRGB;"
        inkscape:label="Inner Shadow"
@@ -82,29 +92,6 @@
          result="composite2"
          id="feComposite960" />
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient902">
-      <stop
-         style="stop-color:#74b524;stop-opacity:1"
-         offset="0"
-         id="stop904" />
-      <stop
-         style="stop-color:#83cd29;stop-opacity:1"
-         offset="1"
-         id="stop906" />
-    </linearGradient>
-    <linearGradient
-       id="Background">
-      <stop
-         id="stop4178"
-         offset="0"
-         style="stop-color:#22779e;stop-opacity:1" />
-      <stop
-         id="stop4180"
-         offset="1"
-         style="stop-color:#2991c0;stop-opacity:1" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath873">
@@ -130,38 +117,6 @@
          stdDeviation="0.71999962"
          id="feGaussianBlur893" />
     </filter>
-    <style
-       id="style867"
-       type="text/css"><![CDATA[
-    .fil0 {fill:#1F1A17}
-   ]]></style>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient902"
-       id="linearGradient908"
-       x1="-220"
-       y1="731.29077"
-       x2="-220"
-       y2="635.29077"
-       gradientUnits="userSpaceOnUse" />
-    <clipPath
-       id="clipPath16">
-      <path
-         id="path18"
-         d="m -9,-9 614,0 0,231 -614,0 0,-231 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath116">
-      <path
-         id="path118"
-         d="m 91.7368,146.3253 -9.7039,-1.577 -8.8548,-3.8814 -7.5206,-4.7308 -7.1566,-8.7335 -4.0431,-4.282 -3.9093,-1.4409 -1.034,2.5271 1.8079,2.6096 0.4062,3.6802 1.211,-0.0488 1.3232,-1.2069 -0.3569,3.7488 -1.4667,0.9839 0.0445,1.4286 -3.4744,-1.9655 -3.1462,-3.712 -0.6559,-3.3176 1.3453,-2.6567 1.2549,-4.5133 2.5521,-1.2084 2.6847,0.1318 2.5455,1.4791 -1.698,-8.6122 1.698,-9.5825 -1.8692,-4.4246 -6.1223,-6.5965 1.0885,-3.941 2.9002,-4.5669 5.4688,-3.8486 2.9007,-0.3969 3.225,-0.1094 -2.012,-8.2601 7.3993,-3.0326 9.2188,-1.2129 3.1535,2.0619 0.2427,5.5797 3.5178,5.8224 0.2426,4.6094 8.4909,-0.6066 7.8843,0.7279 -7.8843,-4.7307 1.3343,-5.701 4.9731,-7.763 4.8521,-2.0622 3.8814,1.5769 1.577,3.1538 8.1269,6.1861 1.5769,-1.3343 12.7363,-0.485 2.5473,2.0619 0.2426,3.6391 -0.849,1.5767 -0.6066,9.8251 -4.2454,8.4909 0.7276,3.7605 2.5475,-1.3343 7.1566,-6.6716 3.5175,-0.2424 3.8815,1.5769 3.8818,2.9109 1.9406,6.3077 11.4021,-0.7277 6.914,2.6686 5.5797,5.2157 4.0028,7.5206 0.9706,8.8546 -0.8493,10.3105 -2.1832,9.2185 -2.1836,2.9112 -3.0322,0.9706 -5.3373,-5.8224 -4.8518,-1.6982 -4.2455,7.0353 -4.2454,3.8815 -2.3049,1.4556 -9.2185,7.6419 -7.3993,4.0028 -7.3993,0.6066 -8.6119,-1.4556 -7.5206,-2.7899 -5.2158,-4.2454 -4.1241,-4.9734 -4.2454,-1.2129" />
-    </clipPath>
-    <clipPath
-       id="clipPath128">
-      <path
-         id="path130"
-         d="m 91.7368,146.3253 -9.7039,-1.577 -8.8548,-3.8814 -7.5206,-4.7308 -7.1566,-8.7335 -4.0431,-4.282 -3.9093,-1.4409 -1.034,2.5271 1.8079,2.6096 0.4062,3.6802 1.211,-0.0488 1.3232,-1.2069 -0.3569,3.7488 -1.4667,0.9839 0.0445,1.4286 -3.4744,-1.9655 -3.1462,-3.712 -0.6559,-3.3176 1.3453,-2.6567 1.2549,-4.5133 2.5521,-1.2084 2.6847,0.1318 2.5455,1.4791 -1.698,-8.6122 1.698,-9.5825 -1.8692,-4.4246 -6.1223,-6.5965 1.0885,-3.941 2.9002,-4.5669 5.4688,-3.8486 2.9007,-0.3969 3.225,-0.1094 -2.012,-8.2601 7.3993,-3.0326 9.2188,-1.2129 3.1535,2.0619 0.2427,5.5797 3.5178,5.8224 0.2426,4.6094 8.4909,-0.6066 7.8843,0.7279 -7.8843,-4.7307 1.3343,-5.701 4.9731,-7.763 4.8521,-2.0622 3.8814,1.5769 1.577,3.1538 8.1269,6.1861 1.5769,-1.3343 12.7363,-0.485 2.5473,2.0619 0.2426,3.6391 -0.849,1.5767 -0.6066,9.8251 -4.2454,8.4909 0.7276,3.7605 2.5475,-1.3343 7.1566,-6.6716 3.5175,-0.2424 3.8815,1.5769 3.8818,2.9109 1.9406,6.3077 11.4021,-0.7277 6.914,2.6686 5.5797,5.2157 4.0028,7.5206 0.9706,8.8546 -0.8493,10.3105 -2.1832,9.2185 -2.1836,2.9112 -3.0322,0.9706 -5.3373,-5.8224 -4.8518,-1.6982 -4.2455,7.0353 -4.2454,3.8815 -2.3049,1.4556 -9.2185,7.6419 -7.3993,4.0028 -7.3993,0.6066 -8.6119,-1.4556 -7.5206,-2.7899 -5.2158,-4.2454 -4.1241,-4.9734 -4.2454,-1.2129" />
-    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -170,38 +125,25 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.2596289"
-     inkscape:cx="62.012793"
-     inkscape:cy="45.550063"
+     inkscape:zoom="4.0745362"
+     inkscape:cx="43.548195"
+     inkscape:cy="43.426863"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer3"
      showgrid="true"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
+     inkscape:window-width="1280"
+     inkscape:window-height="687"
      inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      showborder="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true">
+     inkscape:showpageshadow="false">
     <inkscape:grid
        type="xygrid"
        id="grid821" />
@@ -230,7 +172,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -239,29 +181,27 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(268,-635.29076)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <path
-       style="fill:url(#linearGradient908);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
-       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       style="fill:#82cd29;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 c -27.21517,0 -31.10302,-3.89189 -31.10302,-31.13514 z"
        id="path6455"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssssssss" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="m -220,651.29076 c -0.86298,0 -1.70107,0.17841 -2.44333,0.59855 l -23.49563,13.56741 c -1.52044,0.87539 -2.44457,2.53071 -2.44457,4.29059 l 0,27.0869 c 0,1.75892 0.92413,3.41126 2.44457,4.28936 l 6.13539,3.54211 c 2.98102,1.46918 4.08046,1.44658 5.43728,1.44658 4.41367,0 6.93426,-2.67777 6.93426,-7.33247 l 0,-26.73786 c 0,-0.37799 -0.32696,-0.64892 -0.69809,-0.64892 l -2.94356,0 c -0.37712,0 -0.6981,0.27093 -0.6981,0.64892 l 0,26.73786 c 0,2.06316 -2.14855,4.13777 -5.63639,2.39418 l -6.38611,-3.74122 c -0.22547,-0.12291 -0.39821,-0.33979 -0.39821,-0.59854 l 0,-27.0869 c 0,-0.25716 0.17073,-0.51883 0.39821,-0.64893 l 23.44524,-13.51826 c 0.21948,-0.12609 0.48183,-0.12609 0.69932,0 l 23.44401,13.51826 c 0.22348,0.13408 0.39945,0.38395 0.39945,0.64893 l 0,27.0869 c 0,0.25875 -0.12965,0.52304 -0.34906,0.6477 l -23.4944,13.51825 c -0.20153,0.11972 -0.47984,0.11972 -0.69932,0 l -6.03584,-3.59126 c -0.17957,-0.10535 -0.42494,-0.0974 -0.59854,0 -1.6661,0.94451 -1.97855,1.05459 -3.54088,1.59653 -0.38509,0.13408 -0.97015,0.34304 0.19911,0.99798 l 7.88185,4.63841 c 0.75024,0.43418 1.58535,0.64894 2.44333,0.64894 0.86996,0 1.69435,-0.21476 2.44458,-0.64894 l 23.49564,-13.51825 c 1.52044,-0.88434 2.44333,-2.53044 2.44333,-4.28936 l 0,-27.0869 c 0,-1.75988 -0.92289,-3.41153 -2.44333,-4.29059 l -23.49564,-13.56741 c -0.73627,-0.42014 -1.58159,-0.59855 -2.44458,-0.59855 z m 6.28534,19.35499 c -6.69034,0 -10.67425,2.84698 -10.67425,7.58196 0,5.13662 3.95462,6.54723 10.37559,7.18254 7.68201,0.752 8.28007,1.88002 8.28007,3.39216 0,2.62281 -2.09017,3.7412 -7.03259,3.7412 -6.20947,0 -7.57488,-1.54948 -8.03181,-4.6384 -0.0538,-0.33123 -0.30973,-0.59854 -0.64893,-0.59854 l -3.04188,0 c -0.37512,0 -0.69932,0.32232 -0.69932,0.69809 0,3.95393 2.15198,8.63034 12.42194,8.63034 7.43458,0 11.72261,-2.91881 11.72261,-8.0318 0,-5.06877 -3.46436,-6.42942 -10.67547,-7.38286 -7.28694,-0.96414 -7.98141,-1.43611 -7.98141,-3.14267 0,-1.4087 0.58808,-3.2926 5.98545,-3.2926 4.8207,0 6.60341,1.04011 7.3337,4.29058 0.0639,0.30553 0.33245,0.54816 0.64771,0.54816 l 3.0431,0 c 0.18756,0 0.3693,-0.11493 0.49899,-0.2495 0.1277,-0.14365 0.21708,-0.30462 0.19911,-0.49776 -0.47089,-5.59793 -4.20423,-8.2309 -11.72261,-8.2309 z"
-       id="path4116"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="m -193.22175,651.29076 0,0.83723 2.33334,0 0,6.16277 0.95662,0 0,-6.16277 2.39377,0 0,-0.83723 -5.68373,0 z m 6.52096,0 0,7 0.89766,0 0,-4.12866 c 0,-0.16846 0.008,-0.42818 0,-0.77679 -0.0115,-0.35513 0,-0.66564 0,-0.83871 l 0,-0.17982 1.97368,5.92251 0.95662,0 2.03411,-5.92251 c 0,0.37675 -0.0496,0.74113 -0.0589,1.07748 -0.004,0.32736 0,0.57311 0,0.71784 l 0,4.12719 0.89766,0 0,-6.99853 -1.31628,0 -2.03411,5.92251 -1.97515,-5.92251 -1.37523,0 z"
-       id="path4114"
-       inkscape:connector-curvature="0" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="PLACE YOUR PICTOGRAM HERE"
-     style="display:inline" />
+     style="display:inline">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path28"
+       d="m 47.833258,16.541698 c -0.870556,0 -1.716941,0.1807 -2.465712,0.606108 L 21.666509,30.886221 c -1.533772,0.88637 -2.465712,2.561812 -2.465712,4.343768 l 0,27.426403 c 0,1.780987 0.93194,3.454484 2.465712,4.343608 l 6.189443,3.586212 c 3.007161,1.487625 4.116233,1.464674 5.484953,1.464674 4.452374,0 6.994572,-2.711642 6.994572,-7.424728 l 0,-27.07276 c 0,-0.382737 -0.330104,-0.656698 -0.704489,-0.656698 l -2.968916,0 c -0.380429,0 -0.704496,0.273961 -0.704496,0.656698 l 0,27.07276 c 0,2.089049 -2.167811,4.189899 -5.686232,2.424426 l -6.441042,-3.788085 c -0.227451,-0.12445 -0.40257,-0.344106 -0.40257,-0.606107 l 0,-27.426403 c 0,-0.260384 0.173107,-0.524807 0.40257,-0.656534 L 47.481013,20.885466 c 0.221408,-0.127688 0.485087,-0.127688 0.704489,0 l 23.650711,13.687989 c 0.225439,0.135767 0.402564,0.38823 0.402564,0.656534 l 0,27.426403 c 0,0.262001 -0.130912,0.530305 -0.352245,0.656539 l -23.70103,13.68799 c -0.203297,0.121221 -0.483081,0.121221 -0.704489,0 L 41.39221,73.364278 c -0.181156,-0.106675 -0.42873,-0.0986 -0.60385,0 -1.680706,0.956357 -1.996723,1.067554 -3.572764,1.616285 -0.388473,0.135768 -0.978236,0.347019 0.201284,1.010179 l 7.950666,4.697247 c 0.756821,0.439624 1.600195,0.656534 2.465712,0.656534 0.877589,0 1.708891,-0.21691 2.465711,-0.656534 L 74,67 c 1.533777,-0.895425 2.465712,-2.562621 2.465712,-4.343608 l 0,-27.426403 c 0,-1.781956 -0.931935,-3.453676 -2.465712,-4.343768 L 50.298969,17.147806 C 49.556234,16.722398 48.703813,16.541698 47.833258,16.541698 z M 54.17366,36.13947 c -6.74901,0 -10.768622,2.882968 -10.768622,7.677349 0,5.201047 3.989422,6.630001 10.466697,7.273281 7.749386,0.761436 8.353229,1.903501 8.353229,3.434606 0,2.655717 -2.109443,3.788084 -7.09521,3.788084 -6.263916,0 -7.640692,-1.56957 -8.101631,-4.697241 -0.05428,-0.335384 -0.311987,-0.606108 -0.654164,-0.606108 l -3.069561,0 c -0.37841,0 -0.704489,0.326648 -0.704489,0.707125 0,4.003534 2.169824,8.738119 12.529845,8.738119 7.499794,0 11.825355,-2.954892 11.825355,-8.132011 0,-5.132353 -3.494268,-6.509914 -10.768621,-7.47532 -7.350847,-0.976236 -8.051307,-1.454007 -8.051307,-3.181975 0,-1.426374 0.593782,-3.333749 6.038479,-3.333749 4.862987,0 6.660444,1.052684 7.397136,4.343927 0.06441,0.309356 0.336146,0.555511 0.654168,0.555511 l 3.069561,0 c 0.189206,0 0.372374,-0.116372 0.503211,-0.252622 0.128817,-0.145465 0.219395,-0.309357 0.201279,-0.504927 C 65.523989,38.805369 61.757989,36.13947 54.17366,36.13947 z"
+       sodipodi:nodetypes="sccssccsssssssccssccccssccccccccsccssccssscsscssssscsscssccs" />
+  </g>
   <g
      inkscape:groupmode="layer"
      id="layer2"
@@ -282,7 +222,7 @@
            style="opacity:0.6;filter:url(#filter891)">
           <path
              transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
-             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 12,12 0 1 1 24,0 z"
              sodipodi:ry="12"
              sodipodi:rx="12"
              sodipodi:cy="552.36218"
@@ -301,11 +241,11 @@
              sodipodi:cy="552.36218"
              sodipodi:rx="12"
              sodipodi:ry="12"
-             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 12,12 0 1 1 24,0 z"
              transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
           <path
              transform="matrix(1.25,0,0,1.25,33,-100.45273)"
-             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 12,12 0 1 1 24,0 z"
              sodipodi:ry="12"
              sodipodi:rx="12"
              sodipodi:cy="552.36218"

=== added directory 'lib'
=== added file 'lib/app.js'
--- lib/app.js	1970-01-01 00:00:00 +0000
+++ lib/app.js	2014-01-24 18:05:39 +0000
@@ -0,0 +1,435 @@
+var execFile = require('child_process').execFile;
+var util = require('util');
+var vm = require('vm');
+var fs = require('fs');
+var path = require('path');
+var uidNumber = require('uid-number');
+var mustache = require('mustache');
+var vasync = require('vasync');
+var charm = require('./charm')();
+
+module.exports = App;
+
+function App(options) {
+    if (!(this instanceof App)) return new App(options);
+
+    if (options == null) {
+        options = {};
+    }
+
+    // assuming charm.js is in lib/charm.js the config file defaults to config/config.js
+    this.CONFIG_FILE = options.config || path.join(__dirname, '..', 'config', 'config.js');
+}
+
+function loadTemplate(template) {
+    return fs.readFileSync(path.join(__dirname, '..', 'tpl', template)) + '';
+}
+
+App.prototype.exec = function(cmd, args, cb) {
+    var self = this;
+    execFile(cmd, args, function(err, stdout, stderr) {
+        if (err) {
+            charm.log(util.format('failed to run: %s %j %j', cmd, args, stderr));
+            process.exit(1);
+            return;
+        }
+        if (typeof cb != 'undefined') {
+            cb(stdout ? stdout.trim() : '');
+        }
+    });
+};
+
+App.prototype.configUpdate = function(section, value, cb) {
+    var self = this;
+    fs.readFile(this.CONFIG_FILE, 'utf8', function(err, value) {
+        if (err) {
+            charm.log(util.format('Failed to read config file %s, trying to create it...', this.CONFIG_FILE));
+            // anything else to do? will writefile create file?
+        }
+        var config = vm.runInNewContext('(function(){ return ' + value + ' })()');
+        var s = config[section] || {};
+        util._extend(s, value);
+        config[section] = s;
+        // write back to the config file
+        fs.writeFile(this.CONFIG_FILE, config, function(err) {
+            if (err) {
+                charm.log(util.format('Failed to write config file %s: %j', this.CONFIG_FILE, err));
+                process.exit(1);
+                return;
+            }
+        })
+    });
+};
+
+App.prototype.installPackage = function(pkg, cb) {
+    var self = this;
+    // check if already installed
+    self.exec('apt-cache',['policy', pkg], function(resp){
+        // if not installed, install package
+        if (resp.indexOf('Installed: (none)') != -1) {
+            charm.log(util.format('Installing %s...', pkg));
+            self.exec('apt-get', ['-y', 'install', '-qq', pkg], function(err) {
+                if (err) {
+                    charm.log(util.format('Failed to install %s: %j', pkg, err));
+                    process.exit(1);
+                    return;
+                }
+            });
+        }
+        else {
+            charm.log(util.format('%s is already installed, nothing to do.', pkg));
+        }
+    });
+    cb();
+}
+
+App.prototype.installApp = function(config, cb) {
+    var self = this;
+    var appDir = config.install_root + '/' + config.app_name;
+    // check if already installed
+    fs.exists(appDir, function(exists) {
+        if(!exists) {
+            // install from repository
+            var command = '';
+            var args= [];
+            switch(config.app_scm) {
+                case 'subversion':
+                    command = 'svn';
+                    args.push('checkout', config.app_url, appDir);
+                    break;
+                case 'mercurial':
+                    command = 'hg';
+                    args.push('clone', config.app_url, '-r' , config.app_branch, appDir);
+                    break;
+                case 'bzr':
+                    command = 'bzr';
+                    args.push('checkout', config.app_url, '-r' , config.app_branch, appDir);
+                    break;
+                default:
+                    command = 'git';
+                    args.push('clone', config.app_url, '-b' , config.app_branch, appDir);
+                    break;
+            }
+            self.exec(command, args, function() {
+                uidNumber(config.app_user, config.app_user, function (err, uid, gid) {
+                    if (err) {
+                        charm.log(util.format('Failed to get uid:gid for %s:%s: %j', config.app_user, config.app_user, err));
+                        process.exit(1);
+                        return;
+                    }
+                    else {
+                        fs.chown(appDir, uid, gid, function(err) {
+                            if (err) {
+                                charm.log(util.format('Failed to change ownership of %s to %s: %j', appDir, config.app_user, err));
+                                process.exit(1);
+                                return;
+                            }
+                            else {
+                                vasync.pipeline({
+                                    funcs: [
+                                        function installNpmModules(args, cb) {
+                                            var self = args[1];
+                                            var appDir = args[0].install_root + '/' + args[0].app_name;
+                                            // install module dependencies, if any
+                                            var dependencies = appDir + '/package.json';
+                                            fs.exists(dependencies, function (exists) {
+                                                if (exists) {
+                                                    process.chdir(appDir);
+                                                    self.exec('npm', ['install']);
+                                                }
+                                            });
+                                            cb();
+                                        },
+                                        function createAppService(args, cb) {
+                                            var self = args[1];
+                                            var appDir = args[0].install_root + '/' + args[0].app_name;
+                                            var procFile = appDir + '/Procfile';
+                                            fs.exists(procFile, function (exists) {
+                                                if (exists) {
+                                                    self.exec('npm', ['install', 'foreman']);
+                                                }
+                                                else {
+                                                    var output = mustache.render(loadTemplate('upstart.tpl'), args[0]);
+                                                    var upstartFile = '/etc/init/' + args[0].app_name + '.conf'
+                                                    fs.writeFile(upstartFile, output, function (err) {
+                                                        if (err) {
+                                                            charm.log(util.format('Failed to write upstart file %s: %j', upstartFile, err));
+                                                            process.exit(1);
+                                                            return;
+                                                        }
+                                                    });
+                                                }
+                                            });
+                                            cb();
+                                        }
+                                    ],
+                                    arg: [
+                                        config,
+                                        self
+                                    ]
+                                }, function(err) {
+                                    if (err) {
+                                        charm.log(util.format('An error occurred: %j', err));
+                                        process.exit(1);
+                                        return;
+                                    }
+                                });
+                            }
+                        });
+                    }
+                });
+            });
+        }
+    });
+    cb();
+}
+
+App.prototype.updateApp = function(config, cb) {
+    var self = this;
+    var appDir = config.install_root + '/' + config.app_name;
+
+    process.chdir(appDir);
+
+    // update from repository
+    var command = '';
+    var args= [];
+    switch(config.app_scm) {
+        case 'subversion':
+            command = 'svn';
+            args.push('update')
+            break;
+        case 'mercurial':
+            command = 'hg';
+            args.push('merge')
+            break;
+        case 'bzr':
+            command = 'bzr';
+            args.push('merge')
+            break;
+        default:
+            command = 'git';
+            args.push('checkout', config.app_branch);
+            break;
+    };
+    self.exec(command, args, function(err) {
+        if (err) {
+            charm.log(util.format('Failed to update %s from %s: %j', config.app_name, config.app_url, err));
+            process.exit(1);
+            return;
+        }
+    });
+    cb();
+}
+
+App.prototype.configureApp = function(config, cb) {
+    var self = this;
+    var configFile = path.join(__dirname, '..', 'config', 'config.js');
+    var appDir = config.install_root + '/' + config.app_name;
+    var mongodbConfigFile = '/etc/juju_nodejs_app_' + config.app_name + '_mongodb.env';
+    var mongodbConfig = "";
+
+    charm.log(util.format('Configuring %s...', config.app_name));
+
+    var procFile = appDir + '/Procfile';
+    fs.exists(procFile, function(exists) {
+        if(exists) {
+            charm.log(util.format('Using Procfile to configure %s using foreman...', config.app_name));
+
+            fs.exists(mongodbConfigFile, function(exists) {
+                if(exists) {
+                    fs.readFile(mongodbConfigFile, function (err, data) {
+                        if (err) {
+                            charm.log(util.format('Failed to read config file %s: %j', mongodbConfigFile, err));
+                            process.exit(1);
+                            return;
+                        }
+                        mongodbConfig = data;
+                    });
+                }
+                else {
+                    var output = mustache.render(loadTemplate('mongodb_env.tpl'), config);
+                    fs.writeFile(mongodbConfigFile, output, function (err) {
+                        if (err) {
+                            charm.log(util.format('Failed to write config file %s: %j', mongodbConfigFile, err));
+                            process.exit(1);
+                            return;
+                        }
+                    });
+                }
+            });
+
+            process.chdir(appDir);
+            var args = ['export', '-j', appDir + '/Procfile', '-e', mongodbConfigFile, '-a', config.app_name, '-u', config.app_user, '-p', config.app_port, '-o', '/etc/init', '-t', 'upstart'];
+            self.exec('nf', args, function(err) {
+                if (err) {
+                    charm.log(util.format('Failed to execute foreman: %j', err));
+                    process.exit(1);
+                    return;
+                }
+            });
+        }
+        else {
+            charm.log(util.format('Writing %s config file %s', config.app_name, configFile));
+            fs.exists(configFile, function(exists) {
+                if(exists) {
+                    var data = fs.readFileSync(configFile, {encoding:'utf8'});
+                    if (data == null) {
+                        charm.log(util.format('Couldn\'t read config file %s: %j', configFile, err));
+                        process.exit(1);
+                        return;
+                    }
+
+                    var result = data.replace(/name.*/g, 'name : "'  + config.app_name + '"');
+                    result = result.replace(/listen_port.*/g, 'listen_port : "'  + config.app_port + '"');
+
+                    fs.writeFile(configFile, result, 'utf8', function (err) {
+                        if (err) {
+                            charm.log(util.format('Couldn\'t write config file %s: %j', configFile, err));
+                            process.exit(1);
+                            return;
+                        }
+                    });
+                }
+                else {
+                    charm.log(util.format('Config file %s doesn\'t exist!', configFile));
+                    process.exit(1);
+                    return;
+                }
+            });
+        }
+    });
+
+    // cron schedule???
+
+    vasync.pipeline({
+        funcs: [
+            function installNpmModules(args, cb) {
+                var self = args[1];
+                var appDir = args[0].install_root + '/' + args[0].app_name;
+
+                self.exec('npm', ['update'], function() {
+                    self.exec('npm', ['install'], function() {
+                    });
+                });
+                cb();
+            },
+            function chownAndRestart(args, cb) {
+                var self = args[1];
+                var config = args[0];
+                var appDir = args[0].install_root + '/' + args[0].app_name;
+
+                uidNumber(config.app_user, config.app_user, function (err, uid, gid) {
+                    if (err) {
+                        charm.log(util.format('Failed to get uid:gid for %s:%s: %j', config.app_user, config.app_user, err));
+                        process.exit(1);
+                        return;
+                    }
+                    else {
+                        fs.chown(appDir, uid, gid, function(err) {
+                            if (err) {
+                                charm.log(util.format('Failed to change ownership of %s to %s: %j', appDir, config.app_user, err));
+                                process.exit(1);
+                                return;
+                            }
+                            else {
+                                self.exec('service', [config.app_name, 'restart'], function(ret) {
+                                    if (ret < 0) {
+                                        charm.log(util.format('Failed to restart %s', config.app_name));
+                                    }
+                                    else {
+                                        charm.log(util.format('%s restarted.', config.app_name));
+                                    }
+                                });
+                            }
+                        });
+                    }
+                });
+                cb();
+            }
+        ],
+        arg: [
+            config,
+            self
+        ]
+    }, function(err) {
+        if (err) {
+            charm.log(util.format('An error occurred: %j', err));
+            process.exit(1);
+            return;
+        }
+    });
+
+    cb();
+}
+
+App.prototype.reconfigureApp = function(config, cb) {
+    var self = this;
+    var configFile = path.join(__dirname, '..', 'config', 'config.js');
+    var appDir = config.install_root + '/' + config.app_name;
+    var mongodbConfigFile = '/etc/juju_nodejs_app_' + config.app_name + '_mongodb.env';
+
+    self.relation_get(['--format', 'json'], function(relation) {
+        var mongoNodeRelation = JSON.parse(relation);
+        if (mongoNodeRelation.hostname != ''){
+            charm.log(util.format('Configuring %s to work with the mongodb service...', config.app_name));
+
+            var procFile = appDir + '/Procfile';
+            fs.exists(procFile, function(exists) {
+                if(exists) {
+                    var output = mustache.render(loadTemplate('mongodb_env.tpl'), config);
+                    fs.writeFile(mongodbConfigFile, output, function (err) {
+                        if (err) {
+                            charm.log(util.format('Failed to write config file %s: %j', mongodbConfigFile, err));
+                            process.exit(1);
+                            return;
+                        }
+                    });
+                    self.emit('config-changed', config);
+                }
+                else {
+                    charm.log(util.format('Writing %s config file %s', config.app_name, configFile));
+                    fs.exists(configFile, function(exists) {
+                        if(exists) {
+                            var data = fs.readFileSync(configFile, {encoding:'utf8'});
+                            if (data == null) {
+                                charm.log(util.format('Couldn\'t read config file %s: %j', configFile, err));
+                                process.exit(1);
+                                return;
+                            }
+
+                            var result = data.replace(/mongo_host.*/g, 'mongo_host : "'  + mongoNodeRelation.hostname + '"');
+                            result = result.replace(/mongo_port.*/g, 'mongo_port : "'  + mongoNodeRelation.port + '"');
+                            result = result.replace(/mongo_replset.*/g, 'mongo_replset : "'  + mongoNodeRelation.replset + '"');
+
+                            fs.writeFile(configFile, result, 'utf8', function (err) {
+                                if (err) {
+                                    charm.log(util.format('Couldn\'t write config file %s: %j', configFile, err));
+                                    process.exit(1);
+                                    return;
+                                }
+                            });
+                        }
+                        else {
+                            charm.log(util.format('Config file %s doesn\'t exist!', configFile));
+                            process.exit(1);
+                            return;
+                        }
+                    });
+                }
+            });
+
+            charm.open_port([config.app_port + '/TCP']);
+
+            charm.log(util.format('Restarting %s...', config.app_name))
+            self.exec('service', [config.app_name, 'restart'], function(ret) {
+                if (ret < 0) {
+                    charm.log(util.format('Failed to restart %s', config.app_name));
+                }
+                else {
+                    charm.log(util.format('%s restarted.', config.app_name));
+                }
+            });
+        }
+    });
+    cb();
+}

=== added file 'lib/charm.js'
--- lib/charm.js	1970-01-01 00:00:00 +0000
+++ lib/charm.js	2014-01-24 18:05:39 +0000
@@ -0,0 +1,75 @@
+var execFile = require('child_process').execFile;
+var EE = require('events').EventEmitter;
+var util = require('util');
+
+module.exports = Charm;
+
+function Charm() {
+  if (!(this instanceof Charm)) return new Charm();
+
+  // delay a tick so things can attach, maybe have a separate init that users pass in instead of this being magic on first require
+  var self = this;
+  process.nextTick(function() {
+    //argv[0] is node, argv[1] is script name, the rest will be args for the hook
+    var hook = process.argv[1];
+    //if we have defined a prototype method for this call it instead. otherwise re-emit
+    if (self[hook])
+      self[hook].apply(self, process.argv.slice(2));
+    else
+      self.emit.apply(self, process.argv.slice(1));
+  });
+}
+util.inherits(Charm, EE);
+
+Charm.prototype.relation_get = function(key, cb) {
+  this.exec('relation-get', key, cb);
+};
+
+Charm.prototype.relation_set = function(map, cb) {
+  var params = [];
+  for (var key in map) {
+    params.push(key + '=' + map[key])
+  }
+  this.exec('relation-set', params, cb);
+};
+
+Charm.prototype.log = function(msg, cb) {
+  this.exec('juju-log', [msg], cb);
+};
+
+Charm.prototype.config_get = function(key, cb) {
+    this.exec('config-get', [key], cb);
+};
+
+Charm.prototype.config_get_all = function(cb) {
+    this.exec('config-get', ['--all', '--format', 'json'], function(config) {
+        cb(JSON.parse(config));
+    });
+};
+
+Charm.prototype.unit_get = function(key, cb) {
+    this.exec('unit-get', [key], cb);
+};
+
+Charm.prototype.open_port = function(key, cb) {
+    this.exec('open-port', [key], cb);
+};
+
+Charm.prototype.close_port = function(key, cb) {
+    this.exec('close-port', [key], cb);
+};
+
+/* evil this exits like set -e does */
+Charm.prototype.exec = function(cmd, args, cb) {
+    var self = this;
+    execFile(cmd, args, function(err, stdout, stderr) {
+        if (err) {
+          self.log(util.format('failed to run: %s %j %j', cmd, args, stderr));
+          process.exit(1);
+          return;
+        }
+        if (typeof cb != 'undefined') {
+          cb(stdout ? stdout.trim() : '');
+        }
+    });
+};
\ No newline at end of file

=== modified file 'metadata.yaml'
--- metadata.yaml	2013-07-11 19:24:26 +0000
+++ metadata.yaml	2014-01-24 18:05:39 +0000
@@ -3,7 +3,7 @@
 description: "Deploy a user-defined node.js application"
 categories:
     - app-servers
-maintainer: Mark Mims <[e-mail]>
+maintainer: Daniele Stroppa <[e-mail]>
 requires:
   mongodb:
     interface: mongodb

=== added directory 'tests'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2014-01-24 18:05:39 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+add-apt-repository ppa:juju/stable
+apt-get update
+apt-get install amulet

=== added file 'tests/01-mongodb-deployment'
--- tests/01-mongodb-deployment	1970-01-01 00:00:00 +0000
+++ tests/01-mongodb-deployment	2014-01-24 18:05:39 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/python3
+
+import amulet
+
+d = amulet.Deployment()
+
+d.add('node-app', charm='lp:~dstroppa/charms/precise/node-app')
+d.add('mongodb', charm='cs:precise/mongodb-20')
+
+d.relate('node-app:mongodb', 'mongodb:database')
+
+d.expose('node-app')
+
+try:
+    d.setup(timeout=900)
+    d.sentry.wait()
+except amulet.helpers.TimeoutError:
+    amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+except:
+    raise
+
+# Now you can use d.sentry.unit[UNIT] to address each of the units and perform
+# more in-depth steps. There are three test statuses: amulet.PASS, amulet.FAIL,
+# and amulet.SKIP - these can be triggered with amulet.raise_status(). Each
+# d.sentry.unit[] has the following methods:
+# - .info - An array of the information of that unit from Juju
+# - .file(PATH) - Get the details of a file on that unit
+# - .file_contents(PATH) - Get plain text output of PATH file from that unit
+# - .directory(PATH) - Get details of directory
+# - .directory_contents(PATH) - List files and folders in PATH on that unit
+# - .relation(relation, service:rel) - Get relation data from return service

=== added file 'tests/02-mongodb-haproxy-deployment'
--- tests/02-mongodb-haproxy-deployment	1970-01-01 00:00:00 +0000
+++ tests/02-mongodb-haproxy-deployment	2014-01-24 18:05:39 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/python3
+
+import amulet
+
+d = amulet.Deployment()
+
+d.add('node-app', charm='lp:~dstroppa/charms/precise/node-app')
+d.add('haproxy', charm='cs:precise/haproxy-22')
+d.add('mongodb', charm='cs:precise/mongodb-20')
+
+d.relate('node-app:website', 'haproxy:reverseproxy')
+d.relate('node-app:mongodb', 'mongodb:database')
+
+d.expose('haproxy')
+
+try:
+    d.setup(timeout=900)
+    d.sentry.wait()
+except amulet.helpers.TimeoutError:
+    amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+except:
+    raise
+
+# Now you can use d.sentry.unit[UNIT] to address each of the units and perform
+# more in-depth steps. There are three test statuses: amulet.PASS, amulet.FAIL,
+# and amulet.SKIP - these can be triggered with amulet.raise_status(). Each
+# d.sentry.unit[] has the following methods:
+# - .info - An array of the information of that unit from Juju
+# - .file(PATH) - Get the details of a file on that unit
+# - .file_contents(PATH) - Get plain text output of PATH file from that unit
+# - .directory(PATH) - Get details of directory
+# - .directory_contents(PATH) - List files and folders in PATH on that unit
+# - .relation(relation, service:rel) - Get relation data from return service

=== added directory 'tpl'
=== added file 'tpl/mongodb_env.tpl'
--- tpl/mongodb_env.tpl	1970-01-01 00:00:00 +0000
+++ tpl/mongodb_env.tpl	2014-01-24 18:05:39 +0000
@@ -0,0 +1,8 @@
+{
+    "name": "{{appName}}"
+    , "node_env": "{{appNodeEnv}}"
+    , "mongo": {{mongdbConfig}}
+    , "host": "{{hostname}}"
+    , "port": {{port}}
+    , "replset": "{{replset}}"
+}
\ No newline at end of file

=== added file 'tpl/upstart.tpl'
--- tpl/upstart.tpl	1970-01-01 00:00:00 +0000
+++ tpl/upstart.tpl	2014-01-24 18:05:39 +0000
@@ -0,0 +1,16 @@
+description "{{app_name}} node.js server"
+author "Daniele Stroppa <[e-mail]>"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [06]
+
+respawn
+respawn limit 5 3
+
+setuid {{app_user}}
+setgid {{app_user}}
+
+env HOME="/home/{{app_user}}"
+env NODE_PATH="/usr/lib/node"
+
+exec /usr/bin/node {{{install_root}}}/{{app_name}}/server.js >> /var/log/{{app_name}}.log 2>&1