Merge pull request #254 from gliderlabs/master

release 0.3.29

Author: michaelshobbs

CHANGELOG.md

@@ -11,6 +11,14 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 
+## [0.3.29] - 2017-05-03
+### Fixed
+- @alexquick [build] fix old .env parsing to handle quotes and escapes better      cce259c
+
+### Changed
+- @michaelshobbs Update ruby to version v159
+
+
 ## [0.3.28] - 2017-04-19
 ### Fixed
 - @dmgr bugfix: curl may fail to fetch not quoted url if behind proxy
@@ -346,7 +354,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.28...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.29...HEAD
+[0.3.29]: https://github.com/gliderlabs/herokuish/compare/v0.3.28...v0.3.29
 [0.3.28]: https://github.com/gliderlabs/herokuish/compare/v0.3.27...v0.3.28
 [0.3.27]: https://github.com/gliderlabs/herokuish/compare/v0.3.26...v0.3.27
 [0.3.26]: https://github.com/gliderlabs/herokuish/compare/v0.3.25...v0.3.26

Dockerfile

@@ -1,5 +1,5 @@
 FROM heroku/cedar:14
-RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.3.28/herokuish_0.3.28_linux_x86_64.tgz" \
+RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.3.29/herokuish_0.3.29_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.28
+VERSION ?= 0.3.29
 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 --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.3.28/herokuish_0.3.28_linux_x86_64.tgz \
+RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.3.29/herokuish_0.3.29_linux_x86_64.tgz \
 		  | tar -xzC /bin
 ```
 

buildpacks/buildpack-ruby/buildpack-version

@@ -1 +1 @@
-v158
+v159

include/buildpack.bash

@@ -3,18 +3,18 @@ _envfile-parse() {
     declare desc="Parse input into shell export commands"
     local key
     local value
-    while read line || [[ -n "$line" ]]; do
+    while read -r line || [[ -n "$line" ]]; do
         [[ "$line" =~ ^#.* ]] && continue
         [[ "$line" =~ ^$ ]] && continue
         key=${line%%=*}
         key=${key#*export }
-        value=${line#*=}
+        value="${line#*=}"
         case "$value" in
             \'*|\"*)
-                value=${value}
+                value="${value}"
                 ;;
             *)
-                value=\"${value}\"
+                value=\""${value}"\"
                 ;;
         esac
         echo "export ${key}=${value}"

tests/unit/fixtures/complicated_envfile

@@ -0,0 +1,2 @@
+foo='Hello'$'\n'' '\''world'\'' '
+bar='te'\''st'

tests/unit/tests.sh

@@ -0,0 +1,17 @@
+T_envfile-parse(){
+    source "$(dirname $BASH_SOURCE)/../../include/buildpack.bash"
+    local fixture_filename="$(dirname $BASH_SOURCE)/fixtures/complicated_envfile"
+    local foo_expected='Hello'$'\n'' '\''world'\'' '
+    local bar_expected='te'\''st'
+    eval "$(cat "$fixture_filename" | _envfile-parse)"
+
+    if [[ ! $foo_expected == $foo ]]; then
+        echo "Expected foo = $foo_expected got: $foo"
+        return 1
+    fi
+
+    if [[ ! $bar_expected == $bar ]]; then
+        echo "Expected bar = $bar_expected got: $bar"
+        return 2
+    fi
+}