Merge lp:~nick-moffitt/assets-bundler/use-jinja2-not-sed into lp:assets-bundler

[Nick Moffitt]

This change is untested as of now, but it relies on a jinja2 one-liner I've used in many places in the past. The basic trick is that it uses a template snarfed from stdin and populates it with environment variables. This approach isn't always the most robust, but it seems preferrable to a special-purpose script full of sed commands that aim to emulate jinja2's functionality.

The branch removes this script, which I hope will ease the maintenance burden. If the technique is not suitable here for some reason, I hope you will consider it in other situations where you need a quick template.

Unmerged revisions

32. By Nick Moffitt on 2014-10-14

Try actually using jinja2 templates instead of sed.

=== modified file 'Makefile'
--- Makefile	2014-07-14 15:04:15 +0000
+++ Makefile	2014-10-14 11:05:31 +0000
@@ -117,22 +117,16 @@
 update-manager-directory:
 	PROJECT_NAME=assets-manager sh -ex update-project-directory.sh
 
-upload-and-update-bundles-yaml:
-	cp bundles.template.yaml bundles.temp.yaml
-
-	PROJECT_NAME=assets-server source upload-archive-to-swift.sh && \
-	SERVER_CONTAINER_URI=$$CONTAINER_URI \
-	SERVER_ARCHIVE_FILENAME=$$ARCHIVE_FILENAME \
-	SERVER_BUILD_LABEL=$$BUILD_LABEL \
-	sh -ex update-bundles-yaml.sh
-
-	PROJECT_NAME=assets-manager source upload-archive-to-swift.sh && \
-	MANAGER_CONTAINER_URI=$$CONTAINER_URI \
-	MANAGER_ARCHIVE_FILENAME=$$ARCHIVE_FILENAME \
-	MANAGER_BUILD_LABEL=$$BUILD_LABEL \
-	sh -ex update-bundles-yaml.sh
-	
-	mv bundles.temp.yaml bundles.yaml
+upload-and-update-bundles:
+	PROJECT_NAME=assets-server source upload-archive-to-swift.sh 
+	PROJECT_NAME=assets-manager source upload-archive-to-swift.sh 
+	server_container_uri=$$CONTAINER_URI \
+	  server_archive_filename=$$ARCHIVE_FILENAME \
+	  server_build_label=$$BUILD_LABEL \
+	  manager_container_uri=$$CONTAINER_URI \
+	  manager_archive_filename=$$ARCHIVE_FILENAME \
+	  manager_build_label=$$BUILD_LABEL \
+	  python -c "import os,sys,jinja2; print jinja2.Template(sys.stdin.read()).render(**os.environ)" < bundles.temp.yaml > bundles.yaml
 
 deploy-dev:
 	BUNDLE_NAME=assets-bundle-dev sh -ex deploy.sh
 
=== removed file 'update-bundles-yaml.sh'
--- update-bundles-yaml.sh	2014-07-11 22:15:09 +0000
+++ update-bundles-yaml.sh	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Set archive location variables in bundles.yaml
-# ===
-
-if [ $SERVER_CONTAINER_URI ]; then sed -i 's!{{server_container_uri}}!'$SERVER_CONTAINER_URI'!' bundles.temp.yaml; fi
-if [ $SERVER_ARCHIVE_FILENAME ]; then sed -i 's!{{server_archive_filename}}!'$SERVER_ARCHIVE_FILENAME'!' bundles.temp.yaml; fi
-if [ $SERVER_BUILD_LABEL ]; then sed -i 's!{{server_build_label}}!'$SERVER_BUILD_LABEL'!' bundles.temp.yaml; fi
-
-if [ $MANAGER_CONTAINER_URI ]; then sed -i 's!{{manager_container_uri}}!'$MANAGER_CONTAINER_URI'!' bundles.temp.yaml; fi
-if [ $MANAGER_ARCHIVE_FILENAME ]; then sed -i 's!{{manager_archive_filename}}!'$MANAGER_ARCHIVE_FILENAME'!' bundles.temp.yaml; fi
-if [ $MANAGER_BUILD_LABEL ]; then sed -i 's!{{manager_build_label}}!'$MANAGER_BUILD_LABEL'!' bundles.temp.yaml; fi
-
-if [ $OS_AUTH_URL ]; then sed -i 's!{{swift_auth_url}}!'$OS_AUTH_URL'!' bundles.temp.yaml; fi
-if [ $OS_USERNAME ]; then sed -i 's!{{swift_username}}!'$OS_USERNAME'!' bundles.temp.yaml; fi
-if [ $OS_PASSWORD ]; then sed -i 's!{{swift_password}}!'$OS_PASSWORD'!' bundles.temp.yaml; fi
-if [ $OS_TENANT_NAME ]; then sed -i 's!{{swift_tenant_name}}!'$OS_TENANT_NAME'!' bundles.temp.yaml; fi