grimoire 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a67e6b4597f818bf3075b20f3910be621cde2c8
-  data.tar.gz: 8d5e37c2641122b761c3c3c1128a77ad906d0430
+  metadata.gz: 80076e8f01f36c012ab6dfb0fd3e28002828f06b
+  data.tar.gz: 8a44a15ea9dc630a83937e8a765af8801784163d
 SHA512:
-  metadata.gz: bb8424d75e0392beaa679ccdce8d7046d8bc37d061db0f628635f46d44952c508cca2f89f2e8a37edd110ee3df82b62ab63c64c103a30a910573472c99f34f41
-  data.tar.gz: b7a5c8769d2c75472eb3e1b0b3a0774a006eae9bfff8df0bfd02e04c9434b29f76e7d5416d236e63d8d5c0c85df349af2a169de0f0b8f7b16378658a276b3065
+  metadata.gz: a8d92eb9fcf4c38ae1fd67d5c30472cdcbf7e9775afc7b51129530cf16f9e37edd42269007d82e3ef32c397d9b2be26659f813f751a7f47dd4c436a0e5bab887
+  data.tar.gz: c980efe5d8a72b2ea50fe3b19169662939de2a711076aa4c2de3ce032e0be58dac1ffcc51b881bc7076b85d11e4b45adceb05268fdb8c15ca23b9c71c9a600ed

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.4
+* No longer force error when no requested units are within system
+* Discard no solution errors when pruning the world instead of failing
+
 # v0.2.2
 * Provide origin solver to score keeper when requesting unit score
 * Introduce Solver#prune_world! to remove extraneous units

data/lib/grimoire/solver.rb

@@ -43,15 +43,20 @@ module Grimoire
       @new_world = System.new
       requirements.requirements.each do |req|
         world.units[req.name].each do |r_unit|
-          path = Solver.new(
-            :requirements => RequirementList.new(
+          begin
+            req_list = RequirementList.new(
               :name => :world_pruner,
               :requirements => [[r_unit.name, r_unit.version.version]]
-            ),
-            :system => world,
-            :score_keeper => score_keeper
-          ).generate!.pop
-          new_world.add_unit(*path.units)
+            )
+            path = Solver.new(
+              :requirements => req_list,
+              :system => world,
+              :score_keeper => score_keeper
+            ).generate!.pop
+            new_world.add_unit(*path.units)
+          rescue Error::NoSolution => e
+            debug "Failed to generate valid path for: #{r_unit.name}-#{r_unit.version}"
+          end
         end
       end
       @world = new_world
@@ -142,7 +147,7 @@ module Grimoire
     def reset_queue(name)
       queue = populate_queue(
         create_queue,
-        world.units[name]
+        world.units.fetch(name, [])
       )
       queues[name] = queue
       self
@@ -239,7 +244,7 @@ module Grimoire
           count += 1
         end
       rescue Error::UnitUnavailable => e
-        debug "Failed to unit: #{e}"
+        debug "Failed to locate unit: #{e}"
         count = nil
       end
       if(results.empty?)

data/lib/grimoire/system.rb

@@ -59,10 +59,12 @@ module Grimoire
         raise TypeError.new "Expecting `#{REQUIREMENT_CLASS}` but received `#{constraint.class}`"
       end
       unless(units[unit_name])
-        raise KeyError.new("Failed to locate any units loaded in system with requested name: `#{unit_name}`")
-      end
-      units[unit_name].find_all do |unit|
-        constraint.satisfied_by?(unit.version)
+        Grimoire.debug "Failed to locate any units loaded in system with requested name: `#{unit_name}`"
+        []
+      else
+        units[unit_name].find_all do |unit|
+          constraint.satisfied_by?(unit.version)
+        end
       end
     end
 

data/lib/grimoire/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grimoire
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo