molinillo 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69f2c3781273e6f2e5c06758ed06c441691a9bcc
-  data.tar.gz: e43917b29522495a4108ad810a8ddc6879585fc1
+  metadata.gz: a110136ef30be826a9e0ccbe5bf217e207db85a4
+  data.tar.gz: 34d167f2673c8bdf03bda56073a224dc81ffe72e
 SHA512:
-  metadata.gz: 534b055dd96c322231c79e6624687764ad99bf67c8c15f0293320d695465b8041e7086f27bdff79b3378a568a5998b0ec2242a31043b52e1ee6f736839b0ebf8
-  data.tar.gz: f9c29fb00c70d2638086404f91baa6d0fc9b0c837aa28bd0819fa6dfd44f6466d33941241438cb45b88f066ec97025cf79f611c5f6999b61fd56cd714eae215c
+  metadata.gz: ec56826cd3020c0ae87f8f657e0209d446296119c32bb8ce9337b8672bd8a3420048d50b3579e8c1888c08346f75d03549160aa7b24bf61c3c58cee986e01d8b
+  data.tar.gz: 4e941b7a924b71742108cec967d39702d16739ce4fec2e2b83d892eb7ed83575bf1a2e7a31b208dfabcd8bed9708c5ec1c1af70891622fdac1d18dffa0a133d7

data/lib/molinillo/gem_metadata.rb

@@ -1,3 +1,3 @@
 module Molinillo
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/molinillo/resolution.rb

@@ -12,13 +12,15 @@ module Molinillo
       # @attr [Object] locked_requirement the relevant locking requirement.
       # @attr [Array<Array<Object>>] requirement_trees the different requirement
       #   trees that led to every requirement for the conflicting name.
+      # @attr [{String=>Object}] activated_by_name the already-activated specs.
       Conflict = Struct.new(
         :requirement,
         :requirements,
         :existing,
         :possibility,
         :locked_requirement,
-        :requirement_trees
+        :requirement_trees,
+        :activated_by_name
       )
 
       # @return [SpecificationProvider] the provider that knows about
@@ -216,7 +218,7 @@ module Molinillo
         return nil unless requirement
         seen = false
         state = states.reverse_each.find do |s|
-          seen ||= s.requirement == requirement
+          seen ||= s.requirement == requirement || s.requirements.include?(requirement)
           seen && s.requirement != requirement && !s.requirements.include?(requirement)
         end
         state && state.requirement
@@ -257,14 +259,16 @@ module Molinillo
           vertex.payload,
           possibility,
           locked_requirement_named(name),
-          requirement_trees
+          requirement_trees,
+          Hash[activated.map { |v| [v.name, v.payload] }.select(&:last)]
         )
       end
 
       # @return [Array<Array<Object>>] The different requirement
       #   trees that led to every requirement for the current spec.
       def requirement_trees
-        activated.vertex_named(name).requirements.map { |r| requirement_tree_for(r) }
+        vertex = activated.vertex_named(name)
+        vertex.requirements.map { |r| requirement_tree_for(r) }
       end
 
       # @return [Array<Object>] the list of requirements that led to

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler