Merge pull request #67 from gliderlabs/master

release 0.3.3

Author: michaelshobbs

CHANGELOG.md

@@ -10,6 +10,15 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [0.3.3] - 2015-09-10
+### Added
+- Use exec to run procfile entries
+- Throw error when detect fails in custom buildpack
+
+### Changed
+- Bumped scala buildpack to v60
+
+
 ## [0.3.2] - 2015-07-28
 ### Added
 - Repo Analytics to README
@@ -84,7 +93,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.2...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.3...HEAD
+[0.3.3]: https://github.com/gliderlabs/herokuish/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/gliderlabs/herokuish/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/gliderlabs/herokuish/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/gliderlabs/herokuish/compare/v0.2.0...v0.3.0

Dockerfile

@@ -1,5 +1,5 @@
 FROM heroku/cedar:14
-RUN curl https://github.com/gliderlabs/herokuish/releases/download/v0.3.2/herokuish_0.3.2_linux_x86_64.tgz \
+RUN curl https://github.com/gliderlabs/herokuish/releases/download/v0.3.3/herokuish_0.3.3_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.2
+VERSION ?= 0.3.3
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 
@@ -23,6 +23,11 @@ build-in-docker:
 		$(NAME)-build make -e deps build
 	docker rmi $(NAME)-build || true
 
+clean:
+	rm -rf build/*
+	docker rm $(shell docker ps -aq) || true
+	docker rmi herokuish:dev || true
+
 deps:
 	docker pull heroku/cedar:14
 	go get -u github.com/jteeuwen/go-bindata/...

README.md

@@ -137,11 +137,41 @@ Mounting your local app source directory to `/tmp/app` and running `/bin/herokui
 -----> Compiling Ruby/Rack
 -----> Using Ruby version: ruby-1.9.3
   ...
-	
+
 ```
 
 You can use this output when you submit issues.
 
+#### Troubleshooting
+
+If you run into an issue and looking for more insight into what `herokuish` is doing, you can set the `$TRACE` environment variable.
+
+```
+$ docker run --rm -e TRACE=true -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish test
++ [[ -d /tmp/app ]]
++ rm -rf /app
++ cp -r /tmp/app /app
++ cmd-export paths
++ declare 'desc=Exports a function as a command'
++ declare fn=paths as=paths
++ local ns=
+++ cmd-list-ns
+++ sort
+++ grep -v :
+++ for k in '"${!CMDS[@]}"'
+++ echo :help
+...
+++ unprivileged /tmp/buildpacks/custom/bin/detect /tmp/build
+++ setuidgid u33467 /tmp/buildpacks/custom/bin/detect /tmp/build
+++ true
++ selected_name=
++ [[ -n /tmp/buildpacks/custom ]]
++ [[ -n '' ]]
++ title 'Unable to select a buildpack'
+----->' Unable to select a buildpack
++ exit 1
+```
+
 ## Contributing
 
 Pull requests are welcome! Herokuish is written in Bash and Go. Please conform to the [Bash styleguide](https://github.com/progrium/bashstyle) used for this project when writing Bash.

buildpacks/buildpack-nodejs/tests/nodejs-express/server.js

@@ -9,4 +9,14 @@ app.get('/', function(req, res){
 var port = process.env.PORT || 5000;
 server = app.listen(port);
 
+process.on( "SIGINT", function() {
+  console.log('CLOSING [SIGINT]');
+  process.exit();
+} );
+
+process.on( "SIGTERM", function() {
+  console.log('CLOSING [SIGTERM]');
+  process.exit();
+} );
+
 console.log('Server listening on port %d in %s mode', server.address().port, app.settings.env);

buildpacks/buildpack-scala/buildpack-version

@@ -1 +1 @@
-v58
+v60

include/buildpack.bash

@@ -76,10 +76,10 @@ buildpack-execute() {
 
 		IFS='#' read url commit <<< "$BUILDPACK_URL"
 		buildpack-install "$url" "$commit" custom &> /dev/null
-		
+
 		chown -R "$unprivileged_user:$unprivileged_group" "$buildpack_path/custom"
 
-		selected_name="$(unprivileged $selected_path/bin/detect $build_path)"
+		selected_name="$(unprivileged $selected_path/bin/detect $build_path || true)"
 	else
 		# force heroku-buildpack-multi to detect first if exists
 		if ls "$buildpack_path/heroku-buildpack-multi" > /dev/null 2>&1; then
@@ -95,7 +95,7 @@ buildpack-execute() {
 			done
 		fi
 	fi
-	if [[ "$selected_path" ]]; then
+	if [[ "$selected_path" ]] && [[ "$selected_name" ]]; then
 		title "$selected_name app detected"
 	else
 		title "Unable to select a buildpack"

include/procfile.bash

@@ -18,7 +18,7 @@ procfile-exec() {
 	procfile-load-env
 	procfile-load-profile
 	cd "$app_path"
-	unprivileged /bin/bash -c "$(eval echo $@)"
+	exec setuidgid "$unprivileged_user" $(eval echo $@)
 }
 
 procfile-types() {