molinillo 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f53e46c97a53227bf496401139787e902f29c31c
-  data.tar.gz: 4c702b61c8eb41ddbcb899579e226588ca6ea8c1
+  metadata.gz: a3f407e98934857813a1d4e17fbf807171bfbd02
+  data.tar.gz: 5ca9cff1741fb50a1c8767a7fb6aadc6465d1b70
 SHA512:
-  metadata.gz: 531ffbe26a13d5c3d9883b4de8b0f5d01d3df2aeba3b6f6bfe5ebbbed06187f0594aab1532268894ad8e7f12bef790cc68ebc8e1ef0ebd2e86eac8f74c3a0941
-  data.tar.gz: 1323d5f6cad31427e8bf44e07237de6ee8f9c1f272ec3a2ad803cd33684f634f4d0f6d86013fc49c84c981bddf856638eab1dda7906a397712e9fb8854660a31
+  metadata.gz: 0a683263d7bf6566b74e88d948c20a6b2ec18cbbf26ae68e335ec27ab61708c25b9565329b6295e90bad515322196792d94df6f1d651997d84f32066253b6d85
+  data.tar.gz: d529667799bbb115b1fadd3fffa107fadca0ec456b0c00a97af9404713b45d1ec6a4ae54a8f2309acd68ea068018f7cf63c494b91effcbbf80fc112390340bbb

data/lib/molinillo/dependency_graph.rb

@@ -119,6 +119,7 @@ module Molinillo
     #   {Vertex#successors}
     def ==(other)
       return false unless other
+      return true if equal?(other)
       vertices.each do |name, vertex|
         other_vertex = other.vertex_named(name)
         return false unless other_vertex
@@ -134,6 +135,7 @@ module Molinillo
     def add_child_vertex(name, payload, parent_names, requirement)
       root = !parent_names.delete(nil) { true }
       vertex = add_vertex(name, payload, root)
+      vertex.explicit_requirements << requirement if root
       parent_names.each do |parent_name|
         parent_node = vertex_named(parent_name)
         add_edge(parent_node, vertex, requirement)
@@ -152,7 +154,7 @@ module Molinillo
     # Detaches the {#vertex_named} `name` {Vertex} from the graph, recursively
     # removing any non-root vertices that were orphaned in the process
     # @param [String] name
-    # @return [void]
+    # @return [Array<Vertex>] the vertices which have been detached
     def detach_vertex_named(name)
       log.detach_vertex_named(self, name)
     end

data/lib/molinillo/dependency_graph/detach_vertex_named.rb

@@ -14,16 +14,23 @@ module Molinillo
 
       # (see Action#up)
       def up(graph)
-        return unless @vertex = graph.vertices.delete(name)
+        return [] unless @vertex = graph.vertices.delete(name)
+
+        removed_vertices = [@vertex]
         @vertex.outgoing_edges.each do |e|
           v = e.destination
           v.incoming_edges.delete(e)
-          graph.detach_vertex_named(v.name) unless v.root? || v.predecessors.any?
+          if !v.root? && v.incoming_edges.empty?
+            removed_vertices.concat graph.detach_vertex_named(v.name)
+          end
         end
+
         @vertex.incoming_edges.each do |e|
           v = e.origin
           v.outgoing_edges.delete(e)
         end
+
+        removed_vertices
       end
 
       # (see Action#down)

data/lib/molinillo/dependency_graph/vertex.rb

@@ -81,6 +81,7 @@ module Molinillo
       # @return [Boolean] whether the two vertices are equal, determined
       #   by a recursive traversal of each {Vertex#successors}
       def ==(other)
+        return true if equal?(other)
         shallow_eql?(other) &&
           successors.to_set == other.successors.to_set
       end
@@ -89,6 +90,7 @@ module Molinillo
       # @return [Boolean] whether the two vertices are equal, determined
       #   solely by {#name} and {#payload} equality
       def shallow_eql?(other)
+        return true if equal?(other)
         other &&
           name == other.name &&
           payload == other.payload

data/lib/molinillo/gem_metadata.rb

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

data/lib/molinillo/resolution.rb

@@ -366,13 +366,12 @@ module Molinillo
           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)
-
-            requirements.delete_if do |requirement|
-              requirement_name = name_for(requirement)
-              (requirement_name == succ.name) || all_successor_names.include?(requirement_name)
+            removed_names = activated.detach_vertex_named(succ.name).map(&:name)
+            requirements.delete_if do |r|
+              # the only removed vertices are those with no other requirements,
+              # so it's safe to delete only based upon name here
+              removed_names.include?(name_for(r))
             end
           elsif !matching_deps.include?(outgoing_edge.requirement)
             activated.delete_edge(outgoing_edge)

data/spec/dependency_graph_spec.rb

@@ -57,7 +57,7 @@ module Molinillo
         @graph.detach_vertex_named(root.name)
         expect(@graph.vertex_named(root.name)).to be_nil
         expect(@graph.vertex_named(child.name)).to eq(child)
-        expect(child.predecessors).to eq([root2])
+        expect(child.predecessors).to contain_exactly(root2)
         expect(@graph.vertices.count).to eq(2)
       end
 

data/spec/fuzz_spec.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'spec_helper/naive_resolver'
+
+describe 'fuzzing' do
+  CONSTRAINTS = %w(<= ~> > < >= =).freeze
+  let(:dependencies) do
+    index.specs.keys.sample(Random.rand(5)).
+      map do |d|
+      VersionKit::Dependency.new(
+        d,
+        "#{CONSTRAINTS.sample} #{Random.rand(2)}.#{Random.rand(2)}"
+      )
+    end
+  end
+  let(:index) { Molinillo::TestIndex.from_fixture('fuzz') }
+  let(:ui) { Molinillo::TestUI.new }
+  let(:resolver) { Molinillo::Resolver.new(index, ui) }
+
+  subject { resolver.resolve(dependencies) }
+
+  def validate_dependency_graph_from(graph, dependency)
+    vertex = graph.vertex_named(dependency.name)
+    spec = vertex.payload
+    expect(dependency).to be_satisfied_by(spec.version)
+    expect(spec.dependencies).to match_array(vertex.outgoing_edges.map(&:requirement))
+    spec.dependencies.each do |d|
+      validate_dependency_graph_from(graph, d)
+    end
+  end
+
+  def validate_dependency_graph(graph)
+    dependencies.each do |d|
+      validate_dependency_graph_from(graph, d)
+    end
+  end
+
+  def all_possible_graphs
+    dependencies.reduce([]) { |d| strings(graphs, d) }
+  end
+
+  let(:naive) { Molinillo::NaiveResolver.resolve(index, dependencies) }
+
+  def validate_unresolvable(error)
+    expect(naive).to be_nil,
+                     'Got an error resolving but the naive resolver found ' \
+                     "#{naive && naive.map(&:payload).map(&:to_s)}:\n#{error}"
+  end
+
+  def self.fuzz!(seeds = [])
+    seeds.each do |seed|
+      it "fuzzes with seed #{seed}" do
+        Random.srand seed
+        graph, error = begin
+          subject
+          [subject, nil]
+        rescue => e
+          [nil, e]
+        end
+        validate_dependency_graph(graph) if graph
+        validate_unresolvable(error) if error
+        expect(graph).to eq(naive),
+                         "#{graph && graph.map(&:payload).map(&:to_s)} vs #{naive && naive.map(&:payload).map(&:to_s)}"
+      end
+    end
+  end
+
+  fuzz! [
+    8,
+    9,
+    125,
+    188,
+    666,
+    7_898_789,
+    0.35096144504316984,
+    3.14159,
+  ].concat(Array.new(ENV.fetch('MOLINILLO_FUZZER', '0').to_i) { Random.rand })
+end if RUBY_VERSION >= '1.9'

data/spec/resolver_spec.rb

@@ -1,25 +1,17 @@
 # frozen_string_literal: true
 require File.expand_path('../spec_helper', __FILE__)
-require 'json'
-require 'pathname'
 
 module Molinillo
-  FIXTURE_DIR = Pathname.new('spec/resolver_integration_specs')
-  FIXTURE_INDEX_DIR = FIXTURE_DIR + 'index'
   FIXTURE_CASE_DIR = FIXTURE_DIR + 'case'
 
   class TestCase
-    require File.expand_path('../spec_helper/index', __FILE__)
-    require File.expand_path('../spec_helper/specification', __FILE__)
-    require File.expand_path('../spec_helper/ui', __FILE__)
-
     attr_accessor :name, :requested, :base, :conflicts, :resolver, :result, :index
 
     def initialize(fixture_path)
       File.open(fixture_path) do |fixture|
         JSON.load(fixture).tap do |test_case|
           self.name = test_case['name']
-          self.index = TestIndex.new(test_case['index'] || 'awesome')
+          self.index = TestIndex.from_fixture(test_case['index'] || 'awesome')
           self.requested = test_case['requested'].map do |(name, reqs)|
             VersionKit::Dependency.new name, reqs.split(',').map(&:chomp)
           end
@@ -90,7 +82,7 @@ module Molinillo
 
     describe 'in general' do
       before do
-        @resolver = described_class.new(TestIndex.new('awesome'), TestUI.new)
+        @resolver = described_class.new(TestIndex.from_fixture('awesome'), TestUI.new)
       end
 
       it 'can resolve a list of 0 requirements' do
@@ -122,7 +114,7 @@ module Molinillo
       end
 
       it 'can resolve when two specs have the same dependencies' do
-        index = BundlerIndex.new('rubygems-2016-09-11')
+        index = BundlerIndex.from_fixture('rubygems-2016-09-11')
         @resolver = described_class.new(index, TestUI.new)
         demands = [
           VersionKit::Dependency.new('chef', '~> 12.1.2'),
@@ -182,7 +174,7 @@ module Molinillo
       end
 
       it 'can resolve when two specs have the same dependencies and swapping happens' do
-        index = BundlerIndex.new('rubygems-2016-10-06')
+        index = BundlerIndex.from_fixture('rubygems-2016-10-06')
         @resolver = described_class.new(index, TestUI.new)
         demands = [
           VersionKit::Dependency.new('avro_turf', '0.6.2'),
@@ -243,7 +235,7 @@ module Molinillo
       end
 
       it 'can unwind when the conflict has a common parent' do
-        index = BundlerIndex.new('rubygems-2016-11-05')
+        index = BundlerIndex.from_fixture('rubygems-2016-11-05')
         @resolver = described_class.new(index, TestUI.new)
         demands = [
           VersionKit::Dependency.new('github-pages', '>= 0'),
@@ -256,7 +248,7 @@ module Molinillo
       end
 
       it 'can resolve when swapping changes transitive dependencies' do
-        index = TestIndex.new('restkit')
+        index = TestIndex.from_fixture('restkit')
         def index.sort_dependencies(dependencies, activated, conflicts)
           dependencies.sort_by do |d|
             [
@@ -315,11 +307,11 @@ module Molinillo
           end
 
           def versions_of(dependency_name)
-            specs[dependency_name].count
+            Array(specs[dependency_name]).count
           end
         end
 
-        index = swap_child_with_successors_index.new('swap_child_with_successors')
+        index = swap_child_with_successors_index.from_fixture('swap_child_with_successors')
         @resolver = described_class.new(index, TestUI.new)
         demands = [
           VersionKit::Dependency.new('build-essential', '>= 0.0.0'),
@@ -340,6 +332,50 @@ module Molinillo
 
         expect(resolved.map(&:payload).map(&:to_s)).to match_array(expected)
       end
+
+      it 'can resolve ur face' do
+        index = TestIndex.new(
+          'a' => [
+            TestSpecification.new('name' => 'a', 'version' => '1.0.0', 'dependencies' => { 'z' => '= 2.0.0' }),
+            TestSpecification.new('name' => 'a', 'version' => '2.0.0', 'dependencies' => { 'z' => '= 1.0.0' }),
+          ],
+          'b' => [
+            TestSpecification.new('name' => 'b', 'version' => '1.0.0', 'dependencies' => { 'a' => '< 2' }),
+            TestSpecification.new('name' => 'b', 'version' => '2.0.0', 'dependencies' => { 'a' => '< 2' }),
+          ],
+          'c' => [
+            TestSpecification.new('name' => 'c', 'version' => '1.0.0'),
+            TestSpecification.new('name' => 'c', 'version' => '2.0.0', 'dependencies' => { 'b' => '< 2' }),
+          ],
+          'z' => [
+            TestSpecification.new('name' => 'z', 'version' => '1.0.0'),
+            TestSpecification.new('name' => 'z', 'version' => '2.0.0'),
+          ]
+        )
+        def index.sort_dependencies(dependencies, _activated, _conflicts)
+          index = ['c (>= 1.0.0)', 'b (< 2.0.0)', 'a (< 2.0.0)', 'c (= 1.0.0)']
+          dependencies.sort_by do |dep|
+            [
+              index.index(dep.to_s) || 999,
+            ]
+          end
+        end
+        @resolver = described_class.new(index, TestUI.new)
+        demands = [
+          VersionKit::Dependency.new('c', '= 1.0.0'),
+          VersionKit::Dependency.new('c', '>= 1.0.0'),
+          VersionKit::Dependency.new('z', '>= 1.0.0'),
+        ]
+
+        resolved = @resolver.resolve(demands, DependencyGraph.new)
+
+        expected = [
+          'c (1.0.0)',
+          'z (2.0.0)',
+        ]
+
+        expect(resolved.map(&:payload).map(&:to_s)).to match_array(expected)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ end
 #-----------------------------------------------------------------------------#
 
 require 'pathname'
+require 'json'
 ROOT = Pathname.new(File.expand_path('../../', __FILE__))
 $LOAD_PATH.unshift((ROOT + 'lib').to_s)
 $LOAD_PATH.unshift((ROOT + 'spec').to_s)
@@ -31,6 +32,10 @@ $LOAD_PATH.unshift((ROOT + 'spec').to_s)
 require 'version_kit'
 require 'molinillo'
 
+require 'spec_helper/index'
+require 'spec_helper/specification'
+require 'spec_helper/ui'
+
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = '.rspec_status'

data/spec/spec_helper/index.rb

@@ -1,19 +1,27 @@
 # frozen_string_literal: true
 module Molinillo
+  FIXTURE_DIR = Pathname.new('spec/resolver_integration_specs')
+  FIXTURE_INDEX_DIR = FIXTURE_DIR + 'index'
+
   class TestIndex
     attr_accessor :specs
     include SpecificationProvider
 
-    def initialize(fixture_name)
+    def self.from_fixture(fixture_name)
       File.open(FIXTURE_INDEX_DIR + (fixture_name + '.json'), 'r') do |fixture|
-        self.specs = JSON.load(fixture).reduce(Hash.new([])) do |specs_by_name, (name, versions)|
+        sorted_specs = JSON.load(fixture).reduce(Hash.new([])) do |specs_by_name, (name, versions)|
           specs_by_name.tap do |specs|
             specs[name] = versions.map { |s| TestSpecification.new s }.sort_by(&:version)
           end
         end
+        return new(sorted_specs)
       end
     end
 
+    def initialize(specs_by_name)
+      self.specs = specs_by_name
+    end
+
     def requirement_satisfied_by?(requirement, _activated, spec)
       case requirement
       when TestSpecification
@@ -27,7 +35,7 @@ module Molinillo
       @search_for ||= {}
       @search_for[dependency] ||= begin
         pre_release = dependency_pre_release?(dependency)
-        specs[dependency.name].select do |spec|
+        Array(specs[dependency.name]).select do |spec|
           (pre_release ? true : !spec.version.pre_release?) &&
             dependency.satisfied_by?(spec.version)
         end

data/spec/spec_helper/naive_resolver.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/LineLength
+# rubocop:disable Style/Semicolon
+
+module Molinillo
+  class NaiveResolver
+    def self.resolve(index, dependencies)
+      activated = Molinillo::DependencyGraph.new
+      level = 0
+      dependencies.each { |d| activated.add_child_vertex(d.name, nil, [nil], d) }
+      activated.tag(level)
+      possibilities_by_level = {}
+      loop do
+        vertex = activated.find { |a| !a.requirements.empty? && a.payload.nil? }
+        break unless vertex
+        possibilities = possibilities_by_level[level] ||= index.search_for(VersionKit::Dependency.new(vertex.name, '>= 0.0.0-a'))
+        possibilities.select! do |spec|
+          vertex.requirements.all? { |r| r.satisfied_by?(spec.version) && (!spec.version.pre_release? || index.send(:dependency_pre_release?, r)) } &&
+            spec.dependencies.all? { |d| v = activated.vertex_named(d.name); !v || !v.payload || d.satisfied_by?(v.payload.version) }
+        end
+        warn "level = #{level} possibilities = #{possibilities.map(&:to_s)} requirements = #{vertex.requirements.map(&:to_s)}"
+        if spec = possibilities.pop
+          warn "trying #{spec}"
+          activated.set_payload(vertex.name, spec)
+          spec.dependencies.each do |d|
+            activated.add_child_vertex(d.name, nil, [spec.name], d)
+          end
+          level += 1
+          warn "tagging level #{level}"
+          activated.tag(level)
+          next
+        end
+        level = possibilities_by_level.reverse_each.find(proc { [-1, nil] }) { |_l, p| !p.empty? }.first
+        warn "going back to level #{level}"
+        possibilities_by_level.reject! { |l, _| l > level }
+        return nil if level < 0
+        activated.rewind_to(level)
+        activated.tag(level)
+      end
+
+      activated
+    end
+
+    def self.warn(*); end
+  end
+end

data/spec/spec_helper/specification.rb

@@ -5,8 +5,9 @@ module Molinillo
     def initialize(hash)
       self.name = hash['name']
       self.version = VersionKit::Version.new(hash['version'])
-      self.dependencies = hash['dependencies'].map do |(name, requirement)|
-        VersionKit::Dependency.new(name, requirement.split(',').map(&:chomp))
+      self.dependencies = hash.fetch('dependencies') { Hash.new }.map do |(name, requirement)|
+        requirements = requirement.split(',').map(&:chomp)
+        VersionKit::Dependency.new(name, requirements)
       end
     end
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -70,10 +70,12 @@ files:
 - spec/dependency_graph/log_spec.rb
 - spec/dependency_graph_spec.rb
 - spec/errors_spec.rb
+- spec/fuzz_spec.rb
 - spec/resolver_integration_specs/index_from_rubygems.rb
 - spec/resolver_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper/index.rb
+- spec/spec_helper/naive_resolver.rb
 - spec/spec_helper/specification.rb
 - spec/spec_helper/ui.rb
 - spec/state_spec.rb
@@ -87,12 +89,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -105,9 +107,11 @@ test_files:
 - spec/dependency_graph/log_spec.rb
 - spec/dependency_graph_spec.rb
 - spec/errors_spec.rb
+- spec/fuzz_spec.rb
 - spec/resolver_integration_specs/index_from_rubygems.rb
 - spec/resolver_spec.rb
 - spec/spec_helper/index.rb
+- spec/spec_helper/naive_resolver.rb
 - spec/spec_helper/specification.rb
 - spec/spec_helper/ui.rb
 - spec/spec_helper.rb