diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 00ee5917317..3dc90c04dc9 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -487,7 +487,7 @@ def open(name) Open.new(options, name).run end - if Bundler.feature_flag.console_command? + unless Bundler.feature_flag.bundler_3_mode? desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded" def console(group = nil) require "bundler/cli/console" @@ -524,7 +524,7 @@ def licenses end end - if Bundler.feature_flag.viz_command? + unless Bundler.feature_flag.bundler_3_mode? desc "viz [OPTIONS]", "Generates a visual dependency graph", :hide => true long_desc <<-D Viz generates a PNG file of the current Gemfile as a dependency graph. diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb index 5e5d97ec422..6347e46900d 100644 --- a/lib/bundler/feature_flag.rb +++ b/lib/bundler/feature_flag.rb @@ -33,7 +33,6 @@ def self.settings_method(name, key, &default) settings_flag(:auto_config_jobs) { bundler_2_mode? } settings_flag(:cache_all) { bundler_2_mode? } settings_flag(:cache_command_is_package) { bundler_2_mode? } - settings_flag(:console_command) { !bundler_3_mode? } settings_flag(:default_install_uses_path) { bundler_2_mode? } settings_flag(:deployment_means_frozen) { bundler_2_mode? } settings_flag(:disable_multisource) { bundler_2_mode? } @@ -56,7 +55,6 @@ def self.settings_method(name, key, &default) settings_flag(:unlock_source_unlocks_spec) { !bundler_2_mode? } settings_flag(:update_requires_all_flag) { bundler_3_mode? } settings_flag(:use_gem_version_promoter_for_major_updates) { bundler_2_mode? } - settings_flag(:viz_command) { !bundler_3_mode? } settings_option(:default_cli_command) { bundler_2_mode? ? :cli_help : :install } diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index 3bec5c8c3bd..a1c0825d39d 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -18,7 +18,6 @@ class Settings cache_all cache_all_platforms cache_command_is_package - console_command default_install_uses_path deployment deployment_means_frozen @@ -60,7 +59,6 @@ class Settings unlock_source_unlocks_spec update_requires_all_flag use_gem_version_promoter_for_major_updates - viz_command ].freeze NUMBER_KEYS = %w[ diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb index 3ae22e4adb8..c9df9006475 100644 --- a/spec/quality_spec.rb +++ b/spec/quality_spec.rb @@ -167,7 +167,6 @@ def check_for_specific_pronouns(filename) exemptions = %w[ auto_config_jobs cache_command_is_package - console_command deployment_means_frozen forget_cli_options gem.coc @@ -176,7 +175,6 @@ def check_for_specific_pronouns(filename) inline lockfile_uses_separate_rubygems_sources use_gem_version_promoter_for_major_updates - viz_command ] all_settings = Hash.new {|h, k| h[k] = [] }