Merge pull request #7767 from rubygems/deivid-rodriguez/keep-credentials-take-2

Fix credentials being readded when re-resolving without a full unlock

(cherry picked from commit 9c022dc)

Author: deivid-rodriguez

bundler/lib/bundler/source/rubygems.rb

@@ -10,7 +10,7 @@ class Rubygems < Source
       # Ask for X gems per API request
       API_REQUEST_SIZE = 50
 
-      attr_reader :remotes
+      attr_accessor :remotes
 
       def initialize(options = {})
         @options = options
@@ -20,9 +20,10 @@ def initialize(options = {})
         @allow_cached = false
         @allow_local = options["allow_local"] || false
         @checksum_store = Checksum::Store.new
-        @original_remotes = nil
 
         Array(options["remotes"]).reverse_each {|r| add_remote(r) }
+
+        @lockfile_remotes = @remotes if options["from_lockfile"]
       end
 
       def caches
@@ -92,12 +93,7 @@ def options
 
       def self.from_lock(options)
         options["remotes"] = Array(options.delete("remote")).reverse
-        new(options)
-      end
-
-      def remotes=(new_remotes)
-        @original_remotes = @remotes
-        @remotes = new_remotes
+        new(options.merge("from_lockfile" => true))
       end
 
       def to_lock
@@ -470,7 +466,7 @@ def cache_path
       private
 
       def lockfile_remotes
-        @original_remotes || credless_remotes
+        @lockfile_remotes || credless_remotes
       end
 
       # Checks if the requested spec exists in the global cache. If it does,

bundler/spec/lock/lockfile_spec.rb

@@ -419,8 +419,16 @@
 
     lockfile lockfile_without_credentials
 
+    # when not re-resolving
     bundle "install", artifice: "endpoint_strict_basic_authentication", quiet: true
+    expect(lockfile).to eq lockfile_without_credentials
+
+    # when re-resolving with full unlock
+    bundle "update", artifice: "endpoint_strict_basic_authentication"
+    expect(lockfile).to eq lockfile_without_credentials
 
+    # when re-resolving without ful unlocking
+    bundle "update rack-obama", artifice: "endpoint_strict_basic_authentication"
     expect(lockfile).to eq lockfile_without_credentials
   end