nanoc 4.11.9 → 4.11.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff9ad828cf4dbae57144f1794213717d587b220f19b3b6a9bc168b250d3f5508
-  data.tar.gz: f4fd81a18bb15b30cc53109c4e7c3ddf2d71235d23ebc49ce6639c435b850101
+  metadata.gz: f613b6428b6cfd9eb92da14ff7768e830aacae1872df99649a9ca9941026a189
+  data.tar.gz: f208c9e15638f9745c558ec12d8a71a0bfb77744c24e735c4f9af2a20f510670
 SHA512:
-  metadata.gz: 4ebe934930f925c2a829d1c52106c3fb5e0ca12f6c4a2a96093d60edef05fffe0de80bb9e68195e668921d3d5ec57bcd2f64956062a387933e83e9d49fbd53b6
-  data.tar.gz: a175cb61715a437e1679b827130fb034d3f9b9fb82062437b807e8ce3d6e9897d23d92a9ef40ae6ef0ae47fb76a9d3800293a41b2b42dea5e9089ee840557ffa
+  metadata.gz: 45852ac268085e574f3b266f9ac96ec13848904ad6240a0411c46cefa21e867cc109a0ccdcdda9c9c40212e9b21de2f44338af053b6ed03b00d6a78c92de9c9e
+  data.tar.gz: 8e949b83020fb64bdb8fecd4a233d83a5a9d52c65e57d4a4b29909dc5bd7c723ac7e6a379fb240c7d34576031bf7122caf74b6502c4b041178086385531124e5

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.11.10 (2019-08-31)
+
+Fixes:
+
+* Fixed problem with sporadic `DDMetrics::Stopwatch::AlreadyRunningError` (#1445)
+
 ## 4.11.9 (2019-08-17)
 
 Enhancements:

data/lib/nanoc/base.rb

@@ -9,7 +9,6 @@ end
 require_relative 'base/error'
 require_relative 'base/errors'
 require_relative 'base/changes_stream'
-require_relative 'base/assertions'
 
 require_relative 'base/feature'
 require_relative 'base/repos'

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

@@ -3,10 +3,26 @@
 module Nanoc
   module Int
     class CompilationContext
+      include Nanoc::Core::ContractsSupport
+
       attr_reader :site
       attr_reader :compiled_content_cache
       attr_reader :compiled_content_store
 
+      C_COMPILED_CONTENT_CACHE =
+        C::Or[
+          Nanoc::Core::CompiledContentCache,
+          Nanoc::Core::TextualCompiledContentCache,
+          Nanoc::Core::BinaryCompiledContentCache,
+        ]
+
+      contract C::KeywordArgs[
+        action_provider: Nanoc::Core::ActionProvider,
+        reps: Nanoc::Core::ItemRepRepo,
+        site: Nanoc::Core::Site,
+        compiled_content_cache: C_COMPILED_CONTENT_CACHE,
+        compiled_content_store: Nanoc::Core::CompiledContentStore,
+      ] => C::Any
       def initialize(action_provider:, reps:, site:, compiled_content_cache:, compiled_content_store:)
         @action_provider = action_provider
         @reps = reps
@@ -15,6 +31,8 @@ module Nanoc
         @compiled_content_store = compiled_content_store
       end
 
+      # FIXME: Expand contract
+      contract Nanoc::Core::Layout => C::Any
       def filter_name_and_args_for_layout(layout)
         seq = @action_provider.action_sequence_for(layout)
         if seq.nil? || seq.size != 1 || !seq[0].is_a?(Nanoc::Core::ProcessingActions::Filter)
@@ -24,6 +42,7 @@ module Nanoc
         [seq[0].filter_name, seq[0].params]
       end
 
+      contract Nanoc::Core::DependencyTracker => C::Named['Nanoc::ViewContextForCompilation']
       def create_view_context(dependency_tracker)
         Nanoc::ViewContextForCompilation.new(
           reps: @reps,
@@ -34,6 +53,7 @@ module Nanoc
         )
       end
 
+      contract Nanoc::Core::ItemRep, Nanoc::Core::DependencyTracker => Hash
       def assigns_for(rep, dependency_tracker)
         last_content = @compiled_content_store.get_current(rep)
         content_or_filename_assigns =

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

@@ -72,9 +72,12 @@ module Nanoc
           def run(rep, is_outdated:) # rubocop:disable Lint/UnusedMethodArgument
             yield
 
-            @queue << rep
-
+            # Caution: Notification must be posted before enqueueing the rep,
+            # or we risk a race condition where the :rep_write_ended
+            # notification happens before the :rep_write_enqueued one.
             Nanoc::Core::NotificationCenter.post(:rep_write_enqueued, rep)
+
+            @queue << rep
           end
         end
       end

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

@@ -9,8 +9,6 @@ module Nanoc
   end
 end
 
-require_relative 'stage'
-
 require_relative 'stages/calculate_checksums'
 require_relative 'stages/cleanup'
 require_relative 'stages/compile_reps'

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

@@ -4,7 +4,10 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class BuildReps < Nanoc::Int::Compiler::Stage
+        class BuildReps < Nanoc::Core::CompilationStage
+          include Nanoc::Core::ContractsSupport
+
+          contract C::KeywordArgs[site: Nanoc::Core::Site, action_provider: Nanoc::Core::ActionProvider] => C::Any
           def initialize(site:, action_provider:)
             @site = site
             @action_provider = action_provider

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

@@ -4,7 +4,7 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class CalculateChecksums < Nanoc::Int::Compiler::Stage
+        class CalculateChecksums < Nanoc::Core::CompilationStage
           def initialize(items:, layouts:, code_snippets:, config:)
             @items = items
             @layouts = layouts

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

@@ -4,7 +4,7 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class Cleanup < Nanoc::Int::Compiler::Stage
+        class Cleanup < Nanoc::Core::CompilationStage
           def initialize(output_dirs)
             @output_dirs = output_dirs
           end

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

@@ -4,9 +4,9 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class CompileReps < Nanoc::Int::Compiler::Stage
+        class CompileReps < Nanoc::Core::CompilationStage
           include Nanoc::Core::ContractsSupport
-          include Nanoc::Assertions::Mixin
+          include Nanoc::Core::Assertions::Mixin
 
           def initialize(reps:, outdatedness_store:, dependency_store:, action_sequences:, compilation_context:, compiled_content_cache:)
             @reps = reps
@@ -28,7 +28,7 @@ module Nanoc
               end
             end
 
-            assert Nanoc::Assertions::AllItemRepsHaveCompiledContent.new(
+            assert Nanoc::Core::Assertions::AllItemRepsHaveCompiledContent.new(
               compiled_content_cache: @compiled_content_cache,
               item_reps: @reps,
             )

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

@@ -4,7 +4,7 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class DetermineOutdatedness < Nanoc::Int::Compiler::Stage
+        class DetermineOutdatedness < Nanoc::Core::CompilationStage
           include Nanoc::Core::ContractsSupport
 
           def initialize(reps:, outdatedness_checker:, outdatedness_store:)

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

@@ -4,7 +4,7 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class ForgetOutdatedDependencies < Nanoc::Int::Compiler::Stage
+        class ForgetOutdatedDependencies < Nanoc::Core::CompilationStage
           include Nanoc::Core::ContractsSupport
 
           def initialize(dependency_store:)

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

@@ -4,7 +4,7 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class LoadStores < Nanoc::Int::Compiler::Stage
+        class LoadStores < Nanoc::Core::CompilationStage
           include Nanoc::Core::ContractsSupport
 
           def initialize(checksum_store:, compiled_content_cache:, dependency_store:, action_sequence_store:, outdatedness_store:)

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

@@ -4,7 +4,7 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class Postprocess < Nanoc::Int::Compiler::Stage
+        class Postprocess < Nanoc::Core::CompilationStage
           include Nanoc::Core::ContractsSupport
 
           def initialize(action_provider:, site:)

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

@@ -4,7 +4,7 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class Preprocess < Nanoc::Int::Compiler::Stage
+        class Preprocess < Nanoc::Core::CompilationStage
           def initialize(action_provider:, site:, dependency_store:, checksum_store:)
             @action_provider = action_provider
             @site = site

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

@@ -4,7 +4,7 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class Prune < Nanoc::Int::Compiler::Stage
+        class Prune < Nanoc::Core::CompilationStage
           def initialize(config:, reps:)
             @config = config
             @reps = reps

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

@@ -4,7 +4,7 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class StorePostCompilationState < Nanoc::Int::Compiler::Stage
+        class StorePostCompilationState < Nanoc::Core::CompilationStage
           include Nanoc::Core::ContractsSupport
 
           def initialize(dependency_store:)

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

@@ -4,7 +4,7 @@ module Nanoc
   module Int
     class Compiler
       module Stages
-        class StorePreCompilationState < Nanoc::Int::Compiler::Stage
+        class StorePreCompilationState < Nanoc::Core::CompilationStage
           include Nanoc::Core::ContractsSupport
 
           def initialize(reps:, layouts:, checksum_store:, action_sequence_store:, action_sequences:)

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

@@ -8,6 +8,7 @@ module Nanoc
 
       attr_reader :reps
 
+      contract Nanoc::Core::Site, Nanoc::Core::ActionProvider, Nanoc::Core::ItemRepRepo => C::Any
       def initialize(site, action_provider, reps)
         @site = site
         @action_provider = action_provider

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

@@ -20,6 +20,7 @@ module Nanoc
         end
       end
 
+      contract Nanoc::Core::ItemRepRepo, Nanoc::Core::ActionProvider, Nanoc::Core::Site => C::Any
       def initialize(reps, action_provider, site)
         @reps = reps
         @action_provider = action_provider

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

@@ -5,7 +5,7 @@ module Nanoc
     # @api private
     class ItemRepWriter
       include Nanoc::Core::ContractsSupport
-      include Nanoc::Assertions::Mixin
+      include Nanoc::Core::Assertions::Mixin
 
       TMP_TEXT_ITEMS_DIR = 'text_items'
 
@@ -24,7 +24,7 @@ module Nanoc
       end
 
       def write_single(item_rep, compiled_content_store, snapshot_name, raw_path, written_paths)
-        assert Nanoc::Assertions::PathIsAbsolute.new(path: raw_path)
+        assert Nanoc::Core::Assertions::PathIsAbsolute.new(path: raw_path)
 
         # Don’t write twice
         # TODO: test written_paths behavior

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

@@ -8,15 +8,7 @@ module Nanoc
   class Pruner
     include Nanoc::Core::ContractsSupport
 
-    # @param [Nanoc::Core::Configuration] config
-    #
-    # @param [Nanoc::Core::ItemRepRepo] reps
-    #
-    # @param [Boolean] dry_run true if the files to be deleted
-    #   should only be printed instead of actually deleted, false if the files
-    #   should actually be deleted.
-    #
-    # @param [Enumerable<String>] exclude
+    contract Nanoc::Core::Configuration, Nanoc::Core::ItemRepRepo, C::KeywordArgs[dry_run: C::Optional[C::Bool], exclude: C::Optional[C::IterOf[String]]] => C::Any
     def initialize(config, reps, dry_run: false, exclude: [])
       @config  = config
       @reps    = reps

data/lib/nanoc/base/views/view_context_for_compilation.rb

@@ -14,9 +14,9 @@ module Nanoc
     contract C::KeywordArgs[
       reps: Nanoc::Core::ItemRepRepo,
       items: Nanoc::Core::IdentifiableCollection,
-      dependency_tracker: C::Any,
+      dependency_tracker: Nanoc::Core::DependencyTracker,
       compilation_context: C::Any,
-      compiled_content_store: C::Any,
+      compiled_content_store: Nanoc::Core::CompiledContentStore,
     ] => C::Any
     def initialize(reps:, items:, dependency_tracker:, compilation_context:, compiled_content_store:)
       @reps = reps

data/lib/nanoc/checking/checks/stale.rb

@@ -33,8 +33,9 @@ module Nanoc::Checking::Checks
 
     def pruner
       exclude_config = @config.fetch(:prune, {}).fetch(:exclude, [])
-      # FIXME: reps=nil is icky
-      @pruner ||= Nanoc::Pruner.new(@config, nil, exclude: exclude_config)
+      # FIXME: specifying reps this way is icky
+      reps = Nanoc::Core::ItemRepRepo.new
+      @pruner ||= Nanoc::Pruner.new(@config._unwrap, reps, exclude: exclude_config)
     end
   end
 end

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -65,7 +65,7 @@ module Nanoc::RuleDSL
           items: site.items,
           dependency_tracker: dependency_tracker,
           compilation_context: compiler.compilation_context(reps: reps),
-          compiled_content_store: nil,
+          compiled_content_store: Nanoc::Core::CompiledContentStore.new,
         )
       ctx = new_postprocessor_context(site, view_context)
 

data/lib/nanoc/spec.rb

@@ -164,8 +164,8 @@ module Nanoc
           Nanoc::Int::CompilationContext.new(
             action_provider: @action_provider,
             reps: @reps,
-            site: @site,
-            compiled_content_cache: :__compiled_content_cache,
+            site: site,
+            compiled_content_cache: Nanoc::Core::CompiledContentCache.new(config: @config),
             compiled_content_store: @compiled_content_store,
           )
 

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.11.9'
+  VERSION = '4.11.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.11.9
+  version: 4.11.10
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2019-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.9
+        version: 4.11.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.9
+        version: 4.11.10
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,6 @@ files:
 - bin/nanoc
 - lib/nanoc.rb
 - lib/nanoc/base.rb
-- lib/nanoc/base/assertions.rb
 - lib/nanoc/base/changes_stream.rb
 - lib/nanoc/base/error.rb
 - lib/nanoc/base/errors.rb
@@ -185,7 +184,6 @@ files:
 - lib/nanoc/base/services/compiler/phases/recalculate.rb
 - lib/nanoc/base/services/compiler/phases/resume.rb
 - lib/nanoc/base/services/compiler/phases/write.rb
-- lib/nanoc/base/services/compiler/stage.rb
 - lib/nanoc/base/services/compiler/stages.rb
 - lib/nanoc/base/services/compiler/stages/build_reps.rb
 - lib/nanoc/base/services/compiler/stages/calculate_checksums.rb

data/lib/nanoc/base/assertions.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Assertions
-    class AssertionFailure < Nanoc::Int::Errors::InternalInconsistency
-    end
-
-    module Mixin
-      def assert(assertion)
-        return unless Nanoc::Core::ContractsSupport.enabled?
-
-        unless assertion.call
-          raise AssertionFailure, "assertion failed: #{assertion.class}"
-        end
-      end
-    end
-
-    class Base
-      def call
-        raise NotImplementedError
-      end
-    end
-
-    class AllItemRepsHaveCompiledContent < Nanoc::Assertions::Base
-      def initialize(compiled_content_cache:, item_reps:)
-        @compiled_content_cache = compiled_content_cache
-        @item_reps = item_reps
-      end
-
-      def call
-        @item_reps.all? do |rep|
-          @compiled_content_cache[rep]
-        end
-      end
-    end
-
-    class PathIsAbsolute < Nanoc::Assertions::Base
-      def initialize(path:)
-        @path = path
-      end
-
-      def call
-        Pathname.new(@path).absolute?
-      end
-    end
-  end
-end

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

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    class Compiler
-      class Stage
-        def call(*args)
-          notify(:stage_started)
-          res = Nanoc::Core::Instrumentor.call(:stage_ran, self.class) do
-            run(*args)
-          end
-          notify(:stage_ended)
-          res
-        rescue
-          notify(:stage_aborted)
-          raise
-        end
-
-        def run(*)
-          raise NotImplementedError
-        end
-
-        private
-
-        def notify(sym)
-          name = self.class.to_s.sub(/^.*::/, '')
-          Nanoc::Core::NotificationCenter.post(sym, name)
-        end
-      end
-    end
-  end
-end