From eba3b7d88835216714e9b87908361564df858993 Mon Sep 17 00:00:00 2001 From: Kai Lehmann Date: Mon, 29 Jan 2018 15:25:38 +0100 Subject: [PATCH 1/5] Ignore bundler warning output --- lib/language_pack/helpers/bundler_wrapper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/language_pack/helpers/bundler_wrapper.rb b/lib/language_pack/helpers/bundler_wrapper.rb index ab0baaee9..af0e8dc99 100644 --- a/lib/language_pack/helpers/bundler_wrapper.rb +++ b/lib/language_pack/helpers/bundler_wrapper.rb @@ -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 From bb115599eb690aac435b54414e7c9e884183bace Mon Sep 17 00:00:00 2001 From: Kai Lehmann Date: Wed, 16 Oct 2019 14:21:37 +0200 Subject: [PATCH 2/5] Update ruby default version to 2.5.5 and bundler version to 1.17.3, update dependencies --- .travis.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 85 +++++++++++++------------------ lib/language_pack/ruby.rb | 2 +- lib/language_pack/ruby_version.rb | 2 +- 5 files changed, 39 insertions(+), 54 deletions(-) diff --git a/.travis.yml b/.travis.yml index eeb3709d2..e0e6a5a59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/Gemfile b/Gemfile index eaec7ed7b..483adf2b6 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ group :development, :test do gem "rspec-core" gem "rspec-expectations" gem "excon" - gem "rake" + gem "rake", '< 13' gem "parallel_tests" gem 'rspec-retry' gem "netrc" diff --git a/Gemfile.lock b/Gemfile.lock index fd2c367e8..31c7e91aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 (12.3.3) 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 @@ -90,10 +75,10 @@ DEPENDENCIES json (~> 2.0.2) netrc parallel_tests - rake + rake (< 13) rspec-core rspec-expectations rspec-retry BUNDLED WITH - 1.15.1 + 1.17.3 diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb index 114d8a59f..4a213745a 100644 --- a/lib/language_pack/ruby.rb +++ b/lib/language_pack/ruby.rb @@ -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 = "1.17.3" BUNDLER_GEM_PATH = "bundler-#{BUNDLER_VERSION}" RBX_BASE_URL = "http://binaries.rubini.us/heroku" NODE_BP_PATH = "vendor/node/bin" diff --git a/lib/language_pack/ruby_version.rb b/lib/language_pack/ruby_version.rb index e34f9779a..fe9f8ba7b 100644 --- a/lib/language_pack/ruby_version.rb +++ b/lib/language_pack/ruby_version.rb @@ -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}" From ca825a3807419aceb278398520b040cff45489e9 Mon Sep 17 00:00:00 2001 From: Kai Lehmann Date: Wed, 16 Oct 2019 17:02:49 +0200 Subject: [PATCH 3/5] Update rake dependency --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 483adf2b6..eaec7ed7b 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ group :development, :test do gem "rspec-core" gem "rspec-expectations" gem "excon" - gem "rake", '< 13' + gem "rake" gem "parallel_tests" gem 'rspec-retry' gem "netrc" diff --git a/Gemfile.lock b/Gemfile.lock index 31c7e91aa..feca6c8a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,7 +46,7 @@ GEM platform-api (2.2.0) heroics (~> 0.0.25) moneta (~> 1.0.0) - rake (12.3.3) + rake (13.0.0) repl_runner (0.0.3) activesupport rrrretry (1.0.0) @@ -75,7 +75,7 @@ DEPENDENCIES json (~> 2.0.2) netrc parallel_tests - rake (< 13) + rake rspec-core rspec-expectations rspec-retry From 1eff2a72b8ab83fa42d2afc37545a57a61bd1c38 Mon Sep 17 00:00:00 2001 From: Kai Lehmann Date: Tue, 9 Jun 2020 14:36:53 +0200 Subject: [PATCH 4/5] Update bundler and other dependencies --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index feca6c8a7..57f2030cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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: @@ -81,4 +81,4 @@ DEPENDENCIES rspec-retry BUNDLED WITH - 1.17.3 + 2.1.4 From 0cf6450737101f124a737cd61ac1e4d6a980e107 Mon Sep 17 00:00:00 2001 From: Kai Lehmann Date: Tue, 9 Jun 2020 16:46:15 +0200 Subject: [PATCH 5/5] Use bundler 2.1.4 --- lib/language_pack/ruby.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb index 4a213745a..e71724f6b 100644 --- a/lib/language_pack/ruby.rb +++ b/lib/language_pack/ruby.rb @@ -16,7 +16,7 @@ class LanguagePack::Ruby < LanguagePack::Base NAME = "ruby" LIBYAML_VERSION = "0.1.7" LIBYAML_PATH = "libyaml-#{LIBYAML_VERSION}" - BUNDLER_VERSION = "1.17.3" + 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"