nanoc-core 4.11.17 → 4.11.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748b150c5ee93de8c4ce8dcd31ddc4e4dc64897a73d86dd91be9d743b1ff476d
-  data.tar.gz: '008722ff9d57b3c5e13fda3e5ac60dd4860a1240076383067a37664ebb7df2ca'
+  metadata.gz: 01ecf44ca25369ee5a16d3ab97f0d4880da51e5db1a1b15bf75e75eee4eb88da
+  data.tar.gz: 9cbeb1d146e6fa525b15cf19c62d39c0fe646c4586fed345689e7d0ae276adbf
 SHA512:
-  metadata.gz: 49b011afe4838c9150bd91ccaf17acd7150f5d143af69b13e623f542ff2af7965205f4b2a595b07e651babada9e902a98e2c879f923070be21c14fd199c5674d
-  data.tar.gz: aefeed726b1ac55565446d4fc7ccce5a3d5293029ad7b0e534e33f8f0ff338d0f7d8f9641dfd964125e5a71dbb243aa95e9cf447d071478fea03d1e2a485ea4c
+  metadata.gz: 5de5f16a2b47132155d2a85e3123cf4dc7f43e2c5fdea4d75361fdfbac310093da814b4112ecda5c1c58a5f9f19aefd33457fd260f4c02b1d1b8b46bcefc6c6f
+  data.tar.gz: af0216df8261745768e686b040f3b78f1a0efccd6490f7db4c551af1873f5066526a396b0761de3deaf8a84b0b167a39dcebe3b91b244d611788dcc4cf5735c5

data/lib/nanoc/core.rb

@@ -9,6 +9,7 @@ require 'tmpdir'
 require 'yaml'
 
 # External gems
+require 'concurrent-ruby'
 require 'json_schema'
 require 'ddmemoize'
 require 'ddmetrics'
@@ -19,6 +20,13 @@ require 'tomlrb'
 require 'tty-platform'
 require 'zeitwerk'
 
+# External gems (optional)
+begin
+  require 'clonefile'
+rescue LoadError
+  # ignore
+end
+
 module Nanoc
   module Core
     # Similar to `nil` except that it can only be compared against using

data/lib/nanoc/core/compilation_phases/write.rb

@@ -6,45 +6,6 @@ module Nanoc
       class Write < Abstract
         include Nanoc::Core::ContractsSupport
 
-        class Worker
-          def initialize(queue:, compiled_content_store:)
-            @queue = queue
-            @compiled_content_store = compiled_content_store
-          end
-
-          def start
-            @thread = Thread.new do
-              Thread.current.abort_on_exception = true
-              Thread.current.priority = -1 # schedule I/O work ASAP
-
-              writer = Nanoc::Core::ItemRepWriter.new
-
-              while rep = @queue.pop # rubocop:disable Lint/AssignmentInCondition
-                writer.write_all(rep, @compiled_content_store)
-              end
-            end
-          end
-
-          def join
-            @thread.join
-          end
-        end
-
-        class WorkerPool
-          def initialize(queue:, size:, compiled_content_store:)
-            @workers = Array.new(size) { Worker.new(queue: queue, compiled_content_store: compiled_content_store) }
-          end
-
-          def start
-            @workers.each(&:start)
-          end
-
-          def join
-            @workers.each(&:join)
-          end
-        end
-
-        QUEUE_SIZE = 40
         WORKER_POOL_SIZE = 5
 
         def initialize(compiled_content_store:, wrapped:)
@@ -52,19 +13,16 @@ module Nanoc
 
           @compiled_content_store = compiled_content_store
 
-          @queue = SizedQueue.new(QUEUE_SIZE)
-          @worker_pool = WorkerPool.new(queue: @queue, size: WORKER_POOL_SIZE, compiled_content_store: @compiled_content_store)
-        end
+          @pool = Concurrent::FixedThreadPool.new(WORKER_POOL_SIZE)
 
-        def start
-          super
-          @worker_pool.start
+          @writer = Nanoc::Core::ItemRepWriter.new
         end
 
         def stop
+          @pool.shutdown
+          @pool.wait_for_termination
+
           super
-          @queue.close
-          @worker_pool.join
         end
 
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
@@ -76,7 +34,9 @@ module Nanoc
           # notification happens before the :rep_write_enqueued one.
           Nanoc::Core::NotificationCenter.post(:rep_write_enqueued, rep)
 
-          @queue << rep
+          @pool.post do
+            @writer.write_all(rep, @compiled_content_store)
+          end
         end
       end
     end

data/lib/nanoc/core/contracts_support.rb

@@ -96,7 +96,8 @@ module Nanoc
             false
           end
 
-        @_contracts_support__should_enable = contracts_loadable && !ENV.key?('DISABLE_CONTRACTS')
+        # FIXME: Do something better with contracts on Ruby 3.x
+        @_contracts_support__should_enable = contracts_loadable && !RUBY_VERSION.start_with?('3') && !ENV.key?('DISABLE_CONTRACTS')
 
         if @_contracts_support__should_enable
           # FIXME: ugly

data/lib/nanoc/core/item_rep_writer.rb

@@ -62,11 +62,7 @@ module Nanoc
 
         # Write
         if is_modified
-          begin
-            FileUtils.ln(temp_path, raw_path, force: true)
-          rescue Errno::EXDEV, Errno::EACCES
-            FileUtils.cp(temp_path, raw_path)
-          end
+          smart_cp(temp_path, raw_path)
         end
 
         item_rep.modified = is_modified
@@ -80,6 +76,28 @@ module Nanoc
       def temp_filename
         Nanoc::Core::TempFilenameFactory.instance.create(TMP_TEXT_ITEMS_DIR)
       end
+
+      def smart_cp(from, to)
+        # Try clonefile
+        if defined?(Clonefile)
+          FileUtils.rm_f(to)
+          begin
+            res = Clonefile.always(from, to)
+            return if res
+          rescue Clonefile::UnsupportedPlatform, Errno::ENOTSUP, Errno::EXDEV, Errno::EINVAL
+          end
+        end
+
+        # Try with hardlink
+        begin
+          FileUtils.ln(from, to, force: true)
+          return
+        rescue Errno::EXDEV, Errno::EACCES
+        end
+
+        # Fall back to old-school copy
+        FileUtils.cp(from, to)
+      end
     end
   end
 end

data/lib/nanoc/core/temp_filename_factory.rb

@@ -14,6 +14,7 @@ module Nanoc
       def initialize
         @counts = {}
         @root_dir = Dir.mktmpdir('nanoc')
+        @mutex = Mutex.new
       end
 
       # @param [String] prefix A string prefix to include in the temporary
@@ -21,8 +22,11 @@ module Nanoc
       #
       # @return [String] A new unused filename
       def create(prefix)
-        count = @counts.fetch(prefix, 0)
-        @counts[prefix] = count + 1
+        count = nil
+        @mutex.synchronize do
+          count = @counts.fetch(prefix, 0)
+          @counts[prefix] = count + 1
+        end
 
         dirname  = File.join(@root_dir, prefix)
         filename = File.join(@root_dir, prefix, count.to_s)

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.11.17'
+    VERSION = '4.11.22'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.11.17
+  version: 4.11.22
 platform: ruby
 authors:
 - Denis Defreyne
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ddmemoize
   requirement: !ruby/object:Gem::Requirement
@@ -285,23 +299,23 @@ homepage: https://nanoc.ws/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Core of Nanoc
 test_files: []