Merge lp:~lazypower/charms/trusty/liferay/fix_1364680 into lp:charms/liferay

[Charles Butler]

Unmerged revisions

8. By Charles Butler on 2014-11-07

Refactor charm for trusty: modify the tests to deploy trusty, embed some download helpers in inc/common, remove charm-helpers-sh dependency

=== modified file 'hooks/install'
--- hooks/install	2013-07-15 13:57:38 +0000
+++ hooks/install	2014-11-07 15:19:15 +0000
@@ -5,16 +5,14 @@
 source inc/latest-release
 
 # unzip needed to unzip Liferay, JDK needed to run it
-juju-log "Fetching and installing unzip, openjdk-7-jdk, charm-tools, charm-helper-sh"
-
-apt-get -y install unzip openjdk-7-jre-headless charm-tools charm-helper-sh
-
-# get some charm tools for download and verification steps
-. "/usr/share/charm-helper/sh/net.sh"
+juju-log "Fetching and installing unzip, openjdk-7-jdk, charm-tools"
+
+apt-get -y install unzip openjdk-7-jre-headless charm-tools
+
 
 # download and extract liferay to a temporary spot
 juju-log "Fetching latest upstream Liferay release from $LR_URL with expected hash $LR_HASH"
-DOWNLOAD=`ch_get_file "$LR_URL" "$LR_HASH"`
+DOWNLOAD=`get_file "$LR_URL" "$LR_HASH"`
 
 if [ ! -f "${DOWNLOAD}" ] || [ -z "${DOWNLOAD}" ]; then
 	juju-log "Failed to retrieve ${LR_URL}"

=== modified file 'inc/common'
--- inc/common	2013-06-14 17:15:00 +0000
+++ inc/common	2014-11-07 15:19:15 +0000
@@ -42,7 +42,62 @@
         juju-log "Cannot load current config from ${CHARM_DIR}/.current-config"
         exit 1
     fi
-    
+
     source ${CHARM_DIR}/.current-config
 
-}
\ No newline at end of file
+}
+
+# These are modified and embedded helpers that originated in the charm-helpes-sh
+# package. Not the most elegant solution, but far better tested than what I had
+# originally proposed.
+
+WGET_ARGS=${WGET_ARGS:-" --content-disposition"}
+get_file()
+{
+    local FILE=${1:-""}
+    local HASH=${2:-""}
+    local CH_DOWNLOAD_DIR=${CH_DOWNLOAD_DIR:-"`mktemp -d /tmp/ch-downloads.XXXXXX`"}
+
+    wget $WGET_ARGS --directory-prefix="$CH_DOWNLOAD_DIR/" "$FILE"
+    FILE=$CH_DOWNLOAD_DIR/$(ls -tr $CH_DOWNLOAD_DIR|head -n 1)
+
+    if [ ! -f "$FILE" ]; then
+            return 2
+    fi
+
+    local HASH_TYPE=$(type_hash $HASH)
+    local FILE_HASH=$(${HASH_TYPE}sum $FILE | awk '{ print $1 }')
+
+    if [ "$FILE_HASH" != "$HASH" ]; then
+            return 4
+    fi
+
+
+    echo "$FILE"
+    return 0
+}
+
+type_hash()
+{
+    local DIRTY="$1"
+
+    case $DIRTY in
+      *[![:xdigit:]]* | "" )
+              echo ""
+              return 1
+      ;;
+      * )
+              case ${#DIRTY} in
+                      32 )
+                              echo md5
+                      ;;
+                      40 )
+                              echo sha1
+                      ;;
+                      64 )
+                              echo sha256
+                      ;;
+              esac
+      ;;
+    esac
+}

=== modified file 'tests/99-autogen'
--- tests/99-autogen	2014-11-06 19:21:11 +0000
+++ tests/99-autogen	2014-11-07 15:19:15 +0000
@@ -8,7 +8,7 @@
 class TestDeployment(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.deployment = amulet.Deployment(series='precise')
+        cls.deployment = amulet.Deployment(series='trusty')
 
         cls.deployment.add('liferay')
         cls.deployment.add('mysql')