molinillo 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9546ad44db45ffeeb600e30f638fb9210cf6c961
-  data.tar.gz: de98b81edb5384a6f0c25608f2809e7671a90559
+  metadata.gz: '058fb8f202cdd62307106904580d3fc0b8f906c3'
+  data.tar.gz: ffedb580a16d6b73f469199c93dae9634e6be9c0
 SHA512:
-  metadata.gz: 6bf39875c6f19a858fbebe6ffd35b7e01bf5e7c45e081289bbda2020b4be8ba6229fd6b9b1629f04017165e5a9cbc1f8affb5fde1ba521670631b3fb1e091e38
-  data.tar.gz: 87eed61627ccbd8f4dbabdd362971e64e028354811fa7548c035749a5baf14999cc15937ba227046f5d96b90a46b8e9a7ecdd97dd8fa630bb6c420fe07ade143
+  metadata.gz: 90be827ec5b343a49c0ac22a2aec00f751d84a774e5505e4284ecae8d3f0c7a968b34ec1de97ccbcf0efa9e2d7440e6cc1ef2cc1966855bf4246b136bc04e4e5
+  data.tar.gz: ada1a30e9ffb745c1a0e605628ba54f77bffdeabf88482129ea731f19702593d1754cc83ff048b0518a98018476530c008163a2a492059760e8a35a3190b4ecb

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Molinillo Changelog
 
+## 0.6.1 (2017-08-01)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Allow the set of dependencies for a given possibility to change over time,
+  fixing a regression in 0.6.0.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 0.6.0 (2017-07-27)
 
 ##### Breaking

data/lib/molinillo/gem_metadata.rb

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

data/lib/molinillo/resolution.rb

@@ -688,8 +688,7 @@ module Molinillo
       # @return [void]
       def attempt_to_filter_existing_spec(vertex)
         filtered_set = filtered_possibility_set(vertex)
-        if !filtered_set.possibilities.empty? &&
-            (vertex.payload.dependencies == dependencies_for(possibility.latest_version))
+        if !filtered_set.possibilities.empty?
           activated.set_payload(name, filtered_set)
           new_requirements = requirements.dup
           push_state_for_requirements(new_requirements, false)
@@ -705,18 +704,7 @@ module Molinillo
       # @param [Object] existing vertex
       # @return [PossibilitySet] filtered possibility set
       def filtered_possibility_set(vertex)
-        # Note: we can't just look at the intersection of `vertex.payload.possibilities`
-        # and `possibility.possibilities`, because if one of our requirements contains
-        # a prerelease version the associated prerelease versions will only appear in
-        # one set (but may match all requirements)
-        filtered_old_values = vertex.payload.possibilities.select do |poss|
-          requirement_satisfied_by?(requirement, activated, poss)
-        end
-        filtered_new_values = possibility.possibilities.select do |poss|
-          vertex.requirements.uniq.all? { |req| requirement_satisfied_by?(req, activated, poss) }
-        end
-
-        PossibilitySet.new(vertex.payload.dependencies, filtered_old_values | filtered_new_values)
+        PossibilitySet.new(vertex.payload.dependencies, vertex.payload.possibilities & possibility.possibilities)
       end
 
       # @param [String] requirement_name the spec name to search for

metadata

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