grimoire 0.2.14 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6212f8c60b2164547104c04af321f94ea6c25786
-  data.tar.gz: 7e2ddc441bbfa0bf3e4a8af737544c5353fb3430
+  metadata.gz: 9c9a17a38a635dd8381968dfe601ba977b446a44
+  data.tar.gz: 053725154fb8bb735e6b2732b8de1192cbc32651
 SHA512:
-  metadata.gz: 8ce671fae5ed3842110f8b9dc0ed6d0567f6900fdddd763940d3618c468af6caa165eefa50cb8e5fd01a2f9e2287864cba0ba3cfa50e3ac3342fb64529f4b7c6
-  data.tar.gz: a341c1da2122171235d5af9ad8d4fb8c30010f886883fb4d711236ca1622ff05e2ec3e2352e9340ebc2aae0c7c585b4a94aca80e29c6adf2dd01ab5f17a77555
+  metadata.gz: 3d54699457032f23745a65e9c261c289e6887524e63f9bdba932296900de3a9170b44f157ff7fc3841495c861d2ac01c9f565b87f2af03fb7c55d6dc675a45b1
+  data.tar.gz: 3d00dc2abf2326224e93697124e7d4b3ffd9963f6be46c8f7030bf60cd2d2c3d31772e024b2a8997577580a5c4c30d780cdf4afc995606e1e49f11d1e083a02c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.16
+* Fix constraint validator to check full unit collection
+
 # v0.2.14
 * Relax constraints on dependency libraries
 

data/grimoire.gemspec

@@ -14,5 +14,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'attribute_struct', '>= 0.1.12', '< 0.5'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'rake', '~> 10'
   s.files = Dir['{lib}/**/**/*'] + %w(grimoire.gemspec README.md CHANGELOG.md CONTRIBUTING.md LICENSE)
 end

data/lib/grimoire/solver.rb

@@ -254,12 +254,21 @@ module Grimoire
             deps.compact!
             u_dep
           end.compact.map do |u_dep|  # validator
-            existing = deps.detect{|d| d.name == u_dep.name}
-            if(existing)
-              unless(u_dep.requirement.satisfied_by?(existing.version))
-                deps.delete(existing)
-                reset_queue(u_dep.name)
-                raise Error::ResolutionPathInvalid.new("Unit <#{existing.inspect}> does not satisfy <#{u_dep.inspect}>")
+            existing_collection = deps.find_all do |d|
+              d.name == u_dep.name
+            end
+            existing_requirements = deps.map do |d|
+              d.dependencies.find_all do |d_dep|
+                d_dep.name == u_dep.name
+              end
+            end.flatten.compact.map(&:requirement)
+            existing_collection.each do |existing|
+              ([u_dep.requirement] + existing_requirements).each do |req|
+                unless(req.satisfied_by?(existing.version))
+                  deps.delete(existing)
+                  reset_queue(u_dep.name)
+                  raise Error::ResolutionPathInvalid.new("Unit <#{existing.inspect}> does not satisfy <#{req.inspect}>")
+                end
               end
             end
           end

data/lib/grimoire/version.rb

@@ -1,4 +1,4 @@
 module Grimoire
   # Current library version
-  VERSION = Gem::Version.new('0.2.14')
+  VERSION = Gem::Version.new('0.2.16')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grimoire
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.16
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo
@@ -78,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
 description: Specialized constraint solver allowing weighted results
 email: code@chrisroberts.org
 executables: []