summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2025-10-10 15:30:31 +0900
committergit <svn-admin@ruby-lang.org>2025-10-10 07:59:34 +0000
commitaac6f0681536c8ca58638714c2cc8d7e35aa6a37 (patch)
treea8856cd67d8268e8929c9c9bfede31a5474c6a88
parentb38846db18c34213077a9efaa7b28683b42f12a3 (diff)
[rubygems/rubygems] Make default_cli_command flag to settings
https://github.com/rubygems/rubygems/commit/31d67ecc05
-rw-r--r--lib/bundler/cli.rb2
-rw-r--r--lib/bundler/feature_flag.rb2
-rw-r--r--lib/bundler/settings.rb1
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 6ee6bc76ae..62225a352d 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -107,7 +107,7 @@ module Bundler
shell.say
self.class.send(:class_options_help, shell)
end
- default_task(Bundler.feature_flag.default_cli_command)
+ default_task(Bundler.settings[:default_cli_command])
class_option "no-color", type: :boolean, desc: "Disable colorization in output"
class_option "retry", type: :numeric, aliases: "-r", banner: "NUM",
diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb
index c3b8d790fb..593d704e2b 100644
--- a/lib/bundler/feature_flag.rb
+++ b/lib/bundler/feature_flag.rb
@@ -29,8 +29,6 @@ module Bundler
settings_flag(:update_requires_all_flag) { bundler_5_mode? }
- settings_option(:default_cli_command) { bundler_4_mode? ? :cli_help : :install }
-
def removed_major?(target_major_version)
@major_version > target_major_version
end
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index 64f0c9900e..b6bc6c5a8a 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -83,6 +83,7 @@ module Bundler
"BUNDLE_VERSION" => "lockfile",
"BUNDLE_LOCKFILE_CHECKSUMS" => true,
"BUNDLE_CACHE_ALL" => true,
+ "BUNDLE_DEFAULT_CLI_COMMAND" => "cli_help",
"BUNDLE_PLUGINS" => true,
"BUNDLE_GLOBAL_GEM_CACHE" => false,
}.freeze