nanoc-core 4.11.18 → 4.11.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd4fffaf7813aba1bc2544b16ff1cf801f141a293605c4cd3a4f44d26e6baf02
-  data.tar.gz: a11c2bd8d095dbfcfddc00628cf2a65115184dee3cbedd3ea956d17ce0551f57
+  metadata.gz: 54d0d10c4eecdb49a2507a9bcee39269b3a1e444968732d27a4f3bdafe7ff484
+  data.tar.gz: 712ae47087f51a2087f03368b6f8206b4a8e4fc3959e09f5d7412e85862a089b
 SHA512:
-  metadata.gz: 26a6cf153b5cb6c2fc0c12e1597ab4a77dd6ff52cf95fa90e9b636f684caf819e883677cfbe3d60a179f2f87c548be5a4f436c56f2e981b2691908163844628a
-  data.tar.gz: 2b2dcbaf7d2b0c41a7d9558af9b33c3e7eafa5b8986ec230fb31c74c916beb4912872f80ffa63f02eea9558c60f5e4723ee08d71ece1731ae8d107b5e847b990
+  metadata.gz: 7dfaad676897abbe8eaca4478993c4e5856338cb2cafa2df1fef19d6919be0c8cc3f8e0f8e8edec318d6fd5bcc43215ff525398250943422b59c6c0d0a48ff17
+  data.tar.gz: 260b429bde3ed4c72425410c177b598e9f97239addceff6fecbb42e180c22776377a314c5d7be10e26934431086e2d90134a02d8f0ed8bc0ed01fbffa72a3eba

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
 

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.18'
+    VERSION = '4.11.23'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.11.18
+  version: 4.11.23
 platform: ruby
 authors:
 - Denis Defreyne
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2021-01-16 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.5
+signing_key:
 specification_version: 4
 summary: Core of Nanoc
 test_files: []