Fix fileutils double load when using bundler/inline
#3991
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
deivid-rodriguez
force-pushed
the
fileutils_double_load
branch
2 times, most recently
from
71a1960
to
4ff0e65
Compare
deivid-rodriguez
force-pushed
the
fileutils_double_load
branch
2 times, most recently
from
398c1d5
to
90370f7
Compare
This was referenced Oct 9, 2020
Merged
We need inline gemfiles to not load `fileutils`. If it does, a require of `fileutils` after a `gemfile(true)` block might cause redefinition warnings because the initial require will use "rubygems version of require", which "upgrades default gems", whereas the second require will use the default version of `fileutils`, since bundler "undoes" rubygems require monkeypatches. Similar to other default gem issues, the solution is a mix of: * Lazily loading `fileutils` as much as possible. * Vendor `tmpdir` inside `bundler`. Since `tmpdir` loads `fileutils` internally, by vendoring it we can change this require to instead use bundler's vendored version of fileutils, which is namespaced so it doesn't cause any redefinition issues.
deivid-rodriguez
force-pushed
the
fileutils_double_load
branch
from
90370f7
to
d781931
Compare
deivid-rodriguez
added a commit
that referenced
this pull request
Dec 7, 2020
Fix fileutils double load when using `bundler/inline` (cherry picked from commit 6ebda1d)
deivid-rodriguez
added a commit
that referenced
this pull request
Dec 7, 2020
Fix fileutils double load when using `bundler/inline` (cherry picked from commit 6ebda1d)
deivid-rodriguez
added a commit
that referenced
this pull request
Dec 7, 2020
Fix fileutils double load when using `bundler/inline` (cherry picked from commit 6ebda1d)
deivid-rodriguez
added a commit
that referenced
this pull request
Dec 7, 2020
Fix fileutils double load when using `bundler/inline` (cherry picked from commit 6ebda1d)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
In the following conditions:
gemfile(true, &block)(inlineGemfileand install dependencies on the fly).fileutils.fileutilsand a higher version installed on your system (happens by default on ruby 2.6).Then you'll get a lot of redefinition warnings for
FileUtilsconstants because two different versions offileutilsare required.This PR fixes the problem by avoiding requiring
fileutilstoo early. To do this, we do the following:fileutilsrequires from rubygemsDependencyInstaller.tmpdircode insidebundler, and change its require offileutilsto instead require the version offileutilsvendored insidebundler.With the above changes, warnings are gone since a consistent version of
fileutilsis used.Fixes #3213.
Tasks:
I will abide by the code of conduct.