molinillo 0.5.7 → 0.6.0

data/lib/molinillo/resolver.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'molinillo/dependency_graph'
 
 module Molinillo

data/lib/molinillo/state.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Molinillo
   # A state that a {Resolution} can be in
   # @attr [String] name the name of the current requirement
@@ -7,7 +8,8 @@ module Molinillo
   # @attr [Object] requirement the current requirement
   # @attr [Object] possibilities the possibilities to satisfy the current requirement
   # @attr [Integer] depth the depth of the resolution
-  # @attr [Set<Object>] conflicts unresolved conflicts
+  # @attr [Hash] conflicts unresolved conflicts, indexed by dependency name
+  # @attr [Array<UnwindDetails>] unused_unwind_options unwinds for previous conflicts that weren't explored
   ResolutionState = Struct.new(
     :name,
     :requirements,
@@ -15,14 +17,15 @@ module Molinillo
     :requirement,
     :possibilities,
     :depth,
-    :conflicts
+    :conflicts,
+    :unused_unwind_options
   )
 
   class ResolutionState
     # Returns an empty resolution state
     # @return [ResolutionState] an empty state
     def self.empty
-      new(nil, [], DependencyGraph.new, nil, nil, 0, Set.new)
+      new(nil, [], DependencyGraph.new, nil, nil, 0, {}, [])
     end
   end
 
@@ -40,7 +43,8 @@ module Molinillo
         requirement,
         [possibilities.pop],
         depth + 1,
-        conflicts.dup
+        conflicts.dup,
+        unused_unwind_options.dup
       ).tap do |state|
         state.activated.tag(state)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,9 +45,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ARCHITECTURE.md
+- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/molinillo.rb
+- lib/molinillo/compatibility.rb
 - lib/molinillo/delegates/resolution_state.rb
 - lib/molinillo/delegates/specification_provider.rb
 - lib/molinillo/dependency_graph.rb
@@ -67,19 +70,6 @@ files:
 - lib/molinillo/resolution.rb
 - lib/molinillo/resolver.rb
 - lib/molinillo/state.rb
-- 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/equal_dependency_graph.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
 homepage: https://github.com/CocoaPods/Molinillo
 licenses:
 - MIT
@@ -100,21 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution
-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/equal_dependency_graph.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
-- spec/state_spec.rb
+test_files: []
+has_rdoc: 

data/spec/dependency_graph/log_spec.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-
-describe Molinillo::DependencyGraph::Log do
-  shared_examples_for 'replay' do |steps|
-    it 'replays the log' do
-      copy = Molinillo::DependencyGraph.new
-      graph = Molinillo::DependencyGraph.new.tap { |g| steps.each { |s| s.call(g) } }
-      graph.log.each { |a| a.up(copy) }
-      expect(copy).to eq(graph)
-    end
-
-    it 'can undo to an empty graph' do
-      graph = Molinillo::DependencyGraph.new
-      graph.tag(self)
-      steps.each { |s| s.call(graph) }
-      graph.log.rewind_to(graph, self)
-      expect(graph).to eq(Molinillo::DependencyGraph.new)
-    end
-  end
-
-  it_behaves_like 'replay', []
-  it_behaves_like 'replay', [
-    proc { |g| g.add_child_vertex('Foo', 1, [nil], 4) },
-    proc { |g| g.add_child_vertex('Bar', 2, ['Foo', nil], 3) },
-    proc { |g| g.add_child_vertex('Baz', 3, %w(Foo Bar), 2) },
-    proc { |g| g.add_child_vertex('Foo', 4, [], 1) },
-  ]
-end

data/spec/dependency_graph_spec.rb

@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-require File.expand_path('../spec_helper', __FILE__)
-
-module Molinillo
-  describe DependencyGraph do
-    describe 'in general' do
-      before do
-        @graph = described_class.new
-        @root  = @graph.add_vertex('Root', 'Root', true)
-        @root2 = @graph.add_vertex('Root2', 'Root2', true)
-        @child = @graph.add_child_vertex('Child', 'Child', %w(Root), 'Child')
-      end
-
-      it 'returns root vertices by name' do
-        expect(@graph.root_vertex_named('Root')).to eq(@root)
-      end
-
-      it 'returns vertices by name' do
-        expect(@graph.vertex_named('Root')).to eq(@root)
-        expect(@graph.vertex_named('Child')).to eq(@child)
-      end
-
-      it 'returns nil for non-existent root vertices' do
-        expect(@graph.root_vertex_named('missing')).to be_nil
-      end
-
-      it 'returns nil for non-existent vertices' do
-        expect(@graph.vertex_named('missing')).to be_nil
-      end
-    end
-
-    describe 'detaching a node' do
-      before do
-        @graph = described_class.new
-      end
-
-      it 'detaches a root vertex without successors' do
-        root = @graph.add_vertex('root', 'root', true)
-        @graph.detach_vertex_named(root.name)
-        expect(@graph.vertex_named(root.name)).to be_nil
-        expect(@graph.vertices).to be_empty
-      end
-
-      it 'detaches a root vertex with successors' do
-        root = @graph.add_vertex('root', 'root', true)
-        child = @graph.add_child_vertex('child', 'child', %w(root), 'child')
-        @graph.detach_vertex_named(root.name)
-        expect(@graph.vertex_named(root.name)).to be_nil
-        expect(@graph.vertex_named(child.name)).to be_nil
-        expect(@graph.vertices).to be_empty
-      end
-
-      it 'detaches a root vertex with successors with other parents' do
-        root = @graph.add_vertex('root', 'root', true)
-        root2 = @graph.add_vertex('root2', 'root2', true)
-        child = @graph.add_child_vertex('child', 'child', %w(root root2), 'child')
-        @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 contain_exactly(root2)
-        expect(@graph.vertices.count).to eq(2)
-      end
-
-      it 'detaches a vertex with predecessors' do
-        parent = @graph.add_vertex('parent', 'parent', true)
-        child = @graph.add_child_vertex('child', 'child', %w(parent), 'child')
-        @graph.detach_vertex_named(child.name)
-        expect(@graph.vertex_named(child.name)).to be_nil
-        expect(@graph.vertices).to eq(parent.name => parent)
-        expect(parent.outgoing_edges).to be_empty
-      end
-    end
-  end
-end

data/spec/errors_spec.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-require File.expand_path('../spec_helper', __FILE__)
-
-module Molinillo
-  describe NoSuchDependencyError do
-    let(:dependency) { Gem::Dependency.new('foo', '>= 1.0') }
-    let(:required_by) { [] }
-
-    subject { described_class.new(dependency, required_by) }
-
-    describe '#message' do
-      it 'says it is unable to find the spec' do
-        expect(subject.message).to eq('Unable to find a specification for `foo (>= 1.0)`')
-      end
-
-      context 'when #required_by is not empty' do
-        let(:required_by) { %w(spec-1 spec-2) }
-
-        it 'includes the source names' do
-          expect(subject.message).to eq(
-            'Unable to find a specification for `foo (>= 1.0)` depended upon by `spec-1` and `spec-2`')
-        end
-      end
-    end
-  end
-end

data/spec/fuzz_spec.rb

@@ -1,94 +0,0 @@
-# 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|
-      Gem::Dependency.new(
-        d,
-        "#{CONSTRAINTS.sample} #{Random.rand(2)}.#{Random.rand(2)}"
-      )
-    end
-  end
-  let(:index_class) { Molinillo::TestIndex }
-  let(:index) { index_class.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.requirement).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 = [])
-    Molinillo::INDICES.each do |ic|
-      context "with #{ic.to_s.split('::').last}" do
-        around(:example) do |ex|
-          old_seed = Random::DEFAULT.seed
-          ex.run
-          Random.srand old_seed
-        end
-
-        let(:index_class) { ic }
-        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
-
-            if naive
-              expect(graph).to equal_dependency_graph(naive)
-            else
-              expect(graph).to be_nil, "#{graph && graph.map(&:payload).map(&:to_s)} vs nil"
-            end
-          end
-        end
-      end
-    end
-  end
-
-  fuzz! [
-    8,
-    9,
-    125,
-    188,
-    666,
-    7_898_789,
-    0,
-    3,
-  ].concat(Array.new(ENV.fetch('MOLINILLO_FUZZER', '0').to_i) { Random.rand })
-end if RUBY_VERSION >= '1.9'

data/spec/resolver_integration_specs/index_from_rubygems.rb

@@ -1,76 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'json'
-require 'open-uri'
-require 'set'
-
-GEMS = %w(chef).freeze
-
-VERSION_PATTERN = /\A
-  [0-9]+\.[0-9]+\.[0-9]+           (?# Number component)
-  ([-][0-9a-z-]+(\.[0-9a-z-]+)*)?  (?# Pre-release component)
-  ([+][0-9a-z-]+(\.[0-9a-z-]+)*)?  (?# Build component)
-    \Z/xi
-
-def coerce_to_semver(version)
-  return version if version.sub(/^(\S+\s+)/, '') =~ VERSION_PATTERN
-  return "#{Regexp.last_match[1]}#{Regexp.last_match[2]}" if version =~ /^(\S+\s+)? (\d+\.\d+\.\d+) (?: \.\d+)*$/ix
-
-  parts = version.split(/[\.-]/, 4)
-  4.times do |i|
-    if parts[i] =~ /-?([a-zA-Z])/
-      parts << '0' until parts.size >= 3
-      parts[i].sub!(/-?([a-zA-Z]+)/, '')
-      parts[i] = '0' if parts[i].empty?
-      parts[3] = Regexp.last_match[1] + parts[i..-1].join('')
-    end
-  end
-  semver = parts[0..2].join('.')
-  semver.sub!(/([a-zA-Z])/, '-\1')
-  semver += '-' + parts[-1] if parts.size > 3
-  semver.chomp(".")
-end
-
-def coerce_dependencies_to_semver(deps)
-  dependencies = {}
-  deps.sort_by(&:first).each do |name, req|
-    dependencies[name] = req.split(',').map { |r| coerce_to_semver(r) }.join(',')
-  end
-  dependencies
-end
-
-gems = Set.new(GEMS)
-downloaded_gems = Set.new
-specs = []
-
-loop do
-  size = gems.size
-  (gems ^ downloaded_gems).each_slice(200) do |g|
-    specs += JSON.load open("http://bundler.rubygems.org/api/v1/dependencies.json?gems=#{g.join(',')}")
-  end
-  downloaded_gems.merge(gems)
-
-  gems.merge(specs.flat_map { |s| s['dependencies'].map(&:first) })
-
-  break if gems.size == size
-end
-
-specs.reject! { |s| s['platform'] != 'ruby' }
-specs.uniq! { |s| [s['name'], s['number']] }
-specs.sort_by! { |s| s['name'].downcase }
-specs = specs.group_by { |s| s['name'] }.values.map do |spec|
-  [spec.first['name'], spec.flat_map do |s|
-    {
-      'name' => s['name'],
-      'version' => coerce_to_semver(s['number']),
-      'dependencies' => coerce_dependencies_to_semver(s['dependencies'])
-    }
-  end.uniq { |s| s['version'] }.sort_by { |s| Gem::Version.new(s['version']) }
-  ]
-end
-
-specs = Hash[specs]
-
-json = JSON.generate(specs)
-
-File.open("index/rubygems-#{Date.today}.json", 'w') { |f| f.write json }

data/spec/resolver_spec.rb

@@ -1,235 +0,0 @@
-# frozen_string_literal: true
-require File.expand_path('../spec_helper', __FILE__)
-
-module Molinillo
-  FIXTURE_CASE_DIR = FIXTURE_DIR + 'case'
-
-  class TestCase
-    attr_accessor :name, :requested, :base, :conflicts, :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.from_fixture(test_case['index'] || 'awesome')
-          self.requested = test_case['requested'].map do |(name, reqs)|
-            Gem::Dependency.new name.delete("\x01"), reqs.split(',').map(&:chomp)
-          end
-          add_dependencies_to_graph = lambda do |graph, parent, hash|
-            name = hash['name']
-            version = Gem::Version.new(hash['version'])
-            dependency = index.specs[name].find { |s| s.version == version }
-            node = if parent
-                     graph.add_vertex(name, dependency).tap do |v|
-                       graph.add_edge(parent, v, dependency)
-                     end
-                   else
-                     graph.add_vertex(name, dependency, true)
-                   end
-            hash['dependencies'].each do |dep|
-              add_dependencies_to_graph.call(graph, node, dep)
-            end
-          end
-          self.result = test_case['resolved'].reduce(DependencyGraph.new) do |graph, r|
-            graph.tap do |g|
-              add_dependencies_to_graph.call(g, nil, r)
-            end
-          end
-          self.base = test_case['base'].reduce(DependencyGraph.new) do |graph, r|
-            graph.tap do |g|
-              add_dependencies_to_graph.call(g, nil, r)
-            end
-          end
-          self.conflicts = test_case['conflicts'].to_set
-        end
-      end
-    end
-
-    def run(index_class, context)
-      return if ignore?(index_class)
-
-      test_case = self
-
-      context.instance_eval do
-        it test_case.name do
-          resolve = lambda do
-            index = index_class.new(test_case.index.specs)
-            resolver = Resolver.new(index, TestUI.new)
-            resolver.resolve(test_case.requested, test_case.base)
-          end
-
-          if test_case.conflicts.any?
-            expect { resolve.call }.to raise_error do |error|
-              expect(error).to be_a(ResolverError)
-              names = case error
-                      when CircularDependencyError
-                        error.dependencies.map(&:name)
-                      when VersionConflict
-                        error.conflicts.keys
-                      end.to_set
-              expect(names).to eq(test_case.conflicts)
-            end
-          else
-            result = resolve.call
-
-            pretty_dependencies = lambda do |dg|
-              dg.vertices.values.map { |v| "#{v.name} (#{v.payload && v.payload.version})" }
-            end
-            expect(pretty_dependencies.call(result)).to contain_exactly(*pretty_dependencies.call(test_case.result))
-
-            expect(result).to equal_dependency_graph(test_case.result)
-          end
-        end
-      end
-    end
-
-    def ignore?(index_class)
-      if index_class == BerkshelfIndex &&
-          name == 'can resolve when two specs have the same dependencies and swapping happens' &&
-          Gem.ruby_version < Gem::Version.new('2.3')
-
-        # That index doesn't do a great job sorting, and segiddins has been
-        # unable to get the test passing with the bad sort (on Ruby < 2.3)
-        # without breaking other specs
-        return true
-      end
-
-      false
-    end
-
-    def self.save!(path, name, index, requirements, resolved)
-      resolved_to_h = proc do |v|
-        { :name => v.name, :version => v.payload.version, :dependencies => v.successors.map(&resolved_to_h) }
-      end
-      resolved = resolved.vertices.reduce([]) do |array, (_n, v)|
-        if v.root
-          array << resolved_to_h.call(v)
-        else
-          array
-        end
-      end
-
-      File.open(File.join(FIXTURE_CASE_DIR, "#{path}.json"), 'w') do |f|
-        f.write JSON.pretty_generate(
-          :name => name,
-          :index => index,
-          :requested => Hash[requirements.map { |r| [r.name, r.requirement.to_s] }],
-          :base => [],
-          :resolved => resolved.sort_by { |v| v[:name] },
-          :conflicts => []
-        )
-      end
-    end
-  end
-
-  describe Resolver do
-    describe 'dependency resolution' do
-      test_cases = Dir.glob(FIXTURE_CASE_DIR + '**/*.json').map { |fixture| TestCase.new(fixture) }
-      INDICES.each do |index_class|
-        context "with the #{index_class.to_s.split('::').last} index" do
-          test_cases.each { |tc| tc.run(index_class, self) }
-        end
-      end
-    end
-
-    describe 'in general' do
-      before do
-        @resolver = described_class.new(TestIndex.from_fixture('awesome'), TestUI.new)
-      end
-
-      it 'includes the source of a user-specified unsatisfied dependency' do
-        expect do
-          @resolver.resolve([Gem::Dependency.new('missing', '3.0')], DependencyGraph.new)
-        end.to raise_error(VersionConflict, /required by `user-specified dependency`/)
-      end
-
-      it 'can handle when allow_missing? returns true for the only requirement' do
-        dep = Gem::Dependency.new('missing', '3.0')
-        allow(@resolver.specification_provider).to receive(:allow_missing?).with(dep).and_return(true)
-        expect(@resolver.resolve([dep], DependencyGraph.new).to_a).to be_empty
-      end
-
-      it 'can handle when allow_missing? returns true for a nested requirement' do
-        dep = Gem::Dependency.new('actionpack', '1.2.3')
-        allow(@resolver.specification_provider).to receive(:allow_missing?).
-          with(have_attributes(:name => 'activesupport')).and_return(true)
-        allow(@resolver.specification_provider).to receive(:search_for).
-          with(have_attributes(:name => 'activesupport')).and_return([])
-        allow(@resolver.specification_provider).to receive(:search_for).
-          with(have_attributes(:name => 'actionpack')).and_call_original
-        resolved = @resolver.resolve([dep], DependencyGraph.new)
-        expect(resolved.map(&:payload).map(&:to_s)).to eq(['actionpack (1.2.3)'])
-      end
-
-      it 'only cleans up orphaned nodes after swapping' 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 = [
-          Gem::Dependency.new('c', '= 1.0.0'),
-          Gem::Dependency.new('c', '>= 1.0.0'),
-          Gem::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
-
-      it 'does not reset parent tracking after swapping when another requirement led to the child' do
-        demands = [
-          Gem::Dependency.new('autobuild'),
-          Gem::Dependency.new('pastel'),
-          Gem::Dependency.new('tty-prompt'),
-          Gem::Dependency.new('tty-table'),
-        ]
-
-        index = BundlerIndex.from_fixture('rubygems-2017-01-24')
-        index.specs['autobuild'] = [
-          TestSpecification.new('name' => 'autobuild',
-                                'version' => '0.1.0',
-                                'dependencies' => {
-                                  'tty-prompt' => '>= 0.6.0, ~> 0.6.0',
-                                  'pastel' => '>= 0.6.0, ~> 0.6.0',
-                                }),
-        ]
-
-        @resolver = described_class.new(index, TestUI.new)
-        demands.each { |d| index.search_for(d) }
-
-        resolved = @resolver.resolve(demands, DependencyGraph.new)
-
-        expect(resolved.map(&:payload).map(&:to_s).sort).to include('pastel (0.6.1)', 'tty-table (0.6.0)')
-      end
-    end
-  end
-end