nanoc 4.8.17 → 4.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b0135cd287173e9725acef9bb921109f8158d9e6453bd8e7ae194e23cdd25ef
-  data.tar.gz: 115b6b3baf84924b26cacac37925023f0aacbb9530721bd093386a74102fbd10
+  metadata.gz: 42c6429f3ab75c70a0616b03c8658442b860f3238e626e3b7a41e21b93558bc6
+  data.tar.gz: 329c3e49d8813363facc58726517a330821866d2ef6dac20279aa61800c0c617
 SHA512:
-  metadata.gz: c8aa8b0d5005dfbaa7664d08baaeee74bc7e5fb15cd2873d18bb0d4847c4c76203539852a258c4ad7c5187cb6503db1396e0a43752926f51fe89ea66b04dce12
-  data.tar.gz: 19fd6556430be0ffda0d733f0e8546a0ac646e7deb8da0e62df17c9caae4e99c166f4cc6bf8aadfc39376d5a1df44f53c542f104fefbf404686b840b4d18ced0
+  metadata.gz: 3caf2cc5572e4ccc9615ab06487391f6d691e4dbe9bb08d600f20f2f20284c827a7ce1fd6325e7ed5cd785d16d19b6e77380a2134fa505dd27f11c91defb780b
+  data.tar.gz: 71c7a650d30c2d29ba5a38b8fc2eee74596102506dbc44956a733f914d1c7b58b87bdd0ac5603788eae03758b3ef8ebae6c65c3102b3743e68e17354846b0f0d

data/NEWS.md

@@ -1,5 +1,16 @@
 # Nanoc news
 
+## 4.8.18 (2017-12-28)
+
+Enhancements:
+
+* Added `.tex` to the default list of text extensions (#1280) [Rien Maertens]
+
+Fixes:
+
+* Made `#breadcrumbs_trail` smarter about picking the right parent when there is ambiguity (#1278, #1279)
+* Made `#find_all` be callable with block instead of an argument (like `Enumerable#find_all`) (#1284, #1285)
+
 ## 4.8.17 (2017-12-16)
 
 Enhancements:

data/lib/nanoc.rb

@@ -9,6 +9,8 @@ require 'slow_enumerator_tools'
 require 'ddmemoize'
 require 'ddtelemetry'
 
+DDMemoize.enable_telemetry
+
 module Nanoc
   # @return [String] A string containing information about this Nanoc version
   #   and its environment (Ruby engine and version, Rubygems version if any).
@@ -25,8 +27,6 @@ module Nanoc
   def self.on_windows?
     RUBY_PLATFORM =~ /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i
   end
-
-  MEMOIZATION_TELEMETRY = DDTelemetry.new
 end
 
 # Load general requirements
@@ -44,6 +44,7 @@ require 'pathname'
 require 'pstore'
 require 'set'
 require 'singleton'
+require 'stringio'
 require 'tempfile'
 require 'time'
 require 'timeout'

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

@@ -4,7 +4,7 @@ module Nanoc::Int
   class ActionSequence
     include Nanoc::Int::ContractsSupport
     include Enumerable
-    DDMemoize.activate(self, telemetry: Nanoc::MEMOIZATION_TELEMETRY)
+    DDMemoize.activate(self)
 
     attr_reader :item_rep
     attr_reader :actions

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

@@ -24,7 +24,7 @@ module Nanoc::Int
     # that lacks some options, the default value will be taken from
     # `DEFAULT_CONFIG`.
     DEFAULT_CONFIG = {
-      text_extensions: %w[adoc asciidoc atom css erb haml htm html js less markdown md php rb sass scss txt xhtml xml coffee hb handlebars mustache ms slim rdoc].sort,
+      text_extensions: %w[adoc asciidoc atom css erb haml htm html js less markdown md php rb sass scss tex txt xhtml xml coffee hb handlebars mustache ms slim rdoc].sort,
       lib_dirs: %w[lib],
       commands_dirs: %w[commands],
       output_dir: 'output',

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

@@ -3,7 +3,7 @@
 module Nanoc::Int
   # @api private
   class IdentifiableCollection
-    DDMemoize.activate(self, telemetry: Nanoc::MEMOIZATION_TELEMETRY)
+    DDMemoize.activate(self)
 
     include Nanoc::Int::ContractsSupport
     include Enumerable

data/lib/nanoc/base/services.rb

@@ -9,6 +9,7 @@ require_relative 'services/compiler_loader'
 require_relative 'services/dependency_tracker'
 require_relative 'services/executor'
 require_relative 'services/filter'
+require_relative 'services/instrumentor'
 require_relative 'services/item_rep_builder'
 require_relative 'services/item_rep_router'
 require_relative 'services/item_rep_selector'

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

@@ -27,7 +27,7 @@ module Nanoc::Int
 
     def run_until_preprocessed
       @_res_preprocessed ||= begin
-        run_stage(preprocess_stage)
+        preprocess_stage.call
         {}
       end
     end
@@ -36,7 +36,7 @@ module Nanoc::Int
       @_res_reps_built ||= begin
         prev = run_until_preprocessed
 
-        res = run_stage(build_reps_stage)
+        res = build_reps_stage.call
 
         prev.merge(
           reps: res.fetch(:reps),
@@ -51,14 +51,14 @@ module Nanoc::Int
         action_sequences = prev.fetch(:action_sequences)
         reps = prev.fetch(:reps)
 
-        run_stage(load_stores_stage)
-        checksums = run_stage(calculate_checksums_stage)
+        load_stores_stage.call
+        checksums = calculate_checksums_stage.call
         outdatedness_checker = create_outdatedness_checker(
           checksums: checksums,
           action_sequences: action_sequences,
           reps: reps,
         )
-        outdated_items = run_stage(determine_outdatedness_stage(outdatedness_checker, reps))
+        outdated_items = determine_outdatedness_stage(outdatedness_checker, reps).call
 
         prev.merge(
           checksums: checksums,
@@ -76,14 +76,14 @@ module Nanoc::Int
       checksums = res.fetch(:checksums)
       outdated_items = res.fetch(:outdated_items)
 
-      run_stage(forget_outdated_dependencies_stage, outdated_items)
-      run_stage(store_pre_compilation_state_stage(action_sequences, reps), checksums)
-      run_stage(prune_stage(reps))
-      run_stage(compile_reps_stage(action_sequences, reps))
-      run_stage(store_post_compilation_state_stage)
-      run_stage(postprocess_stage, self)
+      forget_outdated_dependencies_stage.call(outdated_items)
+      store_pre_compilation_state_stage(action_sequences, reps).call(checksums)
+      prune_stage(reps).call
+      compile_reps_stage(action_sequences, reps).call
+      store_post_compilation_state_stage.call
+      postprocess_stage.call(self)
     ensure
-      run_stage(cleanup_stage)
+      cleanup_stage.call
     end
 
     def compilation_context(reps:)
@@ -98,13 +98,6 @@ module Nanoc::Int
 
     private
 
-    def run_stage(stage, *args)
-      Nanoc::Int::NotificationCenter.post(:stage_started, stage.class)
-      stage.run(*args)
-    ensure
-      Nanoc::Int::NotificationCenter.post(:stage_ended, stage.class)
-    end
-
     def create_outdatedness_checker(checksums:, action_sequences:, reps:)
       Nanoc::Int::OutdatednessChecker.new(
         site: @site,

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Nanoc::Int::Compiler::Stage
+  def call(*args)
+    Nanoc::Int::Instrumentor.call(:stage_ran, self.class) do
+      run(*args)
+    end
+  end
+
+  def run(*)
+    raise NotImplementedError
+  end
+end

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

@@ -3,6 +3,8 @@
 module Nanoc::Int::Compiler::Stages
 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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class BuildReps
+  class BuildReps < Nanoc::Int::Compiler::Stage
     def initialize(site:, action_provider:)
       @site = site
       @action_provider = action_provider

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class CalculateChecksums
+  class CalculateChecksums < Nanoc::Int::Compiler::Stage
     def initialize(items:, layouts:, code_snippets:, config:)
       @items = items
       @layouts = layouts

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class Cleanup
+  class Cleanup < Nanoc::Int::Compiler::Stage
     def initialize(output_dirs)
       @output_dirs = output_dirs
     end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class CompileReps
+  class CompileReps < Nanoc::Int::Compiler::Stage
     def initialize(reps:, outdatedness_store:, dependency_store:, action_sequences:, compilation_context:, compiled_content_cache:)
       @reps = reps
       @outdatedness_store = outdatedness_store

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class DetermineOutdatedness
+  class DetermineOutdatedness < Nanoc::Int::Compiler::Stage
     include Nanoc::Int::ContractsSupport
 
     def initialize(reps:, outdatedness_checker:, outdatedness_store:)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class ForgetOutdatedDependencies
+  class ForgetOutdatedDependencies < Nanoc::Int::Compiler::Stage
     include Nanoc::Int::ContractsSupport
 
     def initialize(dependency_store:)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class LoadStores
+  class LoadStores < Nanoc::Int::Compiler::Stage
     include Nanoc::Int::ContractsSupport
 
     def initialize(checksum_store:, compiled_content_cache:, dependency_store:, action_sequence_store:, outdatedness_store:)
@@ -14,11 +14,18 @@ module Nanoc::Int::Compiler::Stages
 
     contract C::None => C::Any
     def run
-      @checksum_store.load
-      @compiled_content_cache.load
-      @dependency_store.load
-      @action_sequence_store.load
-      @outdatedness_store.load
+      load_store(@checksum_store)
+      load_store(@compiled_content_cache)
+      load_store(@dependency_store)
+      load_store(@action_sequence_store)
+      load_store(@outdatedness_store)
+    end
+
+    contract Nanoc::Int::Store => C::Any
+    def load_store(store)
+      Nanoc::Int::Instrumentor.call(:store_loaded, store.class) do
+        store.load
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class Postprocess
+  class Postprocess < Nanoc::Int::Compiler::Stage
     include Nanoc::Int::ContractsSupport
 
     def initialize(action_provider:, site:)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class Preprocess
+  class Preprocess < Nanoc::Int::Compiler::Stage
     def initialize(action_provider:, site:, dependency_store:, checksum_store:)
       @action_provider = action_provider
       @site = site

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class Prune
+  class Prune < Nanoc::Int::Compiler::Stage
     def initialize(config:, reps:)
       @config = config
       @reps = reps

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class StorePostCompilationState
+  class StorePostCompilationState < Nanoc::Int::Compiler::Stage
     include Nanoc::Int::ContractsSupport
 
     def initialize(dependency_store:)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Int::Compiler::Stages
-  class StorePreCompilationState
+  class StorePreCompilationState < Nanoc::Int::Compiler::Stage
     include Nanoc::Int::ContractsSupport
 
     def initialize(reps:, layouts:, checksum_store:, action_sequence_store:, action_sequences:)

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Nanoc::Int
+  # @api private
+  class Instrumentor
+    def self.call(key, *args)
+      stopwatch = DDTelemetry::Stopwatch.new
+      stopwatch.start
+      yield
+    ensure
+      stopwatch.stop
+      Nanoc::Int::NotificationCenter.post(key, stopwatch.duration, *args)
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Nanoc::Int
   # @api private
   class OutdatednessChecker
     class Basic
-      DDMemoize.activate(self, telemetry: Nanoc::MEMOIZATION_TELEMETRY)
+      DDMemoize.activate(self)
 
       include Nanoc::Int::ContractsSupport
 
@@ -97,7 +97,7 @@ module Nanoc::Int
       end
     end
 
-    DDMemoize.activate(self, telemetry: Nanoc::MEMOIZATION_TELEMETRY)
+    DDMemoize.activate(self)
 
     include Nanoc::Int::ContractsSupport
 

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

@@ -7,10 +7,9 @@ module Nanoc::Int
     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)
+      Nanoc::Int::Instrumentor.call(:outdatedness_rule_ran, self.class) do
+        apply(obj, outdatedness_checker)
+      end
     end
 
     def apply(_obj, _outdatedness_checker)

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

@@ -2,7 +2,7 @@
 
 module Nanoc::Int::OutdatednessRules
   class CodeSnippetsModified < Nanoc::Int::OutdatednessRule
-    DDMemoize.activate(self, telemetry: Nanoc::MEMOIZATION_TELEMETRY)
+    DDMemoize.activate(self)
 
     include Nanoc::Int::ContractsSupport
 

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

@@ -4,6 +4,8 @@ module Nanoc
   class IdentifiableCollectionView < ::Nanoc::View
     include Enumerable
 
+    NOTHING = Object.new
+
     # @api private
     def initialize(objects, context)
       super(context)
@@ -46,7 +48,12 @@ module Nanoc
     # @param [String, Regex] arg
     #
     # @return [Enumerable]
-    def find_all(arg)
+    def find_all(arg = NOTHING, &block)
+      if NOTHING.equal?(arg)
+        @context.dependency_tracker.bounce(unwrap, raw_content: true)
+        return @objects.select(&block).map { |i| view_class.new(i, @context) }
+      end
+
       prop_attribute =
         case arg
         when String, Nanoc::Identifier

data/lib/nanoc/cli/command_runner.rb

@@ -20,7 +20,6 @@ module Nanoc::CLI
     def in_site_dir?
       Nanoc::Int::SiteLoader.cwd_is_nanoc_site?
     end
-    alias is_in_site_dir? in_site_dir?
 
     def self.find_site_dir
       start_here = Dir.pwd

data/lib/nanoc/cli/commands/compile_listeners/timing_recorder.rb

@@ -2,7 +2,10 @@
 
 module Nanoc::CLI::Commands::CompileListeners
   class TimingRecorder < Abstract
-    attr_reader :telemetry
+    attr_reader :stages_summary
+    attr_reader :phases_summary
+    attr_reader :outdatedness_rules_summary
+    attr_reader :filters_summary
 
     # @see Listener#enable_for?
     def self.enable_for?(_command_runner, _site)
@@ -12,39 +15,22 @@ module Nanoc::CLI::Commands::CompileListeners
     # @param [Enumerable<Nanoc::Int::ItemRep>] reps
     def initialize(reps:)
       @reps = reps
-      @telemetry = DDTelemetry.new
+
+      @stages_summary = DDTelemetry::Summary.new
+      @phases_summary = DDTelemetry::Summary.new
+      @outdatedness_rules_summary = DDTelemetry::Summary.new
+      @filters_summary = DDTelemetry::Summary.new
+      @load_stores_summary = DDTelemetry::Summary.new
     end
 
     # @see Listener#start
     def start
-      stage_stopwatch = DDTelemetry::Stopwatch.new
-
-      on(:stage_started) do |_klass|
-        stage_stopwatch.start
-      end
-
-      on(:stage_ended) do |klass|
-        stage_stopwatch.stop
-        name = klass.to_s.sub(/.*::/, '')
-        @telemetry.summary(:stages).observe(stage_stopwatch.duration, name)
-        stage_stopwatch = DDTelemetry::Stopwatch.new
+      on(:stage_ran) do |duration, klass|
+        @stages_summary.observe(duration, klass.to_s.sub(/.*::/, ''))
       end
 
-      outdatedness_rule_stopwatches = {}
-
-      on(:outdatedness_rule_started) do |klass, obj|
-        stopwatches = outdatedness_rule_stopwatches.fetch(klass) { outdatedness_rule_stopwatches[klass] = {} }
-        stopwatch = stopwatches.fetch(obj) { stopwatches[obj] = DDTelemetry::Stopwatch.new }
-        stopwatch.start
-      end
-
-      on(:outdatedness_rule_ended) do |klass, obj|
-        stopwatches = outdatedness_rule_stopwatches.fetch(klass)
-        stopwatch = stopwatches.fetch(obj)
-        stopwatch.stop
-
-        name = klass.to_s.sub(/.*::/, '')
-        @telemetry.summary(:outdatedness_rules).observe(stopwatch.duration, name)
+      on(:outdatedness_rule_ran) do |duration, klass|
+        @outdatedness_rules_summary.observe(duration, klass.to_s.sub(/.*::/, ''))
       end
 
       filter_stopwatches = {}
@@ -59,7 +45,11 @@ module Nanoc::CLI::Commands::CompileListeners
         stopwatch = filter_stopwatches.fetch(rep).pop
         stopwatch.stop
 
-        @telemetry.summary(:filters).observe(stopwatch.duration, filter_name.to_s)
+        @filters_summary.observe(stopwatch.duration, filter_name.to_s)
+      end
+
+      on(:store_loaded) do |duration, klass|
+        @load_stores_summary.observe(duration, klass.to_s)
       end
 
       on(:compilation_suspended) do |rep, _exception|
@@ -81,7 +71,7 @@ module Nanoc::CLI::Commands::CompileListeners
         stopwatch = phase_stopwatches.fetch(rep).fetch(phase_name)
         stopwatch.stop
 
-        @telemetry.summary(:phases).observe(stopwatch.duration, phase_name)
+        @phases_summary.observe(stopwatch.duration, phase_name)
       end
 
       on(:phase_yielded) do |phase_name, rep|
@@ -98,7 +88,7 @@ module Nanoc::CLI::Commands::CompileListeners
         stopwatch = phase_stopwatches.fetch(rep).fetch(phase_name)
         stopwatch.stop if stopwatch.running?
 
-        @telemetry.summary(:phases).observe(stopwatch.duration, phase_name)
+        @phases_summary.observe(stopwatch.duration, phase_name)
       end
     end
 
@@ -110,17 +100,17 @@ module Nanoc::CLI::Commands::CompileListeners
 
     protected
 
-    def table_for_summary(name)
+    def table_for_summary(name, summary)
       headers = [name.to_s, 'count', 'min', '.50', '.90', '.95', 'max', 'tot']
 
-      rows = @telemetry.summary(name).map do |filter_name, summary|
-        count = summary.count
-        min   = summary.min
-        p50   = summary.quantile(0.50)
-        p90   = summary.quantile(0.90)
-        p95   = summary.quantile(0.95)
-        tot   = summary.sum
-        max   = summary.max
+      rows = summary.map do |filter_name, stats|
+        count = stats.count
+        min   = stats.min
+        p50   = stats.quantile(0.50)
+        p90   = stats.quantile(0.90)
+        p95   = stats.quantile(0.95)
+        tot   = stats.sum
+        max   = stats.max
 
         [filter_name, count.to_s] + [min, p50, p90, p95, max, tot].map { |r| "#{format('%4.2f', r)}s" }
       end
@@ -128,36 +118,37 @@ module Nanoc::CLI::Commands::CompileListeners
       [headers] + rows
     end
 
-    def table_for_summary_durations(name)
+    def table_for_summary_durations(name, summary)
       headers = [name.to_s, 'tot']
 
-      rows = @telemetry.summary(:stages).map do |stage_name, summary|
-        [stage_name, "#{format('%4.2f', summary.sum)}s"]
+      rows = summary.map do |stage_name, stats|
+        [stage_name, "#{format('%4.2f', stats.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
-      print_table_for_summary(:outdatedness_rules) if Nanoc::CLI.verbosity >= 2
-      DDMemoize.print_telemetry(Nanoc::MEMOIZATION_TELEMETRY) if Nanoc::CLI.verbosity >= 2
+      print_table_for_summary(:filters, @filters_summary)
+      print_table_for_summary(:phases, @phases_summary) if Nanoc::CLI.verbosity >= 2
+      print_table_for_summary_duration(:stages, @stages_summary) if Nanoc::CLI.verbosity >= 2
+      print_table_for_summary(:outdatedness_rules, @outdatedness_rules_summary) if Nanoc::CLI.verbosity >= 2
+      print_table_for_summary_duration(:load_stores, @load_stores_summary) if Nanoc::CLI.verbosity >= 2
+      DDMemoize.print_telemetry if Nanoc::CLI.verbosity >= 2
     end
 
-    def print_table_for_summary(name)
-      return if @telemetry.summary(name).empty?
+    def print_table_for_summary(name, summary)
+      return unless summary.any?
 
       puts
-      print_table(table_for_summary(name))
+      print_table(table_for_summary(name, summary))
     end
 
-    def print_table_for_summary_duration(name)
-      return if @telemetry.summary(name).empty?
+    def print_table_for_summary_duration(name, summary)
+      return unless summary.any?
 
       puts
-      print_table(table_for_summary_durations(name))
+      print_table(table_for_summary_durations(name, summary))
     end
 
     def print_table(rows)

data/lib/nanoc/cli/error_handler.rb

@@ -184,9 +184,11 @@ module Nanoc::CLI
     # `#require` fails, the gem name is looked up in this hash.
     GEM_NAMES = {
       'adsf'           => 'adsf',
+      'asciidoctor'    => 'asciidoctor',
       'bluecloth'      => 'bluecloth',
       'builder'        => 'builder',
       'coderay'        => 'coderay',
+      'coffee-script'  => 'coffee-script',
       'cri'            => 'cri',
       'erubi'          => 'erubi',
       'erubis'         => 'erubis',
@@ -201,9 +203,11 @@ module Nanoc::CLI
       'markaby'        => 'markaby',
       'maruku'         => 'maruku',
       'mime/types'     => 'mime-types',
+      'mustache'       => 'mustache',
       'nanoc/live'     => 'nanoc-live',
       'nokogiri'       => 'nokogiri',
       'nokogumbo'      => 'nokogumbo',
+      'pandoc-ruby'    => 'pandoc-ruby',
       'pry'            => 'pry',
       'rack'           => 'rack',
       'rack/cache'     => 'rack-cache',
@@ -213,7 +217,11 @@ module Nanoc::CLI
       'redcloth'       => 'RedCloth',
       'rubypants'      => 'rubypants',
       'sass'           => 'sass',
+      'slim'           => 'slim',
+      'typogruby'      => 'typogruby',
+      'uglifier'       => 'uglifier',
       'w3c_validators' => 'w3c_validators',
+      'yuicompressor'  => 'yuicompressor',
     }.freeze
 
     # Attempts to find a resolution for the given error, or nil if no

data/lib/nanoc/filters/colorize_syntax.rb

@@ -5,7 +5,7 @@ module Nanoc::Filters
   class ColorizeSyntax < Nanoc::Filter
     identifier :colorize_syntax
 
-    requires 'nokogiri', 'stringio', 'open3'
+    requires 'nokogiri'
 
     DEFAULT_COLORIZER = :coderay
 

data/lib/nanoc/helpers/breadcrumbs.rb

@@ -3,6 +3,34 @@
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#breadcrumbs
   module Breadcrumbs
+    # @api private
+    module Int
+      # e.g. unfold(10.class, &:superclass)
+      # => [Integer, Numeric, Object, BasicObject]
+      def self.unfold(obj, &blk)
+        acc = [obj]
+
+        res = yield(obj)
+        if res
+          acc + unfold(res, &blk)
+        else
+          acc
+        end
+      end
+
+      # e.g. patterns_for_prefix('/foo/1.0')
+      # => ['/foo/1.0.*', '/foo/1.*']
+      def self.patterns_for_prefix(prefix)
+        prefixes =
+          unfold(prefix) do |old_prefix|
+            new_prefix = Nanoc::Identifier.new(old_prefix).without_ext
+            new_prefix == old_prefix ? nil : new_prefix
+          end
+
+        prefixes.map { |pr| pr + '.*' }
+      end
+    end
+
     # @return [Array]
     def breadcrumbs_trail
       # e.g. ['', '/foo', '/foo/bar']
@@ -18,7 +46,8 @@ module Nanoc::Helpers
             if pr == ''
               @items['/index.*']
             else
-              @items[Nanoc::Identifier.new(pr).without_ext + '.*']
+              prefix_patterns = Int.patterns_for_prefix(pr)
+              prefix_patterns.lazy.map { |pat| @items[pat] }.find(&:itself)
             end
           end
       end

data/lib/nanoc/rule_dsl/action_sequence_calculator.rb

@@ -6,7 +6,7 @@ module Nanoc::RuleDSL
   #
   # @api private
   class ActionSequenceCalculator
-    DDMemoize.activate(self, telemetry: Nanoc::MEMOIZATION_TELEMETRY)
+    DDMemoize.activate(self)
 
     class UnsupportedObjectTypeException < ::Nanoc::Error
       def initialize(obj)

data/lib/nanoc/spec.rb

@@ -11,6 +11,19 @@ module Nanoc
       ensure
         Dir.chdir(here)
       end
+
+      def on_windows?
+        Nanoc.on_windows?
+      end
+
+      def command?(cmd)
+        which, null = on_windows? ? %w[where NUL] : ['which', '/dev/null']
+        system("#{which} #{cmd} > #{null} 2>&1")
+      end
+
+      def skip_unless_have_command(cmd)
+        skip "Could not find external command \"#{cmd}\"" unless command?(cmd)
+      end
     end
 
     class HelperContext

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.17
+  version: 4.8.18
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0a2
+        version: 1.0.0a3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0a2
+        version: 1.0.0a3
 - !ruby/object:Gem::Dependency
   name: ddplugin
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0a1
+        version: 1.0.0a2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0a1
+        version: 1.0.0a2
 - !ruby/object:Gem::Dependency
   name: hamster
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,7 @@ 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
@@ -221,6 +222,7 @@ files:
 - lib/nanoc/base/services/dependency_tracker.rb
 - lib/nanoc/base/services/executor.rb
 - lib/nanoc/base/services/filter.rb
+- lib/nanoc/base/services/instrumentor.rb
 - lib/nanoc/base/services/item_rep_builder.rb
 - lib/nanoc/base/services/item_rep_router.rb
 - lib/nanoc/base/services/item_rep_selector.rb
@@ -402,7 +404,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.