molinillo 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b84ed4e59212748f00d03e6af1c8efa14a50312
-  data.tar.gz: c23774f7ef7ceb3641ae3f34357fbc4894c9afb5
+  metadata.gz: e941ca9751ad429184a78dbb929fba03428d5630
+  data.tar.gz: a60bb544a0c227c078e49249848e7a93dcc654b5
 SHA512:
-  metadata.gz: 748d0fcec60150be7b9b33b0585ee1bd52e08ba19bf1ac7d2be6889ad2b4669a29d15a5d4de21e22823f9900f8e2f1b364b1ac40406cff35d4261a8a7c783103
-  data.tar.gz: 1a09bbe11d5b9c1d27e26e5f7b0dfc4848f28a87729d999fea11e784b6ba788a98146108572c6c8b340774360815bc0e3c44ae2f478c9373a85a85be1bbec8c8
+  metadata.gz: 7cfb3cbe6a1c524938933f30ad4cce2384b5ddca16632c99609721e841fb70557be98df82fa2feb0980a127dd009d026f9bd5b34edca1d7fa2e39ba6ecae0307
+  data.tar.gz: 952805cd2f2fc302b2ea5c11181442c3019755cd22dab63afe37e97121ba270e9b3ddebdf2443c83604578dac2f16f8d9252164c490e1dc7cb02a2694421bbe2

data/lib/molinillo/gem_metadata.rb

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

data/lib/molinillo/resolution.rb

@@ -184,6 +184,8 @@ module Molinillo
           raise VersionConflict.new(c) unless state
           activated.rewind_to(sliced_states.first || :initial_state) if sliced_states
           state.conflicts = c
+          index = states.size - 1
+          @parent_of.reject! { |_, i| i >= index }
         end
       end
 
@@ -209,7 +211,10 @@ module Molinillo
       # @return [Object] the requirement that led to `requirement` being added
       #   to the list of requirements.
       def parent_of(requirement)
-        @parent_of[requirement]
+        return unless requirement
+        return unless index = @parent_of[requirement]
+        return unless parent_state = @states[index]
+        parent_state.requirement
       end
 
       # @return [Object] the requirement that led to a version of a possibility
@@ -418,7 +423,8 @@ module Molinillo
         debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
         nested_dependencies.each do |d|
           activated.add_child_vertex(name_for(d), nil, [name_for(activated_spec)], d)
-          @parent_of[d] = requirement
+          parent_index = states.size - 1
+          @parent_of[d] ||= parent_index
         end
 
         push_state_for_requirements(requirements + nested_dependencies, !nested_dependencies.empty?)

data/spec/resolver_integration_specs/index_from_rubygems.rb

@@ -4,7 +4,7 @@ require 'json'
 require 'open-uri'
 require 'set'
 
-GEMS = %w(rails capybara bundler github-linguist).freeze
+GEMS = %w(chef).freeze
 
 VERSION_PATTERN = /\A
   [0-9]+\.[0-9]+\.[0-9]+           (?# Number component)
@@ -28,7 +28,7 @@ def coerce_to_semver(version)
   semver = parts[0..2].join('.')
   semver.sub!(/([a-zA-Z])/, '-\1')
   semver += '-' + parts[-1] if parts.size > 3
-  semver
+  semver.chomp(".")
 end
 
 def coerce_dependencies_to_semver(deps)

data/spec/resolver_spec.rb

@@ -121,6 +121,81 @@ 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
+        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')
+        @resolver = described_class.new(index, TestUI.new)
+        demands = [
+          VersionKit::Dependency.new('chef', '~> 12.1.2'),
+        ]
+
+        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
+
       # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-09-12 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.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution