Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deal with bundler warning output of read-only folder #3

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Deal with bundler warning output of read-only folder #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eba3b7d
Ignore bundler warning output
Jan 29, 2018
86ea27e
Merge branch 'master' of https://github.com/pkgr/heroku-buildpack-ruby
Oct 16, 2019
bb11559
Update ruby default version to 2.5.5 and bundler version to 1.17.3, u…
Oct 16, 2019
ca825a3
Update rake dependency
Oct 16, 2019
1eff2a7
Update bundler and other dependencies
Jun 9, 2020
0cf6450
Use bundler 2.1.4
Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.4.1
- 2.5.5
before_script: bundle exec rake hatchet:setup_travis
script: bundle exec parallel_rspec -n 11 spec/
after_script:
Expand Down
85 changes: 35 additions & 50 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GIT
remote: git://github.com/hone/ruby-git.git
remote: https://github.com/hone/ruby-git.git
revision: 264836fcff3c037d8d8fc44bd770b150b46fdc4e
branch: master
specs:
Expand All @@ -8,77 +8,62 @@ GIT
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.8)
i18n (~> 0.7)
activesupport (6.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
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)
zeitwerk (~> 2.1, >= 2.1.8)
concurrent-ruby (1.1.5)
diff-lcs (1.3)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
excon (0.57.0)
heroics (0.0.22)
excon (0.67.0)
heroics (0.0.25)
erubis (~> 2.0)
excon
moneta
multi_json (>= 1.9.2)
heroku-api (0.4.2)
excon (~> 0.45)
multi_json (~> 1.8)
heroku_hatchet (3.0.1)
activesupport (~> 4)
anvil-cli (~> 0)
heroku_hatchet (3.0.6)
excon (~> 0)
heroku-api (~> 0)
minitest-retry (~> 0.1.9)
platform-api (~> 2)
repl_runner (~> 0.0.3)
rrrretry (~> 1)
thor (~> 0)
threaded (~> 0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.8.4)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
json (2.0.4)
mime-types (2.99.3)
minitest (5.10.2)
moneta (0.8.1)
multi_json (1.12.1)
minitest (5.12.2)
minitest-retry (0.1.9)
minitest (>= 5.0)
moneta (1.0.0)
multi_json (1.14.1)
netrc (0.11.0)
parallel (1.11.2)
parallel_tests (2.14.1)
parallel (1.18.0)
parallel_tests (2.29.2)
parallel
platform-api (2.0.0)
heroics (~> 0.0.22)
moneta (~> 0.8.1)
progress (2.4.0)
rake (12.0.0)
platform-api (2.2.0)
heroics (~> 0.0.25)
moneta (~> 1.0.0)
rake (13.0.0)
repl_runner (0.0.3)
activesupport
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-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
rspec-core (3.9.0)
rspec-support (~> 3.9.0)
rspec-expectations (3.9.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)
rspec-support (~> 3.9.0)
rspec-retry (0.6.1)
rspec-core (> 3.3)
rspec-support (3.9.0)
thor (0.20.3)
thread_safe (0.3.6)
threaded (0.0.4)
tzinfo (1.2.3)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
zeitwerk (2.2.0)

PLATFORMS
ruby
Expand All @@ -96,4 +81,4 @@ DEPENDENCIES
rspec-retry

BUNDLED WITH
1.15.1
2.1.4
2 changes: 2 additions & 0 deletions lib/language_pack/helpers/bundler_wrapper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ def ruby_version
if output.match(/No ruby version specified/)
""
else
# ignore possible warning output from bundler
output = output.lines.select { |line| /\A\w+ \d+\.\d+\.\d+/.match(line) }.join
output.chomp.sub('(', '').sub(')', '').sub(/(p-?\d+)/, ' \1').split.join('-')
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/language_pack/ruby.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class LanguagePack::Ruby < LanguagePack::Base
NAME = "ruby"
LIBYAML_VERSION = "0.1.7"
LIBYAML_PATH = "libyaml-#{LIBYAML_VERSION}"
BUNDLER_VERSION = "1.15.1"
BUNDLER_VERSION = "2.1.4"
BUNDLER_GEM_PATH = "bundler-#{BUNDLER_VERSION}"
RBX_BASE_URL = "http://binaries.rubini.us/heroku"
NODE_BP_PATH = "vendor/node/bin"
Expand Down
2 changes: 1 addition & 1 deletion lib/language_pack/ruby_version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def initialize(output = "")
end
end

DEFAULT_VERSION_NUMBER = "2.4.1"
DEFAULT_VERSION_NUMBER = "2.5.5"
DEFAULT_VERSION = "ruby-#{DEFAULT_VERSION_NUMBER}"
LEGACY_VERSION_NUMBER = "1.9.2"
LEGACY_VERSION = "ruby-#{LEGACY_VERSION_NUMBER}"
Expand Down