nanoc-core 4.13.3 → 4.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e6c97176b06fc6e36cbe73c77589ec6c745b053b40616da81f36b639869d0f6
-  data.tar.gz: 407d91dcc36e7435debe7bfd52356cb88b09f5cf23c8d4b539b5497432cbba83
+  metadata.gz: 0d269d49a75092d2131bb9862da8891db100ba3706aae5a6e7cb1948e4b6ff08
+  data.tar.gz: 9834b81f364302d18b02d541f600a61b14e6cb54cf3e6ae04b083d0301446fcb
 SHA512:
-  metadata.gz: 86b66a9cd073606a2a001f1e0ae2ef6f8ba1ece1756791eebf1a609d723714552e759319b84bd34570b63bf6575c9116cf4adc932a8ba230e44a9c4732a3bdb8
-  data.tar.gz: 14c58ee6fa75b9e1a1101bcad88f261334f6e1eda10bddf423a8d9769b4f27795e683c3a5a614f19a30db37bc6b9d89b69940079371682777ad0d59b3d28d167
+  metadata.gz: 3254f48b180e12a753793abde204b252fdb1166cf654692df6f48ea815d0c0e3fdef07af398b1905236cec9c8872e94f9c49ef49c797693dfcdf131ef12b7702
+  data.tar.gz: d35cb237c18e1b1349d46623c7790493ec689c1437ddfb86992559b32ff8f5f9ec2a5316acbd46dfc7267bb1d0b6ea4abebef64e9f5fbc73675704fee308640a

data/lib/nanoc/core/binary_compiled_content_cache.rb

@@ -92,10 +92,6 @@ module Nanoc
         end
       end
 
-      def use_clonefile?
-        defined?(Clonefile)
-      end
-
       private
 
       def dirname
@@ -136,13 +132,11 @@ module Nanoc
         # changed outside of Nanoc.
 
         # Try clonefile
-        if use_clonefile?
-          FileUtils.rm_f(to)
-          begin
-            res = Clonefile.always(from, to)
-            return if res
-          rescue Clonefile::UnsupportedPlatform, Errno::ENOTSUP, Errno::EXDEV, Errno::EINVAL
-          end
+        FileUtils.rm_f(to)
+        begin
+          res = Clonefile.always(from, to)
+          return if res
+        rescue Clonefile::UnsupportedPlatform, Errno::ENOTSUP, Errno::EXDEV, Errno::EINVAL
         end
 
         # Fall back to old-school copy

data/lib/nanoc/core/compilation_stages/determine_outdatedness.rb

@@ -41,7 +41,7 @@ module Nanoc
         end
 
         def outdated?(rep)
-          if @outdatedness_store.include?(rep)
+          if @outdatedness_store.include?(rep) # rubocop:disable Style/RedundantCondition
             # We determined previously that this rep is outdated.
             true
           else

data/lib/nanoc/core/configuration-schema.json

@@ -106,6 +106,9 @@
           "type": "object",
           "additionalProperties": false,
           "properties": {
+            "user_agent" : {
+              "type": "string"
+            },
             "exclude": {
               "type": "array",
               "items": {

data/lib/nanoc/core/dependency_props.rb

@@ -44,28 +44,10 @@ module Nanoc
 
       contract C_ARGS => C::Any
       def initialize(raw_content: false, attributes: false, compiled_content: false, path: false)
+        @raw_content = raw_content
+        @attributes = attributes
         @compiled_content = compiled_content
         @path = path
-
-        @attributes =
-          case attributes
-          when Set
-            attributes
-          when Array
-            Set.new(attributes)
-          else
-            attributes
-          end
-
-        @raw_content =
-          case raw_content
-          when Set
-            raw_content
-          when Array
-            Set.new(raw_content)
-          else
-            raw_content
-          end
       end
 
       contract C::None => String
@@ -77,7 +59,7 @@ module Nanoc
           s << (compiled_content? ? 'c' : '_')
           s << (path? ? 'p' : '_')
 
-          if @raw_content.is_a?(Set)
+          if @raw_content.is_a?(Set) || @raw_content.is_a?(Array)
             @raw_content.each do |elem|
               s << '; raw_content('
               s << elem.inspect
@@ -85,7 +67,7 @@ module Nanoc
             end
           end
 
-          if @attributes.is_a?(Set)
+          if @attributes.is_a?(Set) || @attributes.is_a?(Array)
             @attributes.each do |elem|
               s << '; attr('
               s << elem.inspect
@@ -110,7 +92,7 @@ module Nanoc
       contract C::None => C::Bool
       def raw_content?
         case @raw_content
-        when Set
+        when Array, Set
           !@raw_content.empty?
         else
           @raw_content
@@ -120,7 +102,7 @@ module Nanoc
       contract C::None => C::Bool
       def attributes?
         case @attributes
-        when Set
+        when Array, Set
           !@attributes.empty?
         else
           @attributes
@@ -168,7 +150,7 @@ module Nanoc
           when false
             own
           else
-            own + other
+            Set.new(own + other)
           end
         end
       end

data/lib/nanoc/core/filter.rb

@@ -146,10 +146,10 @@ module Nanoc
         #   Returns the required libraries for this filter.
         #   @return [Enumerable<String>] This filter’s list of library names that are required
         def requires(*requires)
-          if requires.any?
-            @requires = requires
-          else
+          if requires.empty?
             @requires || []
+          else
+            @requires = requires
           end
         end
 

data/lib/nanoc/core/item_rep_writer.rb

@@ -79,13 +79,11 @@ module Nanoc
 
       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
+        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

data/lib/nanoc/core/outdatedness_checker.rb

@@ -45,7 +45,7 @@ module Nanoc
       contract C_OBJ => C::IterOf[Reasons::Generic]
       def outdatedness_reasons_for(obj)
         basic_reasons = basic_outdatedness_statuses.fetch(obj).reasons
-        if basic_reasons.any?
+        if !basic_reasons.empty?
           basic_reasons
         elsif outdated_due_to_dependencies?(obj)
           [Reasons::DependenciesOutdated]
@@ -134,7 +134,7 @@ module Nanoc
 
       def attributes_unaffected?(status, dependency)
         reason = status.reasons.find { |r| r.is_a?(Nanoc::Core::OutdatednessReasons::AttributesModified) }
-        reason && dependency.props.attribute_keys.any? && (dependency.props.attribute_keys & reason.attributes).empty?
+        reason && !dependency.props.attribute_keys.empty? && (dependency.props.attribute_keys & reason.attributes).empty?
       end
 
       def raw_content_prop_causes_outdatedness?(objects, raw_content_prop)
@@ -175,7 +175,7 @@ module Nanoc
       def attributes_prop_causes_outdatedness?(objects, attributes_prop)
         return false unless attributes_prop
 
-        unless attributes_prop.is_a?(Set)
+        unless attributes_prop.is_a?(Set) || attributes_prop.is_a?(Array)
           raise(
             Nanoc::Core::Errors::InternalInconsistency,
             'expected attributes_prop to be a Set',
@@ -184,7 +184,7 @@ module Nanoc
 
         pairs = attributes_prop.select { |a| a.is_a?(Array) }.to_h
 
-        unless pairs.any?
+        if pairs.empty?
           raise(
             Nanoc::Core::Errors::InternalInconsistency,
             'expected attributes_prop not to be empty',

data/lib/nanoc/core/outdatedness_rules/attributes_modified.rb

@@ -28,7 +28,7 @@ module Nanoc
             attributes = Set.new(old_checksums.keys) + Set.new(new_checksums.keys)
             changed_attributes = attributes.reject { |a| old_checksums[a] == new_checksums[a] }
 
-            if changed_attributes.any?
+            unless changed_attributes.empty?
               Nanoc::Core::OutdatednessReasons::AttributesModified.new(changed_attributes)
             end
           else

data/lib/nanoc/core/pattern.rb

@@ -29,6 +29,11 @@ module Nanoc
         raise NotImplementedError
       end
 
+      contract C::Any => C::Bool
+      def ===(other)
+        match?(other)
+      end
+
       def captures(_identifier)
         raise NotImplementedError
       end

data/lib/nanoc/core/site_loader.rb

@@ -70,7 +70,7 @@ module Nanoc
 
       def code_snippets_from_config(config)
         config[:lib_dirs].flat_map do |lib|
-          Dir["#{lib}/**/*.rb"].sort.map do |filename|
+          Dir["#{File.expand_path(lib)}/**/*.rb"].sort.map do |filename|
             Nanoc::Core::CodeSnippet.new(
               read_code_snippet_contents(filename),
               filename,

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.13.3'
+    VERSION = '4.13.4'
   end
 end

data/lib/nanoc/core.rb

@@ -10,6 +10,7 @@ require 'yaml'
 require 'zlib'
 
 # External gems
+require 'clonefile'
 require 'concurrent-ruby'
 require 'json_schema'
 require 'ddmetrics'
@@ -20,13 +21,6 @@ require 'slow_enumerator_tools'
 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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.13.3
+  version: 4.13.4
 platform: ruby
 authors:
 - Denis Defreyne
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -24,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: clonefile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -303,8 +316,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.13.3/nanoc-core
-post_install_message:
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.13.4/nanoc-core
 rdoc_options: []
 require_paths:
 - lib
@@ -319,8 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Core of Nanoc
 test_files: []