From fda9db6b3cd5af72f4d11927116ca5f027c16eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 21 Feb 2019 13:42:30 +0100 Subject: [PATCH] Rename major_deprecations to silence_deprecations --- lib/bundler/settings.rb | 4 ++-- lib/bundler/shared_helpers.rb | 2 +- man/bundle-config.ronn | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index 15c3ba18817..ff9a5f57af2 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -41,7 +41,6 @@ class Settings init_gems_rb list_command lockfile_uses_separate_rubygems_sources - major_deprecations no_install no_prune only_update_to_newer_versions @@ -52,6 +51,7 @@ class Settings prefer_patch print_only_version_number setup_makes_kernel_gem_public + silence_deprecations silence_root_warning skip_default_git_sources specific_platform @@ -76,7 +76,7 @@ class Settings ].freeze DEFAULT_CONFIG = { - :major_deprecations => true, + :silence_deprecations => false, :disable_version_check => true, :prefer_patch => false, :redirect => 5, diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index ba2808e034f..ed88caf8cfd 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -374,7 +374,7 @@ def resolve_path(path) def prints_major_deprecations? require "bundler" - return false unless Bundler.settings[:major_deprecations] + return false if Bundler.settings[:silence_deprecations] require "bundler/deprecate" return false if Bundler::Deprecate.skip true diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn index 64f0fea7438..0b61cbeca02 100644 --- a/man/bundle-config.ronn +++ b/man/bundle-config.ronn @@ -210,9 +210,6 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html). The number of gems Bundler can install in parallel. Defaults to 1. * `list_command` (`BUNDLE_LIST_COMMAND`) Enable new list command feature -* `major_deprecations` (`BUNDLE_MAJOR_DEPRECATIONS`): - Whether Bundler should print deprecation warnings for behavior that will - be changed in the next major version. * `no_install` (`BUNDLE_NO_INSTALL`): Whether `bundle package` should skip installing gems. * `no_prune` (`BUNDLE_NO_PRUNE`): @@ -247,6 +244,9 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html). * `shebang` (`BUNDLE_SHEBANG`): The program name that should be invoked for generated binstubs. Defaults to the ruby install name used to generate the binstub. +* `silence_deprecations` (`BUNDLE_SILENCE_DEPRECATIONS`): + Whether Bundler should silence deprecation warnings for behavior that will + be changed in the next major version. * `silence_root_warning` (`BUNDLE_SILENCE_ROOT_WARNING`): Silence the warning Bundler prints when installing gems as root. * `skip_default_git_sources` (`BUNDLE_SKIP_DEFAULT_GIT_SOURCES`):