bundler 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 215ac05fe615b4d435ef62e049867404d0af8810
-  data.tar.gz: e9aac3ab09167e73a05f69eb54a77b816c1311a6
+  metadata.gz: 22596756e05afe393c806e7be6f01eecb6481455
+  data.tar.gz: 182b0814c59dfb8bf1552bcccabaecb33fc5437d
 SHA512:
-  metadata.gz: be2ae8f024a33f30192c648dc29510bf7080bbc22a511e1b698f93cfdd610f7742824ca8ab2e1c3d15f0e81910eb196b4449f3207fb3a77e688b7ab0073c026a
-  data.tar.gz: 71fd2298fd6d34233b59d31e27ccfd0cff0b0d8790023be1eed1510736778bed4b115277e84a2f640dfdc0d10e59d058556088a051dc4fb3e828446177cd17c2
+  metadata.gz: a40c512a0b0c523b141906b1b27577345e6b774a0d8b64f5d5a21c574de0e30a6d27ab1f493b0881898a0232ec330c02615550ca7ed6992e5f23f327338127bd
+  data.tar.gz: 6003c4ed54dac0f68cccbd61305c7f2b4fc05a73bd694b57cf6a4b58923186469390b02da27105fb9156bfa0e3863dfa87d3abba0e47324f46dcc01498ce2402

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.13.1 (2016-09-13)
+
+Bugfixes:
+
+  - ensure that `Gem::Source` is available, fixing several exceptions (#4944, @dekellum)
+  - ensure that dependency resolution works when multiple gems have the same dependency (#4961, @segiddins)
+
 ## 1.13.0 (2016-09-05)
 
 This space deliberately left blank.

data/lib/bundler/rubygems_ext.rb

@@ -8,6 +8,16 @@ end
 
 require "rubygems"
 require "rubygems/specification"
+
+begin
+  # Possible use in Gem::Specification#source below and require
+  # shouldn't be deferred.
+  require "rubygems/source"
+rescue LoadError
+  # Not available before Rubygems 2.0.0, ignore
+  nil
+end
+
 require "bundler/match_platform"
 
 module Gem

data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Bundler::Molinillo
   # The version of Bundler::Molinillo.
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb

@@ -184,6 +184,8 @@ module Bundler::Molinillo
           raise VersionConflict.new(c) unless state
           activated.rewind_to(sliced_states.first || :initial_state) if sliced_states
           state.conflicts = c
+          index = states.size - 1
+          @parent_of.reject! { |_, i| i >= index }
         end
       end
 
@@ -209,7 +211,10 @@ module Bundler::Molinillo
       # @return [Object] the requirement that led to `requirement` being added
       #   to the list of requirements.
       def parent_of(requirement)
-        @parent_of[requirement]
+        return unless requirement
+        return unless index = @parent_of[requirement]
+        return unless parent_state = @states[index]
+        parent_state.requirement
       end
 
       # @return [Object] the requirement that led to a version of a possibility
@@ -418,7 +423,8 @@ module Bundler::Molinillo
         debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
         nested_dependencies.each do |d|
           activated.add_child_vertex(name_for(d), nil, [name_for(activated_spec)], d)
-          @parent_of[d] = requirement
+          parent_index = states.size - 1
+          @parent_of[d] ||= parent_index
         end
 
         push_state_for_requirements(requirements + nested_dependencies, !nested_dependencies.empty?)

data/lib/bundler/version.rb

@@ -7,5 +7,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.13.0" unless defined?(::Bundler::VERSION)
+  VERSION = "1.13.1" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - André Arko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek