ruby-changes:57787
From: David <ko1@a...>
Date: Wed, 18 Sep 2019 21:31:42 +0900 (JST)
Subject: [ruby-changes:57787] f18d88b535 (master): [bundler/bundler] Revert "Remove now meaningless setting"
https://git.ruby-lang.org/ruby.git/commit/?id=f18d88b535 From f18d88b5356d347304245c703329b82293f56efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Wed, 21 Aug 2019 20:52:25 +0200 Subject: [bundler/bundler] Revert "Remove now meaningless setting" This reverts commit 52c5a0eedec34b5d86464b3cf135dc2002486f1d. https://github.com/bundler/bundler/commit/b4cc36deb9 diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb index c7c58de..dbf737c 100644 --- a/lib/bundler/inline.rb +++ b/lib/bundler/inline.rb @@ -58,7 +58,7 @@ def gemfile(install = false, options = {}, &gemfile) https://github.com/ruby/ruby/blob/trunk/lib/bundler/inline.rb#L58 Bundler.ui = ui if install if install || missing_specs.call - Bundler.settings.temporary(:inline => true) do + Bundler.settings.temporary(:inline => true, :disable_platform_warnings => true) do installer = Bundler::Installer.install(Bundler.root, definition, :system => true) installer.post_install_messages.each do |name, message| Bundler.ui.info "Post-install message from #{name}:\n#{message}" diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index 166e494..2074070 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -24,6 +24,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/settings.rb#L24 disable_exec_load disable_local_branch_check disable_multisource + disable_platform_warnings disable_shared_gems disable_version_check force_ruby_platform diff --git a/man/bundle-config.1 b/man/bundle-config.1 index c415763..eda7379 100644 --- a/man/bundle-config.1 +++ b/man/bundle-config.1 @@ -187,6 +187,9 @@ The following is a list of all configuration keys and their purpose\. You can le https://github.com/ruby/ruby/blob/trunk/man/bundle-config.1#L187 \fBdisable_multisource\fR (\fBBUNDLE_DISABLE_MULTISOURCE\fR): When set, Gemfiles containing multiple sources will produce errors instead of warnings\. Use \fBbundle config unset disable_multisource\fR to unset\. . .IP "\(bu" 4 +\fBdisable_platform_warnings\fR (\fBBUNDLE_DISABLE_PLATFORM_WARNINGS\fR): Disable warnings during bundle install when a dependency is unused on the current platform\. +. +.IP "\(bu" 4 \fBdisable_shared_gems\fR (\fBBUNDLE_DISABLE_SHARED_GEMS\fR): Stop Bundler from accessing gems installed to RubyGems\' normal location\. . .IP "\(bu" 4 diff --git a/man/bundle-config.1.txt b/man/bundle-config.1.txt index 66a953b..e4570be 100644 --- a/man/bundle-config.1.txt +++ b/man/bundle-config.1.txt @@ -213,6 +213,10 @@ LIST OF AVAILABLE KEYS https://github.com/ruby/ruby/blob/trunk/man/bundle-config.1.txt#L213 files containing multiple sources will produce errors instead of warnings. Use bundle config unset disable_multisource to unset. + o disable_platform_warnings (BUNDLE_DISABLE_PLATFORM_WARNINGS): Dis- + able warnings during bundle install when a dependency is unused on + the current platform. + o disable_shared_gems (BUNDLE_DISABLE_SHARED_GEMS): Stop Bundler from accessing gems installed to RubyGems' normal location. diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn index 069f3b9..75b389e 100644 --- a/man/bundle-config.ronn +++ b/man/bundle-config.ronn @@ -179,6 +179,8 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html). https://github.com/ruby/ruby/blob/trunk/man/bundle-config.ronn#L179 When set, Gemfiles containing multiple sources will produce errors instead of warnings. Use `bundle config unset disable_multisource` to unset. +* `disable_platform_warnings` (`BUNDLE_DISABLE_PLATFORM_WARNINGS`): + Disable warnings during bundle install when a dependency is unused on the current platform. * `disable_shared_gems` (`BUNDLE_DISABLE_SHARED_GEMS`): Stop Bundler from accessing gems installed to RubyGems' normal location. * `disable_version_check` (`BUNDLE_DISABLE_VERSION_CHECK`): -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/