Skip to content
This repository has been archived by the owner. It is now read-only.

More require_relative #7193

Merged
3 commits merged into from Jun 10, 2019
Merged

More require_relative #7193

3 commits merged into from Jun 10, 2019

Conversation

deivid-rodriguez
Copy link
Member

@deivid-rodriguez deivid-rodriguez commented Jun 8, 2019

This is a follow up to #7062 and #7100, migrating the last missing internal requires to use require_relative. I thought I had migrated everything already, but I had not.

As a note, I'm migrating thor's code here. I will open a PR to upstream's thor to incorporate this changes, but thor is still stuck with 1.8 support, so we have to wait a bit. Given the very low activity thor has, it's fine to make the changes here first, and wait until we can incorporate them upstream.

What was the end-user problem that led to this PR?

The problem was that sometimes we can end up requiring the default version of bundler, instead of the current copy that's being run, and that's dangerous and can cause version mismatch issues.

What is your fix for the problem, implemented in this PR?

My fix is to always use require_relative for internal requires.

@deivid-rodriguez deivid-rodriguez changed the title More `require_relative More require_relative Jun 8, 2019
hsbt
hsbt approved these changes Jun 10, 2019
@deivid-rodriguez
Copy link
Member Author

deivid-rodriguez commented Jun 10, 2019

Thanks @hsbt!

@bundlerbot r+

ghost pushed a commit that referenced this issue Jun 10, 2019
7193: More `require_relative` r=deivid-rodriguez a=deivid-rodriguez

This is a follow up to #7062 and #7100, migrating the last missing internal requires to use `require_relative`. I thought I had migrated everything already, but I had not.

As a note, I'm migrating thor's code here. I will open a PR to upstream's thor to incorporate this changes, but thor is still stuck with 1.8 support, so we have to wait a bit. Given the very low activity thor has, it's fine to make the changes here first, and wait until we can incorporate them upstream.
 
### What was the end-user problem that led to this PR?

The problem was that sometimes we can end up requiring the default version of bundler, instead of the current copy that's being run, and that's dangerous and can cause version mismatch issues.

### What is your fix for the problem, implemented in this PR?

My fix is to always use `require_relative` for internal requires.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
@ghost
Copy link

ghost commented Jun 10, 2019

Build succeeded

@ghost ghost merged commit d9d2bf6 into master Jun 10, 2019
3 checks passed
@ghost ghost deleted the more_require_relative branch Jun 10, 2019
ghost pushed a commit that referenced this issue Jun 24, 2019
7216: Revert "Migrate requires from exe/ to also be relative" r=hsbt a=deivid-rodriguez


### What was the end-user problem that led to this PR?

The problem was that in #7193, I included [a commit](d9d2bf6) to migrate requires included in bundler's executable to use `require_relative`. That broke stuff.

### What was your diagnosis of the problem?

My diagnosis was the assumption that if `<install_folder>/exe/bundle` lives on a folder, the corresponding bundler lib lives on `<install_folder>/lib` doesn't hold for default gems. Default gems for gems with executables live in `site_lib` but install their executables in the standard gem location. That means that the reference commit breaks bundler when it is installed as a default gem.

### What is your fix for the problem, implemented in this PR?

My fix is to revert the commit.

### Why did you choose this fix out of the possible options?

I chose this fix because it's the easiest way. The proper long term fix is probably to make default gems behave in a more standard way. There's some ongoing work on that here: rubygems/rubygems#2166.


Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
ghost pushed a commit to rubygems/rubygems that referenced this issue Mar 11, 2020
7216: Revert "Migrate requires from exe/ to also be relative" r=hsbt a=deivid-rodriguez


### What was the end-user problem that led to this PR?

The problem was that in rubygems/bundler#7193, I included [a commit](rubygems/bundler@d9d2bf6) to migrate requires included in bundler's executable to use `require_relative`. That broke stuff.

### What was your diagnosis of the problem?

My diagnosis was the assumption that if `<install_folder>/exe/bundle` lives on a folder, the corresponding bundler lib lives on `<install_folder>/lib` doesn't hold for default gems. Default gems for gems with executables live in `site_lib` but install their executables in the standard gem location. That means that the reference commit breaks bundler when it is installed as a default gem.

### What is your fix for the problem, implemented in this PR?

My fix is to revert the commit.

### Why did you choose this fix out of the possible options?

I chose this fix because it's the easiest way. The proper long term fix is probably to make default gems behave in a more standard way. There's some ongoing work on that here: #2166.


Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants