molinillo 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e941ca9751ad429184a78dbb929fba03428d5630
-  data.tar.gz: a60bb544a0c227c078e49249848e7a93dcc654b5
+  metadata.gz: 07ba133d4a53675053e7dcd0951237049e522ea8
+  data.tar.gz: 21ef570c95d650318652b77f24a68b46fa60b3db
 SHA512:
-  metadata.gz: 7cfb3cbe6a1c524938933f30ad4cce2384b5ddca16632c99609721e841fb70557be98df82fa2feb0980a127dd009d026f9bd5b34edca1d7fa2e39ba6ecae0307
-  data.tar.gz: 952805cd2f2fc302b2ea5c11181442c3019755cd22dab63afe37e97121ba270e9b3ddebdf2443c83604578dac2f16f8d9252164c490e1dc7cb02a2694421bbe2
+  metadata.gz: cb2eb17979338fb368d96effa38d25aa7fc3a19e97e3c41dc4c4e36290260d00d43fe1b206481122d1b4e708963bbb43eb7833c868566e1ff4364840671b1797
+  data.tar.gz: 2541587694311be9e41ee3f7778e996fcb01b5d5ad10b25d5a5db7cc00fbad5164b26f5b63ed4ec12534f19dcd3d18fa2ca6212c85ca7719d21094f27a139d4d

data/lib/molinillo/gem_metadata.rb

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

data/lib/molinillo/resolution.rb

@@ -356,10 +356,14 @@ module Molinillo
       # @return [void]
       def fixup_swapped_children(vertex)
         payload = vertex.payload
-        dep_names = dependencies_for(payload).map(&method(:name_for))
-        vertex.successors.each do |succ|
-          if !dep_names.include?(succ.name) && !succ.root? && succ.predecessors.to_a == [vertex]
+        deps = dependencies_for(payload).group_by(&method(:name_for))
+        vertex.outgoing_edges.each do |outgoing_edge|
+          @parent_of[outgoing_edge.requirement] = states.size - 1
+          succ = outgoing_edge.destination
+          matching_deps = Array(deps[succ.name])
+          if matching_deps.empty? && !succ.root? && succ.predecessors.to_a == [vertex]
             debug(depth) { "Removing orphaned spec #{succ.name} after swapping #{name}" }
+            succ.requirements.each { |r| @parent_of.delete(r) }
             activated.detach_vertex_named(succ.name)
 
             all_successor_names = succ.recursive_successors.map(&:name)
@@ -368,7 +372,10 @@ module Molinillo
               requirement_name = name_for(requirement)
               (requirement_name == succ.name) || all_successor_names.include?(requirement_name)
             end
+          elsif !matching_deps.include?(outgoing_edge.requirement)
+            outgoing_edge.requirement = matching_deps.first
           end
+          matching_deps.delete(outgoing_edge.requirement)
         end
       end
 

data/spec/resolver_spec.rb

@@ -122,28 +122,13 @@ module Molinillo
       end
 
       it 'can resolve when two specs have the same dependencies' do
-        bundler_index = Class.new(TestIndex) do
-          # The bug we want to write a regression test for only occurs when
-          # Molinillo processes dependencies in a specific order for the given
-          # index and demands. This sorting logic ensures we hit the repro case
-          def sort_dependencies(dependencies, activated, conflicts)
-            dependencies.sort_by do |dependency|
-              name = name_for(dependency)
-              [
-                activated.vertex_named(name).payload ? 0 : 1,
-                conflicts[name] ? 0 : 1,
-                activated.vertex_named(name).payload ? 0 : search_for(dependency).count,
-              ]
-            end
-          end
-        end
-
-        index = bundler_index.new('rubygems-2016-09-11')
+        index = BundlerIndex.new('rubygems-2016-09-11')
         @resolver = described_class.new(index, TestUI.new)
         demands = [
           VersionKit::Dependency.new('chef', '~> 12.1.2'),
         ]
 
+        demands.each { |d| index.search_for(d) }
         resolved = @resolver.resolve(demands, DependencyGraph.new)
 
         expected = [
@@ -196,6 +181,67 @@ module Molinillo
         expect(resolved.map(&:payload).map(&:to_s)).to match_array(expected)
       end
 
+      it 'can resolve when two specs have the same dependencies and swapping happens' do
+        index = BundlerIndex.new('rubygems-2016-10-06')
+        @resolver = described_class.new(index, TestUI.new)
+        demands = [
+          VersionKit::Dependency.new('avro_turf', '0.6.2'),
+          VersionKit::Dependency.new('fog', '1.38.0'),
+        ]
+        demands.each { |d| index.search_for(d) }
+
+        resolved = @resolver.resolve(demands, DependencyGraph.new)
+
+        expected = [
+          'pkg-config (1.1.7)',
+          'CFPropertyList (2.3.3)',
+          'multi_json (1.12.1)',
+          'excon (0.45.4)',
+          'builder (3.2.2)',
+          'formatador (0.2.5)',
+          'ipaddress (0.8.3)',
+          'xml-simple (1.1.5)',
+          'mini_portile2 (2.1.0)',
+          'inflecto (0.0.2)',
+          'trollop (2.1.2)',
+          'fission (0.5.0)',
+          'avro (1.8.1)',
+          'fog-core (1.37.0)',
+          'nokogiri (1.6.8)',
+          'avro_turf (0.6.2)',
+          'fog-json (1.0.2)',
+          'fog-local (0.3.0)',
+          'fog-vmfusion (0.1.0)',
+          'fog-xml (0.1.2)',
+          'rbvmomi (1.8.2)',
+          'fog-aliyun (0.1.0)',
+          'fog-brightbox (0.11.0)',
+          'fog-sakuracloud (1.7.5)',
+          'fog-serverlove (0.1.2)',
+          'fog-softlayer (1.1.4)',
+          'fog-storm_on_demand (0.1.1)',
+          'fog-atmos (0.1.0)',
+          'fog-aws (0.9.2)',
+          'fog-cloudatcost (0.1.2)',
+          'fog-dynect (0.0.3)',
+          'fog-ecloud (0.3.0)',
+          'fog-google (0.1.0)',
+          'fog-openstack (0.1.3)',
+          'fog-powerdns (0.1.1)',
+          'fog-profitbricks (0.0.5)',
+          'fog-rackspace (0.1.1)',
+          'fog-radosgw (0.0.5)',
+          'fog-riakcs (0.1.0)',
+          'fog-terremark (0.1.0)',
+          'fog-voxel (0.1.0)',
+          'fog-xenserver (0.2.3)',
+          'fog-vsphere (1.2.0)',
+          'fog (1.38.0)',
+        ]
+
+        expect(resolved.map(&:payload).map(&:to_s).sort).to eq(expected.sort)
+      end
+
       # Regression test. See: https://github.com/CocoaPods/Molinillo/pull/38
       it 'can resolve when swapping children with successors' do
         swap_child_with_successors_index = Class.new(TestIndex) do

data/spec/spec_helper/index.rb

@@ -61,4 +61,20 @@ module Molinillo
       end
     end
   end
+
+  class BundlerIndex < TestIndex
+    # Some bugs we want to write a regression test for only occurs when
+    # Molinillo processes dependencies in a specific order for the given
+    # index and demands. This sorting logic ensures we hit the repro case
+    def sort_dependencies(dependencies, activated, conflicts)
+      dependencies.sort_by do |dependency|
+        name = name_for(dependency)
+        [
+          activated.vertex_named(name).payload ? 0 : 1,
+          conflicts[name] ? 0 : 1,
+          activated.vertex_named(name).payload ? 0 : search_for(dependency).count,
+        ]
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution