nanoc 4.4.6 → 4.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0186a136e28013d7133ebf66fa6d1e7065992a40'
-  data.tar.gz: 9198ef4aa5d624328b6bc3a5dc20238c4d4a4e53
+  metadata.gz: '0167178257988b6aaf09493db7ca9913b18d2961'
+  data.tar.gz: ff4d70d12e3e147010857f60f216d102f17e5ba3
 SHA512:
-  metadata.gz: b4f5f734e8a28c0cb7f01fa35119bbd7b2ffe7cae4a1d832fd70d3fa1fb7657a7f000ed9557213c8f849117033d4222bb7681fe4bc3bc3977dc9f441a59658af
-  data.tar.gz: b193bcfdf436fa88af0ae448019037bba79a5ab75a643280a3b5ce031e92e3e7ebbeab8e135f0d77111244d15fcff0bbf112662f027a60cb5544ed048a809f30
+  metadata.gz: 561f6907b5ae8fe75ac79038a9ca563846c6015b83c78bce7e20f2fdbdcd63f9d9df8d0d052f3810b49be3fa388fa56ec47a52c285ba86312bc5fb8506e64a67
+  data.tar.gz: d28b4eb99ca9dba7e154018201a19f3cef48d6aa0af69e671324e9b5548c675eade4549a9b9d81ef7257c958e3f79a5b6a5986bfbfdf3e8f09ac15aa6cfbccee

data/Gemfile

@@ -47,7 +47,6 @@ group :plugins do
   gem 'mustache', '~> 1.0'
   gem 'nokogiri', '~> 1.6'
   gem 'pandoc-ruby'
-  gem 'parallel'
   gem 'pygments.rb', github: 'tmm1/pygments.rb', platforms: [:ruby, :mswin]
   gem 'rack'
   gem 'rainpress'

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/bbatsov/rubocop.git
-  revision: 186b16e10514eaf304990d614184b980abc0ad2b
+  revision: 7c95534e1906539e53341cd53265fadfc0aba0e2
   specs:
     rubocop (0.46.0)
       parser (>= 2.3.3.1, < 3.0)
@@ -11,23 +11,23 @@ GIT
 
 GIT
   remote: git://github.com/cowboyd/therubyracer.git
-  revision: 2f1127bed45f03b91f3c92469be26399d3c1bcd8
+  revision: a635aee79b2057c396f8af92417cadf93415c275
   specs:
-    therubyracer (0.12.2)
+    therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
 
 GIT
   remote: git://github.com/tmm1/pygments.rb.git
-  revision: a988d127d3270d21685d2ac2e586060bf43709f3
+  revision: cf50cbeda48e8a242ef9cba9467e092935730f66
   specs:
-    pygments.rb (1.1.0)
+    pygments.rb (1.1.1)
       multi_json (>= 1.0.0)
 
 PATH
   remote: .
   specs:
-    nanoc (4.4.6)
+    nanoc (4.4.7)
       cri (~> 2.3)
       hamster (~> 3.0)
       ref (~> 2.0)
@@ -204,7 +204,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.5.2)
+    fog-vsphere (1.6.0)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
@@ -268,13 +268,12 @@ GEM
     multi_json (1.12.1)
     mustache (1.0.3)
     nenv (0.3.0)
-    nokogiri (1.7.0)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
     pandoc-ruby (2.0.1)
-    parallel (1.10.0)
     parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -282,9 +281,9 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rack (2.0.1)
-    rainbow (2.2.0)
+    rainbow (2.2.1)
     rainpress (1.0)
     rake (12.0.0)
     rb-fsevent (0.9.8)
@@ -348,7 +347,7 @@ GEM
     w3c_validators (1.3.1)
       json (~> 2.0)
       nokogiri (~> 1.6)
-    webmock (2.3.1)
+    webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -394,7 +393,6 @@ DEPENDENCIES
   nanoc!
   nokogiri (~> 1.6)
   pandoc-ruby
-  parallel
   pry
   pygments.rb!
   rack

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2016 Denis Defreyne and contributors
+Copyright (c) 2007-2017 Denis Defreyne and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,5 +1,16 @@
 # Nanoc news
 
+## 4.4.7 (2017-01-05)
+
+Fixes:
+
+* Fixed issue that caused an item not to be considered outdated when only the mtime has changed (#1046)
+* Removed stray `require 'parallel'` which could break the `external_links` check (#1051) [Cédric Boutillier]
+
+Enhancements:
+
+* Made Nanoc not recompile compiled items after an exception occurs (#1044)
+
 ## 4.4.6 (2016-12-28)
 
 Fixes:

data/README.md

@@ -19,4 +19,4 @@ Contributions are greatly appreciated! Consult the [Development guidelines](http
 
 Many thanks to everyone who has contributed to Nanoc in one way or another:
 
-Ale Muñoz, Alexander Mankuta, Andy Drop, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Chapman, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Denis Defreyne, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Grégory Karékinian, Gregory Pakosz, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Lorin Werthen, Louis T., Lucas Vuotto, Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Micha Rosenbaum, Michal Cichra, Michal Papis, Mike Pennisi, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Paul Boone, Peter Aronoff, Raphael von der Grün, Rémi Barraquand, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Šime Ramov, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Vlatko Kosturjak, whitequark, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada
+Ale Muñoz, Alexander Mankuta, Andy Drop, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Cédric Boutillier, Chris Chapman, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Denis Defreyne, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Grégory Karékinian, Gregory Pakosz, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Lorin Werthen, Louis T., Lucas Vuotto, Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Micha Rosenbaum, Michal Cichra, Michal Papis, Mike Pennisi, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Paul Boone, Peter Aronoff, Raphael von der Grün, Rémi Barraquand, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Šime Ramov, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Vlatko Kosturjak, whitequark, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada

data/lib/nanoc.rb

@@ -7,7 +7,7 @@ module Nanoc
     gem_info = defined?(Gem) ? "with RubyGems #{Gem::VERSION}" : 'without RubyGems'
     engine   = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
     res = ''
-    res << "Nanoc #{Nanoc::VERSION} © 2007-2016 Denis Defreyne.\n"
+    res << "Nanoc #{Nanoc::VERSION} © 2007-2017 Denis Defreyne.\n"
     res << "Running #{engine} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} #{gem_info}.\n"
     res
   end

data/lib/nanoc/base/repos.rb

@@ -6,5 +6,6 @@ require_relative 'repos/config_loader'
 require_relative 'repos/data_source'
 require_relative 'repos/dependency_store'
 require_relative 'repos/item_rep_repo'
+require_relative 'repos/outdatedness_store'
 require_relative 'repos/rule_memory_store'
 require_relative 'repos/site_loader'

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

@@ -0,0 +1,49 @@
+module Nanoc::Int
+  # @api private
+  class OutdatednessStore < ::Nanoc::Int::Store
+    include Nanoc::Int::ContractsSupport
+
+    contract C::KeywordArgs[site: C::Maybe[Nanoc::Int::Site], reps: Nanoc::Int::ItemRepRepo] => C::Any
+    def initialize(site: nil, reps:)
+      super(Nanoc::Int::Store.tmp_path_for(env_name: (site.config.env_name if site), store_name: 'outdatedness'), 1)
+
+      @outdated_reps = Set.new
+      @all_reps = reps
+    end
+
+    contract Nanoc::Int::ItemRep => C::Bool
+    def include?(obj)
+      @outdated_reps.include?(obj)
+    end
+
+    contract Nanoc::Int::ItemRep => self
+    def add(obj)
+      @outdated_reps << obj
+      self
+    end
+
+    contract Nanoc::Int::ItemRep => self
+    def remove(obj)
+      @outdated_reps.delete(obj)
+      self
+    end
+
+    contract C::None => C::ArrayOf[Nanoc::Int::ItemRep]
+    def to_a
+      @outdated_reps.to_a
+    end
+
+    protected
+
+    def data
+      @outdated_reps.map(&:reference)
+    end
+
+    def data=(new_data)
+      outdated_refs = Set.new(new_data)
+      all_reps = Set.new(@all_reps)
+
+      @outdated_reps = Set.new(all_reps.select { |rep| outdated_refs.include?(rep.reference) })
+    end
+  end
+end

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

@@ -73,128 +73,272 @@ module Nanoc::Int
       end
     end
 
-    # Provides functionality for (re)calculating the content of an item rep, without caching or
-    # outdatedness checking.
-    class RecalculatePhase
-      include Nanoc::Int::ContractsSupport
+    # All phases for the compilation of a single item rep. Phases will be repeated for every rep.
+    module Phases
+      # Provides functionality for (re)calculating the content of an item rep, without caching or
+      # outdatedness checking.
+      class Recalculate
+        include Nanoc::Int::ContractsSupport
+
+        def initialize(action_provider:, dependency_store:, compilation_context:)
+          @action_provider = action_provider
+          @dependency_store = dependency_store
+          @compilation_context = compilation_context
+        end
 
-      def initialize(action_provider:, dependency_store:, compilation_context:)
-        @action_provider = action_provider
-        @dependency_store = dependency_store
-        @compilation_context = compilation_context
+        contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Any
+        def run(rep, is_outdated:) # rubocop:disable Lint/UnusedMethodArgument
+          dependency_tracker = Nanoc::Int::DependencyTracker.new(@dependency_store)
+          dependency_tracker.enter(rep.item)
+
+          executor = Nanoc::Int::Executor.new(rep, @compilation_context, dependency_tracker)
+
+          @action_provider.memory_for(rep).each do |action|
+            case action
+            when Nanoc::Int::ProcessingActions::Filter
+              executor.filter(action.filter_name, action.params)
+            when Nanoc::Int::ProcessingActions::Layout
+              executor.layout(action.layout_identifier, action.params)
+            when Nanoc::Int::ProcessingActions::Snapshot
+              executor.snapshot(action.snapshot_name)
+            else
+              raise Nanoc::Int::Errors::InternalInconsistency, "unknown action #{action.inspect}"
+            end
+          end
+        ensure
+          dependency_tracker.exit
+        end
       end
 
-      contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Any
-      def run(rep, is_outdated:) # rubocop:disable Lint/UnusedMethodArgument
-        dependency_tracker = Nanoc::Int::DependencyTracker.new(@dependency_store)
-        dependency_tracker.enter(rep.item)
-
-        executor = Nanoc::Int::Executor.new(rep, @compilation_context, dependency_tracker)
-
-        @action_provider.memory_for(rep).each do |action|
-          case action
-          when Nanoc::Int::ProcessingActions::Filter
-            executor.filter(action.filter_name, action.params)
-          when Nanoc::Int::ProcessingActions::Layout
-            executor.layout(action.layout_identifier, action.params)
-          when Nanoc::Int::ProcessingActions::Snapshot
-            executor.snapshot(action.snapshot_name)
+      # Provides functionality for (re)calculating the content of an item rep, with caching or
+      # outdatedness checking. Delegates to s::Recalculate if outdated or no cache available.
+      class Cache
+        include Nanoc::Int::ContractsSupport
+
+        def initialize(compiled_content_cache:, wrapped:)
+          @compiled_content_cache = compiled_content_cache
+          @wrapped = wrapped
+        end
+
+        contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Any
+        def run(rep, is_outdated:)
+          if can_reuse_content_for_rep?(rep, is_outdated: is_outdated)
+            Nanoc::Int::NotificationCenter.post(:cached_content_used, rep)
+            rep.snapshot_contents = @compiled_content_cache[rep]
           else
-            raise Nanoc::Int::Errors::InternalInconsistency, "unknown action #{action.inspect}"
+            @wrapped.run(rep, is_outdated: is_outdated)
           end
+
+          rep.compiled = true
+          @compiled_content_cache[rep] = rep.snapshot_contents
+        end
+
+        contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Bool
+        def can_reuse_content_for_rep?(rep, is_outdated:)
+          !is_outdated && !@compiled_content_cache[rep].nil?
         end
-      ensure
-        dependency_tracker.exit
       end
-    end
 
-    # Provides functionality for (re)calculating the content of an item rep, with caching or
-    # outdatedness checking. Delegates to RecalculatePhase if outdated or no cache available.
-    class CachePhase
-      include Nanoc::Int::ContractsSupport
+      # Provides functionality for suspending and resuming item rep compilation (using fibers).
+      class Resume
+        include Nanoc::Int::ContractsSupport
 
-      def initialize(compiled_content_cache:, wrapped:)
-        @compiled_content_cache = compiled_content_cache
-        @wrapped = wrapped
+        def initialize(wrapped:)
+          @wrapped = wrapped
+        end
+
+        contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Any
+        def run(rep, is_outdated:)
+          fiber = fiber_for(rep, is_outdated: is_outdated)
+          while fiber.alive?
+            Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
+            res = fiber.resume
+
+            case res
+            when Nanoc::Int::Errors::UnmetDependency
+              Nanoc::Int::NotificationCenter.post(:compilation_suspended, rep, res)
+              raise(res)
+            when Proc
+              fiber.resume(res.call)
+            else
+              # TODO: raise
+            end
+          end
+
+          Nanoc::Int::NotificationCenter.post(:compilation_ended, rep)
+        end
+
+        private
+
+        contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => Fiber
+        def fiber_for(rep, is_outdated:)
+          @fibers ||= {}
+
+          @fibers[rep] ||=
+            Fiber.new do
+              @wrapped.run(rep, is_outdated: is_outdated)
+              @fibers.delete(rep)
+            end
+
+          @fibers[rep]
+        end
       end
 
-      contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Any
-      def run(rep, is_outdated:)
-        if can_reuse_content_for_rep?(rep, is_outdated: is_outdated)
-          Nanoc::Int::NotificationCenter.post(:cached_content_used, rep)
-          rep.snapshot_contents = @compiled_content_cache[rep]
-        else
-          @wrapped.run(rep, is_outdated: is_outdated)
+      class Write
+        include Nanoc::Int::ContractsSupport
+
+        def initialize(wrapped:)
+          @wrapped = wrapped
         end
 
-        rep.compiled = true
-        @compiled_content_cache[rep] = rep.snapshot_contents
+        contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Any
+        def run(rep, is_outdated:)
+          @wrapped.run(rep, is_outdated: is_outdated)
+
+          rep.snapshot_defs.each do |sdef|
+            ItemRepWriter.new.write(rep, sdef.name)
+          end
+        end
       end
 
-      contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Bool
-      def can_reuse_content_for_rep?(rep, is_outdated:)
-        !is_outdated && !@compiled_content_cache[rep].nil?
+      class MarkDone
+        include Nanoc::Int::ContractsSupport
+
+        def initialize(wrapped:, outdatedness_store:)
+          @wrapped = wrapped
+          @outdatedness_store = outdatedness_store
+        end
+
+        contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Any
+        def run(rep, is_outdated:)
+          @wrapped.run(rep, is_outdated: is_outdated)
+          @outdatedness_store.remove(rep)
+        end
       end
     end
 
-    # Provides functionality for suspending and resuming item rep compilation (using fibers).
-    class ResumePhase
-      include Nanoc::Int::ContractsSupport
+    module Stages
+      class Preprocess
+        def initialize(action_provider:, site:, dependency_store:, checksum_store:)
+          @action_provider = action_provider
+          @site = site
+          @dependency_store = dependency_store
+          @checksum_store = checksum_store
+        end
+
+        def run
+          @action_provider.preprocess(@site)
 
-      def initialize(wrapped:)
-        @wrapped = wrapped
+          @dependency_store.objects = @site.items.to_a + @site.layouts.to_a
+          @checksum_store.objects = @site.items.to_a + @site.layouts.to_a + @site.code_snippets + [@site.config]
+
+          @site.freeze
+        end
       end
 
-      contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Any
-      def run(rep, is_outdated:)
-        fiber = fiber_for(rep, is_outdated: is_outdated)
-        while fiber.alive?
-          Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
-          res = fiber.resume
-
-          case res
-          when Nanoc::Int::Errors::UnmetDependency
-            Nanoc::Int::NotificationCenter.post(:compilation_suspended, rep, res)
-            raise(res)
-          when Proc
-            fiber.resume(res.call)
-          else
-            # TODO: raise
+      class Prune
+        def initialize(config:, reps:)
+          @config = config
+          @reps = reps
+        end
+
+        def run
+          if @config[:prune][:auto_prune]
+            Nanoc::Pruner.new(@config, @reps, exclude: prune_config_exclude).run
           end
         end
 
-        Nanoc::Int::NotificationCenter.post(:compilation_ended, rep)
-      end
+        private
 
-      private
+        def prune_config
+          @config[:prune] || {}
+        end
 
-      contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => Fiber
-      def fiber_for(rep, is_outdated:)
-        @fibers ||= {}
+        def prune_config_exclude
+          prune_config[:exclude] || {}
+        end
+      end
 
-        @fibers[rep] ||=
-          Fiber.new do
-            @wrapped.run(rep, is_outdated: is_outdated)
-            @fibers.delete(rep)
+      class DetermineOutdatedness
+        def initialize(reps:, outdatedness_checker:, outdatedness_store:)
+          @reps = reps
+          @outdatedness_checker = outdatedness_checker
+          @outdatedness_store = outdatedness_store
+        end
+
+        def run
+          outdated_reps_tmp = @reps.select do |r|
+            @outdatedness_store.include?(r) || @outdatedness_checker.outdated?(r)
           end
 
-        @fibers[rep]
-      end
-    end
+          outdated_items = outdated_reps_tmp.map(&:item).uniq
+          outdated_reps = Set.new(outdated_items.flat_map { |i| @reps[i] })
 
-    class WritePhase
-      include Nanoc::Int::ContractsSupport
+          outdated_reps.each { |r| @outdatedness_store.add(r) }
 
-      def initialize(wrapped:)
-        @wrapped = wrapped
+          yield(outdated_items)
+        end
       end
 
-      contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Any
-      def run(rep, is_outdated:)
-        @wrapped.run(rep, is_outdated: is_outdated)
+      class CompileReps
+        def initialize(outdatedness_store:, dependency_store:, action_provider:, compilation_context:, compiled_content_cache:)
+          @outdatedness_store = outdatedness_store
+          @dependency_store = dependency_store
+          @action_provider = action_provider
+          @compilation_context = compilation_context
+          @compiled_content_cache = compiled_content_cache
+        end
+
+        def run
+          selector = Nanoc::Int::ItemRepSelector.new(@outdatedness_store.to_a)
+          selector.each do |rep|
+            handle_errors_while(rep) { compile_rep(rep, is_outdated: @outdatedness_store.include?(rep)) }
+          end
+        ensure
+          @outdatedness_store.store
+          @compiled_content_cache.store
+        end
+
+        private
+
+        def handle_errors_while(item_rep)
+          yield
+        rescue => e
+          raise Nanoc::Int::Errors::CompilationError.new(e, item_rep)
+        end
+
+        def compile_rep(rep, is_outdated:)
+          item_rep_compiler.run(rep, is_outdated: is_outdated)
+        end
 
-        rep.snapshot_defs.each do |sdef|
-          ItemRepWriter.new.write(rep, sdef.name)
+        def item_rep_compiler
+          @_item_rep_compiler ||= begin
+            recalculate_phase = Phases::Recalculate.new(
+              action_provider: @action_provider,
+              dependency_store: @dependency_store,
+              compilation_context: @compilation_context,
+            )
+
+            cache_phase = Phases::Cache.new(
+              compiled_content_cache: @compiled_content_cache,
+              wrapped: recalculate_phase,
+            )
+
+            resume_phase = Phases::Resume.new(
+              wrapped: cache_phase,
+            )
+
+            write_phase = Phases::Write.new(
+              wrapped: resume_phase,
+            )
+
+            mark_done_phase = Phases::MarkDone.new(
+              wrapped: write_phase,
+              outdatedness_store: @outdatedness_store,
+            )
+
+            mark_done_phase
+          end
         end
       end
     end
@@ -225,7 +369,10 @@ module Nanoc::Int
     # @api private
     attr_reader :reps
 
-    def initialize(site, compiled_content_cache:, checksum_store:, rule_memory_store:, action_provider:, dependency_store:, outdatedness_checker:, reps:)
+    # @api private
+    attr_reader :outdatedness_store
+
+    def initialize(site, compiled_content_cache:, checksum_store:, rule_memory_store:, action_provider:, dependency_store:, outdatedness_checker:, reps:, outdatedness_store:)
       @site = site
 
       @compiled_content_cache = compiled_content_cache
@@ -235,22 +382,20 @@ module Nanoc::Int
       @outdatedness_checker   = outdatedness_checker
       @reps                   = reps
       @action_provider        = action_provider
+      @outdatedness_store     = outdatedness_store
     end
 
     def run_all
-      @action_provider.preprocess(@site)
+      preprocess_stage.run
       build_reps
-      prune
-      run
-      @action_provider.postprocess(@site, @reps)
-    end
-
-    def run
+      prune_stage.run
       load_stores
-      @site.freeze
-
-      compile_reps
+      determine_outdatedness
+      forget_dependencies_if_needed
       store
+      compile_reps
+      store_output_state
+      @action_provider.postprocess(@site, @reps)
     ensure
       Nanoc::Int::TempFilenameFactory.instance.cleanup(
         Nanoc::Filter::TMP_BINARY_ITEMS_DIR,
@@ -261,17 +406,10 @@ module Nanoc::Int
     end
 
     def load_stores
-      # FIXME: icky hack to update the dependency/checksum store’s list of objects
-      # (does not include preprocessed objects otherwise)
-      dependency_store.objects = site.items.to_a + site.layouts.to_a
-      checksum_store.objects = site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
-
       stores.each(&:load)
     end
 
-    # Store the modified helper data used for compiling the site.
-    #
-    # @return [void]
+    # TODO: rename to store_preprocessed_state
     def store
       # Calculate rule memory
       (@reps.to_a + @site.layouts.to_a).each do |obj|
@@ -284,7 +422,12 @@ module Nanoc::Int
       objects_to_checksum.each { |obj| checksum_store.add(obj) }
 
       # Store
-      stores.each(&:store)
+      checksum_store.store
+      rule_memory_store.store
+    end
+
+    def store_output_state
+      @dependency_store.store
     end
 
     def build_reps
@@ -305,62 +448,52 @@ module Nanoc::Int
 
     private
 
-    def prune
-      if site.config[:prune][:auto_prune]
-        Nanoc::Pruner.new(site.config, reps, exclude: prune_config_exclude).run
-      end
+    def preprocess_stage
+      @_preprocess_stage ||= Stages::Preprocess.new(
+        action_provider: action_provider,
+        site: site,
+        dependency_store: dependency_store,
+        checksum_store: checksum_store,
+      )
     end
 
-    def prune_config
-      site.config[:prune] || {}
+    def prune_stage
+      @_prune_stage ||= Stages::Prune.new(
+        config: site.config,
+        reps: reps,
+      )
     end
 
-    def prune_config_exclude
-      prune_config[:exclude] || {}
+    def determine_outdatedness_stage
+      @_determine_outdatedness_stage ||= Stages::DetermineOutdatedness.new(
+        reps: reps,
+        outdatedness_checker: outdatedness_checker,
+        outdatedness_store: outdatedness_store,
+      )
     end
 
-    def compile_reps
-      outdated_items = @reps.select { |r| outdatedness_checker.outdated?(r) }.map(&:item).uniq
-      outdated_items.each { |i| @dependency_store.forget_dependencies_for(i) }
-
-      reps_to_recompile = Set.new(outdated_items.flat_map { |i| @reps[i] })
-      selector = Nanoc::Int::ItemRepSelector.new(reps_to_recompile)
-      selector.each do |rep|
-        handle_errors_while(rep) { compile_rep(rep, is_outdated: reps_to_recompile.include?(rep)) }
-      end
+    def compile_reps_stage
+      @_compile_reps_stage ||= Stages::CompileReps.new(
+        outdatedness_store: @outdatedness_store,
+        dependency_store: @dependency_store,
+        action_provider: action_provider,
+        compilation_context: compilation_context,
+        compiled_content_cache: compiled_content_cache,
+      )
     end
 
-    def handle_errors_while(item_rep)
-      yield
-    rescue => e
-      raise Nanoc::Int::Errors::CompilationError.new(e, item_rep)
+    def determine_outdatedness
+      determine_outdatedness_stage.run do |outdated_items|
+        @outdated_items = outdated_items
+      end
     end
 
-    def compile_rep(rep, is_outdated:)
-      item_rep_compiler.run(rep, is_outdated: is_outdated)
+    def forget_dependencies_if_needed
+      @outdated_items.each { |i| @dependency_store.forget_dependencies_for(i) }
     end
 
-    def item_rep_compiler
-      @_item_rep_compiler ||= begin
-        recalculate_phase = RecalculatePhase.new(
-          action_provider: action_provider,
-          dependency_store: @dependency_store,
-          compilation_context: compilation_context,
-        )
-
-        cache_phase = CachePhase.new(
-          compiled_content_cache: compiled_content_cache,
-          wrapped: recalculate_phase,
-        )
-
-        resume_phase = ResumePhase.new(
-          wrapped: cache_phase,
-        )
-
-        WritePhase.new(
-          wrapped: resume_phase,
-        )
-      end
+    def compile_reps
+      compile_reps_stage.run
     end
 
     # Returns all stores that can load/store data that can be used for
@@ -371,6 +504,7 @@ module Nanoc::Int
         compiled_content_cache,
         @dependency_store,
         rule_memory_store,
+        @outdatedness_store,
       ]
     end
   end