molinillo 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a3f407e98934857813a1d4e17fbf807171bfbd02
-  data.tar.gz: 5ca9cff1741fb50a1c8767a7fb6aadc6465d1b70
+SHA256:
+  metadata.gz: e49dcc72411487d09ae920c58cafe7df5acb0786af570d085c753282c2d3a622
+  data.tar.gz: 27de8ebaffabf3a5eb757742593a934842ce46ae39d7db498dea9322e75b380b
 SHA512:
-  metadata.gz: 0a683263d7bf6566b74e88d948c20a6b2ec18cbbf26ae68e335ec27ab61708c25b9565329b6295e90bad515322196792d94df6f1d651997d84f32066253b6d85
-  data.tar.gz: d529667799bbb115b1fadd3fffa107fadca0ec456b0c00a97af9404713b45d1ec6a4ae54a8f2309acd68ea068018f7cf63c494b91effcbbf80fc112390340bbb
+  metadata.gz: ea0bfaa9a5e53a3ea8cc4719b3a777ac906c6e8b01343c27082059b37990965e44aa7dea190a843ab5b33a542e5da5fc95682092f9d7f2abc604f26f5c0f5cf0
+  data.tar.gz: e6603baac5f6bb5f093e5f0139f49ae5f9b298abd1f1c79e42b5f377d3d6ca4206fe3113f54fdd65ae2bb5b86a1f29e7a24dad48773c7c898875c13f4b21b2f4

data/lib/molinillo/dependency_graph.rb

@@ -98,18 +98,27 @@ module Molinillo
       "#{self.class}:#{vertices.values.inspect}"
     end
 
+    # @param [Hash] options options for dot output.
     # @return [String] Returns a dot format representation of the graph
-    def to_dot
+    def to_dot(options = {})
+      edge_label = options.delete(:edge_label)
+      raise ArgumentError, "Unknown options: #{options.keys}" unless options.empty?
+
       dot_vertices = []
       dot_edges = []
       vertices.each do |n, v|
         dot_vertices << "  #{n} [label=\"{#{n}|#{v.payload}}\"]"
         v.outgoing_edges.each do |e|
-          dot_edges << "  #{e.origin.name} -> #{e.destination.name} [label=\"#{e.requirement}\"]"
+          label = edge_label ? edge_label.call(e) : e.requirement
+          dot_edges << "  #{e.origin.name} -> #{e.destination.name} [label=#{label.to_s.dump}]"
         end
       end
+
+      dot_vertices.uniq!
       dot_vertices.sort!
+      dot_edges.uniq!
       dot_edges.sort!
+
       dot = dot_vertices.unshift('digraph G {').push('') + dot_edges.push('}')
       dot.join("\n")
     end

data/lib/molinillo/dependency_graph/add_edge_no_circular.rb

@@ -23,8 +23,8 @@ module Molinillo
       # (see Action#down)
       def down(graph)
         edge = make_edge(graph)
-        edge.origin.outgoing_edges.delete(edge)
-        edge.destination.incoming_edges.delete(edge)
+        delete_first(edge.origin.outgoing_edges, edge)
+        delete_first(edge.destination.incoming_edges, edge)
       end
 
       # @!group AddEdgeNoCircular
@@ -53,6 +53,13 @@ module Molinillo
         @destination = destination
         @requirement = requirement
       end
+
+      private
+
+      def delete_first(array, item)
+        return unless index = array.index(item)
+        array.delete_at(index)
+      end
     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.5.5'.freeze
+  VERSION = '0.5.6'.freeze
 end

data/lib/molinillo/modules/ui.rb

@@ -48,7 +48,7 @@ module Molinillo
       if debug?
         debug_info = yield
         debug_info = debug_info.inspect unless debug_info.is_a?(String)
-        output.puts debug_info.split("\n").map { |s| '  ' * depth + s }
+        output.puts debug_info.split("\n").map { |s| ' ' * depth + s }
       end
     end
 

data/lib/molinillo/resolution.rb

@@ -356,13 +356,20 @@ module Molinillo
       # Ensures there are no orphaned successors to the given {vertex}.
       # @param [DependencyGraph::Vertex] vertex the vertex to fix up.
       # @return [void]
-      def fixup_swapped_children(vertex)
+      def fixup_swapped_children(vertex) # rubocop:disable Metrics/CyclomaticComplexity
         payload = vertex.payload
         deps = dependencies_for(payload).group_by(&method(:name_for))
         vertex.outgoing_edges.each do |outgoing_edge|
-          @parent_of[outgoing_edge.requirement] = states.size - 1
+          requirement = outgoing_edge.requirement
+          parent_index = @parent_of[requirement]
           succ = outgoing_edge.destination
           matching_deps = Array(deps[succ.name])
+          dep_matched = matching_deps.include?(requirement)
+
+          # only reset the parent index when it was originally required by the
+          # same named spec
+          @parent_of[requirement] = states.size - 1 if parent_index && states[parent_index].name == 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) }
@@ -373,9 +380,13 @@ module Molinillo
               # 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)
+          elsif !dep_matched
+            # also reset if we're removing the edge, but only if its parent has
+            # already been fixed up
+            @parent_of[requirement] = states.size - 1 if @parent_of[requirement].nil?
+
             activated.delete_edge(outgoing_edge)
-            requirements.delete(outgoing_edge.requirement)
+            requirements.delete(requirement)
           end
         end
       end

data/spec/errors_spec.rb

@@ -3,14 +3,14 @@ require File.expand_path('../spec_helper', __FILE__)
 
 module Molinillo
   describe NoSuchDependencyError do
-    let(:dependency) { VersionKit::Dependency.new('foo', '>= 1.0') }
+    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.0)`')
+        expect(subject.message).to eq('Unable to find a specification for `foo (>= 1.0)`')
       end
 
       context 'when #required_by is not empty' do
@@ -18,7 +18,7 @@ module Molinillo
 
         it 'includes the source names' do
           expect(subject.message).to eq(
-            'Unable to find a specification for `foo (>= 1.0.0)` depended upon by `spec-1` and `spec-2`')
+            'Unable to find a specification for `foo (>= 1.0)` depended upon by `spec-1` and `spec-2`')
         end
       end
     end

data/spec/fuzz_spec.rb

@@ -7,13 +7,14 @@ describe 'fuzzing' do
   let(:dependencies) do
     index.specs.keys.sample(Random.rand(5)).
       map do |d|
-      VersionKit::Dependency.new(
+      Gem::Dependency.new(
         d,
         "#{CONSTRAINTS.sample} #{Random.rand(2)}.#{Random.rand(2)}"
       )
     end
   end
-  let(:index) { Molinillo::TestIndex.from_fixture('fuzz') }
+  let(:index_class) { Molinillo::TestIndex }
+  let(:index) { index_class.from_fixture('fuzz') }
   let(:ui) { Molinillo::TestUI.new }
   let(:resolver) { Molinillo::Resolver.new(index, ui) }
 
@@ -22,7 +23,7 @@ describe 'fuzzing' do
   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(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)
@@ -48,19 +49,28 @@ describe 'fuzzing' do
   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]
+    Molinillo::INDICES.each do |ic|
+      context "with #{ic.to_s.split('::').last}" do
+        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
-        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

data/spec/resolver_spec.rb

@@ -13,11 +13,11 @@ module Molinillo
           self.name = test_case['name']
           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)
+            Gem::Dependency.new name.delete("\x01"), reqs.split(',').map(&:chomp)
           end
           add_dependencies_to_graph = lambda do |graph, parent, hash|
             name = hash['name']
-            version = VersionKit::Version.new(hash['version'])
+            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|
@@ -46,12 +46,11 @@ module Molinillo
 
       self.resolver = Resolver.new(index, TestUI.new)
     end
-  end
 
-  describe Resolver do
-    describe 'dependency resolution' do
-      Dir.glob(FIXTURE_CASE_DIR + '**/*.json').map do |fixture|
-        test_case = TestCase.new(fixture)
+    def run(_index_class, context)
+      test_case = self
+
+      context.instance_eval do
         it test_case.name do
           resolve = lambda { test_case.resolver.resolve(test_case.requested, test_case.base) }
 
@@ -74,35 +73,66 @@ module Molinillo
             end
             expect(pretty_dependencies.call(result)).to contain_exactly(*pretty_dependencies.call(test_case.result))
 
-            expect(result).to eq(test_case.result)
+            expect(result).to equal_dependency_graph(test_case.result)
           end
         end
       end
     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 'can resolve a list of 0 requirements' do
-        expect(@resolver.resolve([], DependencyGraph.new)).to eq(DependencyGraph.new)
-      end
-
       it 'includes the source of a user-specified unsatisfied dependency' do
         expect do
-          @resolver.resolve([VersionKit::Dependency.new('missing', '3.0')], DependencyGraph.new)
+          @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 = VersionKit::Dependency.new('missing', '3.0')
+        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 = VersionKit::Dependency.new('actionpack', '1.2.3')
+        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).
@@ -113,227 +143,7 @@ module Molinillo
         expect(resolved.map(&:payload).map(&:to_s)).to eq(['actionpack (1.2.3)'])
       end
 
-      it 'can resolve when two specs have the same dependencies' do
-        index = BundlerIndex.from_fixture('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 = [
-          'rake (10.5.0)',
-          'builder (3.2.2)',
-          'ffi (1.9.14)',
-          'libyajl2 (1.2.0)',
-          'hashie (2.1.2)',
-          'mixlib-log (1.7.1)',
-          'rack (2.0.1)',
-          'uuidtools (2.1.5)',
-          'diff-lcs (1.2.5)',
-          'erubis (2.7.0)',
-          'highline (1.7.8)',
-          'mixlib-cli (1.7.0)',
-          'mixlib-config (2.2.4)',
-          'mixlib-shellout (2.2.7)',
-          'net-ssh (2.9.4)',
-          'ipaddress (0.8.3)',
-          'mime-types (2.99.3)',
-          'systemu (2.6.5)',
-          'wmi-lite (1.0.0)',
-          'plist (3.1.0)',
-          'coderay (1.1.1)',
-          'method_source (0.8.2)',
-          'slop (3.6.0)',
-          'rspec-support (3.5.0)',
-          'multi_json (1.12.1)',
-          'net-telnet (0.1.1)',
-          'sfl (2.2.0)',
-          'ffi-yajl (1.4.0)',
-          'mixlib-authentication (1.4.1)',
-          'net-ssh-gateway (1.2.0)',
-          'net-scp (1.2.1)',
-          'pry (0.10.4)',
-          'rspec-core (3.5.3)',
-          'rspec-expectations (3.5.0)',
-          'rspec-mocks (3.5.0)',
-          'chef-zero (4.2.3)',
-          'ohai (8.4.0)',
-          'net-ssh-multi (1.2.1)',
-          'specinfra (2.61.3)',
-          'rspec_junit_formatter (0.2.3)',
-          'rspec-its (1.2.0)',
-          'rspec (3.5.0)',
-          'serverspec (2.36.1)',
-          'chef (12.1.2)',
-        ]
-
-        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.from_fixture('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
-
-      it 'can unwind when the conflict has a common parent' do
-        index = BundlerIndex.from_fixture('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.from_fixture('restkit')
-        def index.sort_dependencies(dependencies, activated, conflicts)
-          dependencies.sort_by do |d|
-            [
-              activated.vertex_named(d.name).payload ? 0 : 1,
-              dependency_pre_release?(d) ? 0 : 1,
-              conflicts[d.name] ? 0 : 1,
-              search_for(d).count,
-            ]
-          end
-        end
-
-        def index.requirement_satisfied_by?(requirement, activated, spec)
-          existing_vertices = activated.vertices.values.select do |v|
-            v.name.split('/').first == requirement.name.split('/').first
-          end
-          existing = existing_vertices.map(&:payload).compact.first
-          if existing
-            existing.version == spec.version && requirement.satisfied_by?(spec.version)
-          else
-            requirement.satisfied_by? spec.version
-          end
-        end
-
-        @resolver = described_class.new(index, TestUI.new)
-        demands = [
-          VersionKit::Dependency.new('RestKit', '~> 0.23.0'),
-          VersionKit::Dependency.new('RestKit', '<= 0.23.2'),
-        ]
-
-        resolved = @resolver.resolve(demands, DependencyGraph.new)
-
-        expected = [
-          'RestKit (0.23.2)',
-          'RestKit/Core (0.23.2)',
-        ]
-
-        expect(resolved.map(&:payload).map(&:to_s)).to match_array(expected)
-      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)
-            Array(specs[dependency_name]).count
-          end
-        end
-
-        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'),
-          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
-
-      it 'can resolve ur face' do
+      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' }),
@@ -362,9 +172,9 @@ module Molinillo
         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'),
+          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)
@@ -376,6 +186,32 @@ module Molinillo
 
         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

data/spec/spec_helper.rb

@@ -29,12 +29,12 @@ ROOT = Pathname.new(File.expand_path('../../', __FILE__))
 $LOAD_PATH.unshift((ROOT + 'lib').to_s)
 $LOAD_PATH.unshift((ROOT + 'spec').to_s)
 
-require 'version_kit'
 require 'molinillo'
 
 require 'spec_helper/index'
 require 'spec_helper/specification'
 require 'spec_helper/ui'
+require 'spec_helper/equal_dependency_graph'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

data/spec/spec_helper/equal_dependency_graph.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+RSpec::Matchers.define :equal_dependency_graph do |expected|
+  diffable
+  attr_reader :actual, :expected
+
+  match do |actual|
+    @expected = expected.to_dot(:edge_label => proc { |e| e.destination.payload.version })
+    @actual = actual.to_dot(:edge_label => proc { |e| e.destination.payload.version })
+    actual == expected
+  end
+
+  failure_message do
+    'Expected the two dependency graphs to be equal'
+  end
+end

data/spec/spec_helper/index.rb

@@ -25,19 +25,19 @@ module Molinillo
     def requirement_satisfied_by?(requirement, _activated, spec)
       case requirement
       when TestSpecification
-        VersionKit::Dependency.new(requirement.name, requirement.version).satisfied_by?(spec.version)
-      when VersionKit::Dependency
-        requirement.satisfied_by?(spec.version)
+        requirement.version == spec.version
+      when Gem::Dependency
+        requirement.requirement.satisfied_by?(spec.version)
       end
     end
 
     def search_for(dependency)
       @search_for ||= {}
       @search_for[dependency] ||= begin
-        pre_release = dependency_pre_release?(dependency)
+        prerelease = dependency_prerelease?(dependency)
         Array(specs[dependency.name]).select do |spec|
-          (pre_release ? true : !spec.version.pre_release?) &&
-            dependency.satisfied_by?(spec.version)
+          (prerelease ? true : !spec.version.prerelease?) &&
+            dependency.requirement.satisfied_by?(spec.version)
         end
       end
       @search_for[dependency].dup
@@ -55,7 +55,7 @@ module Molinillo
       dependencies.sort_by do |d|
         [
           activated.vertex_named(d.name).payload ? 0 : 1,
-          dependency_pre_release?(d) ? 0 : 1,
+          dependency_prerelease?(d) ? 0 : 1,
           conflicts[d.name] ? 0 : 1,
           activated.vertex_named(d.name).payload ? 0 : search_for(d).count,
         ]
@@ -64,10 +64,8 @@ module Molinillo
 
     private
 
-    def dependency_pre_release?(dependency)
-      dependency.requirement_list.requirements.any? do |r|
-        VersionKit::Version.new(r.reference_version).pre_release?
-      end
+    def dependency_prerelease?(dependency)
+      dependency.prerelease?
     end
   end
 
@@ -80,10 +78,91 @@ module Molinillo
         name = name_for(dependency)
         [
           activated.vertex_named(name).payload ? 0 : 1,
+          amount_constrained(dependency),
           conflicts[name] ? 0 : 1,
           activated.vertex_named(name).payload ? 0 : search_for(dependency).count,
         ]
       end
     end
+
+    def amount_constrained(dependency)
+      @amount_constrained ||= {}
+      @amount_constrained[dependency.name] ||= begin
+        all = specs[dependency.name].size
+        if all <= 1
+          all #- 1_000_000
+        else
+          search = search_for(dependency).size
+          search - all
+        end
+      end
+    end
+  end
+
+  class ReverseBundlerIndex < BundlerIndex
+    def sort_dependencies(*)
+      super.reverse
+    end
+  end
+
+  class RandomSortIndex < TestIndex
+    def sort_dependencies(dependencies, _activated, _conflicts)
+      dependencies.shuffle
+    end
   end
+
+  class CocoaPodsIndex < TestIndex
+    def sort_dependencies(dependencies, activated, conflicts)
+      dependencies.sort_by do |d|
+        [
+          activated.vertex_named(d.name).payload ? 0 : 1,
+          dependency_prerelease?(d) ? 0 : 1,
+          conflicts[d.name] ? 0 : 1,
+          search_for(d).count,
+        ]
+      end
+    end
+
+    def requirement_satisfied_by?(requirement, activated, spec)
+      existing_vertices = activated.vertices.values.select do |v|
+        v.name.split('/').first == requirement.name.split('/').first
+      end
+      existing = existing_vertices.map(&:payload).compact.first
+      if existing
+        existing.version == spec.version && requirement.requirement.satisfied_by?(spec.version)
+      else
+        requirement.requirement.satisfied_by? spec.version
+      end
+    end
+  end
+
+  class BerkshelfIndex < TestIndex
+    # 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)
+      Array(specs[dependency_name]).count
+    end
+  end
+
+  INDICES = [
+    TestIndex,
+    BundlerIndex,
+    ReverseBundlerIndex,
+    RandomSortIndex,
+    CocoaPodsIndex,
+    BerkshelfIndex,
+  ].freeze
 end

data/spec/spec_helper/naive_resolver.rb

@@ -15,9 +15,9 @@ module Molinillo
       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 = possibilities_by_level[level] ||= index.search_for(Gem::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)) } &&
+          vertex.requirements.all? { |r| r.requirement.satisfied_by?(spec.version) && (!spec.version.prerelease? || index.send(:dependency_prerelease?, 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)}"

data/spec/spec_helper/specification.rb

@@ -4,10 +4,10 @@ module Molinillo
     attr_accessor :name, :version, :dependencies
     def initialize(hash)
       self.name = hash['name']
-      self.version = VersionKit::Version.new(hash['version'])
+      self.version = Gem::Version.new(hash['version'])
       self.dependencies = hash.fetch('dependencies') { Hash.new }.map do |(name, requirement)|
         requirements = requirement.split(',').map(&:chomp)
-        VersionKit::Dependency.new(name, requirements)
+        Gem::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.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2017-02-08 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: 
@@ -74,6 +74,7 @@ files:
 - 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
@@ -89,17 +90,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution
@@ -110,10 +111,10 @@ test_files:
 - 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
-has_rdoc: