archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[rubygems/rubygems] Remove default_install_uses_path setting

Browse source 
The previous default can already be configured with `bundle config
path.system true`.

cb483b79db
This commit is contained in:
David Rodríguez 2025-07-02 08:25:05 +02:00 • committed by Hiroshi SHIBATA
parent f609d3395e
commit 9918ca1671
5 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/bundler/feature_flag.rb
View file

@ -29,7 +29,6 @@ module Bundler
settings_flag(:allow_offline_install) { bundler_4_mode? } settings_flag(:allow_offline_install) { bundler_4_mode? }
settings_flag(:cache_all) { bundler_4_mode? } settings_flag(:cache_all) { bundler_4_mode? }
settings_flag(:default_install_uses_path) { bundler_4_mode? }
settings_flag(:forget_cli_options) { bundler_4_mode? } settings_flag(:forget_cli_options) { bundler_4_mode? }
settings_flag(:global_gem_cache) { bundler_4_mode? } settings_flag(:global_gem_cache) { bundler_4_mode? }
settings_flag(:lockfile_checksums) { bundler_4_mode? } settings_flag(:lockfile_checksums) { bundler_4_mode? }

5
lib/bundler/man/bundle-config.1
View file

@ -77,9 +77,6 @@ Whether Bundler should run \fBbundle clean\fR automatically after \fBbundle inst
\fBconsole\fR (\fBBUNDLE_CONSOLE\fR) \fBconsole\fR (\fBBUNDLE_CONSOLE\fR)
The console that \fBbundle console\fR starts\. Defaults to \fBirb\fR\. The console that \fBbundle console\fR starts\. Defaults to \fBirb\fR\.
.TP .TP
\fBdefault_install_uses_path\fR (\fBBUNDLE_DEFAULT_INSTALL_USES_PATH\fR)
Whether a \fBbundle install\fR without an explicit \fB\-\-path\fR argument defaults to installing gems in \fB\.bundle\fR\.
.TP
\fBdeployment\fR (\fBBUNDLE_DEPLOYMENT\fR) \fBdeployment\fR (\fBBUNDLE_DEPLOYMENT\fR)
Equivalent to setting \fBfrozen\fR to \fBtrue\fR and \fBpath\fR to \fBvendor/bundle\fR\. Equivalent to setting \fBfrozen\fR to \fBtrue\fR and \fBpath\fR to \fBvendor/bundle\fR\.
.TP .TP
@ -144,7 +141,7 @@ Whether Bundler should leave outdated gems unpruned when caching\.
A space\-separated list of groups to install only gems of the specified groups\. A space\-separated list of groups to install only gems of the specified groups\.
.TP .TP
\fBpath\fR (\fBBUNDLE_PATH\fR) \fBpath\fR (\fBBUNDLE_PATH\fR)
The location on disk where all gems in your bundle will be located regardless of \fB$GEM_HOME\fR or \fB$GEM_PATH\fR values\. Bundle gems not found in this location will be installed by \fBbundle install\fR\. Defaults to \fBGem\.dir\fR\. The location on disk where all gems in your bundle will be located regardless of \fB$GEM_HOME\fR or \fB$GEM_PATH\fR values\. Bundle gems not found in this location will be installed by \fBbundle install\fR\. Defaults to \fB\.bundle\fR relative to repository root in Bundler 4, and to the default system path (\fBGem\.dir\fR) before Bundler 4\.
.TP .TP
\fBpath\.system\fR (\fBBUNDLE_PATH__SYSTEM\fR) \fBpath\.system\fR (\fBBUNDLE_PATH__SYSTEM\fR)
Whether Bundler will install gems into the default system path (\fBGem\.dir\fR)\. Whether Bundler will install gems into the default system path (\fBGem\.dir\fR)\.

7
lib/bundler/man/bundle-config.1.ronn
View file

@ -99,9 +99,6 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
explicitly configured. explicitly configured.
* `console` (`BUNDLE_CONSOLE`): * `console` (`BUNDLE_CONSOLE`):
The console that `bundle console` starts. Defaults to `irb`. The console that `bundle console` starts. Defaults to `irb`.
* `default_install_uses_path` (`BUNDLE_DEFAULT_INSTALL_USES_PATH`):
Whether a `bundle install` without an explicit `--path` argument defaults
to installing gems in `.bundle`.
* `deployment` (`BUNDLE_DEPLOYMENT`): * `deployment` (`BUNDLE_DEPLOYMENT`):
Equivalent to setting `frozen` to `true` and `path` to `vendor/bundle`. Equivalent to setting `frozen` to `true` and `path` to `vendor/bundle`.
* `disable_checksum_validation` (`BUNDLE_DISABLE_CHECKSUM_VALIDATION`): * `disable_checksum_validation` (`BUNDLE_DISABLE_CHECKSUM_VALIDATION`):
@ -166,7 +163,9 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
* `path` (`BUNDLE_PATH`): * `path` (`BUNDLE_PATH`):
The location on disk where all gems in your bundle will be located regardless The location on disk where all gems in your bundle will be located regardless
of `$GEM_HOME` or `$GEM_PATH` values. Bundle gems not found in this location of `$GEM_HOME` or `$GEM_PATH` values. Bundle gems not found in this location
will be installed by `bundle install`. Defaults to `Gem.dir`. will be installed by `bundle install`. Defaults to `.bundle` relative to
repository root in Bundler 4, and to the default system path (`Gem.dir`)
before Bundler 4.
* `path.system` (`BUNDLE_PATH__SYSTEM`): * `path.system` (`BUNDLE_PATH__SYSTEM`):
Whether Bundler will install gems into the default system path (`Gem.dir`). Whether Bundler will install gems into the default system path (`Gem.dir`).
* `path_relative_to_cwd` (`BUNDLE_PATH_RELATIVE_TO_CWD`): * `path_relative_to_cwd` (`BUNDLE_PATH_RELATIVE_TO_CWD`):

3
lib/bundler/settings.rb
View file

@ -12,7 +12,6 @@ module Bundler
cache_all cache_all
cache_all_platforms cache_all_platforms
clean clean
default_install_uses_path
deployment deployment
disable_checksum_validation disable_checksum_validation
disable_exec_load disable_exec_load
@ -275,7 +274,7 @@ module Bundler
def use_system_gems? def use_system_gems?
return true if system_path return true if system_path
return false if explicit_path return false if explicit_path
!Bundler.feature_flag.default_install_uses_path? !Bundler.feature_flag.bundler_4_mode?
end end
def base_path def base_path

2
spec/bundler/support/path.rb
View file

@ -136,7 +136,7 @@ module Spec
end end
def default_bundle_path(*path) def default_bundle_path(*path)
if Bundler.feature_flag.default_install_uses_path? if Bundler.feature_flag.bundler_4_mode?
local_gem_path(*path) local_gem_path(*path)
else else
system_gem_path(*path) system_gem_path(*path)