nanoc 4.11.8 → 4.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f221e83491fb5157ec4e0cfae4b10b38a5d5d4987bf09082fb002817aed80ac
-  data.tar.gz: e8676d508ead44666a32347bc80334d583113e45fb4af813d68c25dcf87096a8
+  metadata.gz: ff9ad828cf4dbae57144f1794213717d587b220f19b3b6a9bc168b250d3f5508
+  data.tar.gz: f4fd81a18bb15b30cc53109c4e7c3ddf2d71235d23ebc49ce6639c435b850101
 SHA512:
-  metadata.gz: e058a5e4c84aa2d1578e069da9b8d6c237229e479c6c147f47681772670652156fd3aef15e9f2847a9bd87e63e413316edd5fd8c1e916382e2c486cfef15bfbf
-  data.tar.gz: 6377f60685b7c93d8268d6172f2a9e7a1acb2a62bf9bd991307a1b78c74211d3845cb6fb7932a0b2e9512c00a3c1c88e0e5e192912bf0896b682510c6602741f
+  metadata.gz: 4ebe934930f925c2a829d1c52106c3fb5e0ca12f6c4a2a96093d60edef05fffe0de80bb9e68195e668921d3d5ec57bcd2f64956062a387933e83e9d49fbd53b6
+  data.tar.gz: a175cb61715a437e1679b827130fb034d3f9b9fb82062437b807e8ce3d6e9897d23d92a9ef40ae6ef0ae47fb76a9d3800293a41b2b42dea5e9089ee840557ffa

data/NEWS.md

@@ -1,5 +1,13 @@
 # Nanoc news
 
+## 4.11.9 (2019-08-17)
+
+Enhancements:
+
+* Allowed specifying excluded files across all checks (#1438)
+* Replace handlebars.rb with ruby-handlebars (#1443)
+* Improved dependency tracking for Sass imports (#1451, #1452) [Romain Goyet]
+
 ## 4.11.8 (2019-08-08)
 
 Fixes:

data/lib/nanoc.rb

@@ -44,7 +44,6 @@ require 'net/http'
 require 'net/https'
 require 'open3'
 require 'pathname'
-require 'pstore'
 require 'set'
 require 'singleton'
 require 'stringio'
@@ -62,6 +61,10 @@ require 'yaml'
 # Load extracted Nanoc dependencies
 require 'nanoc-core'
 
+# Re-export from Nanoc::Core
+Nanoc::Identifier = Nanoc::Core::Identifier
+Nanoc::DataSource = Nanoc::Core::DataSource
+
 # Load Nanoc
 require 'nanoc/version'
 require 'nanoc/base'

data/lib/nanoc/base.rb

@@ -11,7 +11,6 @@ require_relative 'base/errors'
 require_relative 'base/changes_stream'
 require_relative 'base/assertions'
 
-require_relative 'base/entities'
 require_relative 'base/feature'
 require_relative 'base/repos'
 require_relative 'base/services'

data/lib/nanoc/base/errors.rb

@@ -8,6 +8,10 @@ module Nanoc
     module Errors
       Generic = ::Nanoc::Error
 
+      UnmetDependency = ::Nanoc::Core::Errors::UnmetDependency
+      NoSuchSnapshot = ::Nanoc::Core::Errors::NoSuchSnapshot
+      CannotGetCompiledContentOfBinaryItem = ::Nanoc::Core::Errors::CannotGetCompiledContentOfBinaryItem
+
       # Generic trivial error. Superclass for all Nanoc-specific errors that are
       # considered "trivial", i.e. errors that do not require a full crash report.
       class GenericTrivial < Generic
@@ -106,26 +110,6 @@ module Nanoc
         end
       end
 
-      # Error that is raised when an rep cannot be compiled because it depends
-      # on other representations.
-      class UnmetDependency < Generic
-        # @return [Nanoc::Core::ItemRep] The item representation that cannot yet be
-        #   compiled
-        attr_reader :rep
-
-        # @return [Symbol] The name of the snapshot that cannot yet be compiled
-        attr_reader :snapshot_name
-
-        # @param [Nanoc::Core::ItemRep] rep The item representation that cannot yet be
-        #   compiled
-        def initialize(rep, snapshot_name)
-          @rep = rep
-          @snapshot_name = snapshot_name
-
-          super("The current item cannot be compiled yet because of an unmet dependency on the “#{rep.item.identifier}” item (rep “#{rep.name}”, snapshot “#{snapshot_name}”).")
-        end
-      end
-
       # Error that is raised when a binary item is attempted to be laid out.
       class CannotLayoutBinaryItem < Generic
         # @param [Nanoc::Core::ItemRep] rep The item representation that was attempted
@@ -159,35 +143,6 @@ module Nanoc
         end
       end
 
-      # Error that is raised when the compiled content at a non-existing snapshot
-      # is requested.
-      class NoSuchSnapshot < Generic
-        # @return [Nanoc::Core::ItemRep] The item rep from which the compiled content
-        #   was requested
-        attr_reader :item_rep
-
-        # @return [Symbol] The requested snapshot
-        attr_reader :snapshot
-
-        # @param [Nanoc::Core::ItemRep] item_rep The item rep from which the compiled
-        #   content was requested
-        #
-        # @param [Symbol] snapshot The requested snapshot
-        def initialize(item_rep, snapshot)
-          @item_rep = item_rep
-          @snapshot = snapshot
-          super("The “#{item_rep.inspect}” item rep does not have a snapshot “#{snapshot.inspect}”")
-        end
-      end
-
-      # Error that is raised when the compiled content of a binary item is attempted to be accessed.
-      class CannotGetCompiledContentOfBinaryItem < Generic
-        # @param [Nanoc::Core::ItemRep] rep The binary item representation whose compiled content was attempted to be accessed
-        def initialize(rep)
-          super("You cannot access the compiled content of a binary item representation (but you can access the path). The offending item rep is #{rep}.")
-        end
-      end
-
       # Error that is raised when attempting to call #parent or #children on an item with a legacy identifier.
       class CannotGetParentOrChildrenOfNonLegacyItem < Generic
         def initialize(identifier)

data/lib/nanoc/base/repos.rb

@@ -1,19 +1,4 @@
 # frozen_string_literal: true
 
-# Re-exported from Nanoc::Core
-Nanoc::DataSource = Nanoc::Core::DataSource
-
-require_relative 'repos/store'
-
-require_relative 'repos/checksum_store'
-require_relative 'repos/binary_compiled_content_cache'
-require_relative 'repos/textual_compiled_content_cache'
-require_relative 'repos/compiled_content_cache'
 require_relative 'repos/config_loader'
-require_relative 'repos/dependency_store'
-require_relative 'repos/item_rep_repo'
-require_relative 'repos/outdatedness_store'
-require_relative 'repos/action_sequence_store'
 require_relative 'repos/site_loader'
-require_relative 'repos/compiled_content_store'
-require_relative 'repos/prefixed_data_source'

data/lib/nanoc/base/repos/site_loader.rb

@@ -16,7 +16,7 @@ module Nanoc
         data_sources_to_aggregate =
           with_data_sources(config) do |data_sources|
             data_sources.map do |ds|
-              Nanoc::Int::PrefixedDataSource.new(ds, ds.items_root, ds.layouts_root)
+              Nanoc::Core::PrefixedDataSource.new(ds, ds.items_root, ds.layouts_root)
             end
           end
 

data/lib/nanoc/base/services.rb

@@ -3,7 +3,6 @@
 require_relative 'services/compilation_context'
 require_relative 'services/compiler'
 require_relative 'services/compiler_loader'
-require_relative 'services/dependency_tracker'
 require_relative 'services/executor'
 require_relative 'services/filter'
 require_relative 'services/item_rep_builder'
@@ -11,7 +10,6 @@ require_relative 'services/item_rep_router'
 require_relative 'services/item_rep_selector'
 require_relative 'services/item_rep_writer'
 require_relative 'services/pruner'
-require_relative 'services/outdatedness_rule'
 require_relative 'services/outdatedness_rules'
 
 require_relative 'services/compiler/phases'

data/lib/nanoc/base/services/compiler.rb

@@ -18,7 +18,7 @@ module Nanoc
         @action_provider        = action_provider
         @outdatedness_store     = outdatedness_store
 
-        @compiled_content_store = Nanoc::Int::CompiledContentStore.new
+        @compiled_content_store = Nanoc::Core::CompiledContentStore.new
       end
 
       contract Nanoc::Core::Site => C::Any

data/lib/nanoc/base/services/compiler/phases/recalculate.rb

@@ -19,7 +19,7 @@ module Nanoc
 
           contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
           def run(rep, is_outdated:) # rubocop:disable Lint/UnusedMethodArgument
-            dependency_tracker = Nanoc::Int::DependencyTracker.new(@dependency_store)
+            dependency_tracker = Nanoc::Core::DependencyTracker.new(@dependency_store)
             dependency_tracker.enter(rep.item)
 
             executor = Nanoc::Int::Executor.new(rep, @compilation_context, dependency_tracker)

data/lib/nanoc/base/services/compiler/stages/build_reps.rb

@@ -11,7 +11,7 @@ module Nanoc
           end
 
           def run
-            reps = Nanoc::Int::ItemRepRepo.new
+            reps = Nanoc::Core::ItemRepRepo.new
 
             builder = Nanoc::Int::ItemRepBuilder.new(
               @site, @action_provider, reps

data/lib/nanoc/base/services/compiler/stages/cleanup.rb

@@ -23,7 +23,7 @@ module Nanoc
           end
 
           def cleanup_unused_stores
-            used_paths = @output_dirs.map { |d| Nanoc::Int::Store.tmp_path_prefix(d) }
+            used_paths = @output_dirs.map { |d| Nanoc::Core::Store.tmp_path_prefix(d) }
             all_paths = Dir.glob('tmp/nanoc/*')
             (all_paths - used_paths).each do |obsolete_path|
               FileUtils.rm_rf(obsolete_path)

data/lib/nanoc/base/services/compiler/stages/load_stores.rb

@@ -24,7 +24,7 @@ module Nanoc
             load_store(@outdatedness_store)
           end
 
-          contract Nanoc::Int::Store => C::Any
+          contract Nanoc::Core::Store => C::Any
           def load_store(store)
             Nanoc::Core::Instrumentor.call(:store_loaded, store.class) do
               store.load

data/lib/nanoc/base/services/compiler_loader.rb

@@ -5,20 +5,20 @@ module Nanoc
     # @api private
     class CompilerLoader
       def load(site, action_provider: nil)
-        action_sequence_store = Nanoc::Int::ActionSequenceStore.new(config: site.config)
+        action_sequence_store = Nanoc::Core::ActionSequenceStore.new(config: site.config)
 
         dependency_store =
-          Nanoc::Int::DependencyStore.new(site.items, site.layouts, site.config)
+          Nanoc::Core::DependencyStore.new(site.items, site.layouts, site.config)
 
         objects = site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
 
         checksum_store =
-          Nanoc::Int::ChecksumStore.new(config: site.config, objects: objects)
+          Nanoc::Core::ChecksumStore.new(config: site.config, objects: objects)
 
         action_provider ||= Nanoc::Core::ActionProvider.named(site.config.action_provider).for(site)
 
         outdatedness_store =
-          Nanoc::Int::OutdatednessStore.new(config: site.config)
+          Nanoc::Core::OutdatednessStore.new(config: site.config)
 
         compiled_content_cache =
           compiled_content_cache_class.new(config: site.config)
@@ -38,9 +38,9 @@ module Nanoc
       def compiled_content_cache_class
         feature_name = Nanoc::Feature::BINARY_COMPILED_CONTENT_CACHE
         if Nanoc::Feature.enabled?(feature_name)
-          Nanoc::Int::CompiledContentCache
+          Nanoc::Core::CompiledContentCache
         else
-          Nanoc::Int::TextualCompiledContentCache
+          Nanoc::Core::TextualCompiledContentCache
         end
       end
     end

data/lib/nanoc/base/services/outdatedness_checker.rb

@@ -48,13 +48,13 @@ module Nanoc
 
         C_OBJ_MAYBE_REP = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep, Nanoc::Core::Configuration, Nanoc::Core::Layout, Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection]
 
-        contract C::KeywordArgs[outdatedness_checker: OutdatednessChecker, reps: Nanoc::Int::ItemRepRepo] => C::Any
+        contract C::KeywordArgs[outdatedness_checker: OutdatednessChecker, reps: Nanoc::Core::ItemRepRepo] => C::Any
         def initialize(outdatedness_checker:, reps:)
           @outdatedness_checker = outdatedness_checker
           @reps = reps
         end
 
-        contract C_OBJ_MAYBE_REP => C::Maybe[OutdatednessStatus]
+        contract C_OBJ_MAYBE_REP => C::Maybe[Nanoc::Core::OutdatednessStatus]
         memoized def outdatedness_status_for(obj)
           case obj
           when Nanoc::Core::ItemRep
@@ -76,8 +76,8 @@ module Nanoc
 
         private
 
-        contract C::ArrayOf[Class], C_OBJ_MAYBE_REP, OutdatednessStatus => C::Maybe[OutdatednessStatus]
-        def apply_rules(rules, obj, status = OutdatednessStatus.new)
+        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)
               acc
@@ -92,9 +92,9 @@ module Nanoc
           end
         end
 
-        contract C::ArrayOf[Class], C::ArrayOf[C_OBJ_MAYBE_REP] => C::Maybe[OutdatednessStatus]
+        contract C::ArrayOf[Class], C::ArrayOf[C_OBJ_MAYBE_REP] => C::Maybe[Nanoc::Core::OutdatednessStatus]
         def apply_rules_multi(rules, objs)
-          objs.inject(OutdatednessStatus.new) { |acc, elem| apply_rules(rules, elem, acc) }
+          objs.inject(Nanoc::Core::OutdatednessStatus.new) { |acc, elem| apply_rules(rules, elem, acc) }
         end
       end
 
@@ -109,13 +109,13 @@ module Nanoc
       attr_reader :action_sequences
       attr_reader :site
 
-      Reasons = Nanoc::Int::OutdatednessReasons
+      Reasons = Nanoc::Core::OutdatednessReasons
 
       C_OBJ = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep, Nanoc::Core::Configuration, Nanoc::Core::Layout, Nanoc::Core::ItemCollection]
       C_ITEM_OR_REP = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep]
       C_ACTION_SEQUENCES = C::HashOf[C_OBJ => Nanoc::Core::ActionSequence]
 
-      contract C::KeywordArgs[site: Nanoc::Core::Site, checksum_store: Nanoc::Int::ChecksumStore, checksums: Nanoc::Core::ChecksumCollection, dependency_store: Nanoc::Int::DependencyStore, action_sequence_store: Nanoc::Int::ActionSequenceStore, action_sequences: C_ACTION_SEQUENCES, reps: Nanoc::Int::ItemRepRepo] => C::Any
+      contract C::KeywordArgs[site: Nanoc::Core::Site, checksum_store: Nanoc::Core::ChecksumStore, checksums: Nanoc::Core::ChecksumCollection, dependency_store: Nanoc::Core::DependencyStore, action_sequence_store: Nanoc::Core::ActionSequenceStore, action_sequences: C_ACTION_SEQUENCES, reps: Nanoc::Core::ItemRepRepo] => C::Any
       def initialize(site:, checksum_store:, checksums:, dependency_store:, action_sequence_store:, action_sequences:, reps:)
         @site = site
         @checksum_store = checksum_store
@@ -202,12 +202,12 @@ module Nanoc
       end
 
       def attributes_unaffected?(status, dependency)
-        reason = status.reasons.find { |r| r.is_a?(Nanoc::Int::OutdatednessReasons::AttributesModified) }
+        reason = status.reasons.find { |r| r.is_a?(Nanoc::Core::OutdatednessReasons::AttributesModified) }
         reason && dependency.props.attributes.is_a?(Enumerable) && (dependency.props.attributes & reason.attributes).empty?
       end
 
       def raw_content_unaffected?(status, dependency)
-        reason = status.reasons.find { |r| r.is_a?(Nanoc::Int::OutdatednessReasons::DocumentCollectionExtended) }
+        reason = status.reasons.find { |r| r.is_a?(Nanoc::Core::OutdatednessReasons::DocumentCollectionExtended) }
         if reason.nil?
           false
         elsif !dependency.props.raw_content.is_a?(Enumerable)

data/lib/nanoc/base/services/outdatedness_rules/attributes_modified.rb

@@ -3,12 +3,12 @@
 module Nanoc
   module Int
     module OutdatednessRules
-      class AttributesModified < Nanoc::Int::OutdatednessRule
+      class AttributesModified < Nanoc::Core::OutdatednessRule
         include Nanoc::Core::ContractsSupport
 
         affects_props :attributes, :compiled_content
 
-        contract C::Or[Nanoc::Core::ItemRep, Nanoc::Core::Item, Nanoc::Core::Configuration, Nanoc::Core::Layout], C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
+        contract C::Or[Nanoc::Core::ItemRep, Nanoc::Core::Item, Nanoc::Core::Configuration, Nanoc::Core::Layout], C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Core::OutdatednessReasons::Generic]
         def apply(obj, outdatedness_checker)
           case obj
           when Nanoc::Core::ItemRep
@@ -20,7 +20,7 @@ module Nanoc
 
             old_checksums = outdatedness_checker.checksum_store.attributes_checksum_for(obj)
             unless old_checksums
-              return Nanoc::Int::OutdatednessReasons::AttributesModified.new(true)
+              return Nanoc::Core::OutdatednessReasons::AttributesModified.new(true)
             end
 
             new_checksums = outdatedness_checker.checksums.attributes_checksum_for(obj)
@@ -29,7 +29,7 @@ module Nanoc
             changed_attributes = attributes.reject { |a| old_checksums[a] == new_checksums[a] }
 
             if changed_attributes.any?
-              Nanoc::Int::OutdatednessReasons::AttributesModified.new(changed_attributes)
+              Nanoc::Core::OutdatednessReasons::AttributesModified.new(changed_attributes)
             end
           else
             raise ArgumentError

data/lib/nanoc/base/services/outdatedness_rules/code_snippets_modified.rb

@@ -3,7 +3,7 @@
 module Nanoc
   module Int
     module OutdatednessRules
-      class CodeSnippetsModified < Nanoc::Int::OutdatednessRule
+      class CodeSnippetsModified < Nanoc::Core::OutdatednessRule
         DDMemoize.activate(self)
 
         include Nanoc::Core::ContractsSupport
@@ -12,7 +12,7 @@ module Nanoc
 
         def apply(_obj, outdatedness_checker)
           if any_snippets_modified?(outdatedness_checker)
-            Nanoc::Int::OutdatednessReasons::CodeSnippetsModified
+            Nanoc::Core::OutdatednessReasons::CodeSnippetsModified
           end
         end
 

data/lib/nanoc/base/services/outdatedness_rules/content_modified.rb

@@ -3,7 +3,7 @@
 module Nanoc
   module Int
     module OutdatednessRules
-      class ContentModified < Nanoc::Int::OutdatednessRule
+      class ContentModified < Nanoc::Core::OutdatednessRule
         affects_props :raw_content, :compiled_content
 
         def apply(obj, outdatedness_checker)
@@ -12,7 +12,7 @@ module Nanoc
           ch_old = outdatedness_checker.checksum_store.content_checksum_for(obj)
           ch_new = outdatedness_checker.checksums.content_checksum_for(obj)
           if ch_old != ch_new
-            Nanoc::Int::OutdatednessReasons::ContentModified
+            Nanoc::Core::OutdatednessReasons::ContentModified
           end
         end
       end

data/lib/nanoc/base/services/outdatedness_rules/item_collection_extended.rb

@@ -3,15 +3,15 @@
 module Nanoc
   module Int
     module OutdatednessRules
-      class ItemCollectionExtended < Nanoc::Int::OutdatednessRule
+      class ItemCollectionExtended < Nanoc::Core::OutdatednessRule
         affects_props :raw_content
 
-        contract Nanoc::Core::ItemCollection, C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
+        contract Nanoc::Core::ItemCollection, C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Core::OutdatednessReasons::Generic]
         def apply(_obj, outdatedness_checker)
           new_items = outdatedness_checker.dependency_store.new_items
 
           if new_items.any?
-            Nanoc::Int::OutdatednessReasons::ItemCollectionExtended.new(new_items)
+            Nanoc::Core::OutdatednessReasons::ItemCollectionExtended.new(new_items)
           end
         end
       end

data/lib/nanoc/base/services/outdatedness_rules/layout_collection_extended.rb

@@ -3,15 +3,15 @@
 module Nanoc
   module Int
     module OutdatednessRules
-      class LayoutCollectionExtended < Nanoc::Int::OutdatednessRule
+      class LayoutCollectionExtended < Nanoc::Core::OutdatednessRule
         affects_props :raw_content
 
-        contract Nanoc::Core::LayoutCollection, C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
+        contract Nanoc::Core::LayoutCollection, C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Core::OutdatednessReasons::Generic]
         def apply(_obj, outdatedness_checker)
           new_layouts = outdatedness_checker.dependency_store.new_layouts
 
           if new_layouts.any?
-            Nanoc::Int::OutdatednessReasons::LayoutCollectionExtended.new(new_layouts)
+            Nanoc::Core::OutdatednessReasons::LayoutCollectionExtended.new(new_layouts)
           end
         end
       end

data/lib/nanoc/base/services/outdatedness_rules/not_written.rb

@@ -3,12 +3,12 @@
 module Nanoc
   module Int
     module OutdatednessRules
-      class NotWritten < Nanoc::Int::OutdatednessRule
+      class NotWritten < Nanoc::Core::OutdatednessRule
         affects_props :raw_content, :attributes, :compiled_content, :path
 
         def apply(obj, _outdatedness_checker)
           if obj.raw_paths.values.flatten.compact.any? { |fn| !File.file?(fn) }
-            Nanoc::Int::OutdatednessReasons::NotWritten
+            Nanoc::Core::OutdatednessReasons::NotWritten
           end
         end
       end