molinillo 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '058fb8f202cdd62307106904580d3fc0b8f906c3'
-  data.tar.gz: ffedb580a16d6b73f469199c93dae9634e6be9c0
+  metadata.gz: 5b31401d705c0bd1b9839f3b560996af5339a632
+  data.tar.gz: daabc784cc8a0385da64f2befa949887c70e3502
 SHA512:
-  metadata.gz: 90be827ec5b343a49c0ac22a2aec00f751d84a774e5505e4284ecae8d3f0c7a968b34ec1de97ccbcf0efa9e2d7440e6cc1ef2cc1966855bf4246b136bc04e4e5
-  data.tar.gz: ada1a30e9ffb745c1a0e605628ba54f77bffdeabf88482129ea731f19702593d1754cc83ff048b0518a98018476530c008163a2a492059760e8a35a3190b4ecb
+  metadata.gz: 139afb59678e775ae0e93214dfa78e13f1da4b4e73a42b514ab696818cfa00947e57b16a01b4582dbbc2563c222166c3779e032e899244cebf95f4573259ee7b
+  data.tar.gz: 708818cffc500e0f686a51e6025d254150408e206d48e176b5fa97d6466bd8efcf3897ab6fc4f21602197e5c1ac56b5f623b796617741451be77f5d182126ca0

data/ARCHITECTURE.md

@@ -18,7 +18,7 @@ This stack-based approach is used because backtracking (also known as *unwinding
 2. The client calls `resolve` with an array of user-requested dependencies and an optional 'locking' `DependencyGraph`
 3. The `Resolver` creates a new `Resolution` with those four user-specified parameters and calls `resolve` on it
 4. The `Resolution` creates an `initial_state`, which takes the user-requested dependencies and puts them into a `DependencyState`
-  - In the process of creating the state, the `SpecificationProvider` is asked to sort the dependencies and return all the `possibilities` for the `initial_requirement` (taking into account whether the dependency is `locked`). These possibilities are then grouped into `PossibilitySet`s, with each set representing a group of versions for the dependency which share the same sub-dependency requirements
+  - In the process of creating the state, the `SpecificationProvider` is asked to sort the dependencies and return all the `possibilities` for the `initial_requirement` (taking into account whether the dependency is `locked`). These possibilities are then grouped into `PossibilitySet`s, with each set representing a group of versions for the dependency which share the same sub-dependency requirements and are contiguous
   - A `DependencyGraph` is created that has all of these requirements point to `root_vertices`
 5. The resolution process now enters its main loop, which continues as long as there is a current `state` to process, and the current state has requirements left to process
 6. `UI#indicate_progress` is called to allow the client to report progress

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Molinillo Changelog
 
+## 0.6.2 (2017-08-25)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Insist each PossibilitySet contains contiguous versions. Fixes a regression
+  where an older dependency version with identical sub-dependencies to the
+  latest version may be preferred over the second-latest version.  
+  [Grey Baker](https://github.com/greysteil)
+
+
 ## 0.6.1 (2017-08-01)
 
 ##### Enhancements

data/lib/molinillo/gem_metadata.rb

@@ -2,5 +2,5 @@
 
 module Molinillo
   # The version of Molinillo.
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.6.2'.freeze
 end

data/lib/molinillo/resolution.rb

@@ -791,24 +791,25 @@ module Molinillo
       end
 
       # Build an array of PossibilitySets, with each element representing a group of
-      # dependency versions that all have the same sub-dependency version constraints.
+      # dependency versions that all have the same sub-dependency version constraints
+      # and are contiguous.
       # @param [Array] an array of possibilities
       # @return [Array] an array of possibility sets
       def group_possibilities(possibilities)
         possibility_sets = []
-        possibility_sets_index = {}
+        current_possibility_set = nil
 
         possibilities.reverse_each do |possibility|
           dependencies = dependencies_for(possibility)
-          if index = possibility_sets_index[dependencies]
-            possibility_sets[index].possibilities.unshift(possibility)
+          if current_possibility_set && current_possibility_set.dependencies == dependencies
+            current_possibility_set.possibilities.unshift(possibility)
           else
-            possibility_sets << PossibilitySet.new(dependencies, [possibility])
-            possibility_sets_index[dependencies] = possibility_sets.count - 1
+            possibility_sets.unshift(PossibilitySet.new(dependencies, [possibility]))
+            current_possibility_set = possibility_sets.first
           end
         end
 
-        possibility_sets.reverse
+        possibility_sets
       end
 
       # Pushes a new {DependencyState}.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler