Merge pull request #550 from gliderlabs/master

Release 0.5.10

CHANGELOG.md

@@ -10,6 +10,11 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [0.5.10] - 2020-04-01
+
+### Changed
+- @josegonzalez Update ruby to version v213
+
 ## [0.5.9] - 2020-03-31
 ### Changed
 - @josegonzalez Update go to version v139
@@ -639,7 +644,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.5.9...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.5.10...HEAD
+[0.5.10]: https://github.com/gliderlabs/herokuish/compare/v0.5.9...v0.5.10
 [0.5.9]: https://github.com/gliderlabs/herokuish/compare/v0.5.8...v0.5.9
 [0.5.8]: https://github.com/gliderlabs/herokuish/compare/v0.5.7...v0.5.8
 [0.5.7]: https://github.com/gliderlabs/herokuish/compare/v0.5.6...v0.5.7

Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update -qq \
  && mv /etc/ImageMagick-6/policy.xml.custom /etc/ImageMagick-6/policy.xml \
  && apt-get clean \
  && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* /var/tmp/*
-RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.9/herokuish_0.5.9_linux_x86_64.tgz" \
+RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.10/herokuish_0.5.10_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.5.9
+VERSION ?= 0.5.10
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 

README.md

@@ -2,7 +2,7 @@
 
 [![Circle CI](https://circleci.com/gh/gliderlabs/herokuish.png?style=shield)](https://circleci.com/gh/gliderlabs/herokuish)
 [![IRC Channel](https://img.shields.io/badge/irc-%23gliderlabs-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#gliderlabs)
-[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.9-blue)](https://hub.docker.com/r/gliderlabs/herokuish)
+[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.10-blue)](https://hub.docker.com/r/gliderlabs/herokuish)
 
 A command line tool for emulating Heroku build and runtime tasks in containers.
 
@@ -19,7 +19,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.5.9/herokuish_0.5.9_linux_x86_64.tgz \
+RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.10/herokuish_0.5.10_linux_x86_64.tgz \
 		  | tar -xzC /bin
 ```
 

buildpacks/buildpack-ruby/buildpack-version

@@ -1 +1 @@
-v212
+v213

tests/unit/fixtures/complicated_envfile

@@ -1,2 +1,4 @@
 foo='Hello'$'\n'' '\''world'\'' '
 bar='te'\''st'
+nested_foo=foo
+nested_bar=${nested_foo}

tests/unit/tests.sh

@@ -5,6 +5,8 @@ T_envfile-parse(){
     local fixture_filename
     local foo_expected='Hello'$'\n'' '\''world'\'' '
     local bar_expected='te'\''st'
+    local nested_foo_expected=foo
+    local nested_bar_expected=foo
 
     fixture_filename="$(dirname "${BASH_SOURCE[0]}")/fixtures/complicated_envfile"
     eval "$(cat "$fixture_filename" | _envfile-parse)"
@@ -20,6 +22,18 @@ T_envfile-parse(){
         echo "Expected bar = $bar_expected got: $bar"
         return 2
     fi
+
+    # shellcheck disable=2154
+    if [[ ! "$nested_foo_expected" == "$nested_foo" ]]; then
+        echo "Expected nested_foo = $nested_foo_expected got: $nested_foo"
+        return 3
+    fi
+
+    # shellcheck disable=2154
+    if [[ ! "$nested_bar_expected" == "$nested_bar" ]]; then
+        echo "Expected nested_bar = $nested_bar_expected got: $nested_bar"
+        return 4
+    fi
 }
 
 T_procfile-parse-valid() {