Install default and bundled gems into dedicated directories #8761
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
|
Unfortunately, it seems that RubyGems test suite is not prepared enough for existence of |
voxik
force-pushed
the
stdgems
branch
2 times, most recently
from
40dd239
to
e198095
Compare
Previously, all default/bundled gems were installed into single location such as `/usr/local/lib/ruby/gems/3.3.0+0`. However, the same location is used for user installed gems, which is not optimal. With this change, the default gems goes into `/usr/local/lib/ruby/default_gems/3.3.0+0` while the bundled gems goes into `/usr/local/lib/ruby/bundled_gems/3.3.0+0`. User installed gems continues to land in `/usr/local/lib/ruby/gems/3.3.0+0`.
|
I have made some progress with fixing the test failures and with the recent RubyGems updates, there are 4 remaining issues: These are basically checking some defaults, which are not surprisingly overridden by the custom configuration. Not sure yet how to deal with these. I don't think it would be big loss if these were disabled ... |
ekohl
reviewed
Nov 21, 2023
| # Path to specification files of default gems. | ||
|
|
||
| def default_specifications_dir | ||
| @default_specifications_dir ||= File.join(Gem.default_gems_dir, "specifications", "default") |
There was a problem hiding this comment.
Why is this cached while bundled_gems_dir and default_gems_dir aren't?
There was a problem hiding this comment.
This is cached also by RubyGems:
and some parts of the test suite overrides the cached value (if I am not mistaken).
Also, I don't expect that bundled_gems_dir and default_gems_dir would be used by anything else then just by the default_specifications_dir and the default_path method, where the latter is cached here:
Line 348 in 209a025
Therefore the need for caching is minimal IMHO
RubyGems provides means to override their defaults, such as
`Gem.default_path` method. With such modified configuration, the
following errors might be observed:
~~~
1) Failure:
TestGem#test_default_path_vendor_dir [/home/runner/work/ruby/ruby/src/test/rubygems/test_gem.rb:612]:
<["/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-qs43ch/gemhome",
"/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-qs43ch/vendor/gems/3.3.0+0"]> expected but was
<["/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-qs43ch/gemhome",
"/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-qs43ch/vendor/gems/3.3.0+0",
"/usr/local/lib/ruby/bundled_gems/3.3.0+0",
"/usr/local/lib/ruby/default_gems/3.3.0+0"]>.
make: *** [uncommon.mk:943: yes-test-all] Error 4
2) Failure:
TestGem#test_default_path_missing_vendor [/home/runner/work/ruby/ruby/src/test/rubygems/test_gem.rb:592]:
<["/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-c41yb7/gemhome"]> expected but was
<["/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-c41yb7/gemhome",
"/usr/local/lib/ruby/bundled_gems/3.3.0+0",
"/usr/local/lib/ruby/default_gems/3.3.0+0"]>.
3) Failure:
TestGem#test_default_path_user_home [/home/runner/work/ruby/ruby/src/test/rubygems/test_gem.rb:600]:
<["/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-5mm6uc/userhome/.local/share/gem/ruby/3.3.0+0",
"/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-5mm6uc/gemhome"]> expected but was
<["/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-5mm6uc/userhome/.local/share/gem/ruby/3.3.0+0",
"/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-5mm6uc/gemhome",
"/usr/local/lib/ruby/bundled_gems/3.3.0+0",
"/usr/local/lib/ruby/default_gems/3.3.0+0"]>.
4) Failure:
TestGem#test_default_path [/home/runner/work/ruby/ruby/src/test/rubygems/test_gem.rb:582]:
<["/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-kan9o5/gemhome"]> expected but was
<["/home/runner/work/ruby/ruby/build/tmp/test_rubygems_20231110-59661-kan9o5/gemhome",
"/usr/local/lib/ruby/bundled_gems/3.3.0+0",
"/usr/local/lib/ruby/default_gems/3.3.0+0"]>.
~~~
Of course the `Gem.default_path` could be stubbed, but testing stub
should not be the point.
Therefore, just detect if `Gem.default_path` was customized and ignore
the test cases.
|
I have included here patch from rubygems/rubygems#7187 which makes the test suite green |
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.
Previously, all default/bundled gems were installed into single location such as
/usr/local/lib/ruby/gems/3.3.0+0. However, the same location is used for user installed gems, which is not optimal.With this change, the default gems goes into
/usr/local/lib/ruby/default_gems/3.3.0+0while the bundled gems goes into/usr/local/lib/ruby/bundled_gems/3.3.0+0. User installed gems continues to land in/usr/local/lib/ruby/gems/3.3.0+0.