Merge pull request #104 from gliderlabs/master

release 0.3.7

Author: michaelshobbs

CHANGELOG.md

@@ -10,6 +10,19 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [0.3.7] - 2015-12-31
+### Fixed
+- @michaelshobbs force rebuild of packages that are already up to date
+- @michaelshobbs fix buildpack version output after adding dokku/buildpack-nginx
+
+### Removed
+- @michaelshobbs remove unnecessary null line check
+
+### Changed
+- @michaelshobbs re-implement yaml-get and yaml-keys in bash
+- @CEikermann Updated buildpack-php to v90
+- @josegonzalez Upgrade python buildpack to v74
+
 ## [0.3.6] - 2015-12-14
 ### Changed
 - Update php buildpack to version 87
@@ -129,7 +142,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.6...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.7...HEAD
+[0.3.7]: https://github.com/gliderlabs/herokuish/compare/v0.3.6...v0.3.7
 [0.3.6]: https://github.com/gliderlabs/herokuish/compare/v0.3.5...v0.3.6
 [0.3.5]: https://github.com/gliderlabs/herokuish/compare/v0.3.4...v0.3.5
 [0.3.4]: https://github.com/gliderlabs/herokuish/compare/v0.3.3...v0.3.4

Dockerfile

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

Makefile

@@ -1,14 +1,14 @@
 NAME = herokuish
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.3.6
+VERSION ?= 0.3.7
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 
 build:
 	cat buildpacks/*/buildpack* | sed 'N;s/\n/ /' > include/buildpacks.txt
 	go-bindata include
-	mkdir -p build/linux  && GOOS=linux  go build -ldflags "-X main.Version $(VERSION)" -o build/linux/$(NAME)
-	mkdir -p build/darwin && GOOS=darwin go build -ldflags "-X main.Version $(VERSION)" -o build/darwin/$(NAME)
+	mkdir -p build/linux  && GOOS=linux  go build -a -ldflags "-X main.Version $(VERSION)" -o build/linux/$(NAME)
+	mkdir -p build/darwin && GOOS=darwin go build -a -ldflags "-X main.Version $(VERSION)" -o build/darwin/$(NAME)
 ifeq ($(CIRCLECI),true)
 	docker build -t $(IMAGE_NAME):$(BUILD_TAG) .
 else

buildpacks/buildpack-php/buildpack-version

@@ -1 +1 @@
-v87
+v90

buildpacks/buildpack-python/buildpack-version

@@ -1 +1 @@
-v73
+v74

include/herokuish.bash

@@ -41,7 +41,7 @@ version() {
 	declare desc="Show version and supported version info"
 	echo "herokuish: ${HEROKUISH_VERSION:-dev}"
 	echo "buildpacks:"
-	asset-cat include/buildpacks.txt | sed 's/.*heroku\///' | xargs printf "  %-26s %s\n"
+	asset-cat include/buildpacks.txt | sed -e 's/.*heroku\///' -e 's/.*dokku\///' | xargs printf "  %-26s %s\n"
 }
 
 title() {

include/procfile.bash

@@ -1,8 +1,30 @@
 
+yaml-esque-keys() {
+	declare desc="Get process type keys from colon-separated structure"
+	while read line || [[ -n "$line" ]]; do
+		[[ "$line" =~ ^#.* ]] && continue
+		key=${line%%:*}
+		echo $key
+	done <<< "$(cat)"
+}
+
+yaml-esque-get() {
+	declare desc="Get key value from colon-separated structure"
+	declare key="$1"
+	local inputkey
+	local cmd
+	while read line || [[ -n "$line" ]]; do
+		[[ "$line" =~ ^#.* ]] && continue
+		inputkey=${line%%:*}
+		cmd=${line#*:}
+		[[ "$inputkey" == "$key" ]] && echo "$cmd"
+	done <<< "$(cat)"
+}
+
 procfile-parse() {
 	declare desc="Get command string for a process type from Procfile"
 	declare type="$1"
-	cat "$app_path/Procfile" | yaml-get "$type"
+	cat "$app_path/Procfile" | yaml-esque-get "$type"
 }
 
 procfile-start() {
@@ -25,7 +47,7 @@ procfile-types() {
 	title "Discovering process types"
 	if [[ -f "$app_path/Procfile" ]]; then
 		local types
-		types="$(cat $app_path/Procfile | yaml-keys | xargs echo)"
+		types="$(cat $app_path/Procfile | yaml-esque-keys | xargs echo)"
 		echo "Procfile declares types -> ${types// /, }"
 		return
 	fi