nanoc-core 4.13.4 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d269d49a75092d2131bb9862da8891db100ba3706aae5a6e7cb1948e4b6ff08
-  data.tar.gz: 9834b81f364302d18b02d541f600a61b14e6cb54cf3e6ae04b083d0301446fcb
+  metadata.gz: 789cc6b4702b215a8124a7fd9e223bbd5ae0ab388100d2825cc0aab1a2871706
+  data.tar.gz: 41badc8b04d48a56d08b12394a16677973326c82ff94b61e987c332e27ddcfb5
 SHA512:
-  metadata.gz: 3254f48b180e12a753793abde204b252fdb1166cf654692df6f48ea815d0c0e3fdef07af398b1905236cec9c8872e94f9c49ef49c797693dfcdf131ef12b7702
-  data.tar.gz: d35cb237c18e1b1349d46623c7790493ec689c1437ddfb86992559b32ff8f5f9ec2a5316acbd46dfc7267bb1d0b6ea4abebef64e9f5fbc73675704fee308640a
+  metadata.gz: 7f65db903bb45e40731a74aff7ed48a9189ed8327e77bc10323a72084e180845fedb2af85b8c4e9f93b1a9b1beb8a9c3b84af562ef89108de994153af7846f79
+  data.tar.gz: 68ba69732bf619f3b30a73b4029d08cfe38e2e4451da63517aca1fc6040cf8d2451438c023844b5dc626c3c6da3ab4009bcd8c35bffc2b72599f6fad866a5a6f

data/lib/nanoc/core/basic_outdatedness_checker.rb

@@ -77,29 +77,27 @@ module Nanoc
         @action_sequences = action_sequences
 
         # Memoize
-        @_outdatedness_status_for = {}
+        @_apply_rules = {}
       end
 
       contract C_OBJ_MAYBE_REP => C::Maybe[Nanoc::Core::OutdatednessStatus]
       def outdatedness_status_for(obj)
-        # TODO: remove memoization (no longer needed)
-        @_outdatedness_status_for[obj] ||=
-          case obj
-          when Nanoc::Core::ItemRep
-            apply_rules(RULES_FOR_ITEM_REP, obj)
-          when Nanoc::Core::Item
-            apply_rules_multi(RULES_FOR_ITEM_REP, @reps[obj])
-          when Nanoc::Core::Layout
-            apply_rules(RULES_FOR_LAYOUT, obj)
-          when Nanoc::Core::Configuration
-            apply_rules(RULES_FOR_CONFIG, obj)
-          when Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection
-            # Collections are never outdated. Objects inside them might be,
-            # however.
-            apply_rules([], obj)
-          else
-            raise Nanoc::Core::Errors::InternalInconsistency, "do not know how to check outdatedness of #{obj.inspect}"
-          end
+        case obj
+        when Nanoc::Core::ItemRep
+          apply_rules(RULES_FOR_ITEM_REP, obj)
+        when Nanoc::Core::Item
+          apply_rules_multi(RULES_FOR_ITEM_REP, @reps[obj])
+        when Nanoc::Core::Layout
+          apply_rules(RULES_FOR_LAYOUT, obj)
+        when Nanoc::Core::Configuration
+          apply_rules(RULES_FOR_CONFIG, obj)
+        when Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection
+          # Collections are never outdated. Objects inside them might be,
+          # however.
+          apply_rules([], obj)
+        else
+          raise Nanoc::Core::Errors::InternalInconsistency, "do not know how to check outdatedness of #{obj.inspect}"
+        end
       end
 
       def action_sequence_for(rep)
@@ -110,18 +108,19 @@ module Nanoc
 
       contract C::ArrayOf[Class], C_OBJ_MAYBE_REP, Nanoc::Core::OutdatednessStatus => C::Maybe[Nanoc::Core::OutdatednessStatus]
       def apply_rules(rules, obj, status = Nanoc::Core::OutdatednessStatus.new)
-        rules.inject(status) do |acc, rule|
-          if acc.useful_to_apply?(rule)
-            reason = rule.instance.call(obj, self)
-            if reason
-              acc.update(reason)
+        @_apply_rules[obj] ||=
+          rules.inject(status) do |acc, rule|
+            if acc.useful_to_apply?(rule)
+              reason = rule.instance.call(obj, self)
+              if reason
+                acc.update(reason)
+              else
+                acc
+              end
             else
               acc
             end
-          else
-            acc
           end
-        end
       end
 
       contract C::ArrayOf[Class], C::ArrayOf[C_OBJ_MAYBE_REP] => C::Maybe[Nanoc::Core::OutdatednessStatus]

data/lib/nanoc/core/binary_compiled_content_cache.rb

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

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

@@ -10,8 +10,8 @@ module Nanoc
         DONE = Object.new
 
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
-        def run(rep, is_outdated:, &block)
-          fiber = fiber_for(rep, is_outdated:, &block)
+        def run(rep, is_outdated:, &)
+          fiber = fiber_for(rep, is_outdated:, &)
           while fiber.alive?
             res = fiber.resume
 

data/lib/nanoc/core/config_loader.rb

@@ -29,7 +29,11 @@ module Nanoc
 
       # @return [String]
       def self.config_filename_for_cwd
-        filenames = %w[nanoc.yaml config.yaml]
+        filenames = [
+          'nanoc.yaml',
+          'nanoc.toml',
+          'config.yaml',
+        ]
         candidate = filenames.find { |f| File.file?(f) }
         candidate && File.expand_path(candidate)
       end
@@ -54,7 +58,8 @@ module Nanoc
       end
 
       def load_file(filename)
-        YamlLoader.load_file(filename)
+        loader = StructuredDataLoader.for_extension(File.extname(filename))
+        loader.load_file(filename)
       end
 
       # @api private

data/lib/nanoc/core/contracts_support.rb

@@ -78,8 +78,8 @@ module Nanoc
           end
         end
 
-        def contract(*args)
-          Contract(*args)
+        def contract(*)
+          Contract(*)
         end
       end
 

data/lib/nanoc/core/dependency_props.rb

@@ -14,24 +14,24 @@ module Nanoc
         C::Or[
           C::SetOf[C::Or[String, Regexp]],
           C::ArrayOf[C::Or[String, Regexp]],
-          C::Bool
+          C::Bool,
         ]
 
       C_ATTR =
         C::Or[
           C::SetOf[
             C::Or[
-              Symbol,          # any value
-              [Symbol, C::Any] # pair (specific value)
+              Symbol, # any value
+              [Symbol, C::Any], # pair (specific value)
             ],
           ],
           C::ArrayOf[
             C::Or[
-              Symbol,          # any value
-              [Symbol, C::Any] # pair (specific value)
+              Symbol, # any value
+              [Symbol, C::Any], # pair (specific value)
             ],
           ],
-          C::Bool
+          C::Bool,
         ]
 
       C_ARGS =
@@ -39,7 +39,7 @@ module Nanoc
           raw_content: C::Optional[C_RAW_CONTENT],
           attributes: C::Optional[C_ATTR],
           compiled_content: C::Optional[C::Bool],
-          path: C::Optional[C::Bool]
+          path: C::Optional[C::Bool],
         ]
 
       contract C_ARGS => C::Any

data/lib/nanoc/core/dependency_store.rb

@@ -9,14 +9,14 @@ module Nanoc
       C_RAW_CONTENT =
         C::Or[
           C::ArrayOf[C::Or[String, Regexp]],
-          C::Bool
+          C::Bool,
         ]
 
       C_ATTR =
         C::Or[
           C::ArrayOf[Symbol],
           C::HashOf[Symbol => C::Any],
-          C::Bool
+          C::Bool,
         ]
 
       C_KEYWORD_PROPS =
@@ -24,7 +24,7 @@ module Nanoc
           raw_content: C::Optional[C_RAW_CONTENT],
           attributes: C::Optional[C_ATTR],
           compiled_content: C::Optional[C::Bool],
-          path: C::Optional[C::Bool]
+          path: C::Optional[C::Bool],
         ]
 
       C_OBJ_SRC = Nanoc::Core::Item
@@ -34,7 +34,7 @@ module Nanoc
           Nanoc::Core::Item,
           Nanoc::Core::Layout,
           Nanoc::Core::Configuration,
-          Nanoc::Core::IdentifiableCollection
+          Nanoc::Core::IdentifiableCollection,
         ]
 
       attr_reader :items

data/lib/nanoc/core/dependency_tracker.rb

@@ -11,20 +11,20 @@ module Nanoc
           Nanoc::Core::Item,
           Nanoc::Core::Layout,
           Nanoc::Core::Configuration,
-          Nanoc::Core::IdentifiableCollection
+          Nanoc::Core::IdentifiableCollection,
         ]
 
       C_RAW_CONTENT =
         C::Or[
           C::ArrayOf[C::Or[String, Regexp]],
-          C::Bool
+          C::Bool,
         ]
 
       C_ATTR =
         C::Or[
           C::ArrayOf[Symbol],
           C::HashOf[Symbol => C::Any],
-          C::Bool
+          C::Bool,
         ]
 
       C_ARGS =
@@ -32,7 +32,7 @@ module Nanoc
           raw_content: C::Optional[C_RAW_CONTENT],
           attributes: C::Optional[C_ATTR],
           compiled_content: C::Optional[C::Bool],
-          path: C::Optional[C::Bool]
+          path: C::Optional[C::Bool],
         ]
 
       attr_reader :dependency_store

data/lib/nanoc/core/feature.rb

@@ -91,4 +91,4 @@ module Nanoc
   end
 end
 
-Nanoc::Core::Feature.define('where', version: '4.13')
+Nanoc::Core::Feature.define('where', version: '4.14')

data/lib/nanoc/core/instrumentor.rb

@@ -23,7 +23,7 @@ module Nanoc
         @enabled = false
       end
 
-      def self.call(key, *args)
+      def self.call(key, *)
         return yield unless @enabled
 
         begin
@@ -32,7 +32,7 @@ module Nanoc
           yield
         ensure
           stopwatch.stop
-          Nanoc::Core::NotificationCenter.post(key, stopwatch.duration, *args)
+          Nanoc::Core::NotificationCenter.post(key, stopwatch.duration, *)
         end
       end
     end

data/lib/nanoc/core/item_rep_writer.rb

@@ -79,11 +79,13 @@ module Nanoc
 
       def smart_cp(from, to)
         # Try clonefile
-        FileUtils.rm_f(to)
-        begin
-          res = Clonefile.always(from, to)
-          return if res
-        rescue Clonefile::UnsupportedPlatform, Errno::ENOTSUP, Errno::EXDEV, Errno::EINVAL
+        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

data/lib/nanoc/core/notification_center.rb

@@ -79,8 +79,8 @@ module Nanoc
           instance.on(name, id, &)
         end
 
-        def post(name, *args)
-          instance.post(name, *args)
+        def post(name, *)
+          instance.post(name, *)
         end
 
         def remove(name, id)

data/lib/nanoc/core/outdatedness_checker.rb

@@ -28,7 +28,7 @@ module Nanoc
         dependency_store: Nanoc::Core::DependencyStore,
         action_sequence_store: Nanoc::Core::ActionSequenceStore,
         action_sequences: C_ACTION_SEQUENCES,
-        reps: Nanoc::Core::ItemRepRepo
+        reps: Nanoc::Core::ItemRepRepo,
       ] => C::Any
       def initialize(site:, checksum_store:, checksums:, dependency_store:, action_sequence_store:, action_sequences:, reps:)
         @site = site

data/lib/nanoc/core/structured_data_loader.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    # @api private
+    module StructuredDataLoader
+      class UnknownLanguageError < StandardError
+        def initialize(lang)
+          super("cannot find loader for language: #{lang.inspect}")
+        end
+      end
+
+      def self.for_language(language)
+        case language
+        when :yaml
+          YamlLoader
+        when :toml
+          TomlLoader
+        else
+          raise UnknownLanguageError.enw(language)
+        end
+      end
+
+      def self.for_extension(ext)
+        case ext
+        when '.yaml'
+          YamlLoader
+        when '.toml'
+          TomlLoader
+        else
+          raise UnknownLanguageError.enw(language)
+        end
+      end
+    end
+  end
+end

data/lib/nanoc/core/toml_loader.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    # @api private
+    module TomlLoader
+      def self.load(string)
+        require 'perfect_toml'
+        PerfectTOML.parse(string)
+      end
+
+      def self.load_file(filename)
+        require 'perfect_toml'
+        load(File.read(filename))
+      end
+    end
+  end
+end

data/lib/nanoc/core/version.rb

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

data/lib/nanoc/core/view.rb

@@ -10,7 +10,7 @@ module Nanoc
       contract C::Maybe[C::Or[
         Nanoc::Core::ViewContextForCompilation,
         Nanoc::Core::ViewContextForPreCompilation,
-        Nanoc::Core::ViewContextForShell
+        Nanoc::Core::ViewContextForShell,
       ]] => C::Any
       def initialize(context)
         @context = context

data/lib/nanoc/core/yaml_loader.rb

@@ -11,8 +11,8 @@ module Nanoc
 
       private_constant :OPTIONS
 
-      def self.load(yaml_string)
-        YAML.safe_load(yaml_string, **OPTIONS)
+      def self.load(string)
+        YAML.safe_load(string, **OPTIONS)
       end
 
       def self.load_file(filename)

data/lib/nanoc/core.rb

@@ -10,7 +10,6 @@ require 'yaml'
 require 'zlib'
 
 # External gems
-require 'clonefile'
 require 'concurrent-ruby'
 require 'json_schema'
 require 'ddmetrics'
@@ -21,6 +20,13 @@ 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.13.4
+  version: 4.14.0
 platform: ruby
 authors:
 - Denis Defreyne
@@ -23,20 +23,6 @@ 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
@@ -300,9 +286,11 @@ files:
 - lib/nanoc/core/snapshot_def.rb
 - lib/nanoc/core/store.rb
 - lib/nanoc/core/string_pattern.rb
+- lib/nanoc/core/structured_data_loader.rb
 - lib/nanoc/core/temp_filename_factory.rb
 - lib/nanoc/core/textual_compiled_content_cache.rb
 - lib/nanoc/core/textual_content.rb
+- lib/nanoc/core/toml_loader.rb
 - lib/nanoc/core/trivial_error.rb
 - lib/nanoc/core/utils.rb
 - lib/nanoc/core/version.rb
@@ -316,7 +304,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.13.4/nanoc-core
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-core-v4.14.0/nanoc-core
 rdoc_options: []
 require_paths:
 - lib
@@ -324,14 +312,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Core of Nanoc
 test_files: []