nanoc-core 4.12.12 → 4.12.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f5cba2759d0a1a3fed3b3ecd60b4d48fe74e4e47d9855f585731a52436b407c
-  data.tar.gz: cbe6128977455e8109c3991059521a6f97053eda60eccaa4597637c680f89a00
+  metadata.gz: 94f41a5b7ba9b534f61e42a82dc9df7bebed20e7f2aadc6610d6b9523e2a3e8a
+  data.tar.gz: a40f9d8498cf715052ba691850e0e59c0877c107a7b0973594645ce7548cc289
 SHA512:
-  metadata.gz: 488a4b2b75e2a0a49f1a66f810003f5f11961e156013852cd97e1495bc1b66a0906b7efe1816a760127ed4759cd8926426d0dccc9776d12bb159ac15be3eabc6
-  data.tar.gz: 32cc8224e2aaf4abff07af2fb0401211f927bfa1e057c3641acdf043097df4554f4a70142cfcbac37f791f54dfefd196d10e0f48c7637d2692a94134b4850658
+  metadata.gz: 9c28483387d092e48b15f568fb910b60aa237dde2c152938ed4e36174ada46f56edbb29742ad7da98e903d5ed44066b40bc0821891ee48b1e1d48ff607d08370
+  data.tar.gz: b1d14a6cdbb245eb97b7820060406aa545571430214d835110f15d47bd721c49b28a66ee0473130699f4c4be2493cbd8267c81938c4dbc5981b5ce763a3a9437

data/lib/nanoc/core/item_rep_selector.rb

@@ -8,27 +8,13 @@ module Nanoc
         @reps = reps
       end
 
-      # An iterator (FIFO) over an array, with ability to ignore certain
-      # elements.
-      class ItemRepIgnorableIterator
-        def initialize(array)
-          @array = array.dup
-        end
-
-        def next_ignoring(ignored)
-          elem = @array.shift
-          elem = @array.shift while ignored.include?(elem)
-          elem
-        end
-      end
-
       # A priority queue that tracks dependencies and can detect circular
       # dependencies.
       class ItemRepPriorityQueue
         def initialize(reps)
           # Prio A: most important; prio C: least important.
-          @prio_a = []
-          @prio_b = ItemRepIgnorableIterator.new(reps)
+          @prio_a = nil
+          @prio_b = reps.dup
           @prio_c = []
 
           # List of reps that we’ve already seen. Reps from `reps` will end up
@@ -36,25 +22,32 @@ module Nanoc
           # `reps`, when they are part of a dependency.
           @seen = Set.new
 
+          # List of reps that have already been completed (yielded followed by
+          # `#mark_ok`).
+          @completed = Set.new
+
           # Record (hard) dependencies. Used for detecting cycles.
           @dependencies = Hash.new { |hash, key| hash[key] = Set.new }
         end
 
         def next
           # Read prio A
-          @this = @prio_a.pop
+          @this = @prio_a
           if @this
+            @prio_a = nil
             return @this
           end
 
           # Read prio B
-          @this = @prio_b.next_ignoring(@seen)
+          @this = @prio_b.shift
+          @this = @prio_b.shift while @seen.include?(@this)
           if @this
             return @this
           end
 
           # Read prio C
           @this = @prio_c.pop
+          @this = @prio_c.pop while @completed.include?(@this)
           if @this
             return @this
           end
@@ -63,7 +56,7 @@ module Nanoc
         end
 
         def mark_ok
-          # Nothing to do
+          @completed << @this
         end
 
         def mark_failed(dep)
@@ -78,7 +71,7 @@ module Nanoc
 
           # Put `dep` (item rep that needs to be compiled first, before
           # `@this`) into priority A (highest prio).
-          @prio_a.push(dep)
+          @prio_a = dep
 
           # 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

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.12.12'
+    VERSION = '4.12.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.12.12
+  version: 4.12.13
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Core of Nanoc