nanoc-core 4.11.15 → 4.11.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d36108ed7c1e713b65fe5119960115a3a8749efb49acb59dca207bdd82e5892
-  data.tar.gz: d3799629cd606d9cb73aad14f798e2eac3e549149774e374e2a92832a4bc09e4
+  metadata.gz: ac94fc2464196846d4d6b38fb9a3ee02d0566aaa16f4f192e63f7989af937dc0
+  data.tar.gz: 0ba05d8ccb6d2cb10a8ec2909bb9bd99dee5203272c24cd02fdc6c6d4041dd17
 SHA512:
-  metadata.gz: 6aea180789234158ce9d449d922e2bc88b4daf2ba877870eb865cfc0fbae52ac60995439294f2a70bc2c705a248d1dc512431a3df45beda5c4567a8046c06349
-  data.tar.gz: edd1525adfe8ca4e64a227b6dc57c131a674d6bc56071d0befe29b1c765a97933b76102f5acfbf44c7f130c7b746e5494604183392331f7756170064dfec8cd1
+  metadata.gz: b76254a60ba5cc2d94f0dc6a01498b51fa22c068ba6ee93c6434cee1105a29922f664c08090b155b18a9016b065fb854f60dc38a57f2effa6b1a6a1c1d94aeee
+  data.tar.gz: 314da571f7e0b49544152e66dc1bc9b30ae49911b0f8aeaf863d23731294ffe33e7b21977a2238f619396119ab6b7a635453e80544ccaf0193e7a94495d34313

data/lib/nanoc/core.rb

@@ -9,6 +9,8 @@ require 'tmpdir'
 require 'yaml'
 
 # External gems
+require 'clonefile'
+require 'concurrent-ruby'
 require 'json_schema'
 require 'ddmemoize'
 require 'ddmetrics'

data/lib/nanoc/core/checksummer.rb

@@ -50,8 +50,8 @@ module Nanoc
         end
 
         def calc_for_each_attribute_of(obj, digest_class = CompactDigest)
-          obj.attributes.each_with_object({}) do |(key, value), memo|
-            memo[key] = Nanoc::Core::Checksummer.calc(value, digest_class)
+          obj.attributes.transform_values do |value|
+            Nanoc::Core::Checksummer.calc(value, digest_class)
           end
         end
 

data/lib/nanoc/core/compilation_item_rep_view.rb

@@ -3,6 +3,12 @@
 module Nanoc
   module Core
     class CompilationItemRepView < ::Nanoc::Core::BasicItemRepView
+      # How long to wait before the requested file appears.
+      #
+      # This is a bit of a hack -- ideally, Nanoc would know that the file is
+      # being generated, and wait the appropriate amount of time.
+      FILE_APPEAR_TIMEOUT = 10.0
+
       # @abstract
       def item_view_class
         Nanoc::Core::CompilationItemView
@@ -27,7 +33,7 @@ module Nanoc
         # Wait for file to exist
         if res
           start = Time.now
-          sleep 0.05 until File.file?(res) || Time.now - start > 1.0
+          sleep 0.05 until File.file?(res) || Time.now - start > FILE_APPEAR_TIMEOUT
           raise Nanoc::Core::Errors::InternalInconsistency, "File did not apear in time: #{res}" unless File.file?(res)
         end
 

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

@@ -32,7 +32,7 @@ module Nanoc
         end
 
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
-        def run(_rep, is_outdated:) # rubocop:disable Lint/UnusedMethodArgument
+        def run(_rep, is_outdated:)
           raise NotImplementedError
         end
 

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

@@ -21,7 +21,7 @@ module Nanoc
               raise(res)
             when Proc
               fiber.resume(res.call)
-            when DONE # rubocop:disable Lint/EmptyWhen
+            when DONE
               # ignore
             else
               raise Nanoc::Core::Errors::InternalInconsistency.new(

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

@@ -46,8 +46,8 @@ module Nanoc
         @binary_cache[rep] = content.select { |_key, c| c.binary? }
       end
 
-      def prune(*args)
-        @wrapped_caches.each { |w| w.prune(*args) }
+      def prune(items:)
+        @wrapped_caches.each { |w| w.prune(items: items) }
       end
 
       # True if there is cached compiled content available for this item, and

data/lib/nanoc/core/compiler_loader.rb

@@ -32,7 +32,7 @@ module Nanoc
           outdatedness_store: outdatedness_store,
         }
 
-        Nanoc::Core::Compiler.new(site, params)
+        Nanoc::Core::Compiler.new(site, **params)
       end
 
       def compiled_content_cache_class

data/lib/nanoc/core/dependency_store.rb

@@ -113,7 +113,7 @@ module Nanoc
         src_ref = obj2ref(src)
         dst_ref = obj2ref(dst)
 
-        existing_props = Nanoc::Core::DependencyProps.new(@graph.props_for(dst_ref, src_ref) || {})
+        existing_props = Nanoc::Core::DependencyProps.new(**(@graph.props_for(dst_ref, src_ref) || {}))
         new_props = Nanoc::Core::DependencyProps.new(raw_content: raw_content, attributes: attributes, compiled_content: compiled_content, path: path)
         props = existing_props.merge(new_props)
 

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,26 @@ module Nanoc
       def temp_filename
         Nanoc::Core::TempFilenameFactory.instance.create(TMP_TEXT_ITEMS_DIR)
       end
+
+      def smart_cp(from, to)
+        # Try clonefile
+        FileUtils.rm_f(to)
+        begin
+          res = Clonefile.always(from, to)
+          return if res
+        rescue Clonefile::UnsupportedPlatform, Errno::ENOTSUP, Errno::EXDEV, Errno::EINVAL
+        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.15'
+    VERSION = '4.11.20'
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.11.15
+  version: 4.11.20
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: clonefile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+- !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
@@ -300,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.2
 signing_key: 
 specification_version: 4
 summary: Core of Nanoc