grimoire 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6edd571b20c68657154ccebb7e415844163e2021
-  data.tar.gz: c840f072f9a7ea4e7542e1a2243ed9b7b6b6b580
+  metadata.gz: 8a67e6b4597f818bf3075b20f3910be621cde2c8
+  data.tar.gz: 8d5e37c2641122b761c3c3c1128a77ad906d0430
 SHA512:
-  metadata.gz: 9588422c6b487a94fb009f75021499a918e7ffcf5fc247c1c1b4299b8a845170e0c2396b056a978dd04ef5018e434b1f1de71ed658adc0bfd99514e87278fa68
-  data.tar.gz: 6e73d8db9e4b7a82339cc4a7beb1673158cee6db83f76da3d904efe7a5939720f081aa9f9df638b6350bd264fa4e9d2f503942ba82044e5b7900a67b6cb6c35d
+  metadata.gz: bb8424d75e0392beaa679ccdce8d7046d8bc37d061db0f628635f46d44952c508cca2f89f2e8a37edd110ee3df82b62ab63c64c103a30a910573472c99f34f41
+  data.tar.gz: b7a5c8769d2c75472eb3e1b0b3a0774a006eae9bfff8df0bfd02e04c9434b29f76e7d5416d236e63d8d5c0c85df349af2a169de0f0b8f7b16378658a276b3065

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.2
+* Provide origin solver to score keeper when requesting unit score
+* Introduce Solver#prune_world! to remove extraneous units
+
 # v0.2.0
 * Use direct `#to_json` to prevent conversion errors on older ruby
 * Add `UnitScoreKeeper#preferred_score` to provide some score meaning

data/lib/grimoire/solver.rb

@@ -17,16 +17,48 @@ module Grimoire
 
     # @return [System] subset of full system based on requirements
     attr_reader :world
+    # @return [System, NilClass] new system subset when pruning
+    attr_reader :new_world
 
     def initialize(*_)
       super
       @world = System.new
+      @new_world = nil
       @log = []
       build_world(requirements.requirements, world, system)
       @log.clear
       world.scrub!
     end
 
+    # After the world has been generated extraneous units will
+    # be included as a result of dependency constraints that may
+    # be too loose and are not actually required by any resolution
+    # that would be requested. This will run a second pass and remove
+    # extraneous items not required.
+    #
+    # @return [self]
+    # @note This must be called explicitly and is provided for
+    #   resolving an entire system, not a single resolution path
+    def prune_world!
+      @new_world = System.new
+      requirements.requirements.each do |req|
+        world.units[req.name].each do |r_unit|
+          path = Solver.new(
+            :requirements => 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)
+        end
+      end
+      @world = new_world
+      @new_world = nil
+      self
+    end
+
     # Build the world required for the solver (the subset of the
     # entire system required by the requirements)
     #
@@ -97,7 +129,7 @@ module Grimoire
     # @return [Numeric] score
     def score_unit(unit, score)
       if(score_keeper)
-        score_keeper.score_for(unit, score) || score
+        score_keeper.score_for(unit, score, :solver => self) || score
       else
         score
       end

data/lib/grimoire/unit_score_keeper.rb

@@ -15,8 +15,10 @@ module Grimoire
     #
     # @param unit [Unit]
     # @param idx [Integer] current order index
+    # @param opts [Hash] extra options
+    # @option opts [Solver] :solver solver requesting score
     # @return [Numeric]
-    def score_for(unit, idx)
+    def score_for(unit, idx, opts={})
       raise NotImplementedError.new 'No scoring has been defined'
     end
 

data/lib/grimoire/version.rb

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

metadata

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