nanoc 4.8.14 → 4.8.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61126d7052bc64e948aa9ee87b4e9dd63e6e04424ffa22b65b9190a99aae6aaa
-  data.tar.gz: fef1657e63de4eb84ed66b75b3462dee717a7c84f2a6ac164e7a7d52ce6be9e5
+  metadata.gz: 72454ce3213cfb07daf01923f88260c8e1c3e439e163a1b38ecd603cb74794a2
+  data.tar.gz: fd783734d7a4fd46fe5b391f8ef0a3373bb51ad0e6300e356af66d03478e8b7b
 SHA512:
-  metadata.gz: 1fa6df98e23b3d1975f7bae4265f63308e3a900ceea08f82caca0c5bb3039819dfa9e45e3b35983d2c030173e2bf07155dd72d2c7aafa1b861c2b4f5214919e1
-  data.tar.gz: 93dba7e96ddc3a866cd0cd62c90ec7cd380d67b937f7d519afac64a87078186fdf23d87c3bb60101230288380038123756f03801f003ae06d2445a6de733846d
+  metadata.gz: 33d234ba1e4646f801f273b26d43b5993cbe4f06f306d58139b8a9f2f6af01007b319dc3f47bf5b0ffa059c836cb3356b6d329a95901445382dc40eaec57dd2e
+  data.tar.gz: cefdbfa34c2f66ea3fe70fc42f6496b2fa4d607361ff7c5fb8065503f508b0e5786063679e350b996d581ed848860a68cf56055355796db8ddc3f8beb9eca226

data/NEWS.md

@@ -1,5 +1,17 @@
 # Nanoc news
 
+## 4.8.15 (2017-12-02)
+
+Fixes:
+
+* Made `nanoc` show item being compiled in crash logs of all errors, not just errors inheriting from `StandardError` (#1258)
+* Made Erubi stack traces include the filename of the item or layout that is being compiled (#1255, #1259)
+* Prevented `view --live-reload` from crashing when the output directory does not exist (#1254, #1261)
+
+Enhancements:
+
+* Made pruner not remove the output directory if it’s empty (#1260)
+
 ## 4.8.14 (2017-11-27)
 
 Same as 4.8.13, but published with the proper release date.
@@ -95,7 +107,7 @@ Enhancements:
 
 * Various speed improvements
 
-## 4.8.0 (2017-07-17)
+## 4.8 (2017-07-17)
 
 Features:
 

data/lib/nanoc.rb

@@ -24,6 +24,7 @@ require 'ddplugin'
 require 'hamster'
 require 'ref'
 require 'slow_enumerator_tools'
+require 'ddtelemetry'
 
 # Load general requirements
 require 'cgi'
@@ -50,7 +51,6 @@ require 'yaml'
 # Load Nanoc
 require 'nanoc/version'
 require 'nanoc/base'
-require 'nanoc/telemetry'
 require 'nanoc/checking'
 require 'nanoc/deploying'
 require 'nanoc/extra'

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

@@ -26,7 +26,7 @@ module Nanoc::Int::Compiler::Stages
 
     def handle_errors_while(item_rep)
       yield
-    rescue => e
+    rescue Exception => e # rubocop:disable Lint/RescueException
       raise Nanoc::Int::Errors::CompilationError.new(e, item_rep)
     end
 

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

@@ -80,6 +80,8 @@ module Nanoc
       present_files = []
       present_dirs = []
 
+      expanded_dir = File.expand_path(dir)
+
       Find.find(dir) do |f|
         basename = File.basename(f)
 
@@ -91,7 +93,7 @@ module Nanoc
         when 'directory'
           if exclude?(basename)
             Find.prune
-          else
+          elsif expanded_dir != File.expand_path(f)
             present_dirs << f
           end
         end

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

@@ -12,12 +12,12 @@ module Nanoc::CLI::Commands::CompileListeners
     # @param [Enumerable<Nanoc::Int::ItemRep>] reps
     def initialize(reps:)
       @reps = reps
-      @telemetry = Nanoc::Telemetry.new
+      @telemetry = DDTelemetry.new
     end
 
     # @see Listener#start
     def start
-      stage_stopwatch = Nanoc::Telemetry::Stopwatch.new
+      stage_stopwatch = DDTelemetry::Stopwatch.new
 
       on(:stage_started) do |_klass|
         stage_stopwatch.start
@@ -27,14 +27,14 @@ module Nanoc::CLI::Commands::CompileListeners
         stage_stopwatch.stop
         name = klass.to_s.sub(/.*::/, '')
         @telemetry.summary(:stages).observe(stage_stopwatch.duration, name)
-        stage_stopwatch = Nanoc::Telemetry::Stopwatch.new
+        stage_stopwatch = DDTelemetry::Stopwatch.new
       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] = Nanoc::Telemetry::Stopwatch.new }
+        stopwatch = stopwatches.fetch(obj) { stopwatches[obj] = DDTelemetry::Stopwatch.new }
         stopwatch.start
       end
 
@@ -51,7 +51,7 @@ module Nanoc::CLI::Commands::CompileListeners
 
       on(:filtering_started) do |rep, _filter_name|
         stopwatch_stack = filter_stopwatches.fetch(rep) { filter_stopwatches[rep] = [] }
-        stopwatch_stack << Nanoc::Telemetry::Stopwatch.new
+        stopwatch_stack << DDTelemetry::Stopwatch.new
         stopwatch_stack.last.start
       end
 
@@ -74,7 +74,7 @@ module Nanoc::CLI::Commands::CompileListeners
 
       on(:phase_started) do |phase_name, rep|
         stopwatches = phase_stopwatches.fetch(rep) { phase_stopwatches[rep] = {} }
-        stopwatches[phase_name] = Nanoc::Telemetry::Stopwatch.new.tap(&:start)
+        stopwatches[phase_name] = DDTelemetry::Stopwatch.new.tap(&:start)
       end
 
       on(:phase_ended) do |phase_name, rep|
@@ -196,7 +196,7 @@ module Nanoc::CLI::Commands::CompileListeners
     end
 
     def print_table(rows)
-      puts Nanoc::Telemetry::Table.new(rows).to_s
+      puts DDTelemetry::Table.new(rows).to_s
     end
   end
 end

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

@@ -23,6 +23,9 @@ module Nanoc::CLI::Commands
 
       config = Nanoc::Int::ConfigLoader.new.new_from_cwd
 
+      # Create output dir so that viewer/watcher doesn’t explode.
+      FileUtils.mkdir_p(config[:output_dir])
+
       server =
         Adsf::Server.new(
           root: File.absolute_path(config[:output_dir]),

data/lib/nanoc/filters/erubi.rb

@@ -23,7 +23,9 @@ module Nanoc::Filters
       assigns_binding = context.get_binding(&proc)
 
       # Get result
-      eval(::Erubi::Engine.new(content, { bufvar: '_erbout', filename: filename }.merge(params)).src, assigns_binding)
+      engine_opts = { bufvar: '_erbout', filename: filename }.merge(params)
+      engine = ::Erubi::Engine.new(content, engine_opts)
+      eval(engine.src, assigns_binding, filename)
     end
   end
 end

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.14
+  version: 4.8.15
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ddtelemetry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0a1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0a1
 - !ruby/object:Gem::Dependency
   name: hamster
   requirement: !ruby/object:Gem::Requirement
@@ -360,14 +374,6 @@ files:
 - lib/nanoc/rule_dsl/rules_collection.rb
 - lib/nanoc/rule_dsl/rules_loader.rb
 - lib/nanoc/spec.rb
-- lib/nanoc/telemetry.rb
-- lib/nanoc/telemetry/counter.rb
-- lib/nanoc/telemetry/labelled_counter.rb
-- lib/nanoc/telemetry/labelled_summary.rb
-- lib/nanoc/telemetry/registry.rb
-- lib/nanoc/telemetry/stopwatch.rb
-- lib/nanoc/telemetry/summary.rb
-- lib/nanoc/telemetry/table.rb
 - lib/nanoc/version.rb
 homepage: http://nanoc.ws/
 licenses:
@@ -391,7 +397,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.

data/lib/nanoc/telemetry.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  # @api private
-  module Telemetry
-    def self.new
-      Registry.new
-    end
-  end
-end
-
-require_relative 'telemetry/counter'
-require_relative 'telemetry/summary'
-
-require_relative 'telemetry/labelled_counter'
-require_relative 'telemetry/labelled_summary'
-
-require_relative 'telemetry/registry'
-require_relative 'telemetry/stopwatch'
-
-require_relative 'telemetry/table'

data/lib/nanoc/telemetry/counter.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Telemetry
-  class Counter
-    attr_reader :value
-
-    def initialize
-      @value = 0
-    end
-
-    def increment
-      @value += 1
-    end
-  end
-end

data/lib/nanoc/telemetry/labelled_counter.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Telemetry
-  class LabelledCounter
-    def initialize
-      @counters = {}
-    end
-
-    def increment(label)
-      get(label).increment
-    end
-
-    def get(label)
-      @counters.fetch(label) { @counters[label] = Counter.new }
-    end
-
-    def empty?
-      @counters.empty?
-    end
-
-    def value(label)
-      get(label).value
-    end
-
-    def values
-      @counters.each_with_object({}) do |(label, counter), res|
-        res[label] = counter.value
-      end
-    end
-
-    def map
-      @counters.map { |(label, counter)| yield(label, counter) }
-    end
-  end
-end

data/lib/nanoc/telemetry/labelled_summary.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Telemetry
-  class LabelledSummary
-    def initialize
-      @summaries = {}
-    end
-
-    def observe(value, label)
-      get(label).observe(value)
-    end
-
-    def get(label)
-      @summaries.fetch(label) { @summaries[label] = Summary.new }
-    end
-
-    def empty?
-      @summaries.empty?
-    end
-
-    def quantile(fraction, label)
-      get(label).quantile(fraction)
-    end
-
-    def map
-      @summaries.map { |(label, summary)| yield(label, summary) }
-    end
-
-    # TODO: add quantiles(fraction)
-    # TODO: add min(label)
-    # TODO: add mins
-    # TODO: add max(label)
-    # TODO: add maxs
-    # TODO: add sum(label)
-    # TODO: add sums
-  end
-end

data/lib/nanoc/telemetry/registry.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Telemetry
-  class Registry
-    def initialize
-      @counters = {}
-      @summaries = {}
-    end
-
-    def counter(name)
-      @counters.fetch(name) { @counters[name] = LabelledCounter.new }
-    end
-
-    def summary(name)
-      @summaries.fetch(name) { @summaries[name] = LabelledSummary.new }
-    end
-  end
-end

data/lib/nanoc/telemetry/stopwatch.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Telemetry
-  class Stopwatch
-    attr_reader :duration
-
-    class AlreadyRunningError < StandardError
-      def message
-        'Cannot start, because stopwatch is already running'
-      end
-    end
-
-    class NotRunningError < StandardError
-      def message
-        'Cannot stop, because stopwatch is not running'
-      end
-    end
-
-    def initialize
-      @duration = 0.0
-      @last_start = nil
-    end
-
-    def start
-      raise AlreadyRunningError if running?
-      @last_start = Time.now
-    end
-
-    def stop
-      raise NotRunningError unless running?
-      @duration += (Time.now - @last_start)
-      @last_start = nil
-    end
-
-    def running?
-      !@last_start.nil?
-    end
-
-    def stopped?
-      !running?
-    end
-  end
-end

data/lib/nanoc/telemetry/summary.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Telemetry
-  class Summary
-    class EmptySummaryError < StandardError
-      def message
-        'Cannot calculate quantile for empty summary'
-      end
-    end
-
-    def initialize
-      @values = []
-    end
-
-    def observe(value)
-      @values << value
-      @sorted_values = nil
-    end
-
-    def count
-      @values.size
-    end
-
-    def sum
-      raise EmptySummaryError if @values.empty?
-      @values.reduce(:+)
-    end
-
-    def avg
-      sum / count
-    end
-
-    def min
-      quantile(0.0)
-    end
-
-    def max
-      quantile(1.0)
-    end
-
-    def quantile(fraction)
-      raise EmptySummaryError if @values.empty?
-
-      target = (@values.size - 1) * fraction.to_f
-      interp = target % 1.0
-      sorted_values[target.floor] * (1.0 - interp) + sorted_values[target.ceil] * interp
-    end
-
-    private
-
-    def sorted_values
-      @sorted_values ||= @values.sort
-    end
-  end
-end

data/lib/nanoc/telemetry/table.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Telemetry
-  class Table
-    def initialize(rows)
-      @rows = rows
-    end
-
-    def to_s
-      columns = @rows.transpose
-      column_lengths = columns.map { |c| c.map(&:size).max }
-
-      [].tap do |lines|
-        lines << row_to_s(@rows[0], column_lengths)
-        lines << separator(column_lengths)
-        lines.concat(@rows.drop(1).map { |r| row_to_s(r, column_lengths) })
-      end.join("\n")
-    end
-
-    private
-
-    def row_to_s(row, column_lengths)
-      values = row.zip(column_lengths).map { |text, length| text.rjust(length) }
-      values[0] + ' │ ' + values[1..-1].join('   ')
-    end
-
-    def separator(column_lengths)
-      (+'').tap do |s|
-        s << '─' * column_lengths[0]
-        s << '─┼─'
-        s << column_lengths[1..-1].map { |l| '─' * l }.join('───')
-      end
-    end
-  end
-end