Skip to content
This repository was archived by the owner on Apr 14, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/bundler/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions lib/bundler/feature_flag.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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? }
Expand All @@ -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 }

Expand Down
2 changes: 0 additions & 2 deletions lib/bundler/settings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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[
Expand Down
2 changes: 0 additions & 2 deletions spec/quality_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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] = [] }
Expand Down