molinillo 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 201374a6119011f4e8aad27f0c594fd27a210707
-  data.tar.gz: d2ae554dca78b440d312ead38410706198eb2a2c
+  metadata.gz: f53e46c97a53227bf496401139787e902f29c31c
+  data.tar.gz: 4c702b61c8eb41ddbcb899579e226588ca6ea8c1
 SHA512:
-  metadata.gz: 53c5b13bda9d0865e3d0b2d836325db2548757d9e145798401cbd59737e6378c30d46378c65a683742e0db8aa903629d002a839bacad78320ccf5dfd2e81f541
-  data.tar.gz: bfc7c83391e307a8dbb03321c356cb300c75ad3e27c1ddda1ee207467dabe1089a8671f6c95f35de6b2a9cb4d4e5fe0d41a7bb68724254e38d3cbbc4defae685
+  metadata.gz: 531ffbe26a13d5c3d9883b4de8b0f5d01d3df2aeba3b6f6bfe5ebbbed06187f0594aab1532268894ad8e7f12bef790cc68ebc8e1ef0ebd2e86eac8f74c3a0941
+  data.tar.gz: 1323d5f6cad31427e8bf44e07237de6ee8f9c1f272ec3a2ad803cd33684f634f4d0f6d86013fc49c84c981bddf856638eab1dda7906a397712e9fb8854660a31

data/lib/molinillo/gem_metadata.rb

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

data/lib/molinillo/resolution.rb

@@ -194,18 +194,20 @@ module Molinillo
       def state_index_for_unwind
         current_requirement = requirement
         existing_requirement = requirement_for_existing_name(name)
-        until current_requirement.nil?
-          current_state = find_state_for(current_requirement)
-          return states.index(current_state) if state_any?(current_state)
-          current_requirement = parent_of(current_requirement)
+        index = -1
+        [current_requirement, existing_requirement].each do |r|
+          until r.nil?
+            current_state = find_state_for(r)
+            if state_any?(current_state)
+              current_index = states.index(current_state)
+              index = current_index if current_index > index
+              break
+            end
+            r = parent_of(r)
+          end
         end
 
-        until existing_requirement.nil?
-          existing_state = find_state_for(existing_requirement)
-          return states.index(existing_state) if state_any?(existing_state)
-          existing_requirement = parent_of(existing_requirement)
-        end
-        -1
+        index
       end
 
       # @return [Object] the requirement that led to `requirement` being added

data/spec/resolver_spec.rb

@@ -242,6 +242,19 @@ module Molinillo
         expect(resolved.map(&:payload).map(&:to_s).sort).to eq(expected.sort)
       end
 
+      it 'can unwind when the conflict has a common parent' do
+        index = BundlerIndex.new('rubygems-2016-11-05')
+        @resolver = described_class.new(index, TestUI.new)
+        demands = [
+          VersionKit::Dependency.new('github-pages', '>= 0'),
+        ]
+        demands.each { |d| index.search_for(d) }
+
+        resolved = @resolver.resolve(demands, DependencyGraph.new)
+
+        expect(resolved.map(&:payload).map(&:to_s).sort).to include('github-pages (104.0.0)')
+      end
+
       it 'can resolve when swapping changes transitive dependencies' do
         index = TestIndex.new('restkit')
         def index.sort_dependencies(dependencies, activated, conflicts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler