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

Revert "Migrate requires from exe/ to also be relative" #7216

Merged
1 commit merged into from Jun 24, 2019

Conversation

deivid-rodriguez
Copy link
Member

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

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

The problem was that in #7193, I included a commit 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.

@deivid-rodriguez deivid-rodriguez requested a review from hsbt Jun 20, 2019
@deivid-rodriguez deivid-rodriguez force-pushed the revert_relative_require_from_executable branch from 632136b to eeb2ff1 Compare Jun 20, 2019
@hsbt
Copy link
Member

hsbt commented Jun 24, 2019

👍

@hsbt
Copy link
Member

hsbt commented Jun 24, 2019

@bundlerbot r+

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
Copy link

ghost commented Jun 24, 2019

Build succeeded

@ghost ghost merged commit eeb2ff1 into master Jun 24, 2019
3 checks passed
@ghost ghost deleted the revert_relative_require_from_executable branch Jun 24, 2019
@deivid-rodriguez
Copy link
Member Author

deivid-rodriguez commented Jun 24, 2019

Thanks!

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