Skip to content

Commit aac6f06

Browse files
hsbtmatzbot
authored andcommitted
[rubygems/rubygems] Make default_cli_command flag to settings
ruby/rubygems@31d67ecc05
1 parent b38846d commit aac6f06

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

lib/bundler/cli.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def cli_help
107107
shell.say
108108
self.class.send(:class_options_help, shell)
109109
end
110-
default_task(Bundler.feature_flag.default_cli_command)
110+
default_task(Bundler.settings[:default_cli_command])
111111

112112
class_option "no-color", type: :boolean, desc: "Disable colorization in output"
113113
class_option "retry", type: :numeric, aliases: "-r", banner: "NUM",

lib/bundler/feature_flag.rb

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

3030
settings_flag(:update_requires_all_flag) { bundler_5_mode? }
3131

32-
settings_option(:default_cli_command) { bundler_4_mode? ? :cli_help : :install }
33-
3432
def removed_major?(target_major_version)
3533
@major_version > target_major_version
3634
end

lib/bundler/settings.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ class Settings
8383
"BUNDLE_VERSION" => "lockfile",
8484
"BUNDLE_LOCKFILE_CHECKSUMS" => true,
8585
"BUNDLE_CACHE_ALL" => true,
86+
"BUNDLE_DEFAULT_CLI_COMMAND" => "cli_help",
8687
"BUNDLE_PLUGINS" => true,
8788
"BUNDLE_GLOBAL_GEM_CACHE" => false,
8889
}.freeze

0 commit comments

Comments
 (0)