Merge pull request #344 from gliderlabs/mh/release/v0.3.36

release v0.3.36

Author: michaelshobbs

CHANGELOG.md

@@ -10,6 +10,17 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [0.3.36] - 2018-03-10
+### Changed
+- @josegonzalez fix: retrieve only valid process types
+- @michaelshobbs Update ruby to version v174
+- @michaelshobbs Update python to version v124
+- @michaelshobbs Update php to version v132
+- @michaelshobbs Update nodejs to version v121
+- @michaelshobbs Update go to version v85
+
+**NOTE: This will be the last version of herokuish based on cedar-14**
+
 ## [0.3.35] - 2018-02-09
 ### Added
 - @davidkarlsen Be able to opt out from setuidgid - needed when not running as root initially
@@ -440,7 +451,9 @@ 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.34...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.36...HEAD
+[0.3.36]: https://github.com/gliderlabs/herokuish/compare/v0.3.35...v0.3.36
+[0.3.35]: https://github.com/gliderlabs/herokuish/compare/v0.3.34...v0.3.35
 [0.3.34]: https://github.com/gliderlabs/herokuish/compare/v0.3.33...v0.3.34
 [0.3.33]: https://github.com/gliderlabs/herokuish/compare/v0.3.32...v0.3.33
 [0.3.32]: https://github.com/gliderlabs/herokuish/compare/v0.3.31...v0.3.32

Dockerfile

@@ -1,5 +1,5 @@
 FROM heroku/cedar:14
-RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.3.35/herokuish_0.3.35_linux_x86_64.tgz" \
+RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.3.36/herokuish_0.3.36_linux_x86_64.tgz" \
 		--silent -L | tar -xzC /bin
 RUN apt-get update && apt-get -qq -y --force-yes dist-upgrade && apt-get clean && rm -rf /var/cache/apt/archives/*
 RUN /bin/herokuish buildpack install \

Makefile

@@ -1,6 +1,6 @@
 NAME = herokuish
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.3.35
+VERSION ?= 0.3.36
 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.35/herokuish_0.3.35_linux_x86_64.tgz \
+RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.3.36/herokuish_0.3.36_linux_x86_64.tgz \
 		  | tar -xzC /bin
 ```
 

buildpacks/buildpack-go/buildpack-version

@@ -1 +1 @@
-v83
+v85

buildpacks/buildpack-nodejs/buildpack-version

@@ -1 +1 @@
-v118
+v121

buildpacks/buildpack-php/buildpack-version

@@ -1 +1 @@
-v130
+v132

buildpacks/buildpack-python/buildpack-version

@@ -1 +1 @@
-v123
+v124

buildpacks/buildpack-ruby/buildpack-version

@@ -1 +1 @@
-v173
+v174

include/procfile.bash

@@ -3,6 +3,7 @@ yaml-esque-keys() {
 	declare desc="Get process type keys from colon-separated structure"
 	while read -r line || [[ -n "$line" ]]; do
 		[[ "$line" =~ ^#.* ]] && continue
+		[[ "$line" == *:* ]] || continue
 		key=${line%%:*}
 		echo "$key"
 	done <<< "$(cat)"
@@ -18,6 +19,7 @@ yaml-esque-get() {
 		cmd=${line#*:}
 		if [[ "$inputkey" == "$key" ]]; then
 			echo "$cmd"
+			break
 		fi
 	done <<< "$(cat)"
 }
@@ -63,7 +65,7 @@ procfile-types() {
 	title "Discovering process types"
 	if [[ -f "$app_path/Procfile" ]]; then
 		local types
-		types="$(cat "$app_path/Procfile" | yaml-esque-keys | xargs echo)"
+		types="$(cat "$app_path/Procfile" | yaml-esque-keys | sort | uniq | xargs echo)"
 		echo "Procfile declares types -> ${types// /, }"
 		return
 	fi

tests/unit/fixtures-merge-conflict/Procfile

@@ -0,0 +1,7 @@
+<<<<<<< HEAD
+web: npm start
+worker: npm worker
+========
+web: npm start-2
+worker: npm worker-2
+>>>>>>> 5bb7ec3e2a8f4f6565432a4fc82c92d4a3603d28

tests/unit/tests.sh

@@ -44,6 +44,28 @@ T_procfile-parse-valid() {
     done
 }
 
+T_procfile-parse-merge-conflict() {
+    # shellcheck disable=SC1090
+    source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash"
+    local expected actual app_path
+    app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures-merge-conflict"
+    for type in web worker; do
+        case "$type" in
+            web)
+                expected="npm start"
+                ;;
+            worker)
+                expected="npm worker"
+                ;;
+        esac
+        actual=$(procfile-parse "$type" | xargs)
+        if [[ "$actual" != "$expected" ]]; then
+            echo "$actual != $expected"
+            return 1
+        fi
+    done
+}
+
 T_procfile-parse-invalid() {
     # shellcheck disable=SC1090
     source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash"
@@ -77,6 +99,24 @@ T_procfile-types() {
     fi
 }
 
+T_procfile-types-merge-conflict() {
+    title() {
+        :
+    }
+    # shellcheck disable=SC1090
+    source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash"
+    local expected actual app_path
+    app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures-merge-conflict"
+
+    expected="Procfile declares types -> web, worker"
+    actual="$(procfile-types invalid-proc | tail -1)"
+
+    if [[ "$actual" != "$expected" ]]; then
+        echo "$actual != $expected"
+        return 1
+    fi
+}
+
 T_procfile-load-env() {
     # shellcheck disable=SC1090
     source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash"