nanoc-core 4.11.19 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5609a4d82cab318b327443ab017ec28ace7a23f0766176df6e289c7c757138e
-  data.tar.gz: 4646c4338db2b0fe0a46b0b604205796c154d51c7f5f77c5b59d2031fd806877
+  metadata.gz: 3785b5628c2b36382f5c6eed88988943304f6d4e8555a4a72c769b11e8f9a21e
+  data.tar.gz: cb562257783d0a0d351822b25c19f9172e134a9910b2fd475ec27a2aa6a13321
 SHA512:
-  metadata.gz: d387e1b5fbd4ed31ac03f6eb0510238f4e8e92a615b1c38351fa2e7c1f785e7f2d9ac013c51c48a1f0f6e32a02c8b49d20f9a48e324ed07bc45c054246cdda62
-  data.tar.gz: 6789e6da893cb64eb032c110f244de514c56143df96c8865b2a2903ffcbbbb2a242c60ee46eca40fb3bb1e77e11c1febdc7ebbe675d428ce9e41e419f5683f0d
+  metadata.gz: 5386cce963813faa6c3ac38936b8b2ffce7e3fc94297b5f663a4b8b76df9590e62ee891013abfe665f5f2c06bd14cc754b3c56cbf473b38a079a97eab0e11900
+  data.tar.gz: a038f93b08e01ecad024545e97fde14627c1522ed546d6f2cfebdb06f348ad3fdc4fbb2743d8dbe0a658333ba996a91d2f559bbfd8dbd7e5045d35f07b3302ba

data/lib/nanoc/core.rb

@@ -20,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
@@ -32,7 +39,7 @@ module Nanoc
     #
     # @api private
     def self.version_information
-      "Nanoc #{Nanoc::VERSION} © 2007–2019 Denis Defreyne.\n" \
+      "Nanoc #{Nanoc::VERSION} © 2007–2021 Denis Defreyne.\n" \
       "Running #{RUBY_ENGINE} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} with RubyGems #{Gem::VERSION}.\n"
     end
 
@@ -70,14 +77,6 @@ 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')
+Nanoc::Core::Feature.define('toml', version: '4.12')

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/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/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/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.19'
+    VERSION = '4.12.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.11.19
+  version: 4.12.0
 platform: ruby
 authors:
 - Denis Defreyne
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-16 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -299,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.11
+signing_key:
 specification_version: 4
 summary: Core of Nanoc
 test_files: []