Fix -I require priority #3124
Merged
Fix -I require priority #3124
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
|
This issue was found by the Debian ruby team when trying to package psych for ruby2.7, and this PR should close the related issue they opened to the psych project: ruby/psych#431. |
deivid-rodriguez
force-pushed
the
fix_dash_i_require_priority
branch
from
7bcc9c4
to
fb907f9
Compare
|
I need to figure out the Windows CI issue, but other than that I think it should be ready. |
If `require "a"` is run when two folders have been specified in the -I option including a "a.rb" file and a "a.so" file respectively, the ruby spec says that the ".rb" file should always be preferred. However, the logic we added in 6b81076d9 to make the -I option always beat default gems does not respect this spec, creating a difference from the original ruby-core's require. [the ruby spec says]: https://github.com/ruby/spec/blob/d80a6e2b221d4f17a8cadcac75ef950c59cba901/core/kernel/shared/require.rb#L234-L246
deivid-rodriguez
force-pushed
the
fix_dash_i_require_priority
branch
from
60a1c91
to
b394438
Compare
|
Windows CI is passing now too 👍. |
hsbt
approved these changes
Feb 5, 2020
| begin | ||
| if File.symlink? safe_lp # for backward compatibility | ||
| next | ||
| Gem.suffixes.each do |s| |
There was a problem hiding this comment.
Note: I confirmed Gem.suffixes returned ["", ".rb", ".bundle"] on macOS.
There was a problem hiding this comment.
Thanks! I had two doubts here:
- Is the "empty extension" actually needed?
- Should I explicitly loop first through ".rb", and then through the rest of the extensions, so that we don't depend on the order of
Gem.suffixes?
There was a problem hiding this comment.
Both of the issues are actually present in the current code, so I'll move this forward for now.
|
@bundlerbot r=hsbt |
ghost
pushed a commit
that referenced
this pull request
Feb 5, 2020
3124: Fix -I require priority r=hsbt a=deivid-rodriguez # Description: If `require "a"` is run when two folders have been specified in the -I option including a "a.rb" file and a "a.so" file respectively, [the ruby spec says](https://github.com/ruby/spec/blob/d80a6e2b221d4f17a8cadcac75ef950c59cba901/core/kernel/shared/require.rb#L234-L246) that the ".rb" file should always be preferred. However, the logic we added in 6b81076d9 to make the -I option always beat default gems does not respect this spec, creating a difference from the original ruby-core's require. # Tasks: - [x] Describe the problem / feature - [x] Write tests - [x] Write code to solve the problem - [x] Get code review from coworkers / friends I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md). Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
Build succeeded
|
ghost
merged commit
sorah
pushed a commit
to sorah-rbpkg/ruby
that referenced
this pull request
Oct 29, 2020
Origin: rubygems/rubygems#3124 Author: deivid <deivid.rodriguez@riseup.net> Gbp-Pq: Name 0006-Fix-priority-order-of-paths-in-I-option.patch
This pull request was closed.
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:
If
require "a"is run when two folders have been specified in the -I option including a "a.rb" file and a "a.so" file respectively, the ruby spec says that the ".rb" file should always be preferred. However, the logic we added in 6b81076d9 to make the -I option always beat default gems does not respectthis spec, creating a difference from the original ruby-core's require.
Tasks:
I will abide by the code of conduct.