nanoc 4.11.0 → 4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b2704181c12e6dc71bf46b7bb87dc14e31c18d7d4530a0420dd2c98ffb3e9b
-  data.tar.gz: 913ca912414ce823d274704ba45e06ace2a4e603081472a6815fe0b9076dd1b2
+  metadata.gz: 81da98fdd728f76e389fc4618fc54a22e98827d40e20320e0102ab7dc4b2b89f
+  data.tar.gz: c642b86779f1564d1d09a499e4b3e6bbe0d60ebdb5d3c828c05dee3101bf4c08
 SHA512:
-  metadata.gz: cb662339340e2682df52518b85d5295bab537b18014a9fcd001f65fe31cb62aae1ab9bccca0c877ba196025a1e839ac6cd6fd26538e4df00b6b250a06dff7b61
-  data.tar.gz: d1b82c96c958141bdeb7d82511fd06d4a9499c251f6b656e300ea9120041377fcfde2c6562758c733e0d5e4eef593ba36fff5b3d16d4f719cc81f451014e2edb
+  metadata.gz: '078c89114ddab916b9bf54fcf7f32359d51472351fd9bde7abe1d03e575797b13fa02782e228bb87677d1e74950d187b2afcfd6612b80b37fe9438f37fe65dc5'
+  data.tar.gz: 8ab157e67fc2172adf8aa910f52937cf92505a42441bc9b54ec2b5d0beae5c880cd0f62472bc0633a0445a7916fdc3cadc208f96a012dffaddbddcb87bbf93b0

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.11.1 (2019-02-09)
+
+Fixes:
+
+* Fixed an issue which caused hardlinking to fail in certain situations (#1405, #1406)
+
 ## 4.11.0 (2018-12-01)
 
 Features:

data/lib/nanoc.rb

@@ -2,18 +2,11 @@
 
 # Load external dependencies
 require 'addressable'
-require 'ddmemoize'
-require 'ddmetrics'
 require 'ddplugin'
-require 'hamster'
 require 'json'
-require 'json_schema'
 require 'parallel'
-require 'ref'
 require 'slow_enumerator_tools'
 
-DDMemoize.enable_metrics
-
 module Nanoc
   # @return [String] A string containing information about this Nanoc version
   #   and its environment (Ruby engine and version, Rubygems version if any).
@@ -46,6 +39,7 @@ require 'fiber'
 require 'fileutils'
 require 'find'
 require 'forwardable'
+require 'logger'
 require 'net/http'
 require 'net/https'
 require 'open3'
@@ -62,6 +56,9 @@ require 'tmpdir'
 require 'uri'
 require 'yaml'
 
+# Load extracted Nanoc dependencies
+require 'nanoc-core'
+
 # Load Nanoc
 require 'nanoc/version'
 require 'nanoc/base'

data/lib/nanoc/base.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # @api private
-module Nanoc::Int
+module Nanoc
+  module Int
+  end
 end
 
-require_relative 'base/core_ext'
-require_relative 'base/contracts_support'
 require_relative 'base/error'
 require_relative 'base/errors'
 require_relative 'base/changes_stream'

data/lib/nanoc/base/assertions.rb

@@ -7,7 +7,7 @@ module Nanoc
 
     module Mixin
       def assert(assertion)
-        return unless Nanoc::Int::ContractsSupport.enabled?
+        return unless Nanoc::Core::ContractsSupport.enabled?
 
         unless assertion.call
           raise AssertionFailure, "assertion failed: #{assertion.class}"

data/lib/nanoc/base/entities.rb

@@ -1,29 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'entities/context'
-require_relative 'entities/directed_graph'
+# Re-exported from Nanoc::Core
+Nanoc::Identifier = Nanoc::Core::Identifier
 
-require_relative 'entities/identifier'
-require_relative 'entities/content'
-require_relative 'entities/processing_action'
-require_relative 'entities/processing_actions'
-
-require_relative 'entities/identifiable_collection'
-require_relative 'entities/item_collection'
-require_relative 'entities/layout_collection'
-
-require_relative 'entities/code_snippet'
-require_relative 'entities/configuration'
-require_relative 'entities/lazy_value'
-require_relative 'entities/document'
-require_relative 'entities/item'
-require_relative 'entities/item_rep'
-require_relative 'entities/layout'
-require_relative 'entities/pattern'
 require_relative 'entities/props'
 require_relative 'entities/action_sequence'
 require_relative 'entities/site'
-require_relative 'entities/snapshot_def'
 
 require_relative 'entities/checksum_collection'
 require_relative 'entities/outdatedness_status'

data/lib/nanoc/base/entities/action_sequence.rb

@@ -1,84 +1,80 @@
 # frozen_string_literal: true
 
-module Nanoc::Int
-  class ActionSequence
-    include Nanoc::Int::ContractsSupport
-    include Enumerable
-    DDMemoize.activate(self)
+module Nanoc
+  module Int
+    class ActionSequence
+      include Nanoc::Core::ContractsSupport
+      include Enumerable
+      DDMemoize.activate(self)
 
-    attr_reader :item_rep
-    attr_reader :actions
+      attr_reader :item_rep
+      attr_reader :actions
 
-    def initialize(item_rep, actions: [])
-      @item_rep = item_rep
-      @actions = actions
-    end
-
-    def self.build(rep)
-      builder = Nanoc::Int::ActionSequenceBuilder.new(rep)
-      yield(builder)
-      builder.action_sequence
-    end
+      def initialize(item_rep, actions: [])
+        @item_rep = item_rep
+        @actions = actions
+      end
 
-    contract C::None => Numeric
-    def size
-      @actions.size
-    end
+      contract C::None => Numeric
+      def size
+        @actions.size
+      end
 
-    contract Numeric => C::Maybe[Nanoc::Int::ProcessingAction]
-    def [](idx)
-      @actions[idx]
-    end
+      contract Numeric => C::Maybe[Nanoc::Core::ProcessingAction]
+      def [](idx)
+        @actions[idx]
+      end
 
-    contract C::None => C::ArrayOf[Nanoc::Int::ProcessingAction]
-    def snapshot_actions
-      @actions.select { |a| a.is_a?(Nanoc::Int::ProcessingActions::Snapshot) }
-    end
+      contract C::None => C::ArrayOf[Nanoc::Core::ProcessingAction]
+      def snapshot_actions
+        @actions.select { |a| a.is_a?(Nanoc::Core::ProcessingActions::Snapshot) }
+      end
 
-    contract C::None => Array
-    def paths
-      snapshot_actions.map { |a| [a.snapshot_names, a.paths] }
-    end
+      contract C::None => Array
+      def paths
+        snapshot_actions.map { |a| [a.snapshot_names, a.paths] }
+      end
 
-    memoized def serialize
-      serialize_uncached
-    end
+      memoized def serialize
+        serialize_uncached
+      end
 
-    contract C::None => Array
-    def serialize_uncached
-      to_a.map(&:serialize)
-    end
+      contract C::None => Array
+      def serialize_uncached
+        to_a.map(&:serialize)
+      end
 
-    contract C::Func[Nanoc::Int::ProcessingAction => C::Any] => self
-    def each
-      @actions.each { |a| yield(a) }
-      self
-    end
+      contract C::Func[Nanoc::Core::ProcessingAction => C::Any] => self
+      def each
+        @actions.each { |a| yield(a) }
+        self
+      end
 
-    contract C::Func[Nanoc::Int::ProcessingAction => C::Any] => self
-    def map
-      self.class.new(
-        @item_rep,
-        actions: @actions.map { |a| yield(a) },
-      )
-    end
+      contract C::Func[Nanoc::Core::ProcessingAction => C::Any] => self
+      def map
+        self.class.new(
+          @item_rep,
+          actions: @actions.map { |a| yield(a) },
+        )
+      end
 
-    def snapshots_defs
-      is_binary = @item_rep.item.content.binary?
-      snapshot_defs = []
+      def snapshots_defs
+        is_binary = @item_rep.item.content.binary?
+        snapshot_defs = []
 
-      each do |action|
-        case action
-        when Nanoc::Int::ProcessingActions::Snapshot
-          action.snapshot_names.each do |snapshot_name|
-            snapshot_defs << Nanoc::Int::SnapshotDef.new(snapshot_name, binary: is_binary)
+        each do |action|
+          case action
+          when Nanoc::Core::ProcessingActions::Snapshot
+            action.snapshot_names.each do |snapshot_name|
+              snapshot_defs << Nanoc::Core::SnapshotDef.new(snapshot_name, binary: is_binary)
+            end
+          when Nanoc::Core::ProcessingActions::Filter
+            is_binary = Nanoc::Filter.named!(action.filter_name).to_binary?
           end
-        when Nanoc::Int::ProcessingActions::Filter
-          is_binary = Nanoc::Filter.named!(action.filter_name).to_binary?
         end
-      end
 
-      snapshot_defs
+        snapshot_defs
+      end
     end
   end
 end

data/lib/nanoc/base/entities/checksum_collection.rb

@@ -1,32 +1,34 @@
 # frozen_string_literal: true
 
-module Nanoc::Int
-  class ChecksumCollection
-    include Nanoc::Int::ContractsSupport
+module Nanoc
+  module Int
+    class ChecksumCollection
+      include Nanoc::Core::ContractsSupport
 
-    c_obj = C::Or[Nanoc::Int::Item, Nanoc::Int::Layout, Nanoc::Int::Configuration, Nanoc::Int::CodeSnippet]
+      c_obj = C::Or[Nanoc::Core::Item, Nanoc::Core::Layout, Nanoc::Core::Configuration, Nanoc::Core::CodeSnippet]
 
-    def initialize(checksums)
-      @checksums = checksums
-    end
+      def initialize(checksums)
+        @checksums = checksums
+      end
 
-    contract c_obj => C::Maybe[String]
-    def checksum_for(obj)
-      @checksums[obj.reference]
-    end
+      contract c_obj => C::Maybe[String]
+      def checksum_for(obj)
+        @checksums[obj.reference]
+      end
 
-    contract c_obj => C::Maybe[String]
-    def content_checksum_for(obj)
-      @checksums[[obj.reference, :content]]
-    end
+      contract c_obj => C::Maybe[String]
+      def content_checksum_for(obj)
+        @checksums[[obj.reference, :content]]
+      end
 
-    contract c_obj => C::Maybe[C::HashOf[Symbol, String]]
-    def attributes_checksum_for(obj)
-      @checksums[[obj.reference, :each_attribute]]
-    end
+      contract c_obj => C::Maybe[C::HashOf[Symbol, String]]
+      def attributes_checksum_for(obj)
+        @checksums[[obj.reference, :each_attribute]]
+      end
 
-    def to_h
-      @checksums
+      def to_h
+        @checksums
+      end
     end
   end
 end

data/lib/nanoc/base/entities/dependency.rb

@@ -1,33 +1,35 @@
 # frozen_string_literal: true
 
-module Nanoc::Int
-  # @api private
-  # A dependency between two items/layouts.
-  class Dependency
-    include Nanoc::Int::ContractsSupport
+module Nanoc
+  module Int
+    # @api private
+    # A dependency between two items/layouts.
+    class Dependency
+      include Nanoc::Core::ContractsSupport
 
-    C_OBJ_FROM = C::Or[Nanoc::Int::Item, Nanoc::Int::Layout, Nanoc::Int::Configuration, Nanoc::Int::IdentifiableCollection]
-    C_OBJ_TO   = Nanoc::Int::Item
+      C_OBJ_FROM = C::Or[Nanoc::Core::Item, Nanoc::Core::Layout, Nanoc::Core::Configuration, Nanoc::Core::IdentifiableCollection]
+      C_OBJ_TO   = Nanoc::Core::Item
 
-    contract C::None => C::Maybe[C_OBJ_FROM]
-    attr_reader :from
+      contract C::None => C::Maybe[C_OBJ_FROM]
+      attr_reader :from
 
-    contract C::None => C::Maybe[C_OBJ_TO]
-    attr_reader :to
+      contract C::None => C::Maybe[C_OBJ_TO]
+      attr_reader :to
 
-    contract C::None => Nanoc::Int::Props
-    attr_reader :props
+      contract C::None => Nanoc::Int::Props
+      attr_reader :props
 
-    contract C::Maybe[C_OBJ_FROM], C::Maybe[C_OBJ_TO], Nanoc::Int::Props => C::Any
-    def initialize(from, to, props)
-      @from  = from
-      @to    = to
-      @props = props
-    end
+      contract C::Maybe[C_OBJ_FROM], C::Maybe[C_OBJ_TO], Nanoc::Int::Props => C::Any
+      def initialize(from, to, props)
+        @from  = from
+        @to    = to
+        @props = props
+      end
 
-    contract C::None => String
-    def inspect
-      "Dependency(#{@from.inspect} -> #{@to.inspect}, #{@props.inspect})"
+      contract C::None => String
+      def inspect
+        "Dependency(#{@from.inspect} -> #{@to.inspect}, #{@props.inspect})"
+      end
     end
   end
 end

data/lib/nanoc/base/entities/outdatedness_reasons.rb

@@ -1,86 +1,88 @@
 # frozen_string_literal: true
 
-module Nanoc::Int
-  # Module that contains all outdatedness reasons.
-  #
-  # @api private
-  module OutdatednessReasons
-    # A generic outdatedness reason. An outdatedness reason is basically a
-    # descriptive message that explains why a given object is outdated.
-    class Generic
-      # @return [String] A descriptive message for this outdatedness reason
-      attr_reader :message
-
-      # @return [Nanoc::Int::Props]
-      attr_reader :props
-
-      # @param [String] message The descriptive message for this outdatedness
-      #   reason
-      def initialize(message, props = Nanoc::Int::Props.new)
-        @message = message
-        @props = props
+module Nanoc
+  module Int
+    # Module that contains all outdatedness reasons.
+    #
+    # @api private
+    module OutdatednessReasons
+      # A generic outdatedness reason. An outdatedness reason is basically a
+      # descriptive message that explains why a given object is outdated.
+      class Generic
+        # @return [String] A descriptive message for this outdatedness reason
+        attr_reader :message
+
+        # @return [Nanoc::Int::Props]
+        attr_reader :props
+
+        # @param [String] message The descriptive message for this outdatedness
+        #   reason
+        def initialize(message, props = Nanoc::Int::Props.new)
+          @message = message
+          @props = props
+        end
       end
-    end
-
-    CodeSnippetsModified = Generic.new(
-      'The code snippets have been modified since the last time the site was compiled.',
-      Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
-    )
-
-    DependenciesOutdated = Generic.new(
-      'This item uses content or attributes that have changed since the last time the site was compiled.',
-    )
-
-    NotWritten = Generic.new(
-      'This item representation has not yet been written to the output directory (but it does have a path).',
-      Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
-    )
-
-    RulesModified = Generic.new(
-      'The rules file has been modified since the last time the site was compiled.',
-      Props.new(compiled_content: true, path: true),
-    )
-
-    ContentModified = Generic.new(
-      'The content of this item has been modified since the last time the site was compiled.',
-      Props.new(raw_content: true, compiled_content: true),
-    )
-
-    class DocumentCollectionExtended < Generic
-      attr_reader :objects
-
-      def initialize(objects)
-        super(
-          'New items/layouts have been added to the site.',
-          Props.new(raw_content: true),
-        )
 
-        @objects = objects
+      CodeSnippetsModified = Generic.new(
+        'The code snippets have been modified since the last time the site was compiled.',
+        Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
+      )
+
+      DependenciesOutdated = Generic.new(
+        'This item uses content or attributes that have changed since the last time the site was compiled.',
+      )
+
+      NotWritten = Generic.new(
+        'This item representation has not yet been written to the output directory (but it does have a path).',
+        Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
+      )
+
+      RulesModified = Generic.new(
+        'The rules file has been modified since the last time the site was compiled.',
+        Props.new(compiled_content: true, path: true),
+      )
+
+      ContentModified = Generic.new(
+        'The content of this item has been modified since the last time the site was compiled.',
+        Props.new(raw_content: true, compiled_content: true),
+      )
+
+      class DocumentCollectionExtended < Generic
+        attr_reader :objects
+
+        def initialize(objects)
+          super(
+            'New items/layouts have been added to the site.',
+            Props.new(raw_content: true),
+          )
+
+          @objects = objects
+        end
       end
-    end
 
-    class ItemCollectionExtended < DocumentCollectionExtended
-    end
+      class ItemCollectionExtended < DocumentCollectionExtended
+      end
 
-    class LayoutCollectionExtended < DocumentCollectionExtended
-    end
+      class LayoutCollectionExtended < DocumentCollectionExtended
+      end
 
-    class AttributesModified < Generic
-      attr_reader :attributes
+      class AttributesModified < Generic
+        attr_reader :attributes
 
-      def initialize(attributes)
-        super(
-          'The attributes of this item have been modified since the last time the site was compiled.',
-          Props.new(attributes: true, compiled_content: true),
-        )
+        def initialize(attributes)
+          super(
+            'The attributes of this item have been modified since the last time the site was compiled.',
+            Props.new(attributes: true, compiled_content: true),
+          )
 
-        @attributes = attributes
+          @attributes = attributes
+        end
       end
-    end
 
-    UsesAlwaysOutdatedFilter = Generic.new(
-      'This item rep uses one or more filters that cannot track dependencies, and will thus always be considered as outdated.',
-      Props.new(raw_content: true, attributes: true, compiled_content: true),
-    )
+      UsesAlwaysOutdatedFilter = Generic.new(
+        'This item rep uses one or more filters that cannot track dependencies, and will thus always be considered as outdated.',
+        Props.new(raw_content: true, attributes: true, compiled_content: true),
+      )
+    end
   end
 end