Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history 
* upstream/master: (213 commits)
  Revert "Merge pull request #586 from heroku/check-binstubs"
  Move binstub detection to main compile flow
  Warn if ruby/rails/bundle binstub shebangs are bad
  Added explicit case for JVM version 8 or 1.8 in system.properties
  v168
  install node when using execjs OR webpacker
  fix typo in bin/support/ruby_compile
  Update comment in bin/compile
  Retry failed downloads for untar
  v167
  Skip Bundler version check
  Use HTTPS for interactions with GitHub and S3
  Changelog.
  Bundler 1.15.2
  update changelog
  bump to v166
  [CI Skip] heroku-buildpack-ruby v165
  Add CHANGELOG v165
  Update Node to 6.11.1
  Set JAVA_HOME env var for JRuby apps
  ...
  • Loading branch information
@rodacato
rodacato committed Sep 22, 2017
2 parents 71f7b65 + 10f2f86 commit 80d09f1
Show file tree
Hide file tree
Showing 77 changed files with 1,669 additions and 557 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
language: ruby
rvm:
- 2.0.0
before_script: bundle exec rake travis:setup
- 2.4.1
before_script: bundle exec rake hatchet:setup_travis
script: bundle exec parallel_rspec -n 11 spec/
after_script:
- heroku keys:remove $USER@`hostname`
env:
global:
- HATCHET_RETRIES=3
- IS_RUNNING_ON_TRAVIS=true
- IS_RUNNING_ON_CI=true
- HATCHET_DEPLOY_STRATEGY=git
- HATCHET_APP_LIMIT=80
- secure: bM8uWN5b9hZzzHk73EN9xHCK65vuopcbwQILcuMt0A1mHB8tSH1xyMYddNrbGdfznLAVXf8UjvKvv6rvvG4O+j3GRuIWVNukoAvZxG0FC9QxYuKbDccEPPdtqGwVEfWEKQYLajsIpF8/ACyALGV+Oe/Z28WRk6Ba3FLptfulc6s=
- secure: xFS5oLPMGyT6N0LKwU7wllaEZEVLzE/D5HuD14q3Vfd4L369XpV6ORYJF/2mkf765m+LH1MaN09rJaKc00ZcQfQECMuzyWagLsr1bVKs+szta3G/nFjjVTwmoPX5kVw5q7e6TYvS/KAzo+n8u5pW+zu8MMTwnv40QI6LfcbZkTc=
- secure: wd/FBYI9I37PJ+eXhO8vesvWELkklNgGRA1xo/tuA31+ACpY/jG5EjrHd+semsfDTxM8fZe3s0foIch+jeMTIOcGs98tDC/L/8b/h6i0Qic0DqkAk6B30fT+5Nl3dufjiXsBJg5xj1zYqW6ka3DKIDjnn+3ao2cme05MtDQBHdc=
sudo: false
dist: trusty
addons:
apt:
sources:
- heroku
- heroku
packages:
- heroku-toolbelt
- heroku-toolbelt
140 changes: 139 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,142 @@
## Master
## v168 (08/14/2017)

* Install Node when using either ExecJS _or_ Webpacker (#608)
* Make installs more robust against temporary network issues by retrying failed
downloads in `LanguagePack::Fetcher#fetch_untar`, which installs Rubies (#585)

## v167 (07/25/2016)

* Update Bundler to 1.15.2 (#602)

## v166 (07/11/2017)

* no changes from v165

## v165 (07/11/2017)

* Set `$JAVA_HOME` for JRuby apps during build (#593)
* Update Node to 6.11.1 (#598)

## v164 (06/21/2017)

* Update Bundler to 1.15.1 (#579)

## v163 (05/22/2017)

* Fix CI rake tasks not running (#571)

## v162 (05/18/2017)

* Disable roubocop warnings for `heroku_clear_tasks` (#567)

## v161 (05/18/2017)

* Ruby apps being run on CI are no longer expected to have Rails commands (#565)

## v160 (05/18/2017)

* `bin/rails test` only gets called in CI for Rails 5+ apps
* support `:sql` (structure) Rails schema for CI (#549)

## v159 (04/24/2017)

* Blacklist JAVA_OPTS and JAVA_TOOL_OPTIONS during build (#559)

## v158 (04/12/2017)

* Fix CI issue causing system Ruby to be used (#558)

## v157 (04/11/2017)

* Fix "double ruby rainbow bug" caused by executing two `compile` actions on the same
app (#553 & #555)
* Remove Ruby 1.8.7 compatiability to allow for #555. This version of Ruby has been EOL
for a long time. It is not available on Cedar-14 and Cedar-10 is EOL

## v156 (04/11/2017)

* Update default Ruby version to 2.3.4.

## v155 (03/16/2017)

* Yarn now installed for apps with `webpacker` gem (#547)

## v154 (03/01/2017)

* Postgres database add-on will only be provisioned if app has a postgres driver in the `Gemfile`. (#535)
* Fix regression, where JRuby patchlevel was being pulled from `Gemfile.lock` and used when not appropriate (#536)

## v153 (01/18/2017)

* Fix regression, where defaults would override user env with rake (#528)

## v152 (01/18/2017)

* Remove RAILS_GROUPS=assets from being set in .profile.d (#526)

## v151 (01/16/2017)

* Upgrade to bundler 1.13.7 (#519)
* Vendor Default Ruby to execute the buildpack (#515)
* Heroku CI Support (#516)

## v150 (12/23/2016)

* Allow deployment of pre-release rubies (preview and rc) with Bundler 1.13.6+. This is needed because the patch level is recorded in the gemfile as `-1` since it is not released yet. For example 2.4.0rc1 will show up in a `Gemfile.lock` like this:

```
RUBY VERSION
ruby 2.4.0p-1
```

## v149 (12/01/2016)

* Guarantee we always show warning when upgrading bundler version.

## v148 (11/17/2016)

* Default Ruby Version is 2.2.6
* Update libyaml to 0.1.7 for [CVE-2014-9130](https://devcenter.heroku.com/changelog-items/1016)

## v147 (11/15/2016)

* Bump bundler to 1.13.6 [Bundler changelog](https://github.com/bundler/bundler/blob/v1.13.6/CHANGELOG.md). Allows for use of Ruby version operators.

## v146 (03/23/2016)

* Warn when `.bundle/config` is checked in (#471)
* Do not cache `.bundle/config` between builds (#471)
* Set WEB_CONCURRENCY for M-Performance dynos using sensible defaults (#474)
* Fix rake task detection in Rails apps actually fails builds (#475)

## v145 (03/08/2016)

* Bump bundler to 1.11.2 [Bundler changelog](https://github.com/bundler/bundler/blob/master/CHANGELOG.md#1112-2015-12-15) (#461)
* Rails 5 Support for logging to STDOUT via environment variable (#460)
* Fail build when rake tasks cannot be detected in a Rails app (#462)

## v144 (02/01/2016)

* Fix default ruby to actually be Ruby 2.2.4 (#456)

## v143 (01/28/2016)

* Change default for new apps to Ruby 2.2.4 (#454)

## v142 (01/14/2016)

* Added pgconfig jar to JDK for JRuby JDBC (#450)
* Let API pick exact postgres plan (#449)
* Follow redirects on `curl` command (#443)
* Check for preinstalled JDK (#434)

## v141 (11/03/2015)

* Support for custom JDK versions in system.properties (#423)
* Fix nodejs buildpack integration (#429)
* Automatic jruby heap setting for IX dynos (#426)
* Warn when RAILS_ENV != production (https://devcenter.heroku.com/articles/deploying-to-a-custom-rails-environment)
* Warn when using asset_sync (https://devcenter.heroku.com/articles/please-do-not-use-asset-sync)

## v140 (9/9/2015)

Expand Down
1 change: 1 addition & 0 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ group :development, :test do
gem 'rspec-retry'
gem "netrc"
gem "git", github: "hone/ruby-git", branch: "master"
gem 'json', '~> 2.0.2'
end
87 changes: 53 additions & 34 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,62 +8,77 @@ GIT
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.0)
activesupport (5.1.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
anvil-cli (0.16.2)
progress (~> 2.4, >= 2.4.0)
rest-client (~> 1.6, >= 1.6.7)
thor (~> 0.15, >= 0.15.2)
diff-lcs (1.1.3)
excon (0.45.3)
heroku-api (0.3.22)
excon (~> 0.38)
multi_json (~> 1.8)
heroku_hatchet (1.4.1)
activesupport (~> 4)
concurrent-ruby (1.0.5)
diff-lcs (1.3)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
excon (0.58.0)
heroics (0.0.23)
erubis (~> 2.0)
excon
multi_json (>= 1.9.2)
heroku_hatchet (3.0.3)
activesupport (~> 5)
anvil-cli (~> 0)
excon (~> 0)
heroku-api (~> 0)
minitest-retry (~> 0.1.9)
platform-api (~> 2)
repl_runner (~> 0.0.3)
rrrretry (~> 1)
thor (~> 0)
threaded (~> 0)
i18n (0.7.0)
json (1.8.2)
mime-types (2.4.3)
minitest (5.5.1)
multi_json (1.10.1)
netrc (0.10.2)
parallel (0.6.5)
parallel_tests (0.13.1)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.8.6)
json (2.0.4)
mime-types (2.99.3)
minitest (5.10.3)
minitest-retry (0.1.9)
minitest (>= 5.0)
moneta (0.8.1)
multi_json (1.12.1)
netrc (0.11.0)
parallel (1.11.2)
parallel_tests (2.14.1)
parallel
platform-api (2.1.0)
heroics (~> 0.0.23)
moneta (~> 0.8.1)
progress (2.4.0)
rake (10.0.4)
rake (12.0.0)
repl_runner (0.0.3)
activesupport
rest-client (1.7.2)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rrrretry (1.0.0)
rspec (2.2.0)
rspec-core (~> 2.2)
rspec-expectations (~> 2.2)
rspec-mocks (~> 2.2)
rspec-core (2.13.1)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.13.1)
rspec-retry (0.2.1)
rspec
thor (0.19.1)
thread_safe (0.3.4)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-retry (0.5.4)
rspec-core (> 3.3, < 3.7)
rspec-support (3.6.0)
thor (0.19.4)
thread_safe (0.3.6)
threaded (0.0.4)
tzinfo (1.2.2)
tzinfo (1.2.3)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)

PLATFORMS
ruby
Expand All @@ -72,9 +87,13 @@ DEPENDENCIES
excon
git!
heroku_hatchet
json (~> 2.0.2)
netrc
parallel_tests
rake
rspec-core
rspec-expectations
rspec-retry

BUNDLED WITH
1.15.3
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Heroku Buildpack for Ruby
![ruby](https://cloud.githubusercontent.com/assets/51578/8882726/52caf102-3217-11e5-8a6c-2d47c57f0030.jpg)
![ruby](https://cloud.githubusercontent.com/assets/51578/13712725/3c6b3368-e793-11e5-83c1-728440111358.png)

This is a [Heroku Buildpack](http://devcenter.heroku.com/articles/buildpacks) for Ruby, Rack, and Rails apps. It uses [Bundler](http://gembundler.com) for dependency management.
This is a [Heroku Buildpack](http://devcenter.heroku.com/articles/buildpacks) for Ruby, Rack, and Rails apps. It uses [Bundler](https://bundler.io) for dependency management.

This buildpack requires 64-bit Linux.

Expand Down Expand Up @@ -32,7 +32,7 @@ Example Usage:
Procfile declares types -> (none)
Default types for Ruby -> console, rake

The buildpack will detect your app as Ruby if it has a `Gemfile` and `Gemfile.lock` files in the root directory. It will then proceed to run `bundle install` after setting up the appropriate environment for [ruby](http://ruby-lang.org) and [Bundler](http://gembundler.com).
The buildpack will detect your app as Ruby if it has a `Gemfile` and `Gemfile.lock` files in the root directory. It will then proceed to run `bundle install` after setting up the appropriate environment for [ruby](http://ruby-lang.org) and [Bundler](https://bundler.io).

#### Bundler

Expand Down Expand Up @@ -132,7 +132,7 @@ First you'll need to build a Heroku-compatible version of Node.js:

Open `lib/language_pack/ruby.rb` in your editor, and change the following line:

BUNDLER_VERSION = "1.1.rc"
BUNDLER_VERSION = "1.11.2"

Open `lib/language_pack/base.rb` in your editor, and change the following line:

Expand Down Expand Up @@ -171,4 +171,4 @@ If you don't want to run them in parallel you can still:
$ bundle exec rake spec
```

Now go take a nap or something for a really long time.
Now go take a nap or do something for a really long time.
Loading

0 comments on commit 80d09f1

Please sign in to comment.