molinillo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ca54c31b0225c0a70bd08056c807459893d8b05
-  data.tar.gz: d044395b17ede295d35e8663bbeba8c5f0ab91c5
+  metadata.gz: 3c0e6948c750e17cfaf091e5cd1f94ac58e4bffe
+  data.tar.gz: 64427be3edf97f492aef46c7c6eb69f1e262e25e
 SHA512:
-  metadata.gz: cbb0cc34b7ec121f29199e73115e1e1b6231662325c36852ca552c894e031e533adc996c56642a61e60f6410234006dcc42de20068c15bc8c49cd15629c3abdc
-  data.tar.gz: 30e5ffb3e3bd50da99a14cccdf3d3eecc34c8c5887f3c1503913e97c4f311303cd0d0e982ccfd6e1853173ba0b3a5b28216b84e00fb3e008937283c619a834b9
+  metadata.gz: 2e11fb6bebe0f6797d7c855cfe92aef39054a7d82cccb9e6b78b080bb69bdb9455aa4e8b13fc613a4acd3c430fb3a6faf96ae5d63663404f377a95bbc417136e
+  data.tar.gz: e4d395af07f86d361e5fa47c13e098f3ee77f4f878311a93c9a64bcbc87d1775837233f2096ccc84196a2b13c68586852097ad1e866e9814e09212a8d82c5dda

data/lib/molinillo/dependency_graph.rb

@@ -102,6 +102,7 @@ module Molinillo
     # @return [void]
     def detach_vertex_named(name)
       vertex = vertex_named(name)
+      return unless vertex
       successors = vertex.successors
       vertices.delete(name)
       edges.reject! { |e| e.origin == vertex || e.destination == vertex }

data/lib/molinillo/gem_metadata.rb

@@ -1,3 +1,3 @@
 module Molinillo
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/molinillo/resolution.rb

@@ -3,12 +3,14 @@ module Molinillo
     # A specific resolution from a given {Resolver}
     class Resolution
       # A conflict that the resolution process encountered
+      # @attr [Object] requirement the requirement that immediately led to the conflict
       # @attr [{String,Nil=>[Object]}] requirements the requirements that caused the conflict
       # @attr [Object, nil] existing the existing spec that was in conflict with
       #   the {#possibility}
       # @attr [Object] possibility the spec that was unable to be activated due
       #   to a conflict
       Conflict = Struct.new(
+        :requirement,
         :requirements,
         :existing,
         :possibility
@@ -55,7 +57,7 @@ module Molinillo
           break unless state.requirements.any? || state.requirement
           indicate_progress
           if state.respond_to?(:pop_possibility_state) # DependencyState
-            debug(depth) { "Creating possibility state (#{possibilities.count} remaining)" }
+            debug(depth) { "Creating possibility state for #{requirement} (#{possibilities.count} remaining)" }
             state.pop_possibility_state.tap { |s| states.push(s) if s }
           end
           process_topmost_state
@@ -172,15 +174,27 @@ module Molinillo
       # Unwinds the states stack because a conflict has been encountered
       # @return [void]
       def unwind_for_conflict
-        if depth > 0
-          debug(depth) { 'Unwinding from level ' + state.depth.to_s }
-          conflicts.tap do |c|
-            states.pop
-            state.conflicts = c
-          end
-        else
-          raise VersionConflict.new(conflicts)
+        debug(depth) { "Unwinding for conflict: #{requirement}" }
+        conflicts.tap do |c|
+          states.slice!(state_index_for_unwind..-1)
+          states.pop if state
+          raise VersionConflict.new(c) unless state
+          state.conflicts = c
+        end
+      end
+
+      # @return [Integer] The index to which the resolution should unwind in the
+      #   case of conflict.
+      def state_index_for_unwind
+        index = states.rindex do |state|
+          return nil unless vertex = state.activated.vertex_named(name)
+          state.is_a?(DependencyState) &&
+            (
+              !vertex.payload ||
+              (!state.requirements.include?(requirement) && state.requirement != requirement)
+            )
         end
+        index + 2
       end
 
       # @return [Conflict] a {Conflict} that reflects the failure to activate
@@ -194,7 +208,8 @@ module Molinillo
         }
         vertex.incoming_edges.each { |edge| (requirements[edge.origin.payload] ||= []).unshift(*edge.requirements) }
         conflicts[name] = Conflict.new(
-          requirements,
+          requirement,
+          Hash[requirements.select { |_, r| !r.empty? }],
           existing,
           possibility
         )
@@ -229,7 +244,8 @@ module Molinillo
       def attempt_to_activate
         debug(depth) { 'Attempting to activate ' + possibility.to_s }
         existing_node = activated.vertex_named(name)
-        if existing_node && existing_node.payload
+        if existing_node.payload
+          debug(depth) { "Found existing spec (#{existing_node.payload})" }
           attempt_to_activate_existing_spec(existing_node)
         else
           attempt_to_activate_new_spec
@@ -246,7 +262,7 @@ module Molinillo
           push_state_for_requirements(new_requirements)
         else
           create_conflict
-          debug(depth) { 'Unsatisfied by existing spec' }
+          debug(depth) { "Unsatisfied by existing spec (#{existing_node.payload})" }
           unwind_for_conflict
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler