nanoc-core 4.11.23 → 4.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54d0d10c4eecdb49a2507a9bcee39269b3a1e444968732d27a4f3bdafe7ff484
-  data.tar.gz: 712ae47087f51a2087f03368b6f8206b4a8e4fc3959e09f5d7412e85862a089b
+  metadata.gz: 3dc7e6692696f6b2b0bbf15a7c5f0aa607af851182de259323b3f18869117ef0
+  data.tar.gz: a6964648a0eb41ffbffbda9fd9b18da1f80dd83a1a86d8564aee05f6bd5be16d
 SHA512:
-  metadata.gz: 7dfaad676897abbe8eaca4478993c4e5856338cb2cafa2df1fef19d6919be0c8cc3f8e0f8e8edec318d6fd5bcc43215ff525398250943422b59c6c0d0a48ff17
-  data.tar.gz: 260b429bde3ed4c72425410c177b598e9f97239addceff6fecbb42e180c22776377a314c5d7be10e26934431086e2d90134a02d8f0ed8bc0ed01fbffa72a3eba
+  metadata.gz: 4ee96bf469d44eb81ee815f6adf1439dadcd7efa34fdb9f71c057888ac4b690d799506d24b3fce04d54530deca15deb3564894cd340f519fde93fdeb80295487
+  data.tar.gz: cfa697a3471cb5efb04c8d9e7f919c39b399f958b2f20a8232bd6c3d2d5214fd2a3acf4fb4308a4b094cbf02c4bb87ae050379c6a3b0421092101c2576e69432

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'), 1)
+        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'binary_content'), 2)
 
         @cache = {}
       end
@@ -49,6 +49,11 @@ module Nanoc
         rep_cache = @cache[rep.item.identifier][rep.name]
 
         content.each do |snapshot, binary_content|
+          # Check
+          if Nanoc::Core::ContractsSupport.enabled? && !File.file?(binary_content.filename)
+            raise Nanoc::Core::Errors::InternalInconsistency, "Binary content at #{binary_content.filename.inspect} does not exist, but is expected to."
+          end
+
           filename = build_filename(rep, snapshot)
           rep_cache[snapshot] = filename
 
@@ -57,12 +62,8 @@ module Nanoc
           next if binary_content.filename == filename
 
           # Copy
-          #
-          # NOTE: hardlinking is not an option in this case, because hardlinking
-          # would make it possible for the content to be (inadvertently)
-          # changed outside of Nanoc.
           FileUtils.mkdir_p(File.dirname(filename))
-          FileUtils.cp(binary_content.filename, filename)
+          smart_cp(binary_content.filename, filename)
         end
       end
 
@@ -123,6 +124,26 @@ module Nanoc
           string_to_path_component(snapshot_name.to_s),
         )
       end
+
+      # NOTE: Similar to ItemRepWriter#smart_cp (but without hardlinking)
+      def smart_cp(from, to)
+        # NOTE: hardlinking is not an option in this case, because hardlinking
+        # would make it possible for the content to be (inadvertently)
+        # changed outside of Nanoc.
+
+        # 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
+
+        # Fall back to old-school copy
+        FileUtils.cp(from, to)
+      end
     end
   end
 end

data/lib/nanoc/core/code_snippet.rb

@@ -36,7 +36,13 @@ module Nanoc
       # @return [void]
       def load
         # rubocop:disable Security/Eval
-        eval('def self.use_helper(mod); Nanoc::Core::Context.instance_eval { include mod }; end', TOPLEVEL_BINDING)
+        eval(<<~CODE, TOPLEVEL_BINDING)
+          unless respond_to?(:use_helper)
+            def self.use_helper(mod)
+              Nanoc::Core::Context.instance_eval { include mod }
+            end
+          end
+        CODE
         eval(@data, TOPLEVEL_BINDING, @filename)
         # rubocop:enable Security/Eval
         nil

data/lib/nanoc/core/compilation_item_rep_view.rb

@@ -34,7 +34,7 @@ module Nanoc
         if res
           start = Time.now
           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)
+          raise Nanoc::Core::Errors::InternalInconsistency, "File raw_path did not appear in time (#{FILE_APPEAR_TIMEOUT}s): #{res}" unless File.file?(res)
         end
 
         res

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

@@ -18,15 +18,20 @@ module Nanoc
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
         def run(rep, is_outdated:)
           if can_reuse_content_for_rep?(rep, is_outdated: is_outdated)
+            # If cached content can be used for this item rep, do so, and skip
+            # recalculation of the item rep compiled content.
             Nanoc::Core::NotificationCenter.post(:cached_content_used, rep)
-
             @compiled_content_store.set_all(rep, @compiled_content_cache[rep])
           else
+            # Cached content couldn’t be used for this rep. Continue as usual with
+            # recalculation of the item rep compiled content.
             yield
+
+            # Update compiled content cache, now that the item rep is compiled.
+            @compiled_content_cache[rep] = @compiled_content_store.get_all(rep)
           end
 
           rep.compiled = true
-          @compiled_content_cache[rep] = @compiled_content_store.get_all(rep)
         end
 
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Bool

data/lib/nanoc/core/compiler_loader.rb

@@ -36,12 +36,7 @@ module Nanoc
       end
 
       def compiled_content_cache_class
-        feature_name = Nanoc::Core::Feature::BINARY_COMPILED_CONTENT_CACHE
-        if Nanoc::Core::Feature.enabled?(feature_name)
-          Nanoc::Core::CompiledContentCache
-        else
-          Nanoc::Core::TextualCompiledContentCache
-        end
+        Nanoc::Core::CompiledContentCache
       end
     end
   end

data/lib/nanoc/core/config_loader.rb

@@ -29,12 +29,7 @@ module Nanoc
 
       # @return [String]
       def self.config_filename_for_cwd
-        filenames =
-          if Nanoc::Core::Feature.enabled?(Nanoc::Core::Feature::TOML)
-            %w[nanoc.yaml config.yaml nanoc.toml]
-          else
-            %w[nanoc.yaml config.yaml]
-          end
+        filenames = %w[nanoc.yaml config.yaml]
         candidate = filenames.find { |f| File.file?(f) }
         candidate && File.expand_path(candidate)
       end
@@ -59,14 +54,7 @@ module Nanoc
       end
 
       def load_file(filename)
-        case File.extname(filename)
-        when '.yaml'
-          YAML.load_file(filename)
-        when '.toml'
-          Tomlrb.load_file(filename)
-        else
-          raise Nanoc::Core::Errors::InternalInconsistency, 'Unhandled config file extension'
-        end
+        YAML.load_file(filename)
       end
 
       # @api private

data/lib/nanoc/core/dependency_store.rb

@@ -19,20 +19,25 @@ module Nanoc
       def initialize(items, layouts, config)
         super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'dependencies'), 5)
 
+        @config = config
         @items = items
         @layouts = layouts
 
-        @refs2objs = {}
-        items.each   { |o| add_vertex_for(o) }
-        layouts.each { |o| add_vertex_for(o) }
-        add_vertex_for(config)
-        add_vertex_for(items)
-        add_vertex_for(layouts)
+        rebuild_refs2objs
 
         @new_objects = []
         @graph = Nanoc::Core::DirectedGraph.new([nil] + objs2refs(@items) + objs2refs(@layouts))
       end
 
+      def rebuild_refs2objs
+        @refs2objs = {}
+        @items.each   { |o| add_vertex_for(o) }
+        @layouts.each { |o| add_vertex_for(o) }
+        add_vertex_for(@config)
+        add_vertex_for(@items)
+        add_vertex_for(@layouts)
+      end
+
       contract C_OBJ_SRC => C::ArrayOf[Nanoc::Core::Dependency]
       def dependencies_causing_outdatedness_of(object)
         objects_causing_outdatedness_of(object).map do |other_object|
@@ -53,14 +58,12 @@ module Nanoc
 
       def items=(items)
         @items = items
-        items.each { |o| @refs2objs[obj2ref(o)] = o }
-        add_vertex_for(items)
+        rebuild_refs2objs
       end
 
       def layouts=(layouts)
         @layouts = layouts
-        layouts.each { |o| @refs2objs[obj2ref(o)] = o }
-        add_vertex_for(layouts)
+        rebuild_refs2objs
       end
 
       def new_items

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'), 2)
+        super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'compiled_content'), 3)
 
         @cache = {}
       end

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.11.23'
+    VERSION = '4.12.3'
   end
 end

data/lib/nanoc/core.rb

@@ -16,7 +16,6 @@ require 'ddmetrics'
 require 'ddplugin'
 require 'hamster'
 require 'slow_enumerator_tools'
-require 'tomlrb'
 require 'tty-platform'
 require 'zeitwerk'
 
@@ -76,15 +75,3 @@ loader.eager_load
 require_relative 'core/core_ext/array'
 require_relative 'core/core_ext/hash'
 require_relative 'core/core_ext/string'
-
-# Tracking issue:
-# https://github.com/nanoc/features/issues/24
-Nanoc::Core::Feature.define('live_cmd', version: '4.11')
-
-# Tracking issue:
-# https://github.com/nanoc/features/issues/40
-Nanoc::Core::Feature.define('toml', version: '4.11')
-
-# Tracking issue:
-# https://github.com/nanoc/features/issues/20
-Nanoc::Core::Feature.define('binary_compiled_content_cache', version: '4.11')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.11.23
+  version: 4.12.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: tomlrb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: tty-platform
   requirement: !ruby/object:Gem::Requirement
@@ -307,14 +293,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: Core of Nanoc