bundler 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c72cc5574866e51d9e467c708aaa1bd9fb03de4
-  data.tar.gz: 7419a9b2bbdffaacdceefad488f599c1ab32c18a
+  metadata.gz: 974a8897ede822989f7655a8737514711a5c037a
+  data.tar.gz: c6a75a0b592f1270622f3629edefbe2b4fd6da7c
 SHA512:
-  metadata.gz: 4b05906f1728f467c04ca3cae1b1032102be61bfd9e6c158df5a19eb8b679b938d793db207d479372325fa08adff7a2e0d44d9e97cf5015c9b561a9a5b9786e7
-  data.tar.gz: 48993072f4436bc1a6baf6613652564ac245fa74d742706219eb6d5981f63b05dbf3bf0ba607dfe88474896b69d785ef3c1eddfedc9523e4060a32a2ff7e902c
+  metadata.gz: 58cd817f1ed4f0565415847f00ee713042e353bc6814dec6f158f711a3cc4731af3af8183a48c035a76b61b8b36b9256a606962160b83c28ef76fdf157b346df
+  data.tar.gz: be08f525fd4e7dba10a19c76807112396faf3a8036013a45ccfdb41e26cee97c40c9c0095ee09d051376e85a62f7f16636e89195cd9251415a08b24025b9d3df

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.8.8 (2015-04-29)
+
+Bugfixes:
+
+  - Respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
+
 ## 1.8.7 (2015-04-07)
 
 Bugfixes:

data/lib/bundler/definition.rb

@@ -184,11 +184,10 @@ module Bundler
     # @return [SpecSet] resolved dependencies
     def resolve
       @resolve ||= begin
+        last_resolve = converge_locked_specs
         if Bundler.settings[:frozen] || (!@unlocking && nothing_changed?)
-          @locked_specs
+          last_resolve
         else
-          last_resolve = converge_locked_specs
-
           # Run a resolve against the locally available gems
           last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, last_resolve)
         end
@@ -521,7 +520,9 @@ module Bundler
 
       converged = []
       @locked_specs.each do |s|
-        s.source = sources.get(s.source)
+        # Replace the locked dependency's source with the equivalent source from the Gemfile
+        dep = @dependencies.find { |dep| s.satisfies?(dep) }
+        s.source = (dep && dep.source) || sources.get(s.source)
 
         # Don't add a spec to the list if its source is expired. For example,
         # if you change a Git gem to Rubygems.
@@ -569,7 +570,7 @@ module Bundler
     end
 
     def satisfies_locked_spec?(dep)
-      @locked_specs.any? { |s| s.satisfies?(dep) && (!dep.source || s.source == dep.source) }
+      @locked_specs.any? { |s| s.satisfies?(dep) && (!dep.source || s.source.include?(dep.source)) }
     end
 
     def expanded_dependencies

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.8.7" unless defined?(::Bundler::VERSION)
+  VERSION = "1.8.8" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache