Merge pull request #290 from gliderlabs/master

release v0.3.32

Author: michaelshobbs

.circleci/config.yml

@@ -0,0 +1,30 @@
+version: 2
+jobs:
+  build:
+    machine: true
+    working_directory: ~/gliderlabs/herokuish
+    parallelism: 4
+    steps:
+      - checkout
+      - run: |
+          case $CIRCLE_NODE_INDEX in 0) make shellcheck;; esac
+      - run: |
+          case $CIRCLE_NODE_INDEX in 0) make lint;; esac
+      - run: |
+          make circleci
+      - run: |
+          make deps
+      - run: |
+          make build
+      - run: |
+          case $CIRCLE_NODE_INDEX in 0) basht tests/**/tests.sh ;; esac
+      - run: |
+          tests=$(circleci tests glob buildpacks/*/tests/*/test.sh | circleci tests split --split-by=timings | xargs)
+          echo "executing tests: $tests"
+          basht $tests
+      - deploy:
+          name: release
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "release" ]; then
+              make release
+            fi

.stickler.yml

@@ -0,0 +1,11 @@
+linters:
+  shellcheck:
+    shell: bash
+    exclude: 'SC2002,SC2030,SC2031,SC2034'
+  golint:
+files:
+  ignore:
+    - 'vendor/*'
+    - 'bower_components/*'
+    - 'node_modules/*'
+    - 'buildpacks/*/tests/*/test.sh'

CHANGELOG.md

@@ -10,6 +10,36 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [0.3.32] - 2017-08-29
+### Changed
+- @miyucy Update ruby version to v168
+- @miyucy Update nodejs to version v110
+- @michaelshobbs Update clojure to version v77
+- @michaelshobbs Update go to version v72
+- @michaelshobbs Update java to version v53
+- @michaelshobbs Update nodejs to version v99
+- @michaelshobbs Update php to version v122
+- @michaelshobbs Update python to version v99
+- @michaelshobbs Update scala to version v78
+- @michaelshobbs Update gradle to version v23
+- @michaelshobbs exit 1 on incompatible buildpack for buildpack test command
+- @michaelshobbs use image GOPATH as working dir
+- @michaelshobbs use circleci 2.0 machine executor
+
+### Added
+- @dzaporozhets Add support for buildpack test command
+- @michaelshobbs add stickler-ci
+- @michaelshobbs add linting and fix lintballs
+- @michaelshobbs add procfile tests
+- @dzaporozhets Update clojure-ring test app to make lein test work
+- @dzaporozhets Add support for testing buildpack test on clojure project
+- @dzaporozhets Add support for testing buildpack test on ruby project
+- @dzaporozhets Add buildpack test to readme and changelog
+
+### Removed
+- @michaelshobbs drop grails 2 buildpack per heroku
+
+
 ## [0.3.31] - 2017-06-21
 ### Changed
 - @michaelshobbs Update go to version v69
@@ -371,7 +401,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.31...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.32...HEAD
+[0.3.32]: https://github.com/gliderlabs/herokuish/compare/v0.3.31...v0.3.32
 [0.3.31]: https://github.com/gliderlabs/herokuish/compare/v0.3.30...v0.3.31
 [0.3.30]: https://github.com/gliderlabs/herokuish/compare/v0.3.29...v0.3.30
 [0.3.29]: https://github.com/gliderlabs/herokuish/compare/v0.3.28...v0.3.29

Dockerfile

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

Makefile

@@ -1,12 +1,22 @@
 NAME = herokuish
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.3.31
+VERSION ?= 0.3.32
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 
-BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle grails scala play php go erlang static
+BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle scala play php go erlang static
 SHELL := /bin/bash
 
+shellcheck:
+ifneq ($(shell shellcheck --version > /dev/null 2>&1 ; echo $$?),0)
+ifeq ($(SYSTEM),Darwin)
+	brew install shellcheck
+else
+	@sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse'
+	@sudo apt-get update && sudo apt-get install -y shellcheck
+endif
+endif
+
 build:
 	@count=0; \
 	for i in $(BUILDPACK_ORDER); do \
@@ -28,7 +38,7 @@ build-in-docker:
 	docker build --rm -f Dockerfile.build -t $(NAME)-build .
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro \
 		-v /var/lib/docker:/var/lib/docker \
-		-v ${PWD}:/usr/src/myapp -w /usr/src/myapp \
+		-v ${PWD}:/go/src/github.com/gliderlabs/herokuish -w /go/src/github.com/gliderlabs/herokuish \
 		-e IMAGE_NAME=$(IMAGE_NAME) -e BUILD_TAG=$(BUILD_TAG) -e VERSION=master \
 		$(NAME)-build make -e deps build
 	docker rmi $(NAME)-build || true
@@ -53,6 +63,14 @@ circleci:
 	rm -f ~/.gitconfig
 	mv Dockerfile.dev Dockerfile
 
+lint:
+	# SC2002: Useless cat - https://github.com/koalaman/shellcheck/wiki/SC2002
+	# SC2030: Modification of name is local - https://github.com/koalaman/shellcheck/wiki/SC2030
+	# SC2031: Modification of name is local - https://github.com/koalaman/shellcheck/wiki/SC2031
+	# SC2034: VAR appears unused - https://github.com/koalaman/shellcheck/wiki/SC2034
+	@echo linting...
+	shellcheck -e SC2002,SC2030,SC2031,SC2034 -s bash include/*.bash tests/**/tests.sh
+
 release: build
 	rm -rf release && mkdir release
 	tar -zcf release/$(NAME)_$(VERSION)_linux_$(HARDWARE).tgz -C build/linux $(NAME)

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.31/herokuish_0.3.31_linux_x86_64.tgz \
+RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.3.32/herokuish_0.3.32_linux_x86_64.tgz \
 		  | tar -xzC /bin
 ```
 
@@ -36,6 +36,7 @@ Available commands:
     build                    Build an application using installed buildpacks
     install                  Install buildpack from Git URL and optional committish
     list                     List installed buildpacks
+    test                     Build and run tests for an application using installed buildpacks
   help                     Shows help information for a command
   paths                    Shows path settings
   procfile                 Use Procfiles and run app commands
@@ -142,6 +143,26 @@ Mounting your local app source directory to `/tmp/app` and running `/bin/herokui
 
 You can use this output when you submit issues.
 
+#### Running an app tests using Heroku buildpacks
+
+```
+$ docker run --rm -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish buildpack test
+```
+
+Mounting your local app source directory to `/tmp/app` and running `/bin/herokuish buildpack test` will run your app through the buildpack test-compile process. Then it will run `test` command to execute application tests.
+
+```
+-----> Ruby app detected
+-----> Setting up Test for Ruby/Rack
+-----> Using Ruby version: ruby-2.3.3
+  ...
+-----> Detecting rake tasks
+-----> Running test: bundle exec rspec
+       .
+       Finished in 0.00239 seconds (files took 0.07525 seconds to load)
+       1 example, 0 failures
+```
+
 #### Troubleshooting
 
 If you run into an issue and looking for more insight into what `herokuish` is doing, you can set the `$TRACE` environment variable.

buildpacks/buildpack-clojure/buildpack-version

@@ -1 +1 @@
-v76
+v77

buildpacks/buildpack-clojure/tests/clojure-ring/project.clj

@@ -1,14 +1,12 @@
 (defproject opdemand-helloworld "1.0.0-SNAPSHOT"
   :description "OpDemand Example Application"
-  :dependencies [
-        [org.clojure/clojure "1.2.1"]
-        [compojure "1.0.1"]
-        [ring/ring-core "1.0.0"]
-        [ring/ring-jetty-adapter "1.0.0"]
-        [lein-ring "0.5.4"]
-        ]
-  :dev-dependencies [
-    [org.clojure/clojure-contrib "1.2.0"]
-    ]
+  :min-lein-version "2.0.0"
+  :dependencies [[org.clojure/clojure "1.7.0"]
+                 [compojure "1.3.4"]
+                 [ring/ring-core "1.3.2"]
+                 [ring/ring-jetty-adapter "1.3.2"]
+                 [lein-ring "0.8.13"]]
+  :profiles
+  {:dev {:dependencies [[ring/ring-mock "0.3.0"]]}}
   :ring {:handler helloworld.web/handler}
-  :main "helloworld.web")
+  :main helloworld.web)

buildpacks/buildpack-clojure/tests/clojure-ring/src/helloworld/web.clj

@@ -1,23 +1,21 @@
-	(ns helloworld.web 
-	    (:use compojure.core [ring.adapter.jetty :only [run-jetty]] )
-	    (:require [compojure.route :as route]
-	              [compojure.handler :as handler]))
+(ns helloworld.web
+  (:use compojure.core [ring.adapter.jetty :only [run-jetty]] )
+  (:require [compojure.route :as route]
+            [compojure.handler :as handler]))
 
-	(defn splash []
-        {:status 200
-    	:headers {"Content-Type" "text/plain"}
-		:body "clojure-ring\n"})
+(defn splash []
+  {:status 200
+   :headers {"Content-Type" "text/plain"}
+   :body "clojure-ring\n"})
 
-	(defroutes main-routes
-	  ; what's going on
-	  	(GET "/" [] (splash))
-	    (route/resources "/")
-	    (route/not-found "Page not found")   )
+(defroutes main-routes
+  (GET "/" [] (splash))
+  (route/resources "/")
+  (route/not-found "Page not found"))
 
+(def app
+  (handler/api main-routes))
 
-	(def app
-	    (handler/api main-routes))
-	       
-	(defn -main []
-            (def port (get (System/getenv) "PORT" 5000))
-	    (run-jetty app {:port (Integer. port)}))
+(defn -main []
+  (def port (get (System/getenv) "PORT" 5000))
+  (run-jetty app {:port (Integer. port)}))

buildpacks/buildpack-clojure/tests/clojure-ring/test.sh

@@ -1,2 +1,3 @@
 source "$(dirname $BASH_SOURCE)/../../../test"
 app-test "$(basename $(dirname $BASH_SOURCE))"
+buildpack-test "$(basename $(dirname $BASH_SOURCE))"

buildpacks/buildpack-clojure/tests/clojure-ring/test/helloworld/test/core.clj

@@ -0,0 +1,14 @@
+(ns helloworld.web-test
+  (:require [clojure.test :refer :all]
+            [ring.mock.request :as mock]
+            [helloworld.web :refer :all]))
+
+(deftest test-app
+  (testing "main route"
+    (let [response (app (mock/request :get "/"))]
+      (is (= (:status response) 200))
+      (is (= (:body response) "clojure-ring\n"))))
+
+  (testing "not-found route"
+    (let [response (app (mock/request :get "/invalid"))]
+      (is (= (:status response) 404)))))

buildpacks/buildpack-clojure/tests/clojure-ring/test/helloworld/web_test.clj

@@ -1 +1 @@
-v69
+v72

buildpacks/buildpack-go/buildpack-version

@@ -1 +1 @@
-v22
+v23