[2.0] Suppress Using … messages during installation when a version has not changed

lib/bundler/feature_flag.rb

@@ -37,6 +37,7 @@ def self.settings_method(name, key, &default)
     settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
     settings_flag(:prefer_gems_rb) { bundler_2_mode? }
     settings_flag(:skip_default_git_sources) { 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? }
 

lib/bundler/settings.rb

@@ -35,6 +35,7 @@ class Settings
       prefer_gems_rb
       silence_root_warning
       skip_default_git_sources
+      suppress_install_using_messages
       unlock_source_unlocks_spec
       update_requires_all_flag
     ].freeze

lib/bundler/source.rb

@@ -60,5 +60,13 @@ def version_color(spec_version, locked_spec_version)
     def earlier_version?(spec_version, locked_spec_version)
       Gem::Version.new(spec_version) < Gem::Version.new(locked_spec_version)
     end
+
+    def print_using_message(message)
+      if !message.include?("(was ") && Bundler.feature_flag.suppress_install_using_messages?
+        Bundler.ui.debug message
+      else
+        Bundler.ui.info message
+      end
+    end
   end
 end

lib/bundler/source/git.rb

@@ -169,7 +169,7 @@ def specs(*)
       def install(spec, options = {})
         force = options[:force]
 
-        Bundler.ui.info "Using #{version_message(spec)} from #{self}"
+        print_using_message "Using #{version_message(spec)} from #{self}"
 
         if requires_checkout? && !@copied && !force
           Bundler.ui.debug "  * Checking out revision: #{ref}"

lib/bundler/source/metadata.rb

@@ -36,7 +36,7 @@ def options
       end
 
       def install(spec, _opts = {})
-        Bundler.ui.info "Using #{version_message(spec)}"
+        print_using_message "Using #{version_message(spec)}"
         nil
       end
 

lib/bundler/source/path.rb

@@ -76,7 +76,7 @@ def name
       end
 
       def install(spec, options = {})
-        Bundler.ui.info "Using #{version_message(spec)} from #{self}"
+        print_using_message "Using #{version_message(spec)} from #{self}"
         generate_bin(spec, :disable_extensions => true)
         nil # no post-install message
       end

lib/bundler/source/rubygems.rb

@@ -106,7 +106,7 @@ def install(spec, opts = {})
         end
 
         if installed?(spec) && !force
-          Bundler.ui.info "Using #{version_message(spec)}"
+          print_using_message "Using #{version_message(spec)}"
           return nil # no post-install message
         end
 

man/bundle-config.ronn

@@ -243,6 +243,9 @@ learn more about their operation in [bundle install(1)][bundle-install].
 * `skip_default_git_sources` (`BUNDLE_SKIP_DEFAULT_GIT_SOURCES`):
    Whether Bundler should skip adding default git source shortcuts to the
    Gemfile DSL.
+* `suppress_install_using_messages` (`BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES`):
+   Avoid printing `Using ...` messages during installation when the version of
+   a gem has not changed.
 
 In general, you should set these settings per-application by using the applicable
 flag to the [bundle install(1)][bundle-install] or [bundle package(1)][bundle-package] command.

spec/commands/pristine_spec.rb

@@ -116,7 +116,6 @@
       foo_changes_txt = Pathname.new(foo.full_gem_path).join("lib/changes.txt")
       FileUtils.touch(foo_changes_txt)
       expect(foo_changes_txt).to be_file
-      foo_ref = Spec::Builders::GitReader.new(lib_path("foo")).ref_for("HEAD", 6)
 
       bar = Bundler.definition.specs["bar"].first
       bar_changes_txt = Pathname.new(bar.full_gem_path).join("lib/changes.txt")
@@ -130,11 +129,9 @@
 
       bundle! "pristine foo bar weakling"
 
-      expect(out).to eq(strip_whitespace(<<-EOS).strip)
-        Cannot pristine bar (1.0). Gem is sourced from local path.
-        Using foo 1.0 from #{lib_path("foo")} (at master@#{foo_ref})
-        Installing weakling 1.0
-      EOS
+      expect(out).to include("Cannot pristine bar (1.0). Gem is sourced from local path.").
+        and include("Installing weakling 1.0")
+
       expect(weakling_changes_txt).not_to be_file
       expect(foo_changes_txt).not_to be_file
       expect(bar_changes_txt).to be_file

spec/commands/update_spec.rb

@@ -430,7 +430,7 @@
 end
 
 RSpec.describe "bundle update" do
-  it "shows the previous version of the gem when updated from rubygems source" do
+  it "shows the previous version of the gem when updated from rubygems source", :bundler => "< 2" do
     build_repo2
 
     install_gemfile <<-G
@@ -449,6 +449,40 @@
     expect(out).to include("Installing activesupport 3.0 (was 2.3.5)")
   end
 
+  context "with suppress_install_using_messages set" do
+    before { bundle! "config suppress_install_using_messages true" }
+
+    it "only prints `Using` for versions that have changed" do
+      build_repo4 do
+        build_gem "bar"
+        build_gem "foo"
+      end
+
+      install_gemfile! <<-G
+        source "file://#{gem_repo4}"
+        gem "bar"
+        gem "foo"
+      G
+
+      bundle! "update", :all => bundle_update_requires_all?
+      out.gsub!(/RubyGems [\d\.]+ is not threadsafe.*\n?/, "")
+      expect(out).to include "Resolving dependencies...\nBundle updated!"
+
+      update_repo4 do
+        build_gem "foo", "2.0"
+      end
+
+      bundle! "update", :all => bundle_update_requires_all?
+      out.gsub!(/RubyGems [\d\.]+ is not threadsafe.*\n?/, "")
+      expect(out).to include strip_whitespace(<<-EOS).strip
+        Resolving dependencies...
+        Fetching foo 2.0 (was 1.0)
+        Installing foo 2.0 (was 1.0)
+        Bundle updated
+      EOS
+    end
+  end
+
   it "shows error message when Gemfile.lock is not preset and gem is specified" do
     install_gemfile <<-G
       source "file://#{gem_repo2}"

spec/install/deploy_spec.rb

@@ -312,15 +312,13 @@
       expect(bundled_app("vendor/cache/foo")).to be_directory
 
       bundle! "install --local"
-      expect(out).to include("Using foo 1.0 from source at")
-      expect(out).to include("vendor/cache/foo")
+      expect(out).to include("Updating files in vendor/cache")
 
       simulate_new_machine
       bundle! "install --deployment --verbose"
       expect(out).not_to include("You are trying to install in deployment mode after changing your Gemfile")
       expect(out).not_to include("You have added to the Gemfile")
       expect(out).not_to include("You have deleted from the Gemfile")
-      expect(out).to include("Using foo 1.0 from source at")
       expect(out).to include("vendor/cache/foo")
       expect(the_bundle).to include_gems "foo 1.0"
     end

spec/install/force_spec.rb

@@ -17,7 +17,6 @@
       bundle "install --force"
 
       expect(exitstatus).to eq(0) if exitstatus
-      expect(out).to include "Using bundler"
       expect(out).to include "Installing rack 1.0.0"
       expect(rack_lib.open(&:read)).to eq("RACK = '1.0.0'\n")
       expect(the_bundle).to include_gems "rack 1.0.0"
@@ -27,7 +26,6 @@
       bundle "install --force"
 
       expect(exitstatus).to eq(0) if exitstatus
-      expect(out).to include "Using bundler"
       expect(out).to include "Installing rack 1.0.0"
       expect(the_bundle).to include_gems "rack 1.0.0"
     end
@@ -48,17 +46,13 @@
         foo_lib.open("w") {|f| f.write("blah blah blah") }
         bundle! "install --force"
 
-        expect(out).to include "Using bundler"
-        expect(out).to include "Using foo 1.0 from #{lib_path("foo-1.0")} (at master@#{ref[0, 7]})"
         expect(foo_lib.open(&:read)).to eq("FOO = '1.0'\n")
         expect(the_bundle).to include_gems "foo 1.0"
       end
 
       it "works on first bundle install" do
         bundle! "install --force"
 
-        expect(out).to include "Using bundler"
-        expect(out).to include "Using foo 1.0 from #{lib_path("foo-1.0")} (at master@#{ref[0, 7]})"
         expect(the_bundle).to include_gems "foo 1.0"
       end
     end

spec/install/gemfile/eval_gemfile_spec.rb

@@ -20,8 +20,9 @@
         eval_gemfile 'Gemfile-other'
       G
       expect(out).to include("Resolving dependencies")
-      expect(out).to include("Using gunks 0.0.1 from source at `gems/gunks`")
       expect(out).to include("Bundle complete")
+
+      expect(the_bundle).to include_gem "gunks 0.0.1", :source => "path@#{bundled_app("gems", "gunks")}"
     end
   end
 
@@ -52,8 +53,9 @@
         gemspec :path => 'gems/gunks'
       G
       expect(out).to include("Resolving dependencies")
-      expect(out).to include("Using gunks 0.0.1 from source at `gems/gunks`")
       expect(out).to include("Bundle complete")
+
+      expect(the_bundle).to include_gem "gunks 0.0.1", :source => "path@#{bundled_app("gems", "gunks")}"
     end
   end
 end

spec/install/gemfile/git_spec.rb

@@ -397,9 +397,8 @@
         gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
       G
 
-      bundle %(config local.rack #{lib_path("local-rack")})
-      bundle :install
-      expect(out).to match(/at #{lib_path('local-rack')}/)
+      bundle! %(config local.rack #{lib_path("local-rack")})
+      bundle! :install
 
       run "require 'rack'"
       expect(out).to eq("LOCAL")

spec/install/gems/native_extensions_spec.rb

@@ -83,7 +83,6 @@
     G
 
     expect(out).not_to include("extconf.rb failed")
-    expect(out).to include("Using c_extension 1.0")
 
     run! "Bundler.require; puts CExtension.new.its_true"
     expect(out).to eq("true")

spec/install/git_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe "bundle install" do
   context "git sources" do
-    it "displays the revision hash of the gem repository" do
+    it "displays the revision hash of the gem repository", :bundler => "< 2" do
       build_git "foo", "1.0", :path => lib_path("foo")
 
       install_gemfile <<-G
@@ -14,7 +14,7 @@
       expect(the_bundle).to include_gems "foo 1.0", :source => "git@#{lib_path("foo")}"
     end
 
-    it "displays the ref of the gem repository when using branch~num as a ref" do
+    it "displays the ref of the gem repository when using branch~num as a ref", :bundler => "< 2" do
       build_git "foo", "1.0", :path => lib_path("foo")
       rev = revision_for(lib_path("foo"))[0..6]
       update_git "foo", "2.0", :path => lib_path("foo"), :gemspec => true

spec/runtime/setup_spec.rb

@@ -529,8 +529,7 @@ def clean_load_path(lp)
       G
 
       bundle %(config local.rack #{lib_path("local-rack")})
-      bundle :install
-      expect(out).to match(/at #{lib_path('local-rack')}/)
+      bundle! :install
 
       FileUtils.rm_rf(lib_path("local-rack"))
       run "require 'rack'"
@@ -548,8 +547,7 @@ def clean_load_path(lp)
       G
 
       bundle %(config local.rack #{lib_path("local-rack")})
-      bundle :install
-      expect(out).to match(/at #{lib_path('local-rack')}/)
+      bundle! :install
 
       gemfile <<-G
         source "file://#{gem_repo1}"
@@ -571,8 +569,7 @@ def clean_load_path(lp)
       G
 
       bundle %(config local.rack #{lib_path("local-rack")})
-      bundle :install
-      expect(out).to match(/at #{lib_path('local-rack')}/)
+      bundle! :install
 
       gemfile <<-G
         source "file://#{gem_repo1}"

spec/update/git_spec.rb

@@ -27,12 +27,11 @@
         s.add_dependency "activesupport", "= 3.0"
       end
 
-      install_gemfile <<-G
+      install_gemfile! <<-G
         gem "rails", :git => "#{lib_path("rails")}"
       G
 
-      bundle "update rails"
-      expect(out).to include("Using activesupport 3.0 from #{lib_path("rails")} (at master@#{revision_for(lib_path("rails"))[0..6]})")
+      bundle! "update rails"
       expect(the_bundle).to include_gems "rails 3.0", "activesupport 3.0"
     end