This repository has been archived by the owner on Apr 14, 2021. It is now read-only.
Ignore to add bundler lib direcotry if it is same as rubylibdir #6941
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
…["rubylibdir"]. https://bugs.ruby-lang.org/issues/15469 In ruby core, the bundled bundler was located same as rubylibdir. When user used the specific version of default gems like json, Bundler uses default gems under the rubylibdir, not specific version. I avoid to add bundler directory from RUBYLIB enviromental variable, Because its directory was already added $LOAD_PATH.
deivid-rodriguez
approved these changes
Feb 4, 2019
There was a problem hiding this comment.
Nice fix! It would be best to have a high level that puts a default gem with a specific version on a Gemfile, and makes sure the default bundler vendored with ruby is able to choose it. But it might not be easy to write such a test because of the specifities of the bundler vendored with ruby, so this is good for now to me since it has been manually validated by the users who reported the bug on ruby core! 👍
I'll try to work on such test in any case.
|
@bundlerbot r+ |
ghost
pushed a commit
that referenced
this pull request
Feb 5, 2019
6941: Ignore to add bundler lib direcotry if it is same as rubylibdir r=hsbt a=hsbt ### What was the end-user problem that led to this PR? In ruby core, the bundled bundler was located same as rubylibdir. When user used the specific version of default gems like json, Bundler uses default gems under the rubylibdir, not a specific version. Fixed https://bugs.ruby-lang.org/issues/15469 ### What was your diagnosis of the problem? See the details: https://bugs.ruby-lang.org/issues/15469#note-4 ### What is your fix for the problem, implemented in this PR? I avoid adding bundler directory from RUBYLIB environmental variable Because its directory was already added $LOAD_PATH. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
Build succeeded |
ghost
merged commit
hsbt
pushed a commit
that referenced
this pull request
Feb 5, 2019
6941: Ignore to add bundler lib direcotry if it is same as rubylibdir r=hsbt a=hsbt ### What was the end-user problem that led to this PR? In ruby core, the bundled bundler was located same as rubylibdir. When user used the specific version of default gems like json, Bundler uses default gems under the rubylibdir, not a specific version. Fixed https://bugs.ruby-lang.org/issues/15469 ### What was your diagnosis of the problem? See the details: https://bugs.ruby-lang.org/issues/15469#note-4 ### What is your fix for the problem, implemented in this PR? I avoid adding bundler directory from RUBYLIB environmental variable Because its directory was already added $LOAD_PATH. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org> (cherry picked from commit 9cbc7dd)
hsbt
pushed a commit
that referenced
this pull request
Feb 5, 2019
6941: Ignore to add bundler lib direcotry if it is same as rubylibdir r=hsbt a=hsbt ### What was the end-user problem that led to this PR? In ruby core, the bundled bundler was located same as rubylibdir. When user used the specific version of default gems like json, Bundler uses default gems under the rubylibdir, not a specific version. Fixed https://bugs.ruby-lang.org/issues/15469 ### What was your diagnosis of the problem? See the details: https://bugs.ruby-lang.org/issues/15469#note-4 ### What is your fix for the problem, implemented in this PR? I avoid adding bundler directory from RUBYLIB environmental variable Because its directory was already added $LOAD_PATH. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org> (cherry picked from commit 9cbc7dd)
colby-swandale
added a commit
that referenced
this pull request
Feb 10, 2019
* 2-0-stable: (43 commits) remove path that i copied from my personal computer Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect Merge #6941 Merge #6834 Version 2.0.1 with changelog update tested rubygems in travis Lower required RubyGems to 2.5 or greater Bundler 2.0 with changelog update CHANGELOG with new changes and release Merge #6856 add RubyGems v3.0.1 to rg clone task Version 2.0.0.pre.3 wih changelog update tested versions of RubyGems in travis update gemspec to require RubyGems 3.0.0 Merge #6849 Merge #6853 Revert "Version 2.0.0 with changelog" Version 2.0.0 with changelog fix breaking edge case spec Merge #6818 ...
colby-swandale
added a commit
that referenced
this pull request
Feb 12, 2019
* 2-0-stable: (43 commits) remove path that i copied from my personal computer Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect Merge #6941 Merge #6834 Version 2.0.1 with changelog update tested rubygems in travis Lower required RubyGems to 2.5 or greater Bundler 2.0 with changelog update CHANGELOG with new changes and release Merge #6856 add RubyGems v3.0.1 to rg clone task Version 2.0.0.pre.3 wih changelog update tested versions of RubyGems in travis update gemspec to require RubyGems 3.0.0 Merge #6849 Merge #6853 Revert "Version 2.0.0 with changelog" Version 2.0.0 with changelog fix breaking edge case spec Merge #6818 ...
This was referenced Feb 14, 2019
colby-swandale
added a commit
that referenced
this pull request
Feb 18, 2019
* commit '77f4c15451aaac135d19ac5d1637981d7b05d799': (43 commits) remove path that i copied from my personal computer Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect Merge #6941 Merge #6834 Version 2.0.1 with changelog update tested rubygems in travis Lower required RubyGems to 2.5 or greater Bundler 2.0 with changelog update CHANGELOG with new changes and release Merge #6856 add RubyGems v3.0.1 to rg clone task Version 2.0.0.pre.3 wih changelog update tested versions of RubyGems in travis update gemspec to require RubyGems 3.0.0 Merge #6849 Merge #6853 Revert "Version 2.0.0 with changelog" Version 2.0.0 with changelog fix breaking edge case spec Merge #6818 ...
colby-swandale
added a commit
that referenced
this pull request
Feb 20, 2019
* 2-0-stable: (43 commits) remove path that i copied from my personal computer Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect Merge #6941 Merge #6834 Version 2.0.1 with changelog update tested rubygems in travis Lower required RubyGems to 2.5 or greater Bundler 2.0 with changelog update CHANGELOG with new changes and release Merge #6856 add RubyGems v3.0.1 to rg clone task Version 2.0.0.pre.3 wih changelog update tested versions of RubyGems in travis update gemspec to require RubyGems 3.0.0 Merge #6849 Merge #6853 Revert "Version 2.0.0 with changelog" Version 2.0.0 with changelog fix breaking edge case spec Merge #6818 ... (cherry picked from commit 77f4c15)
deivid-rodriguez
pushed a commit
that referenced
this pull request
Feb 28, 2019
* 2-0-stable: (43 commits) remove path that i copied from my personal computer Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect Merge #6941 Merge #6834 Version 2.0.1 with changelog update tested rubygems in travis Lower required RubyGems to 2.5 or greater Bundler 2.0 with changelog update CHANGELOG with new changes and release Merge #6856 add RubyGems v3.0.1 to rg clone task Version 2.0.0.pre.3 wih changelog update tested versions of RubyGems in travis update gemspec to require RubyGems 3.0.0 Merge #6849 Merge #6853 Revert "Version 2.0.0 with changelog" Version 2.0.0 with changelog fix breaking edge case spec Merge #6818 ... (cherry picked from commit 77f4c15)
deivid-rodriguez
pushed a commit
that referenced
this pull request
Mar 13, 2019
* 2-0-stable: (43 commits) remove path that i copied from my personal computer Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect Merge #6941 Merge #6834 Version 2.0.1 with changelog update tested rubygems in travis Lower required RubyGems to 2.5 or greater Bundler 2.0 with changelog update CHANGELOG with new changes and release Merge #6856 add RubyGems v3.0.1 to rg clone task Version 2.0.0.pre.3 wih changelog update tested versions of RubyGems in travis update gemspec to require RubyGems 3.0.0 Merge #6849 Merge #6853 Revert "Version 2.0.0 with changelog" Version 2.0.0 with changelog fix breaking edge case spec Merge #6818 ... (cherry picked from commit 77f4c15)
deivid-rodriguez
pushed a commit
that referenced
this pull request
Mar 13, 2019
* 2-0-stable: (43 commits) remove path that i copied from my personal computer Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect Merge #6941 Merge #6834 Version 2.0.1 with changelog update tested rubygems in travis Lower required RubyGems to 2.5 or greater Bundler 2.0 with changelog update CHANGELOG with new changes and release Merge #6856 add RubyGems v3.0.1 to rg clone task Version 2.0.0.pre.3 wih changelog update tested versions of RubyGems in travis update gemspec to require RubyGems 3.0.0 Merge #6849 Merge #6853 Revert "Version 2.0.0 with changelog" Version 2.0.0 with changelog fix breaking edge case spec Merge #6818 ... (cherry picked from commit 77f4c15)
deivid-rodriguez
pushed a commit
that referenced
this pull request
Mar 15, 2019
* 2-0-stable: (43 commits) remove path that i copied from my personal computer Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect Merge #6941 Merge #6834 Version 2.0.1 with changelog update tested rubygems in travis Lower required RubyGems to 2.5 or greater Bundler 2.0 with changelog update CHANGELOG with new changes and release Merge #6856 add RubyGems v3.0.1 to rg clone task Version 2.0.0.pre.3 wih changelog update tested versions of RubyGems in travis update gemspec to require RubyGems 3.0.0 Merge #6849 Merge #6853 Revert "Version 2.0.0 with changelog" Version 2.0.0 with changelog fix breaking edge case spec Merge #6818 ... (cherry picked from commit 77f4c15)
deivid-rodriguez
pushed a commit
that referenced
this pull request
Mar 20, 2019
* 2-0-stable: (43 commits) remove path that i copied from my personal computer Auto merge of #6586 - bundler:segiddins/softer-major-deprecations, r=indirect Merge #6941 Merge #6834 Version 2.0.1 with changelog update tested rubygems in travis Lower required RubyGems to 2.5 or greater Bundler 2.0 with changelog update CHANGELOG with new changes and release Merge #6856 add RubyGems v3.0.1 to rg clone task Version 2.0.0.pre.3 wih changelog update tested versions of RubyGems in travis update gemspec to require RubyGems 3.0.0 Merge #6849 Merge #6853 Revert "Version 2.0.0 with changelog" Version 2.0.0 with changelog fix breaking edge case spec Merge #6818 ... (cherry picked from commit 77f4c15)
5 tasks
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Sep 18, 2019
## 2.0.2 (2019-05-13) Changes: - Fixes for Bundler integration with ruby-src ([#6941](rubygems/bundler#6941), [#6973](rubygems/bundler#6973), [#6977](rubygems/bundler#6977), [#6315](rubygems/bundler#6315), [#7061](rubygems/bundler#7061)) - Use `__dir__` instead of `__FILE__` when generating a gem with `bundle gem` ([#6503](rubygems/bundler#6503)) - Use `https` on externals links in the Bundler gemspec ([#6721](rubygems/bundler#6721)) - Removed duplicate gem names from the suggested `did you mean` list for gem typos ([#6739](rubygems/bundler#6739)) - Removed Ruby 1.x compatibility code ([#6764](rubygems/bundler#6764), [#6806](rubygems/bundler#6806)) - Fixed an issue where `bundle remove` would crash with certain Gemfiles ([#6768](rubygems/bundler#6769)) - Fixed indentation in the Bundler executable template ([#6773](rubygems/bundler#6773)) - Fixed an issue where plugins could register for the same Bundler hook multiple times ([#6775](rubygems/bundler#6775)) - Changed the "multiple sources" message in `bundle install` to be a warning instead of an error ([#6790](rubygems/bundler#6790)) - Fixed a bug where path gems would break when using `only_update_to_newer_versions` ([#6774](rubygems/bundler#6774)) - Fixed a bug where installing plugins with the `--delpoyment` setting would fail ([#6805](rubygems/bundler#6805)) - Fixed an issue where `bundle update` couldn't update & install a gem when `no_install` was set (a `bundle package` config) ([#7078](rubygems/bundler#7078)) - Fixed an issue where users could not run `bundle exec` on default gems ([#6963](rubygems/bundler#6963)) - Updated vendor libraries to their latest version ([#7076](rubygems/bundler#7067), [#7068](rubygems/bundler#7068)) - Fixed an issue where the `github` source was not using `https` by default that we mentioned in the 2.0 release ([#7182](rubygems/bundler#7182)) - Fixed an issue where `rake release` was not outputting the message to users asking for a 2fa token ([#7199](rubygems/bundler#7199)) Documentation: - Fix incorrect documented `BUNDLE_PATH_RELATIVE_TO_CWD` env var ([#6751](rubygems/bundler#6751)) - Update URLs in Bundler's documentation to use `https` ([#6935](rubygems/bundler#6935)) ## 2.0.1 (2019-01-04) Changes: - Relaxed RubyGems requirement to `>= 2.5.0` ([#6867](rubygems/bundler#6867)) ## 2.0.0 (2019-01-03) No new changes ## 2.0.0.pre.3 (2018-12-30) Breaking Changes: - Bundler 2 now requires RubyGems 3.0.0 at minimum Changes: - Ruby 2.6 compatibility fixes (@segiddins) - Import changes from Bundler 1.17.3 release Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler` ## 2.0.0.pre.2 (2018-11-27) Breaking Changes: - `:github` source in the Gemfile now defaults to using HTTPS Changes - Add compatibility for Bundler merge into ruby-src Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler` ## 2.0.0.pre.1 (2018-11-09) Breaking Changes: - Dropped support for versions of Ruby < 2.3 - Dropped support for version of RubyGems < 2.5 - Moved error messages from STDOUT to STDERR Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`
This pull request was closed.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What was the end-user problem that led to this PR?
In ruby core, the bundled bundler was located same as rubylibdir. When user used the specific version of default gems like json, Bundler uses default gems under the rubylibdir, not a specific version.
Fixed https://bugs.ruby-lang.org/issues/15469
What was your diagnosis of the problem?
See the details: https://bugs.ruby-lang.org/issues/15469#note-4
What is your fix for the problem, implemented in this PR?
I avoid adding bundler directory from RUBYLIB environmental variable Because its directory was already added $LOAD_PATH.