Merge pull request #194 from gliderlabs/master

release 0.3.20

Author: michaelshobbs

CHANGELOG.md

@@ -11,6 +11,15 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 
+## [0.3.20] - 2016-11-13
+### Changed
+- @michaelshobbs michaelshobbs   new .env parser that handles spaces
+- @michaelshobbs michaelshobbs   change readme instructions to use github releases
+- @michaelshobbs michaelshobbs   Update go to version v52
+- @michaelshobbs michaelshobbs   Update php to version v114
+- @michaelshobbs michaelshobbs   Update python to version v83
+
+
 ## [0.3.19] - 2016-09-20
 ### Changed
 - @josegonzalez Update static buildpack to v6
@@ -264,7 +273,8 @@ All notable changes to this project will be documented in this file.
 - User for `buildpack-build` is `$USER` or randomized
 - User for `procfile-exec` is `$USER` or detected from `/app`
 
-[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.19...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.20...HEAD
+[0.3.20]: https://github.com/gliderlabs/herokuish/compare/v0.3.19...v0.3.20
 [0.3.19]: https://github.com/gliderlabs/herokuish/compare/v0.3.18...v0.3.19
 [0.3.18]: https://github.com/gliderlabs/herokuish/compare/v0.3.17...v0.3.18
 [0.3.17]: https://github.com/gliderlabs/herokuish/compare/v0.3.16...v0.3.17

Dockerfile

@@ -1,5 +1,5 @@
 FROM heroku/cedar:14
-RUN curl https://github.com/gliderlabs/herokuish/releases/download/v0.3.19/herokuish_0.3.19_linux_x86_64.tgz \
+RUN curl https://github.com/gliderlabs/herokuish/releases/download/v0.3.20/herokuish_0.3.20_linux_x86_64.tgz \
 		--silent -L | tar -xzC /bin
 RUN /bin/herokuish buildpack install \
 	&& ln -s /bin/herokuish /build \

Makefile

@@ -1,6 +1,6 @@
 NAME = herokuish
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.3.19
+VERSION ?= 0.3.20
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 

README.md

@@ -18,7 +18,7 @@ Download and uncompress the latest binary tarball from [releases](https://github
 For example, you can do this directly in your Dockerfiles installing into `/bin` as one step:
 
 ```
-RUN curl --silent http://dl.gliderlabs.com/herokuish/latest/linux_x86_64.tgz \
+RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.3.20/herokuish_0.3.20_linux_x86_64.tgz \
 		  | tar -xzC /bin
 ```
 

buildpacks/buildpack-go/buildpack-version

@@ -1 +1 @@
-v44
+v52

buildpacks/buildpack-java/tests/java-jetty/.env

@@ -0,0 +1,6 @@
+TEST1=The big brown fox1
+TEST2="The big brown fox2"
+TEST3='The big brown fox3'
+export TEST4=The big brown fox4
+export TEST5="The big brown fox5"
+export TEST6='The big brown fox6'

buildpacks/buildpack-php/buildpack-version

@@ -1 +1 @@
-v110
+v114

buildpacks/buildpack-python/buildpack-version

@@ -1 +1 @@
-v82
+v83

include/buildpack.bash

@@ -1,4 +1,25 @@
 
+_envfile-parse() {
+    declare desc="Parse input into shell export commands"
+    local key
+    local value
+    while read line || [[ -n "$line" ]]; do
+        [[ "$line" =~ ^#.* ]] && continue
+        key=${line%%=*}
+        key=${key#*export }
+        value=${line#*=}
+        case "$value" in
+            \'*|\"*)
+                value=${value}
+                ;;
+            *)
+                value=\"${value}\"
+                ;;
+        esac
+        echo "export ${key}=${value}"
+    done <<< "$(cat)"
+}
+
 buildpack-build() {
 	declare desc="Build an application using installed buildpacks"
 	ensure-paths
@@ -88,10 +109,9 @@ buildpack-setup() {
 	export CURL_CONNECT_TIMEOUT="30"
 	export CURL_TIMEOUT="180"
 
-
 	# Buildstep backwards compatibility
 	if [[ -f "$app_path/.env" ]]; then
-		source "$app_path/.env"
+		eval $(cat "$app_path/.env" | _envfile-parse)
 	fi
 }
 

include/herokuish.bash

@@ -119,7 +119,6 @@ herokuish-test() {
 	echo "::: TEST FINISHED :::"
 }
 
-
 main() {
 	set -eo pipefail; [[ "$TRACE" ]] && set -x