Skip to content

Commit 9918ca1

Browse files
deivid-rodriguezhsbt
authored andcommitted
[rubygems/rubygems] Remove default_install_uses_path setting
The previous default can already be configured with `bundle config path.system true`. ruby/rubygems@cb483b79db
1 parent f609d33 commit 9918ca1

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

lib/bundler/feature_flag.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ def self.settings_method(name, key, &default)
2929

3030
settings_flag(:allow_offline_install) { bundler_4_mode? }
3131
settings_flag(:cache_all) { bundler_4_mode? }
32-
settings_flag(:default_install_uses_path) { bundler_4_mode? }
3332
settings_flag(:forget_cli_options) { bundler_4_mode? }
3433
settings_flag(:global_gem_cache) { bundler_4_mode? }
3534
settings_flag(:lockfile_checksums) { bundler_4_mode? }

lib/bundler/man/bundle-config.1

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ Whether Bundler should run \fBbundle clean\fR automatically after \fBbundle inst
7777
\fBconsole\fR (\fBBUNDLE_CONSOLE\fR)
7878
The console that \fBbundle console\fR starts\. Defaults to \fBirb\fR\.
7979
.TP
80-
\fBdefault_install_uses_path\fR (\fBBUNDLE_DEFAULT_INSTALL_USES_PATH\fR)
81-
Whether a \fBbundle install\fR without an explicit \fB\-\-path\fR argument defaults to installing gems in \fB\.bundle\fR\.
82-
.TP
8380
\fBdeployment\fR (\fBBUNDLE_DEPLOYMENT\fR)
8481
Equivalent to setting \fBfrozen\fR to \fBtrue\fR and \fBpath\fR to \fBvendor/bundle\fR\.
8582
.TP
@@ -144,7 +141,7 @@ Whether Bundler should leave outdated gems unpruned when caching\.
144141
A space\-separated list of groups to install only gems of the specified groups\.
145142
.TP
146143
\fBpath\fR (\fBBUNDLE_PATH\fR)
147-
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\.
144+
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\.
148145
.TP
149146
\fBpath\.system\fR (\fBBUNDLE_PATH__SYSTEM\fR)
150147
Whether Bundler will install gems into the default system path (\fBGem\.dir\fR)\.

lib/bundler/man/bundle-config.1.ronn

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
9999
explicitly configured.
100100
* `console` (`BUNDLE_CONSOLE`):
101101
The console that `bundle console` starts. Defaults to `irb`.
102-
* `default_install_uses_path` (`BUNDLE_DEFAULT_INSTALL_USES_PATH`):
103-
Whether a `bundle install` without an explicit `--path` argument defaults
104-
to installing gems in `.bundle`.
105102
* `deployment` (`BUNDLE_DEPLOYMENT`):
106103
Equivalent to setting `frozen` to `true` and `path` to `vendor/bundle`.
107104
* `disable_checksum_validation` (`BUNDLE_DISABLE_CHECKSUM_VALIDATION`):
@@ -166,7 +163,9 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
166163
* `path` (`BUNDLE_PATH`):
167164
The location on disk where all gems in your bundle will be located regardless
168165
of `$GEM_HOME` or `$GEM_PATH` values. Bundle gems not found in this location
169-
will be installed by `bundle install`. Defaults to `Gem.dir`.
166+
will be installed by `bundle install`. Defaults to `.bundle` relative to
167+
repository root in Bundler 4, and to the default system path (`Gem.dir`)
168+
before Bundler 4.
170169
* `path.system` (`BUNDLE_PATH__SYSTEM`):
171170
Whether Bundler will install gems into the default system path (`Gem.dir`).
172171
* `path_relative_to_cwd` (`BUNDLE_PATH_RELATIVE_TO_CWD`):

lib/bundler/settings.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class Settings
1212
cache_all
1313
cache_all_platforms
1414
clean
15-
default_install_uses_path
1615
deployment
1716
disable_checksum_validation
1817
disable_exec_load
@@ -275,7 +274,7 @@ def path
275274
def use_system_gems?
276275
return true if system_path
277276
return false if explicit_path
278-
!Bundler.feature_flag.default_install_uses_path?
277+
!Bundler.feature_flag.bundler_4_mode?
279278
end
280279

281280
def base_path

spec/bundler/support/path.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def home(*path)
136136
end
137137

138138
def default_bundle_path(*path)
139-
if Bundler.feature_flag.default_install_uses_path?
139+
if Bundler.feature_flag.bundler_4_mode?
140140
local_gem_path(*path)
141141
else
142142
system_gem_path(*path)

0 commit comments

Comments
 (0)