nanoc-core 4.11.21 → 4.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f63cf9ed0953520b811eb964d1b71cad082bc07f945c5b9c838a3730dc9cc2
-  data.tar.gz: 58e44db73eb2a9fdd8959964802b78570e15ddc2e4ae8afd2a5da9161da06c61
+  metadata.gz: c4a5b22f92ecd2425faeae4cbb597dee48846a8507e5c00673478c4146d99b60
+  data.tar.gz: b384739256cd987cbbdead7820fcfa3b48a0dff9aacbc632b48bdf9daf77305c
 SHA512:
-  metadata.gz: b4d4b9458fc23a57bb961c0ed9ff31dd82b43f243cf92d2c45424efda54d3ccacab16be0fd36805f606958eb9167b6537c178ff23c15947f2a2f667bd9901f40
-  data.tar.gz: 4668c6c8188d5c885829421d4d4e3564146f9f935576be13daed38410ca7537781545d2f44f4c3a44fdb1c145d1331baf84526b37732f85cdfb9e1e77ce3ccdd
+  metadata.gz: 4c06b89e2b6e699c07cf8a3da87755d15b03e05f368a1823eaa31165822dc258221c08048505a23e64cf412cbafda1425eaf2b6a93fee833351bf1f7ed4caa2c
+  data.tar.gz: a0108e0a31c98c277a5306d55ec0f666b2e87717a9f0355813c5d66a5410392bbc145a4a8a6b13f8fb1be849a1c1275804c9ac53ae60f0e350d33d6dd8a23516

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'
 
@@ -39,7 +38,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
 
@@ -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')

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/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/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/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/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.21'
+    VERSION = '4.12.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.11.21
+  version: 4.12.2
 platform: ruby
 authors:
 - Denis Defreyne
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-05-28 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
@@ -299,23 +285,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.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.2
-signing_key: 
+rubygems_version: 3.2.18
+signing_key:
 specification_version: 4
 summary: Core of Nanoc
 test_files: []