From fcfaf43e272b137ccdd3ea08b6e944cb46d7ffef Mon Sep 17 00:00:00 2001
From: Samuel Giddins <segiddins@segiddins.me>
Date: Wed, 12 Apr 2017 12:01:14 -0500
Subject: [Pristine] Skip the bundler gem

Since Source::Rubygems will never re-install it
---
 lib/bundler/cli/pristine.rb    |  8 +++++---
 lib/bundler/source/rubygems.rb |  6 ++++--
 spec/commands/pristine_spec.rb | 10 ++++++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lib/bundler/cli/pristine.rb b/lib/bundler/cli/pristine.rb
index c7d8dcfdf5..30542b583e 100644
--- a/lib/bundler/cli/pristine.rb
+++ b/lib/bundler/cli/pristine.rb
@@ -4,7 +4,9 @@ require "bundler/cli/common"
 module Bundler
   class CLI::Pristine
     def run
-      ::Bundler.load.specs.each do |spec|
+      Bundler.load.specs.each do |spec|
+        next if spec.name == "bundler" # Source::Rubygems doesn't install bundler
+
         gem_name = "#{spec.name} (#{spec.version}#{spec.git_version})"
         gem_name += " (#{spec.platform})" if !spec.platform.nil? && spec.platform != Gem::Platform::RUBY
 
@@ -12,7 +14,7 @@ module Bundler
         when Source::Rubygems
           cached_gem = spec.cache_file
           unless File.exist?(cached_gem)
-            ::Bundler.ui.error("Failed to pristine #{gem_name}. Cached gem #{cached_gem} does not exist.")
+            Bundler.ui.error("Failed to pristine #{gem_name}. Cached gem #{cached_gem} does not exist.")
             next
           end
 
@@ -23,7 +25,7 @@ module Bundler
           git_source.remote!
           git_source.install(spec, :force => true)
         else
-          ::Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is sourced from local path.")
+          Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is sourced from local path.")
         end
       end
     end
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index 8c592cb727..353194f53f 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -289,8 +289,10 @@ module Bundler
           idx = Index.new
           have_bundler = false
           Bundler.rubygems.all_specs.reverse_each do |spec|
-            next if spec.name == "bundler" && spec.version.to_s != VERSION
-            have_bundler = true if spec.name == "bundler"
+            if spec.name == "bundler"
+              next unless spec.version.to_s == VERSION
+              have_bundler = true
+            end
             spec.source = self
             if Bundler.rubygems.spec_missing_extensions?(spec, false)
               Bundler.ui.debug "Source #{self} is ignoring #{spec} because it is missing extensions"
diff --git a/spec/commands/pristine_spec.rb b/spec/commands/pristine_spec.rb
index ff327e190b..a6f991bb4a 100644
--- a/spec/commands/pristine_spec.rb
+++ b/spec/commands/pristine_spec.rb
@@ -24,8 +24,6 @@ RSpec.describe "bundle pristine" do
 
       gemspec
     G
-
-    bundle "install"
   end
 
   context "when sourced from Rubygems" do
@@ -39,6 +37,14 @@ RSpec.describe "bundle pristine" do
       bundle "pristine"
       expect(changes_txt).to_not be_file
     end
+
+    it "does not delete the bundler gem" do
+      system_gems :bundler
+      bundle! "install"
+      bundle! "pristine", :system_bundler => true
+      bundle! "-v", :system_bundler => true
+      expect(out).to end_with(Bundler::VERSION)
+    end
   end
 
   context "when sourced from git repo" do
-- 
cgit v1.2.1