Merge lp:~mariusko/charms/precise/node-app/lp1130092_update_support_for_user_application into lp:charms/node-app

[Marius B. Kotsbak]

[lp:~mariusko/charms/precise/node-app/lp1130092_update_support_for_user_application]

33. By Marius B. Kotsbak on 2013-02-19

Fetch with parameter branch/commit is wrong. Change to pull to ensure local branch is merged with the remote.

34. By Marius B. Kotsbak on 2013-02-19

Fixed the branch detection logic as there are asterix/space in front of the active branch.

35. By Marius B. Kotsbak on 2013-02-19

Ensure switch to the local branch before "git pull" so that the merge part will be right.

36. By Marius B. Kotsbak on 2013-02-22

Run "npm install" agin after update in case new nodejs dependencies are introduced.

Also fix the file owners again.

37. By Marius B. Kotsbak on 2013-02-27

Improve algorithm for updating from git. It was not working properly for commit IDs and new remote branches.

[Mark Mims (mark-mims)]

whoohoo! so happy to see this

[Marius B. Kotsbak (mariusko)]

:) If you don't want to experience bzr's rough edges wrt merges (add/add conflict, which Git would handle OK), I suggest reviewing/merging my trunk branch instead, which contains all merged together.

=== modified file 'config.yaml'
--- config.yaml	2012-01-28 01:11:44 +0000
+++ config.yaml	2013-02-28 09:12:22 +0000
@@ -18,7 +18,7 @@
   app_branch:
     type: string
     default: master
-    description: Application repository deployment branch
+    description: Application repository deployment branch. Might also be a revision ID (e.g. tag or SHA1 for git) to upgrade/downgrade application.
   install_root:
     type: string
     default: /opt

=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2013-02-28 09:12:22 +0000
@@ -0,0 +1,30 @@
+#!/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_branch=`config-get app_branch`
+
+cd $app_dir
+
+# 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}
+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
+    fi
+  fi
+fi
+
+npm update && npm install
+
+chown -Rf ${app_user}.${app_user} ${app_dir}
+
+service ${app_name} restart