molinillo 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9236a5dbc46018bc0f27a22e51d675808034c0f
-  data.tar.gz: fc9a01753517f46df9ced17dd489b4329d812fa4
+  metadata.gz: 5471c5978d4fcbf76eb45959379323cb82e267c5
+  data.tar.gz: 7fdf053d634d953fd63625c8954ead0f36d7b9cd
 SHA512:
-  metadata.gz: b75238ffd8561de2d08d4965b167193ea40e83305892d35d228a105166740f4f18da1a02d4d844be5f13b20ab0f900d9bdd6c54bc56c238339646365d45f2b8c
-  data.tar.gz: f39575f18399b6e67fc98ee2efda18e4578f4cfd53c1b29366e17857031812afaaf2e4ff91eb6a1d424e4f0d010f207a311e4404d2c4fc3a118308913c8f54df
+  metadata.gz: 7eebcc4b974f45733fbf034330958c5add2ad31b0dfd674f2442d6811761bbbf7a4ae160d3f1c6a98e19483d2d5511d715c724c15e07eff52dbc8da92234a257
+  data.tar.gz: ab9a7d6eb33b8f40cf1aa4a9a5495da77c4ee2eeac629d128cffb5e9e54fbf5f1acc06d8a23f2af20960e05dbb7f58c3eebd723f8b58c5623bec9040640adb70

data/lib/molinillo/dependency_graph.rb

@@ -16,7 +16,7 @@ module Molinillo
     include TSort
 
     # @visibility private
-    alias_method :tsort_each_node, :each
+    alias tsort_each_node each
 
     # @visibility private
     def tsort_each_child(vertex, &block)
@@ -184,7 +184,7 @@ module Molinillo
 
       # @return [Boolean] whether the vertex is considered a root vertex
       attr_accessor :root
-      alias_method :root?, :root
+      alias root? root
 
       # Initializes a vertex with the given name and payload.
       # @param [String] name see {#name}
@@ -262,7 +262,7 @@ module Molinillo
           payload == other.payload
       end
 
-      alias_method :eql?, :==
+      alias eql? ==
 
       # @return [Fixnum] a hash for the vertex based upon its {#name}
       def hash
@@ -276,7 +276,7 @@ module Molinillo
         equal?(other) || successors.any? { |v| v.path_to?(other) }
       end
 
-      alias_method :descendent?, :path_to?
+      alias descendent? path_to?
 
       # Is there a path from `other` to `self` following edges in the
       # dependency graph?
@@ -285,7 +285,7 @@ module Molinillo
         other.path_to?(self)
       end
 
-      alias_method :is_reachable_from?, :ancestor?
+      alias is_reachable_from? ancestor?
     end
   end
 end

data/lib/molinillo/gem_metadata.rb

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

data/lib/molinillo/resolution.rb

@@ -131,7 +131,7 @@ module Molinillo
             specification_provider.send(instance_method, *args, &block)
           rescue NoSuchDependencyError => error
             if state
-              vertex = activated.vertex_named(name_for error.dependency)
+              vertex = activated.vertex_named(name_for(error.dependency))
               error.required_by += vertex.incoming_edges.map { |e| e.origin.name }
               error.required_by << name_for_explicit_dependency_source unless vertex.explicit_requirements.empty?
             end
@@ -345,7 +345,7 @@ module Molinillo
         vertex = swapped.vertex_named(name)
         vertex.payload = possibility
         return unless vertex.requirements.
-            all? { |r| requirement_satisfied_by?(r, swapped, possibility) }
+                      all? { |r| requirement_satisfied_by?(r, swapped, possibility) }
         return unless new_spec_satisfied?
         actual_vertex = activated.vertex_named(name)
         actual_vertex.payload = possibility
@@ -363,7 +363,13 @@ module Molinillo
           if !dep_names.include?(succ.name) && !succ.root? && succ.predecessors.to_a == [vertex]
             debug(depth) { "Removing orphaned spec #{succ.name} after swapping #{name}" }
             activated.detach_vertex_named(succ.name)
-            requirements.delete_if { |r| name_for(r) == succ.name }
+
+            all_successor_names = succ.recursive_successors.map(&:name)
+
+            requirements.delete_if do |requirement|
+              requirement_name = name_for(requirement)
+              (requirement_name == succ.name) || all_successor_names.include?(requirement_name)
+            end
           end
         end
       end
@@ -420,14 +426,14 @@ module Molinillo
         debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
         nested_dependencies.each { |d| activated.add_child_vertex(name_for(d), nil, [name_for(activated_spec)], d) }
 
-        push_state_for_requirements(requirements + nested_dependencies, nested_dependencies.size > 0)
+        push_state_for_requirements(requirements + nested_dependencies, !nested_dependencies.empty?)
       end
 
       # Pushes a new {DependencyState} that encapsulates both existing and new
       # requirements
       # @param [Array] new_requirements
       # @return [void]
-      def push_state_for_requirements(new_requirements, requires_sort = true, new_activated = activated.dup)
+      def push_state_for_requirements(new_requirements, requires_sort = true, new_activated = activated)
         new_requirements = sort_dependencies(new_requirements.uniq, new_activated, conflicts) if requires_sort
         new_requirement = new_requirements.shift
         new_name = new_requirement ? name_for(new_requirement) : ''

data/spec/resolver_spec.rb

@@ -119,6 +119,51 @@ module Molinillo
         resolved = @resolver.resolve([dep], DependencyGraph.new)
         expect(resolved.map(&:payload).map(&:to_s)).to eq(['actionpack (1.2.3)'])
       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
+          # 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
+          # when using the index file "swap_child_with_successors"
+          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 : versions_of(name),
+              ]
+            end
+          end
+
+          def versions_of(dependency_name)
+            specs[dependency_name].count
+          end
+        end
+
+        index = swap_child_with_successors_index.new('swap_child_with_successors')
+        @resolver = described_class.new(index, TestUI.new)
+        demands = [
+          VersionKit::Dependency.new('build-essential', '>= 0.0.0'),
+          VersionKit::Dependency.new('nginx', '>= 0.0.0'),
+        ]
+
+        resolved = @resolver.resolve(demands, DependencyGraph.new)
+
+        expected = [
+          'build-essential (2.4.0)',
+          '7-zip (1.0.0)',
+          'windows (1.39.2)',
+          'chef-handler (1.3.0)',
+          'nginx (2.7.6)',
+          'yum-epel (0.6.6)',
+          'yum (3.10.0)',
+        ]
+
+        expect(resolved.map(&:payload).map(&:to_s)).to match_array(expected)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -33,4 +33,6 @@ require 'molinillo'
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = '.rspec_status'
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.0
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution