nanoc-core 4.12.12 → 4.12.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f5cba2759d0a1a3fed3b3ecd60b4d48fe74e4e47d9855f585731a52436b407c
-  data.tar.gz: cbe6128977455e8109c3991059521a6f97053eda60eccaa4597637c680f89a00
+  metadata.gz: f6002d238861027abd84a4b7499c56f95be1e8bf3dec412eb21051c91c11fcce
+  data.tar.gz: 3788262a93f33920e549372a34d5fcacc4a2c6d120d3acf1562499eaaaca0cfb
 SHA512:
-  metadata.gz: 488a4b2b75e2a0a49f1a66f810003f5f11961e156013852cd97e1495bc1b66a0906b7efe1816a760127ed4759cd8926426d0dccc9776d12bb159ac15be3eabc6
-  data.tar.gz: 32cc8224e2aaf4abff07af2fb0401211f927bfa1e057c3641acdf043097df4554f4a70142cfcbac37f791f54dfefd196d10e0f48c7637d2692a94134b4850658
+  metadata.gz: 869cddca22933872511ec0b10d7a09c9d37ff3dd89de4340f88b2d6fcceee725779d0c0dd9e891f2c28e2a25adb6f7a909f378537d8d88bd5a4f128fc76b86de
+  data.tar.gz: 208bd267925b4d51df67bd0293fe6f903671089f4899c529fc63cc8d5ecd0130c434662211b2e232e115bb532a2234301c6c44e5b74fff4acfc74e93288d703d

data/lib/nanoc/core/action_sequence_store.rb

@@ -11,7 +11,7 @@ module Nanoc
 
       contract C::KeywordArgs[config: Nanoc::Core::Configuration] => C::Any
       def initialize(config:)
-        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'rule_memory'), 1)
+        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'rule_memory'), 2)
 
         @action_sequences = {}
       end

data/lib/nanoc/core/binary_compiled_content_cache.rb

@@ -11,7 +11,7 @@ module Nanoc
 
       contract C::KeywordArgs[config: Nanoc::Core::Configuration] => C::Any
       def initialize(config:)
-        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'binary_content'), 2)
+        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'binary_content'), 3)
 
         @cache = {}
       end

data/lib/nanoc/core/checksum_store.rb

@@ -16,7 +16,7 @@ module Nanoc
 
       contract C::KeywordArgs[config: Nanoc::Core::Configuration, objects: C::IterOf[c_obj]] => C::Any
       def initialize(config:, objects:)
-        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'checksums'), 2)
+        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'checksums'), 3)
 
         @objects = objects
 

data/lib/nanoc/core/dependency_store.rb

@@ -42,7 +42,7 @@ module Nanoc
 
       contract Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection, Nanoc::Core::Configuration => C::Any
       def initialize(items, layouts, config)
-        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'dependencies'), 5)
+        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'dependencies'), 6)
 
         @config = config
         @items = items

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/outdatedness_store.rb

@@ -8,7 +8,7 @@ module Nanoc
 
       contract C::KeywordArgs[config: Nanoc::Core::Configuration] => C::Any
       def initialize(config:)
-        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'outdatedness'), 1)
+        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'outdatedness'), 2)
 
         @outdated_refs = Set.new
       end

data/lib/nanoc/core/store.rb

@@ -128,12 +128,16 @@ module Nanoc
         self.data = read_obj_from_file(data_filename)
       end
 
-      def write_obj_to_file(fn, obj)
-        File.binwrite(fn, Marshal.dump(obj))
+      def write_obj_to_file(filename, obj)
+        data = Marshal.dump(obj)
+        compressed_data = Zlib::Deflate.deflate(data, Zlib::BEST_SPEED)
+        write_data_to_file(filename, compressed_data)
       end
 
       def read_obj_from_file(fn)
-        Marshal.load(File.binread(fn))
+        compressed_data = File.binread(fn)
+        data = Zlib::Inflate.inflate(compressed_data)
+        Marshal.load(data)
       end
 
       def version_filename
@@ -143,6 +147,28 @@ module Nanoc
       def data_filename
         "#{filename}.data.db"
       end
+
+      def write_data_to_file(filename, data)
+        basename = File.basename(filename)
+        dirname = File.dirname(filename)
+
+        # Write to a temporary file first, and then (atomically) move it into
+        # place.
+        Tempfile.open(".#{basename}", dirname) do |temp_file|
+          temp_file.binmode
+
+          # Write the data as a stream, because File.binwrite can’t
+          # necessarily deal with writing that much data all at once.
+          #
+          # See https://github.com/nanoc/nanoc/issues/1635.
+          reader = StringIO.new(data)
+          IO.copy_stream(reader, temp_file)
+          temp_file.close
+
+          # Rename (atomic)
+          File.rename(temp_file.path, filename)
+        end
+      end
     end
   end
 end

data/lib/nanoc/core/textual_compiled_content_cache.rb

@@ -11,7 +11,7 @@ module Nanoc
 
       contract C::KeywordArgs[config: Nanoc::Core::Configuration] => C::Any
       def initialize(config:)
-        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'compiled_content'), 3)
+        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'compiled_content'), 4)
 
         @cache = {}
       end

data/lib/nanoc/core/version.rb

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

data/lib/nanoc/core.rb

@@ -7,6 +7,7 @@ require 'pstore'
 require 'singleton'
 require 'tmpdir'
 require 'yaml'
+require 'zlib'
 
 # External gems
 require 'concurrent-ruby'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.12.12
+  version: 4.12.14
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-12-03 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