nanoc 4.7.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a139ed28840cdd9e8d815959a6ce67a2a3d64629
-  data.tar.gz: 443fad3be7c31740a6b0378e37b358355f4cf451
+  metadata.gz: 3697f07907752b5c0010bbf3fb01e701d6128bba
+  data.tar.gz: 70dfb18ac4973838113380a201ddde4468f2b13b
 SHA512:
-  metadata.gz: 54e42408687a77e4775218127f65e92780702969c3f18e8d4dbd723b7428d6f0a8eec603545ab092f69de699af67af0861ae690b142b5e9314ac4c893ef8830b
-  data.tar.gz: 66dc4eb54985f21f9a6614b366fbcd4b0dc4b8e3dc3cd4fe0e7b6f5c3497432f91e0221e3868cf8c2a2bb60df04dd18d8a0909508e3ef6aad2a15e45ef2cf8f2
+  metadata.gz: e8810bd89fcd0e3c65f647ec3b99a76454dc2fa35169b5b4e66317f178b260e2e8229686342aee8c83929e7de04b323c98137c8c8b690c7b1259fabed99e2147
+  data.tar.gz: 144aacfa4f5981109e514c8c33cde796598e86ec27c2b6d115ff2c4b497dc25b5d7a5950a071ad4e23dce5c68063b699b3fb42258f6b0f7c31ded9a81c311177

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/bbatsov/rubocop.git
-  revision: 7623afc89d97b6149067428e1cb8d69a1786d0b3
+  revision: a047a11633e104d5ee9ca4d2957e4b1cf571f30b
   specs:
     rubocop (0.47.1)
       parser (>= 2.3.3.1, < 3.0)
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.7.0)
+    nanoc (4.7.1)
       cri (~> 2.3)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
@@ -211,7 +211,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.7.1)
+    fog-vsphere (1.8.0)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.3.0)
@@ -347,7 +347,7 @@ GEM
     trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
-    uglifier (3.1.7)
+    uglifier (3.1.8)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.1.3)
     url (0.3.2)

data/NEWS.md

@@ -1,10 +1,21 @@
 # Nanoc news
 
+## 4.7.1 (2017-03-19)
+
+Fixes:
+
+* Fixed issue with `:xsl` filter not recompiling when it should (#924, #1127)
+
+Enhancements:
+
+* Made `compile --verbose` print percentiles rather than averages (#1122)
+* Improved dependency cycle error messages (#1123)
+
 ## 4.7 (2017-03-15)
 
 Features:
 
-* Added `:erubi` filter (#1103)
+* Added `:erubi` filter (#1103) [Jan M. Faber]
 * Added `write ext: 'something'` shortcut (#1079)
 
 ## 4.6.4 (2017-03-10)

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, 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, Hugo Peixoto, 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, Hugo Peixoto, Jack Chu, Jake Benilov, Jan M. Faber, 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/base/entities/directed_graph.rb

@@ -158,6 +158,22 @@ module Nanoc::Int
 
     # @group Querying the graph
 
+    def any_cycle
+      path = [@vertices.keys.first]
+
+      loop do
+        nexts = direct_successors_of(path.last)
+        cycle_start_index = path.find_index { |node| nexts.include?(node) }
+        if cycle_start_index
+          break path[cycle_start_index..-1]
+        elsif nexts.empty?
+          break nil
+        else
+          path << nexts.sample
+        end
+      end
+    end
+
     # Returns the direct predecessors of the given vertex, i.e. the vertices
     # x where there is an edge from x to the given vertex y.
     #

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

@@ -4,6 +4,7 @@ module Nanoc::Int
     include Nanoc::Int::ContractsSupport
     include Enumerable
 
+    extend Nanoc::Int::Memoization
     extend Forwardable
 
     def_delegator :@objects, :each
@@ -29,15 +30,10 @@ module Nanoc::Int
 
     contract C::Any => C::Maybe[C::RespondTo[:identifier]]
     def [](arg)
-      case arg
-      when Nanoc::Identifier
-        object_with_identifier(arg)
-      when String
-        object_with_identifier(arg) || object_matching_glob(arg)
-      when Regexp
-        @objects.find { |i| i.identifier.to_s =~ arg }
+      if frozen?
+        get_memoized(arg)
       else
-        raise ArgumentError, "don’t know how to fetch objects by #{arg.inspect}"
+        get_unmemoized(arg)
       end
     end
 
@@ -61,6 +57,26 @@ module Nanoc::Int
 
     protected
 
+    contract C::Any => C::Maybe[C::RespondTo[:identifier]]
+    def get_unmemoized(arg)
+      case arg
+      when Nanoc::Identifier
+        object_with_identifier(arg)
+      when String
+        object_with_identifier(arg) || object_matching_glob(arg)
+      when Regexp
+        @objects.find { |i| i.identifier.to_s =~ arg }
+      else
+        raise ArgumentError, "don’t know how to fetch objects by #{arg.inspect}"
+      end
+    end
+
+    contract C::Any => C::Maybe[C::RespondTo[:identifier]]
+    def get_memoized(arg)
+      get_unmemoized(arg)
+    end
+    memoize :get_memoized
+
     def object_with_identifier(identifier)
       if frozen?
         @mapping[identifier.to_s]

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

@@ -58,5 +58,10 @@ module Nanoc::Int
       'One or more output paths of this item have been modified since the last time the site was compiled.',
       Props.new(path: 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

data/lib/nanoc/base/errors.rb

@@ -68,12 +68,17 @@ module Nanoc::Int
 
     # Error that is raised during site compilation when an item (directly or
     # indirectly) includes its own item content, leading to endless recursion.
-    class RecursiveCompilation < Generic
-      # @param [Array<Nanoc::Int::ItemRep>] reps A list of item representations
-      #   that mutually depend on each other
-      def initialize(reps)
-        list = reps.map(&:inspect).join("\n")
-        super("The site cannot be compiled because the following items mutually depend on each other:\n#{list}.")
+    class DependencyCycle < Generic
+      def initialize(graph)
+        cycle = graph.any_cycle
+
+        msg_bits = []
+        msg_bits << 'The site cannot be compiled because there is a dependency cycle:'
+        msg_bits << ''
+        cycle.each.with_index { |r, i| msg_bits << "    (#{i + 1}) item #{r.item.identifier}, rep #{r.name.inspect}, depends on" }
+        msg_bits.last << ' (1)'
+
+        super(msg_bits.map { |x| x + "\n" }.join(''))
       end
     end
 

data/lib/nanoc/base/memoization.rb

@@ -5,23 +5,6 @@ module Nanoc::Int
   #
   # @api private
   module Memoization
-    class Wrapper
-      attr_reader :ref
-
-      def initialize(ref)
-        @ref = ref
-      end
-
-      def inspect
-        obj = @ref.object
-        if obj
-          obj.inspect
-        else
-          '<garbage collected>'
-        end
-      end
-    end
-
     class Value
       attr_reader :value
 
@@ -69,20 +52,20 @@ module Nanoc::Int
       original_method_name = '__nonmemoized_' + method_name.to_s
       alias_method original_method_name, method_name
 
+      instance_cache = Hash.new { |hash, key| hash[key] = {} }
+
       define_method(method_name) do |*args|
-        @__memoization_cache ||= {}
-        @__memoization_cache[method_name] ||= {}
-        method_cache = @__memoization_cache[method_name]
+        instance_method_cache = instance_cache[self]
 
         value = NONE
-        if method_cache.key?(args)
-          object = method_cache[args].ref.object
+        if instance_method_cache.key?(args)
+          object = instance_method_cache[args].object
           value = object ? object.value : NONE
         end
 
         if value.equal?(NONE)
           send(original_method_name, *args).tap do |r|
-            method_cache[args] = Wrapper.new(Ref::SoftReference.new(Value.new(r)))
+            instance_method_cache[args] = Ref::SoftReference.new(Value.new(r))
           end
         else
           value

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

@@ -2,8 +2,7 @@ module Nanoc::Int::Compiler::Phases
   class Abstract
     include Nanoc::Int::ContractsSupport
 
-    def initialize(wrapped:, name:)
-      @name = name
+    def initialize(wrapped:)
       @wrapped = wrapped
     end
 
@@ -28,7 +27,8 @@ module Nanoc::Int::Compiler::Phases
     private
 
     def notify(sym, rep)
-      Nanoc::Int::NotificationCenter.post(sym, @name, rep)
+      name = self.class.to_s.sub(/^.*::/, '')
+      Nanoc::Int::NotificationCenter.post(sym, name, rep)
     end
   end
 end

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

@@ -4,10 +4,8 @@ module Nanoc::Int::Compiler::Phases
   class Cache < Abstract
     include Nanoc::Int::ContractsSupport
 
-    NAME = 'cache'.freeze
-
     def initialize(wrapped:, compiled_content_cache:, snapshot_repo:)
-      super(wrapped: wrapped, name: NAME)
+      super(wrapped: wrapped)
 
       @compiled_content_cache = compiled_content_cache
       @snapshot_repo = snapshot_repo

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

@@ -2,10 +2,8 @@ module Nanoc::Int::Compiler::Phases
   class MarkDone < Abstract
     include Nanoc::Int::ContractsSupport
 
-    NAME = 'mark_done'.freeze
-
     def initialize(wrapped:, outdatedness_store:)
-      super(wrapped: wrapped, name: NAME)
+      super(wrapped: wrapped)
 
       @outdatedness_store = outdatedness_store
     end

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

@@ -4,10 +4,8 @@ module Nanoc::Int::Compiler::Phases
   class Recalculate < Abstract
     include Nanoc::Int::ContractsSupport
 
-    NAME = 'recalculate'.freeze
-
     def initialize(action_provider:, dependency_store:, compilation_context:)
-      super(wrapped: nil, name: NAME)
+      super(wrapped: nil)
 
       @action_provider = action_provider
       @dependency_store = dependency_store

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

@@ -3,10 +3,8 @@ module Nanoc::Int::Compiler::Phases
   class Resume < Abstract
     include Nanoc::Int::ContractsSupport
 
-    NAME = 'resume'.freeze
-
     def initialize(wrapped:)
-      super(wrapped: wrapped, name: NAME)
+      super(wrapped: wrapped)
     end
 
     contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any

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

@@ -2,10 +2,8 @@ module Nanoc::Int::Compiler::Phases
   class Write < Abstract
     include Nanoc::Int::ContractsSupport
 
-    NAME = 'write'.freeze
-
     def initialize(snapshot_repo:, wrapped:)
-      super(wrapped: wrapped, name: NAME)
+      super(wrapped: wrapped)
 
       @snapshot_repo = snapshot_repo
     end

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

@@ -93,6 +93,21 @@ module Nanoc
         (@to || :text) == :binary
       end
 
+      # @return [Boolean]
+      #
+      # @api private
+      def always_outdated?
+        @always_outdated || false
+      end
+
+      # Marks this filter as always causing the item rep to be outdated. This is useful for filters
+      # that cannot do dependency tracking properly.
+      #
+      # @return [void]
+      def always_outdated
+        @always_outdated = true
+      end
+
       # @overload requires(*requires)
       #   Sets the required libraries for this filter.
       #   @param [Array<String>] requires A list of library names that are required

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

@@ -30,7 +30,7 @@ module Nanoc::Int
 
       # Check whether everything was compiled
       unless graph.vertices.empty?
-        raise Nanoc::Int::Errors::RecursiveCompilation.new(graph.vertices)
+        raise Nanoc::Int::Errors::DependencyCycle.new(graph)
       end
     end
 

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

@@ -19,6 +19,7 @@ module Nanoc::Int
           Rules::NotWritten,
           Rules::CodeSnippetsModified,
           Rules::ConfigurationModified,
+          Rules::UsesAlwaysOutdatedFilter,
         ].freeze
 
       RULES_FOR_LAYOUT =
@@ -26,6 +27,7 @@ module Nanoc::Int
           Rules::RulesModified,
           Rules::ContentModified,
           Rules::AttributesModified,
+          Rules::UsesAlwaysOutdatedFilter,
         ].freeze
 
       contract C::KeywordArgs[outdatedness_checker: OutdatednessChecker, reps: Nanoc::Int::ItemRepRepo] => C::Any
@@ -56,7 +58,7 @@ module Nanoc::Int
         rules.inject(status) do |acc, rule|
           if !acc.useful_to_apply?(rule)
             acc
-          elsif rule.instance.apply(obj, @outdatedness_checker)
+          elsif rule.instance.call(obj, @outdatedness_checker)
             acc.update(rule.instance.reason)
           else
             acc

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

@@ -4,6 +4,13 @@ module Nanoc::Int
     include Nanoc::Int::ContractsSupport
     include Singleton
 
+    def call(obj, outdatedness_checker)
+      Nanoc::Int::NotificationCenter.post(:outdatedness_rule_started, self.class, obj)
+      apply(obj, outdatedness_checker)
+    ensure
+      Nanoc::Int::NotificationCenter.post(:outdatedness_rule_ended, self.class, obj)
+    end
+
     def apply(_obj, _outdatedness_checker)
       raise NotImplementedError.new('Nanoc::Int::OutdatednessRule subclasses must implement ##reason, and #apply')
     end

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

@@ -117,5 +117,21 @@ module Nanoc::Int
         paths_old != paths_new
       end
     end
+
+    class UsesAlwaysOutdatedFilter < OutdatednessRule
+      def reason
+        Nanoc::Int::OutdatednessReasons::UsesAlwaysOutdatedFilter
+      end
+
+      def apply(obj, outdatedness_checker)
+        mem = outdatedness_checker.action_provider.memory_for(obj)
+
+        mem
+          .select { |a| a.is_a?(Nanoc::Int::ProcessingActions::Filter) }
+          .map { |a| Nanoc::Filter.named(a.filter_name) }
+          .compact
+          .any?(&:always_outdated?)
+      end
+    end
   end
 end

data/lib/nanoc/cli/commands/compile.rb

@@ -5,414 +5,15 @@ Compile all items of the current site.
 EOS
 flag nil, :profile, 'profile compilation' if Nanoc::Feature.enabled?(Nanoc::Feature::PROFILER)
 
+require_relative 'compile_listeners/abstract'
+require_relative 'compile_listeners/debug_printer'
+require_relative 'compile_listeners/diff_generator'
+require_relative 'compile_listeners/file_action_printer'
+require_relative 'compile_listeners/stack_prof_profiler'
+require_relative 'compile_listeners/timing_recorder'
+
 module Nanoc::CLI::Commands
   class Compile < ::Nanoc::CLI::CommandRunner
-    # Listens to compilation events and reacts to them. This abstract class
-    # does not have a real implementation; subclasses should override {#start}
-    # and set up notifications to listen to.
-    #
-    # @abstract Subclasses must override {#start} and may override {#stop}.
-    class Listener
-      def initialize(*); end
-
-      # @param [Nanoc::CLI::CommandRunner] command_runner The command runner for this listener
-      #
-      # @return [Boolean] true if this listener should be enabled for the given command runner, false otherwise
-      #
-      # @abstract Returns `true` by default, but subclasses may override this.
-      def self.enable_for?(command_runner) # rubocop:disable Lint/UnusedMethodArgument
-        true
-      end
-
-      # Starts the listener. Subclasses should override this method and set up listener notifications.
-      #
-      # @return [void]
-      #
-      # @abstract
-      def start
-        raise NotImplementedError, 'Subclasses of Listener should implement #start'
-      end
-
-      # Stops the listener. The default implementation removes self from all notification center observers.
-      #
-      # @return [void]
-      def stop; end
-
-      # @api private
-      def start_safely
-        start
-        @_started = true
-      end
-
-      # @api private
-      def stop_safely
-        stop if @_started
-        @_started = false
-      end
-    end
-
-    # Generates diffs for every output file written
-    class DiffGenerator < Listener
-      # @see Listener#enable_for?
-      def self.enable_for?(command_runner)
-        command_runner.site.config[:enable_output_diff]
-      end
-
-      # @see Listener#start
-      def start
-        require 'tempfile'
-        setup_diffs
-        old_contents = {}
-        Nanoc::Int::NotificationCenter.on(:will_write_rep, self) do |rep, path|
-          old_contents[rep] = File.file?(path) ? File.read(path) : nil
-        end
-        Nanoc::Int::NotificationCenter.on(:rep_written, self) do |rep, binary, path, _is_created, _is_modified|
-          unless binary
-            new_contents = File.file?(path) ? File.read(path) : nil
-            if old_contents[rep] && new_contents
-              generate_diff_for(path, old_contents[rep], new_contents)
-            end
-            old_contents.delete(rep)
-          end
-        end
-      end
-
-      # @see Listener#stop
-      def stop
-        super
-
-        Nanoc::Int::NotificationCenter.remove(:will_write_rep, self)
-        Nanoc::Int::NotificationCenter.remove(:rep_written, self)
-
-        teardown_diffs
-      end
-
-      protected
-
-      def setup_diffs
-        @diff_lock    = Mutex.new
-        @diff_threads = []
-        FileUtils.rm('output.diff') if File.file?('output.diff')
-      end
-
-      def teardown_diffs
-        @diff_threads.each(&:join)
-      end
-
-      def generate_diff_for(path, old_content, new_content)
-        return if old_content == new_content
-
-        @diff_threads << Thread.new do
-          # Generate diff
-          diff = diff_strings(old_content, new_content)
-          diff.sub!(/^--- .*/,    '--- ' + path)
-          diff.sub!(/^\+\+\+ .*/, '+++ ' + path)
-
-          # Write diff
-          @diff_lock.synchronize do
-            File.open('output.diff', 'a') { |io| io.write(diff) }
-          end
-        end
-      end
-
-      def diff_strings(a, b)
-        require 'open3'
-
-        # Create files
-        Tempfile.open('old') do |old_file|
-          Tempfile.open('new') do |new_file|
-            # Write files
-            old_file.write(a)
-            old_file.flush
-            new_file.write(b)
-            new_file.flush
-
-            # Diff
-            cmd = ['diff', '-u', old_file.path, new_file.path]
-            Open3.popen3(*cmd) do |_stdin, stdout, _stderr|
-              result = stdout.read
-              return (result == '' ? nil : result)
-            end
-          end
-        end
-      rescue Errno::ENOENT
-        warn 'Failed to run `diff`, so no diff with the previously compiled ' \
-             'content will be available.'
-        nil
-      end
-    end
-
-    # Records the time spent per filter and per item representation
-    class TimingRecorder < Listener
-      # @see Listener#enable_for?
-      def self.enable_for?(command_runner)
-        command_runner.options.fetch(:verbose, false)
-      end
-
-      # @param [Enumerable<Nanoc::Int::ItemRep>] reps
-      def initialize(reps:)
-        @reps = reps
-      end
-
-      # @see Listener#start
-      def start
-        @telemetry = Nanoc::Telemetry.new
-
-        stage_stopwatch = Nanoc::Telemetry::Stopwatch.new
-
-        Nanoc::Int::NotificationCenter.on(:stage_started) do |_stage_name|
-          stage_stopwatch.start
-        end
-
-        Nanoc::Int::NotificationCenter.on(:stage_ended) do |stage_name|
-          stage_stopwatch.stop
-          @telemetry.summary(:stages).observe(stage_stopwatch.duration, stage_name.to_s)
-          stage_stopwatch = Nanoc::Telemetry::Stopwatch.new
-        end
-
-        filter_stopwatches = {}
-
-        Nanoc::Int::NotificationCenter.on(:filtering_started) do |rep, _filter_name|
-          stopwatch_stack = filter_stopwatches.fetch(rep) { filter_stopwatches[rep] = [] }
-          stopwatch_stack << Nanoc::Telemetry::Stopwatch.new
-          stopwatch_stack.last.start
-        end
-
-        Nanoc::Int::NotificationCenter.on(:filtering_ended) do |rep, filter_name|
-          stopwatch = filter_stopwatches.fetch(rep).pop
-          stopwatch.stop
-
-          @telemetry.summary(:filters).observe(stopwatch.duration, filter_name.to_s)
-        end
-
-        Nanoc::Int::NotificationCenter.on(:compilation_suspended) do |rep, _exception|
-          filter_stopwatches.fetch(rep).each(&:stop)
-        end
-
-        Nanoc::Int::NotificationCenter.on(:compilation_started) do |rep|
-          filter_stopwatches.fetch(rep, []).each(&:start)
-        end
-
-        phase_stopwatches = {}
-
-        Nanoc::Int::NotificationCenter.on(:phase_started) do |phase_name, rep|
-          stopwatches = phase_stopwatches.fetch(rep) { phase_stopwatches[rep] = {} }
-          stopwatches[phase_name] = Nanoc::Telemetry::Stopwatch.new.tap(&:start)
-        end
-
-        Nanoc::Int::NotificationCenter.on(:phase_ended) do |phase_name, rep|
-          stopwatch = phase_stopwatches.fetch(rep).fetch(phase_name)
-          stopwatch.stop
-
-          @telemetry.summary(:phases).observe(stopwatch.duration, phase_name)
-        end
-
-        Nanoc::Int::NotificationCenter.on(:phase_yielded) do |phase_name, rep|
-          stopwatch = phase_stopwatches.fetch(rep).fetch(phase_name)
-          stopwatch.stop
-        end
-
-        Nanoc::Int::NotificationCenter.on(:phase_resumed) do |phase_name, rep|
-          stopwatch = phase_stopwatches.fetch(rep).fetch(phase_name)
-          stopwatch.start if stopwatch.stopped?
-        end
-
-        Nanoc::Int::NotificationCenter.on(:phase_aborted) do |phase_name, rep|
-          stopwatch = phase_stopwatches.fetch(rep).fetch(phase_name)
-          stopwatch.stop if stopwatch.running?
-
-          @telemetry.summary(:phases).observe(stopwatch.duration, phase_name)
-        end
-      end
-
-      # @see Listener#stop
-      def stop
-        print_profiling_feedback
-        super
-      end
-
-      protected
-
-      def table_for_summary(name)
-        headers = [name.to_s, 'count', 'min', 'avg', 'max', 'tot']
-
-        rows = @telemetry.summary(name).map do |filter_name, summary|
-          count = summary.count
-          min   = summary.min
-          avg   = summary.avg
-          tot   = summary.sum
-          max   = summary.max
-
-          [filter_name, count.to_s] + [min, avg, max, tot].map { |r| "#{format('%4.2f', r)}s" }
-        end
-
-        [headers] + rows
-      end
-
-      def table_for_summary_durations(name)
-        headers = [name.to_s, 'tot']
-
-        rows = @telemetry.summary(:stages).map do |stage_name, summary|
-          [stage_name, "#{format('%4.2f', summary.sum)}s"]
-        end
-
-        [headers] + rows
-      end
-
-      def print_profiling_feedback
-        print_table_for_summary(:filters)
-        print_table_for_summary(:phases) if Nanoc::CLI.verbosity >= 2
-        print_table_for_summary_duration(:stages) if Nanoc::CLI.verbosity >= 2
-      end
-
-      def print_table_for_summary(name)
-        return if @telemetry.summary(name).empty?
-
-        puts
-        print_table(table_for_summary(name))
-      end
-
-      def print_table_for_summary_duration(name)
-        return if @telemetry.summary(name).empty?
-
-        puts
-        print_table(table_for_summary_durations(name))
-      end
-
-      def print_table(table)
-        lengths = table.transpose.map { |r| r.map(&:size).max }
-
-        print_row(table[0], lengths)
-
-        puts "#{'─' * lengths[0]}─┼─#{lengths[1..-1].map { |length| '─' * length }.join('───')}"
-
-        table[1..-1].each { |row| print_row(row, lengths) }
-      end
-
-      def print_row(row, lengths)
-        values = row.zip(lengths).map { |text, length| text.rjust length }
-
-        puts values[0] + ' │ ' + values[1..-1].join('   ')
-      end
-    end
-
-    # Prints debug information (compilation started/ended, filtering started/ended, …)
-    class DebugPrinter < Listener
-      # @see Listener#enable_for?
-      def self.enable_for?(command_runner)
-        command_runner.debug?
-      end
-
-      # @see Listener#start
-      def start
-        Nanoc::Int::NotificationCenter.on(:compilation_started) do |rep|
-          puts "*** Started compilation of #{rep.inspect}"
-        end
-        Nanoc::Int::NotificationCenter.on(:compilation_ended) do |rep|
-          puts "*** Ended compilation of #{rep.inspect}"
-          puts
-        end
-        Nanoc::Int::NotificationCenter.on(:compilation_suspended) do |rep, e|
-          puts "*** Suspended compilation of #{rep.inspect}: #{e.message}"
-        end
-        Nanoc::Int::NotificationCenter.on(:cached_content_used) do |rep|
-          puts "*** Used cached compiled content for #{rep.inspect} instead of recompiling"
-        end
-        Nanoc::Int::NotificationCenter.on(:filtering_started) do |rep, filter_name|
-          puts "*** Started filtering #{rep.inspect} with #{filter_name}"
-        end
-        Nanoc::Int::NotificationCenter.on(:filtering_ended) do |rep, filter_name|
-          puts "*** Ended filtering #{rep.inspect} with #{filter_name}"
-        end
-        Nanoc::Int::NotificationCenter.on(:dependency_created) do |src, dst|
-          puts "*** Dependency created from #{src.inspect} onto #{dst.inspect}"
-        end
-      end
-    end
-
-    # Prints file actions (created, updated, deleted, identical, skipped)
-    class FileActionPrinter < Listener
-      def initialize(reps:)
-        @start_times = {}
-        @acc_durations = {}
-
-        @reps = reps
-      end
-
-      # @see Listener#start
-      def start
-        Nanoc::Int::NotificationCenter.on(:compilation_started, self) do |rep|
-          @start_times[rep] = Time.now
-          @acc_durations[rep] ||= 0.0
-        end
-
-        Nanoc::Int::NotificationCenter.on(:compilation_suspended, self) do |rep|
-          @acc_durations[rep] += Time.now - @start_times[rep]
-        end
-
-        Nanoc::Int::NotificationCenter.on(:rep_written, self) do |rep, _binary, path, is_created, is_modified|
-          @acc_durations[rep] += Time.now - @start_times[rep]
-          duration = @acc_durations[rep]
-
-          action =
-            if is_created then :create
-            elsif is_modified then :update
-            else :identical
-            end
-          level =
-            if is_created then :high
-            elsif is_modified then :high
-            else :low
-            end
-          log(level, action, path, duration)
-        end
-      end
-
-      # @see Listener#stop
-      def stop
-        super
-
-        Nanoc::Int::NotificationCenter.remove(:compilation_started, self)
-        Nanoc::Int::NotificationCenter.remove(:compilation_suspended, self)
-        Nanoc::Int::NotificationCenter.remove(:rep_written, self)
-
-        @reps.reject(&:compiled?).each do |rep|
-          raw_paths = rep.raw_paths.values.flatten.uniq
-          raw_paths.each do |raw_path|
-            log(:low, :skip, raw_path, nil)
-          end
-        end
-      end
-
-      private
-
-      def log(level, action, path, duration)
-        Nanoc::CLI::Logger.instance.file(level, action, path, duration)
-      end
-    end
-
-    # Records a profile using StackProf
-    class StackProfProfiler < Listener
-      PROFILE_FILE = 'tmp/stackprof_profile'.freeze
-
-      # @see Listener#enable_for?
-      def self.enable_for?(command_runner)
-        command_runner.options.fetch(:profile, false)
-      end
-
-      # @see Listener#start
-      def start
-        require 'stackprof'
-        StackProf.start(mode: :cpu)
-      end
-
-      # @see Listener#stop
-      def stop
-        StackProf.stop
-        StackProf.results(PROFILE_FILE)
-      end
-    end
-
     attr_accessor :listener_classes
 
     def initialize(options, arguments, command)
@@ -439,11 +40,11 @@ module Nanoc::CLI::Commands
 
     def default_listener_classes
       [
-        Nanoc::CLI::Commands::Compile::StackProfProfiler,
-        Nanoc::CLI::Commands::Compile::DiffGenerator,
-        Nanoc::CLI::Commands::Compile::DebugPrinter,
-        Nanoc::CLI::Commands::Compile::TimingRecorder,
-        Nanoc::CLI::Commands::Compile::FileActionPrinter,
+        Nanoc::CLI::Commands::CompileListeners::StackProfProfiler,
+        Nanoc::CLI::Commands::CompileListeners::DiffGenerator,
+        Nanoc::CLI::Commands::CompileListeners::DebugPrinter,
+        Nanoc::CLI::Commands::CompileListeners::TimingRecorder,
+        Nanoc::CLI::Commands::CompileListeners::FileActionPrinter,
       ]
     end