Merge branch 'master' into release

Author: michaelshobbs

CHANGELOG.md

@@ -10,6 +10,116 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+
+## [0.3.12] - 2016-04-27
+### Fixed
+- @michaelshobbs try testing port more times before continuing. add output when testing for a listener
+- @michaelshobbs increase retry in an attempt to allow the (ember specifially) app to fully startup
+
+### Added
+- @michaelshobbs support compressed tarball buildpacks (#144)
+
+### Changed
+- @michaelshobbs Update go to version v34
+- @michaelshobbs Update nodejs to version v90
+- @michaelshobbs Update php to version v101
+- @michaelshobbs Update scala to version v70
+
+
+## [0.3.11] - 2016-04-07
+### Changed
+- @michaelshobbs Update php to version v100 (#140)
+- @michaelshobbs Update python to version v80 (#141)
+
+
+## [0.3.10] - 2016-03-30
+### Changed
+- @michaelshobbs Update nodejs to version v89
+- @michaelshobbs Update php to version v99
+- @michaelshobbs Update python to version v79
+- @michaelshobbs Update ruby to version v146
+- @michaelshobbs Update scala to version v67
+
+
+## [0.3.9] - 2016-03-08
+### Fixed
+- @graphaelli clean up link warning
+
+### Added
+- @michaelshobbs extract config_vars from .release
+
+### Changed
+- @singlow singlow use find to identify only files not already owned by user
+- @michaelshobbs Update clojure to version v75
+- @michaelshobbs Update grails to version v20
+- @michaelshobbs Update java to version v44
+- @michaelshobbs Update nodejs to version v88
+- @michaelshobbs Update play to version v26
+- @michaelshobbs Update python to version v77
+- @michaelshobbs Update ruby to version v145
+- @michaelshobbs Update scala to version v66
+- @michaelshobbs Update php to version v95
+- @michaelshobbs Update go to version v31
+- @michaelshobbs upgrade to go1.6
+
+
+## [0.3.8] - 2016-01-06
+### Changed
+- @josegonzalez Upgrade gradle buildpack version to 17
+- @josegonzalez Update java buildpack version to 42
+- @josegonzalez Update scala buildpack version to 64
+
+
+## [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
+- Update clojure buildpack to version 73
+- Update golang buildpack to version 22
+- Update gradle buildpack to version 16
+- Update java buildpack to version 41
+- Update nodejs buildpack to version 87
+- Update python buildpack to version 73
+- Update ruby buildpack to version 141
+- Update multi buildpack to version v1.0.0
+
+
+## [0.3.5] - 2015-11-25
+### Added
+- Add static buildpack and test
+
+### Changed
+ - Increased CURL_TIMEOUT env var in buildpacks from the default 30 to 180
+ - Update python buildpack to v70
+ - Update static buildpack to v5
+ - Update local build env to docker 1.9.1
+
+
+## [0.3.4] - 2015-10-23
+### Changed
+- Upgrade clojure buildpack to version 70
+- Update go buildpack to version 18
+- Update java buildpack to version 40
+- Update nodejs buildpack to version 86
+- Update php buildpack to version 80
+- Update python buildpack to version 68
+- Update ruby buildpack to version 140
+- Update scala buildpack to version 63
+
+
 ## [0.3.3] - 2015-09-10
 ### Added
 - Use exec to run procfile entries
@@ -93,7 +203,16 @@ 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.3...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.12...HEAD
+[0.3.12]: https://github.com/gliderlabs/herokuish/compare/v0.3.11...v0.3.12
+[0.3.11]: https://github.com/gliderlabs/herokuish/compare/v0.3.10...v0.3.11
+[0.3.10]: https://github.com/gliderlabs/herokuish/compare/v0.3.9...v0.3.10
+[0.3.9]: https://github.com/gliderlabs/herokuish/compare/v0.3.8...v0.3.9
+[0.3.8]: https://github.com/gliderlabs/herokuish/compare/v0.3.7...v0.3.8
+[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
 [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

Dockerfile

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

Dockerfile.build

@@ -1,2 +1,2 @@
 FROM golang:1.4-cross
-RUN curl -s -o - https://get.docker.com/builds/Linux/x86_64/docker-1.6.2 > /usr/local/bin/docker && chmod +x /usr/local/bin/docker
+RUN curl -s -o - https://get.docker.com/builds/Linux/x86_64/docker-1.9.1 > /usr/local/bin/docker && chmod +x /usr/local/bin/docker

Dockerfile.dev

@@ -1,5 +1,10 @@
 FROM heroku/cedar:14
+ENV LC_ALL C
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
 COPY ./build/linux/herokuish /bin/herokuish
+RUN apt-get -qq update
+RUN apt-get -qq -y install html2text
 RUN /bin/herokuish buildpack install \
 	&& ln -s /bin/herokuish /build \
 	&& ln -s /bin/herokuish /start \

Makefile

@@ -1,23 +1,24 @@
 NAME = herokuish
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.3.3
+VERSION ?= 0.3.12
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 
 build:
-	cat buildpacks/*/buildpack* | sed 'N;s/\n/ /' > include/buildpacks.txt
+	cat buildpacks/*/buildpack* | sed 'N;s/\n/ /' | sort > 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
 	docker build -f Dockerfile.dev -t $(IMAGE_NAME):$(BUILD_TAG) .
 endif
 
 build-in-docker:
-	docker build -f Dockerfile.build -t $(NAME)-build .
-	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
+	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 \
 		-e IMAGE_NAME=$(IMAGE_NAME) -e BUILD_TAG=$(BUILD_TAG) -e VERSION=master \
 		$(NAME)-build make -e deps build

README.md

@@ -182,7 +182,7 @@ For help and discussion beyond Github Issues, join us on Freenode in `#gliderlab
 
 ## Releases
 
-Anybody can propose a release. First bump the version in `Makefile`, make sure `CHANGELOG.md` is up to date, and make sure tests are passing. Then open a Pull Request from `master` into the `release` branch. Once a maintainer approves and merges, CircleCI will build a release and upload it to Github.
+Anybody can propose a release. First bump the version in `Makefile` and `Dockerfile`, make sure `CHANGELOG.md` is up to date, and make sure tests are passing. Then open a Pull Request from `master` into the `release` branch. Once a maintainer approves and merges, CircleCI will build a release and upload it to Github.
 
 ## Acknowledgements
 

buildpacks/buildpack-clojure/buildpack-version

@@ -1 +1 @@
-v67
+v75

buildpacks/buildpack-emberjs/buildpack-url

@@ -0,0 +1 @@
+https://codon-buildpacks.s3.amazonaws.com/buildpacks/heroku/emberjs.tgz

buildpacks/buildpack-emberjs/buildpack-version

@@ -0,0 +1 @@
+latest

buildpacks/buildpack-emberjs/tests/emberjs/.bowerrc

@@ -0,0 +1,4 @@
+{
+  "directory": "bower_components",
+  "analytics": false
+}

buildpacks/buildpack-emberjs/tests/emberjs/.editorconfig

@@ -0,0 +1,34 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false

buildpacks/buildpack-emberjs/tests/emberjs/.ember-cli

@@ -0,0 +1,9 @@
+{
+  /**
+    Ember CLI sends analytics information by default. The data is completely
+    anonymous, but there are times when you might want to disable this behavior.
+
+    Setting `disableAnalytics` to true will prevent any data from being sent.
+  */
+  "disableAnalytics": false
+}

buildpacks/buildpack-emberjs/tests/emberjs/.jshintrc

@@ -0,0 +1,32 @@
+{
+  "predef": [
+    "document",
+    "window",
+    "-Promise"
+  ],
+  "browser": true,
+  "boss": true,
+  "curly": true,
+  "debug": false,
+  "devel": true,
+  "eqeqeq": true,
+  "evil": true,
+  "forin": false,
+  "immed": false,
+  "laxbreak": false,
+  "newcap": true,
+  "noarg": true,
+  "noempty": false,
+  "nonew": false,
+  "nomen": false,
+  "onevar": false,
+  "plusplus": false,
+  "regexp": false,
+  "undef": true,
+  "sub": true,
+  "strict": false,
+  "white": false,
+  "eqnull": true,
+  "esnext": true,
+  "unused": true
+}

buildpacks/buildpack-emberjs/tests/emberjs/app/app.js

@@ -0,0 +1,18 @@
+import Ember from 'ember';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
+import config from './config/environment';
+
+let App;
+
+Ember.MODEL_FACTORY_INJECTIONS = true;
+
+App = Ember.Application.extend({
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
+  Resolver
+});
+
+loadInitializers(App, config.modulePrefix);
+
+export default App;

buildpacks/buildpack-emberjs/tests/emberjs/app/components/.gitkeep

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Herokuish</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {{content-for "head"}}
+
+    <link rel="stylesheet" href="assets/vendor.css">
+    <link rel="stylesheet" href="assets/herokuish.css">
+
+    {{content-for "head-footer"}}
+  </head>
+  <body>
+    {{content-for "body"}}
+
+    <script src="assets/vendor.js"></script>
+    <script src="assets/herokuish.js"></script>
+
+    {{content-for "body-footer"}}
+  </body>
+</html>

buildpacks/buildpack-emberjs/tests/emberjs/app/controllers/.gitkeep

@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;

buildpacks/buildpack-emberjs/tests/emberjs/app/helpers/.gitkeep

@@ -0,0 +1,11 @@
+import Ember from 'ember';
+import config from './config/environment';
+
+const Router = Ember.Router.extend({
+  location: config.locationType
+});
+
+Router.map(function() {
+});
+
+export default Router;

buildpacks/buildpack-emberjs/tests/emberjs/app/index.html

@@ -0,0 +1 @@
+emberjs

buildpacks/buildpack-emberjs/tests/emberjs/app/models/.gitkeep

@@ -0,0 +1,9 @@
+{
+  "name": "herokuish",
+  "dependencies": {
+    "ember": "~2.4.3",
+    "ember-cli-shims": "0.1.1",
+    "ember-cli-test-loader": "0.2.2",
+    "ember-qunit-notifications": "0.1.0"
+  }
+}