nanoc-core 4.14.1 → 4.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5de89d113517fc4b36e407d4e143a8cf715a976403a88ebccd7b835657d0fe7c
-  data.tar.gz: fa356053ac5f68c8000fe8f33d5c04441e866921905f9b360a0f55c16897e3ac
+  metadata.gz: 1eb383ecd0b9f70dab794c7cbbeaea2000372252ec7fca79a88977f4b9ee52e4
+  data.tar.gz: 10b983997d7836e81a8d9926f8ccaf2f2208e557fce3a61d67675dc954d8dd4a
 SHA512:
-  metadata.gz: c6ee804845d8df4865282f5844d9d04005efd6b72235a8d1c145308d9df521f1340852934564b34163623da8809abbde7c003dfc04cea8865dd30139898db2ed
-  data.tar.gz: aff44bee226c1edbf815cb9f459a2ab6a59729f0ffd520a771e101f1b92aa11a3adcbf447547a61a147aee7d032ed0849326d65f59c7e6f36a77886791b45ee9
+  metadata.gz: 2a05d9133dfcea7375b3b2dbc86d876701f86d29298bc029eae947b59893071f06df12aeb0491179ec3b6f725770de9ff7af940d16ffbd978c02859acb50e2cb
+  data.tar.gz: e374dd038fb6535c7e48ec2228f872ec06a70022a82306da0a4ac35c11ec2133e88aea1bee4f0ec5fbe339965a63e67f2054a34d1afacb8b7275c26de7e5e6c1

data/lib/nanoc/core/compilation_stages/compile_reps.rb

@@ -33,7 +33,12 @@ module Nanoc
             end
           end
 
-          selector = Nanoc::Core::ItemRepSelector.new(outdated_reps)
+          selector = Nanoc::Core::ItemRepSelector.new(
+            outdated_reps:,
+            reps: @reps,
+            dependency_store: @dependency_store,
+          )
+
           run_phase_stack do |phase_stack|
             selector.each do |rep|
               handle_errors_while(rep) do

data/lib/nanoc/core/item_rep_selector.rb

@@ -4,17 +4,22 @@ module Nanoc
   module Core
     # Yields item reps to compile.
     class ItemRepSelector
-      def initialize(reps)
+      def initialize(outdated_reps:, reps:, dependency_store:)
+        @outdated_reps = outdated_reps
         @reps = reps
+        @dependency_store = dependency_store
       end
 
       # A priority queue that tracks dependencies and can detect circular
       # dependencies.
       class ItemRepPriorityQueue
-        def initialize(reps)
+        def initialize(outdated_reps:, reps:, dependency_store:)
+          @reps = reps
+          @dependency_store = dependency_store
+
           # Prio A: most important; prio C: least important.
           @prio_a = nil
-          @prio_b = reps.dup
+          @prio_b = outdated_reps.dup
           @prio_c = []
 
           # List of reps that we’ve already seen. Reps from `reps` will end up
@@ -59,30 +64,31 @@ module Nanoc
           @completed << @this
         end
 
-        def mark_failed(dep)
-          record_dependency(dep)
+        def mark_failed(needed_rep:)
+          record_dependency(needed_rep)
 
-          # `@this` depends on `dep`, so `dep` has to be compiled first. Thus,
-          # move `@this` into priority C, and `dep` into priority A.
+          # `@this` depends on `needed_rep`, so `needed_rep` has to be compiled
+          # first. Thus, move `@this` into priority C, and `needed_rep` into
+          # priority A.
 
-          # Put `@this` (item rep that needs `dep` to be compiled first) into
-          # priority C (lowest prio).
+          # Put `@this` (item rep that needs `needed_rep` to be compiled first)
+          # into priority C (lowest prio).
           @prio_c.push(@this) unless @prio_c.include?(@this)
 
-          # Put `dep` (item rep that needs to be compiled first, before
+          # Put `needed_rep` (item rep that needs to be compiled first, before
           # `@this`) into priority A (highest prio).
-          @prio_a = dep
+          @prio_a = needed_rep
 
-          # Remember that we’ve prioritised `dep`. This particular element will
-          # come from @prio_b at some point in the future, so we’ll have to skip
-          # it then.
-          @seen << dep
+          # Remember that we’ve prioritised `needed_rep`. This particular
+          # element will come from @prio_b at some point in the future, so we’ll
+          # have to skip it then.
+          @seen << needed_rep
         end
 
         private
 
-        def record_dependency(dep)
-          @dependencies[@this] << dep
+        def record_dependency(rep)
+          @dependencies[@this] << rep
 
           find_cycle(@this, [@this])
         end
@@ -102,7 +108,11 @@ module Nanoc
       end
 
       def each
-        pq = ItemRepPriorityQueue.new(@reps)
+        pq = ItemRepPriorityQueue.new(
+          outdated_reps: @outdated_reps,
+          reps: @reps,
+          dependency_store: @dependency_store,
+        )
 
         loop do
           rep = pq.next
@@ -115,7 +125,7 @@ module Nanoc
             actual_error = e.is_a?(Nanoc::Core::Errors::CompilationError) ? e.unwrap : e
 
             if actual_error.is_a?(Nanoc::Core::Errors::UnmetDependency)
-              pq.mark_failed(actual_error.rep)
+              pq.mark_failed(needed_rep: actual_error.rep)
             else
               raise(e)
             end

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.14.1'
+    VERSION = '4.14.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.14.1
+  version: 4.14.2
 platform: ruby
 authors:
 - Denis Defreyne
@@ -303,7 +303,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.14.1/nanoc-core
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.14.2/nanoc-core
 rdoc_options: []
 require_paths:
 - lib
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Core of Nanoc
 test_files: []