diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-10-29 13:13:18 +0100 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-11-06 17:05:54 +0100 |
commit | 72ee2dff9501e4dadd70a5875286be442bbd28b7 (patch) | |
tree | 9804ec3dd603c50d865b7b23e741e8e2aa030d1e | |
parent | 0070d9fdddc027c0ee17662a1617e05b17331171 (diff) | |
download | bundler-rubygems_gemdeps.tar.gz |
Revert warning when RUBYGEMS_GEMDEPS activatedrubygems_gemdeps
Currently RUBYGEMS_GEMDEPS simply requires `bundler/setup`, so there's
no conflict. Probably the conflict that was meant was when using `gem
install -g` experimental Gemfile mode, that could indeed potentially
lead to a different resolution, but that's not tied to RUBYGEMS_GEMDEPS
at the moment.
-rw-r--r-- | lib/bundler/cli.rb | 8 | ||||
-rw-r--r-- | spec/bundler/cli_spec.rb | 16 |
2 files changed, 0 insertions, 24 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index ee4888329a..96f4d7ac0e 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -72,14 +72,6 @@ module Bundler Bundler.ui = UI::Shell.new(options) Bundler.ui.level = "debug" if options["verbose"] unprinted_warnings.each {|w| Bundler.ui.warn(w) } - - if ENV["RUBYGEMS_GEMDEPS"] && !ENV["RUBYGEMS_GEMDEPS"].empty? - Bundler.ui.warn( - "The RUBYGEMS_GEMDEPS environment variable is set. This enables RubyGems' " \ - "experimental Gemfile mode, which may conflict with Bundler and cause unexpected errors. " \ - "To remove this warning, unset RUBYGEMS_GEMDEPS.", :wrap => true - ) - end end check_unknown_options!(:except => [:config, :exec]) diff --git a/spec/bundler/cli_spec.rb b/spec/bundler/cli_spec.rb index ddcd699d6c..fa27f6dac3 100644 --- a/spec/bundler/cli_spec.rb +++ b/spec/bundler/cli_spec.rb @@ -102,22 +102,6 @@ RSpec.describe "bundle executable" do end end - context "when ENV['RUBYGEMS_GEMDEPS'] is set" do - it "displays a warning" do - gemfile bundled_app("Gemfile"), <<-G - source "#{file_uri_for(gem_repo1)}" - gem 'rack' - G - - bundle :install, :env => { "RUBYGEMS_GEMDEPS" => "foo" } - expect(err).to include("RUBYGEMS_GEMDEPS") - expect(err).to include("conflict with Bundler") - - bundle :install, :env => { "RUBYGEMS_GEMDEPS" => "" } - expect(err).not_to include("RUBYGEMS_GEMDEPS") - end - end - context "with --verbose" do it "prints the running command" do gemfile "" |