Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Fix more leaks to default copy of bundler #7274

Merged
9 commits merged into from Aug 18, 2019

Commits on Aug 17, 2019

  1. Copy the full SHA
    f9cb39e View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    fb587b9 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    e4cbb91 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    789dd18 View commit details
    Browse the repository at this point in the history
  5. Don't use system bundler on this spec

    If we use system bundler, when booting the "outermost" bundler process,
    bundler will save the path to the system bundler in BUNDLE_BIN_PATH, and
    use it again when booting the "innermost" bundler process (`bundle exec
    echo foo`).
    
    That means that second process will use the system bundler path again.
    However, we have `-rsupport/hax` in RUBYOPT, so that file will load from
    the local copy of bundler, and that file will load `bundler/version`
    from the project (not from system), because -Ilib is in the LOAD_PATH.
    
    That will end up causing redefinition errors because the same constant
    will be loaded from two different locations.
    
    In general, this is expected behavior, normally you will wrap the
    process with `Bundler.with_original_env` to reset the environment.
    However, the easiest fix here is to not use system bundler, because it's
    not really necessary and thus doesn't help the readability of the spec.
    deivid-rodriguez committed Aug 17, 2019
    Copy the full SHA
    a3d72a3 View commit details
    Browse the repository at this point in the history
  6. Remove unnecessary rubygems monkeypatch

    Instead, make sure we always load the local copy of bundler during
    specs, and never end up using the default copy.
    deivid-rodriguez committed Aug 17, 2019
    Copy the full SHA
    ac655ff View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    6b0dc20 View commit details
    Browse the repository at this point in the history
  8. No need to activate the fileutils default gem

    The version we're vendoring actually relaxed this restriction back to
    2.3.0+, so we can always use the vendored version.
    deivid-rodriguez committed Aug 17, 2019
    Copy the full SHA
    d366cbf View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    8ef571e View commit details
    Browse the repository at this point in the history