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

Improve fileutils require #7156

Merged
1 commit merged into from May 12, 2019
Merged

Improve fileutils require #7156

1 commit merged into from May 12, 2019

Conversation

deivid-rodriguez
Copy link
Member

@deivid-rodriguez deivid-rodriguez commented May 3, 2019

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

The problem was there's upstream changes in fileutils.

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

My fix is to port the upstream changes, which consist of using require_relative everywhere.

@deivid-rodriguez
Copy link
Member Author

deivid-rodriguez commented May 3, 2019

So this broke on ruby 2.3, just like the conditional claimed.

I thought this would be compatible judging by the required_rubygems_version restriction in the fileutils version we're using.

The restriction was changed here: ruby/fileutils#19. At first I thought the motivation was to at least allow installation on jruby, but I think the currently supported jruby series (9.2) are ruby 2.5+ compatible, so I'm not sure why the restriction was relaxed if fileutils doesn't really work on ruby 2.3. @hsbt?

Anyways, I'll drop the related commit since the conditional is indeed necessary.

@deivid-rodriguez
Copy link
Member Author

This is part of #7062, which has already been approved, but since I had already opened this one, I'll merge this and rebase #7062 on top.

@bundlerbot r+

ghost pushed a commit that referenced this pull request May 12, 2019
7156: Improve fileutils require r=deivid-rodriguez a=deivid-rodriguez

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

The problem was there's [upstream changes in fileutils](ruby/fileutils#35).

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

My fix is to port the upstream changes, which consist of using `require_relative` everywhere.


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

ghost commented May 12, 2019

Build succeeded

@ghost ghost merged commit 3b77937 into master May 12, 2019
@ghost ghost deleted the improve_fileutils_require branch May 12, 2019 13:17
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

1 participant