bundler 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd72f56b8e88b2e79896d64cbc9fc6ae4ede97c
-  data.tar.gz: a264fc3a829a856bf74c94ba2386983480878822
+  metadata.gz: 2b1aaf8e4e40f84d9eca9b9d919d08c10f5b426c
+  data.tar.gz: e7d8a3f164414640330e9d82da8ca3d697f72065
 SHA512:
-  metadata.gz: 9fd42a2f2eac4fbb2d115b1c77af1a0adbe1dec2826dc664e7973d48742d31a30232d89f59daa6c7e9f17f9bedbb80dd239c52bc51e4d70f5bd3fda8f0bcbdd4
-  data.tar.gz: 8661d781682dc0d08fe1663f884cf8017b4c1913217a3052f6daadd6e3181c2b443a8193a3b2cffcd2bddbf7be4e9774e6b94fbddc4b24310067bdc9585f7a19
+  metadata.gz: c412782fb44f681f0d932a2315aea509c12592788993ecf9fc91ca6fe1608ff51b1733b17048879b0bb3a61fb9fb5c9c928f08422527a0d38d5acd5e35f02f89
+  data.tar.gz: 925bf88b4902b053e2f16348fac713091b1390e386c036bca32066a61ea52e890a9bd906faf84fd5e10084b98584dc03226022fba515c2af04944f24ae788b6f

data/CHANGELOG.md

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

data/lib/bundler/cli/gem.rb

@@ -136,7 +136,7 @@ module Bundler
 
       if choice.nil?
         Bundler.ui.confirm header
-        choice = (Bundler.ui.ask("#{message} y/(n):") =~ /y|yes/)
+        choice = Bundler.ui.yes? "#{message} y/(n):"
         Bundler.settings.set_global("gem.#{key}", choice)
       end
 

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/ui/shell.rb

@@ -46,6 +46,14 @@ module Bundler
         @shell.ask(msg)
       end
 
+      def yes?(msg)
+        @shell.yes?(msg)
+      end
+
+      def no?
+        @shell.no?(msg)
+      end
+
       def level=(level)
         raise ArgumentError unless LEVELS.include?(level.to_s)
         @level = level

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.9.4" unless defined?(::Bundler::VERSION)
+  VERSION = "1.9.5" unless defined?(::Bundler::VERSION)
 end

metadata

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