From ae7830749fab8d7a28a602eb32f6bbe8838d48f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 14 Mar 2019 16:42:20 +0100 Subject: Bump to MRI 2.6.2 --- .travis.yml | 6 +++--- Rakefile | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e90164fe8..9970f59421 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ addons: secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8=" rvm: - - 2.6.1 + - 2.6.2 - 2.5.3 - 2.4.5 - 2.3.8 @@ -47,7 +47,7 @@ env: jobs: include: - - rvm: 2.6.1 + - rvm: 2.6.2 script: rake rubocop stage: linting # Ruby 2.5, Rubygems 2.7 @@ -67,7 +67,7 @@ jobs: env: RGV=master stage: test # 1.x mode (we want to keep stuff passing in 1.x mode for now) - - rvm: 2.6.1 + - rvm: 2.6.2 env: RGV=v3.0.3 BUNDLER_SPEC_SUB_VERSION=1.98 stage: test diff --git a/Rakefile b/Rakefile index d64e9cc789..0f455f4652 100644 --- a/Rakefile +++ b/Rakefile @@ -77,11 +77,9 @@ namespace :spec do # Install the gems with a consistent version of RubyGems sh "gem update --system 3.0.3" - # Fix incorrect default gem specifications on ruby 2.6.1. Can be removed - # when 2.6.2 is released and we start testing against it - if RUBY_VERSION == "2.6.1" + # Fix incorrect default etc gem specification file list on ruby 2.6.2. + if RUBY_VERSION == "2.6.2" sh "gem install etc:1.0.1 --default" - sh "gem install bundler:1.17.2 --default" end $LOAD_PATH.unshift("./spec") -- cgit v1.2.1 From d5becd0acb738214351abb8c9f32e7c2c44a6923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 15 Mar 2019 08:22:30 +0100 Subject: Bump to MRI 2.5.4 MRI 2.5.4 now regressed and suffers from the same issue as 2.6.2 :S --- .travis.yml | 4 ++-- Rakefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9970f59421..2c1b862c96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ addons: rvm: - 2.6.2 - - 2.5.3 + - 2.5.4 - 2.4.5 - 2.3.8 @@ -51,7 +51,7 @@ jobs: script: rake rubocop stage: linting # Ruby 2.5, Rubygems 2.7 - - rvm: 2.5.3 + - rvm: 2.5.4 env: RGV=v2.7.9 stage: test # Ruby 2.4, Rubygems 2.6 diff --git a/Rakefile b/Rakefile index 0f455f4652..35b39a579c 100644 --- a/Rakefile +++ b/Rakefile @@ -77,8 +77,8 @@ namespace :spec do # Install the gems with a consistent version of RubyGems sh "gem update --system 3.0.3" - # Fix incorrect default etc gem specification file list on ruby 2.6.2. - if RUBY_VERSION == "2.6.2" + # Fix incorrect default etc gem specification file list on ruby 2.6.2 and 2.5.4 + if RUBY_VERSION == "2.6.2" || RUBY_VERSION == "2.5.4" sh "gem install etc:1.0.1 --default" end -- cgit v1.2.1 From 28eeef400af629c87804e96dd26e1c6a6b5a7a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 15 Mar 2019 15:39:38 +0100 Subject: Bump to MRI 2.5.5 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c1b862c96..c87c1305c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ addons: rvm: - 2.6.2 - - 2.5.4 + - 2.5.5 - 2.4.5 - 2.3.8 @@ -51,7 +51,7 @@ jobs: script: rake rubocop stage: linting # Ruby 2.5, Rubygems 2.7 - - rvm: 2.5.4 + - rvm: 2.5.5 env: RGV=v2.7.9 stage: test # Ruby 2.4, Rubygems 2.6 -- cgit v1.2.1 From 7f1ec3d02f62ddea6dac75513e320c607ac3ed93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 26 Mar 2019 13:40:08 +0100 Subject: Patch vendored fileutils to not activate `etc` gem --- lib/bundler/vendor/fileutils/lib/fileutils.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/bundler/vendor/fileutils/lib/fileutils.rb b/lib/bundler/vendor/fileutils/lib/fileutils.rb index 77b3bade52..3a48e80293 100644 --- a/lib/bundler/vendor/fileutils/lib/fileutils.rb +++ b/lib/bundler/vendor/fileutils/lib/fileutils.rb @@ -1082,11 +1082,6 @@ module Bundler::FileUtils end module_function :chown_R - begin - require 'etc' - rescue LoadError # rescue LoadError for miniruby - end - def fu_get_uid(user) #:nodoc: return nil unless user case user @@ -1095,6 +1090,7 @@ module Bundler::FileUtils when /\A\d+\z/ user.to_i else + require 'etc' Etc.getpwnam(user) ? Etc.getpwnam(user).uid : nil end end @@ -1108,6 +1104,7 @@ module Bundler::FileUtils when /\A\d+\z/ group.to_i else + require 'etc' Etc.getgrnam(group) ? Etc.getgrnam(group).gid : nil end end -- cgit v1.2.1 From 15976c00bd92207c4182614205d99c7bffa29901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 26 Mar 2019 13:40:25 +0100 Subject: Try removing hacks --- Rakefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Rakefile b/Rakefile index 35b39a579c..0a4d9c8900 100644 --- a/Rakefile +++ b/Rakefile @@ -77,11 +77,6 @@ namespace :spec do # Install the gems with a consistent version of RubyGems sh "gem update --system 3.0.3" - # Fix incorrect default etc gem specification file list on ruby 2.6.2 and 2.5.4 - if RUBY_VERSION == "2.6.2" || RUBY_VERSION == "2.5.4" - sh "gem install etc:1.0.1 --default" - end - $LOAD_PATH.unshift("./spec") require "support/rubygems_ext" Spec::Rubygems::DEPS["codeclimate-test-reporter"] = "~> 0.6.0" if RUBY_VERSION >= "2.2.0" -- cgit v1.2.1 From c7ac5b38012051379fb87d40e31e0887833dca98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 26 Mar 2019 14:17:12 +0100 Subject: Lazily require rubygems config file To avoid activation of the `etc` gem. --- lib/bundler/rubygems_integration.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 13a6030277..c1d785a6e1 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "monitor" -require "rubygems/config_file" module Bundler class RubygemsIntegration -- cgit v1.2.1