Merge Bundler 2.0.1 from upstream.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 30 insertions, 29 deletions

diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb
index 249170c4b2..e5b4e84063 100644
--- a/lib/bundler/feature_flag.rb
+++ b/lib/bundler/feature_flag.rb
@@ -27,38 +27,39 @@ module Bundler
 
     (1..10).each {|v| define_method("bundler_#{v}_mode?") { major_version >= v } }
 
-    settings_flag(:allow_bundler_dependency_conflicts) { bundler_2_mode? }
-    settings_flag(:allow_offline_install) { bundler_2_mode? }
-    settings_flag(:auto_clean_without_path) { bundler_2_mode? }
-    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_2_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? }
+    settings_flag(:allow_bundler_dependency_conflicts) { bundler_3_mode? }
+    settings_flag(:allow_offline_install) { bundler_3_mode? }
+    settings_flag(:auto_clean_without_path) { bundler_3_mode? }
+    settings_flag(:auto_config_jobs) { bundler_3_mode? }
+    settings_flag(:cache_all) { bundler_3_mode? }
+    settings_flag(:cache_command_is_package) { bundler_3_mode? }
+    settings_flag(:console_command) { !bundler_3_mode? }
+    settings_flag(:default_install_uses_path) { bundler_3_mode? }
+    settings_flag(:deployment_means_frozen) { bundler_3_mode? }
+    settings_flag(:disable_multisource) { bundler_3_mode? }
     settings_flag(:error_on_stderr) { bundler_2_mode? }
-    settings_flag(:forget_cli_options) { bundler_2_mode? }
-    settings_flag(:global_path_appends_ruby_scope) { bundler_2_mode? }
-    settings_flag(:global_gem_cache) { bundler_2_mode? }
-    settings_flag(:init_gems_rb) { bundler_2_mode? }
-    settings_flag(:list_command) { bundler_2_mode? }
-    settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_2_mode? }
-    settings_flag(:only_update_to_newer_versions) { bundler_2_mode? }
-    settings_flag(:path_relative_to_cwd) { bundler_2_mode? }
+    settings_flag(:forget_cli_options) { bundler_3_mode? }
+    settings_flag(:global_path_appends_ruby_scope) { bundler_3_mode? }
+    settings_flag(:global_gem_cache) { bundler_3_mode? }
+    settings_flag(:init_gems_rb) { bundler_3_mode? }
+    settings_flag(:list_command) { bundler_3_mode? }
+    settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_3_mode? }
+    settings_flag(:lockfile_upgrade_warning) { bundler_3_mode? }
+    settings_flag(:only_update_to_newer_versions) { bundler_3_mode? }
+    settings_flag(:path_relative_to_cwd) { bundler_3_mode? }
     settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
-    settings_flag(:prefer_gems_rb) { bundler_2_mode? }
-    settings_flag(:print_only_version_number) { bundler_2_mode? }
-    settings_flag(:setup_makes_kernel_gem_public) { !bundler_2_mode? }
-    settings_flag(:skip_default_git_sources) { bundler_2_mode? }
-    settings_flag(:specific_platform) { bundler_2_mode? }
-    settings_flag(:suppress_install_using_messages) { bundler_2_mode? }
-    settings_flag(:unlock_source_unlocks_spec) { !bundler_2_mode? }
-    settings_flag(:update_requires_all_flag) { bundler_2_mode? }
-    settings_flag(:use_gem_version_promoter_for_major_updates) { bundler_2_mode? }
-    settings_flag(:viz_command) { !bundler_2_mode? }
+    settings_flag(:prefer_gems_rb) { bundler_3_mode? }
+    settings_flag(:print_only_version_number) { bundler_3_mode? }
+    settings_flag(:setup_makes_kernel_gem_public) { !bundler_3_mode? }
+    settings_flag(:skip_default_git_sources) { bundler_3_mode? }
+    settings_flag(:specific_platform) { bundler_3_mode? }
+    settings_flag(:suppress_install_using_messages) { bundler_3_mode? }
+    settings_flag(:unlock_source_unlocks_spec) { !bundler_3_mode? }
+    settings_flag(:update_requires_all_flag) { bundler_3_mode? }
+    settings_flag(:use_gem_version_promoter_for_major_updates) { bundler_3_mode? }
+    settings_flag(:viz_command) { !bundler_3_mode? }
 
-    settings_option(:default_cli_command) { bundler_2_mode? ? :cli_help : :install }
+    settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install }
 
     settings_method(:github_https?, "github.https") { bundler_2_mode? }