nanoc 4.8.4 → 4.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f693f075f9d417738964c959fde56d79d89d1733
-  data.tar.gz: 7e9eaf4cbbc4fd08ce8bc1e034d3599338d523d0
+  metadata.gz: cafd3c0aac9622344c7d94be09957d8b616426a2
+  data.tar.gz: 1f239f61b0329e35bd5cb56bce1f6fe762898926
 SHA512:
-  metadata.gz: d3adbb7324f0c594e3b59639c3bbbfce493e04d9e3253948596a01b237cc766ed960b3840a8365fe5e1ffa1f7d703e2e9072eae4576695def77d4d0ff6e7f16f
-  data.tar.gz: 75cd883a140e83374f766995511502a0c09b3ccdaf2705e012eff20b49e6a98469d14cee92ff64a2627deb9a004c49792a449b1068bba66d5cf1198507e23688
+  metadata.gz: ae453f24b6d9a652a8a9c9499bc121ac3bc056f0947713b83e43e62ea413e32ae1415a0897f3ccf982c38c9deaf77a15999918f0e7337ecdfa48150fcb77338f
+  data.tar.gz: b1ab390568886eaf34ce69704be75396f34f32859fa50fa073dac06d46ef2ca2171d4dd31f6acc2e3d6770e491ede4e4a62ecfafcabeb4ec10cfb0e40afe9554

data/NEWS.md

@@ -1,5 +1,12 @@
 # Nanoc news
 
+## 4.8.5 (2017-09-07)
+
+Enhancements:
+
+* Made `nanoc check` accept hyphenated check names (e.g. `internal-links`, in addition to `internal_links`).
+* `compile --verbose` now prints “cached” rather than “identical” when cached compiled content is used. (#1214)
+
 ## 4.8.4 (2017-09-03)
 
 Fixes:

data/lib/nanoc/checking/runner.rb

@@ -98,10 +98,11 @@ module Nanoc::Checking
       Nanoc::Checking::Check.all
     end
 
-    def check_classes_named(n)
-      n.map do |a|
-        klass = Nanoc::Checking::Check.named(a.to_sym)
-        raise Nanoc::Int::Errors::GenericTrivial, "Unknown check: #{a}" if klass.nil?
+    def check_classes_named(names)
+      names.map do |name|
+        name = name.to_s.tr('-', '_').to_sym
+        klass = Nanoc::Checking::Check.named(name)
+        raise Nanoc::Int::Errors::GenericTrivial, "Unknown check: #{name}" if klass.nil?
         klass
       end
     end

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

@@ -20,6 +20,11 @@ module Nanoc::CLI::Commands::CompileListeners
         @acc_durations[rep] += Time.now - @start_times[rep]
       end
 
+      cached_reps = Set.new
+      Nanoc::Int::NotificationCenter.on(:cached_content_used, self) do |rep|
+        cached_reps << 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]
@@ -27,6 +32,7 @@ module Nanoc::CLI::Commands::CompileListeners
         action =
           if is_created then :create
           elsif is_modified then :update
+          elsif cached_reps.include?(rep) then :cached
           else :identical
           end
         level =

data/lib/nanoc/cli/logger.rb

@@ -8,12 +8,13 @@ module Nanoc::CLI
   #
   # @api private
   class Logger
-    # Maps actions (`:create`, `:update`, `:identical`, `:skip` and `:delete`)
+    # Maps actions (`:create`, `:update`, `:identical`, `:cached`, `:skip` and `:delete`)
     # onto their ANSI color codes.
     ACTION_COLORS = {
       create: "\e[32m", # green
       update: "\e[33m", # yellow
       identical: '',    # (nothing)
+      cached: '',       # (nothing)
       skip: '',         # (nothing)
       delete: "\e[31m"  # red
     }.freeze
@@ -35,7 +36,7 @@ module Nanoc::CLI
     #
     # @param [:high, :low] level The importance of this action
     #
-    # @param [:create, :update, :identical, :skip, :delete] action The kind of file action
+    # @param [:create, :update, :identical, :cached, :skip, :delete] action The kind of file action
     #
     # @param [String] name The name of the file the action was performed on
     #

data/lib/nanoc/version.rb

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

data/spec/nanoc/checking/runner_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+describe Nanoc::Checking::Runner do
+  subject(:runner) { described_class.new(site) }
+
+  let(:site) { double(:site) }
+
+  describe '#check_classes_named' do
+    subject { runner.check_classes_named(names) }
+
+    context 'given one full name' do
+      let(:names) { %w[internal_links] }
+      it { is_expected.to eq([Nanoc::Checking::Checks::InternalLinks]) }
+    end
+
+    context 'given one full name with dash instead of underscore' do
+      let(:names) { %w[internal-links] }
+      it { is_expected.to eq([Nanoc::Checking::Checks::InternalLinks]) }
+    end
+
+    context 'given one abbreviated name' do
+      let(:names) { %w[ilinks] }
+      it { is_expected.to eq([Nanoc::Checking::Checks::InternalLinks]) }
+    end
+  end
+end

data/spec/nanoc/cli/commands/compile/file_action_printer_spec.rb

@@ -60,19 +60,53 @@ describe Nanoc::CLI::Commands::CompileListeners::FileActionPrinter, stdio: true
     before { listener.start }
     before { Nanoc::CLI::Logger.instance.level = :high }
 
-    it 'prints skipped (uncompiled) reps' do
+    it 'does not print skipped (uncompiled) reps' do
       expect { listener.stop }
         .not_to output(/skip/).to_stdout
     end
+
+    it 'prints nothing' do
+      Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
+      Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 1))
+
+      expect { Nanoc::Int::NotificationCenter.post(:rep_written, rep, false, '/foo.html', false, false) }
+        .not_to output(/identical/).to_stdout
+    end
+
+    it 'prints nothing' do
+      Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
+      Nanoc::Int::NotificationCenter.post(:cached_content_used, rep)
+      Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 1))
+
+      expect { Nanoc::Int::NotificationCenter.post(:rep_written, rep, false, '/foo.html', false, false) }
+        .not_to output(/cached/).to_stdout
+    end
   end
 
   context 'log level = low' do
     before { listener.start }
     before { Nanoc::CLI::Logger.instance.level = :low }
 
-    it 'prints nothing' do
+    it 'prints skipped (uncompiled) reps' do
       expect { listener.stop }
         .to output(/skip.*\/hi\.html/).to_stdout
     end
+
+    it 'prints “identical” if not cached' do
+      Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
+      Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 1))
+
+      expect { Nanoc::Int::NotificationCenter.post(:rep_written, rep, false, '/foo.html', false, false) }
+        .to output(/identical/).to_stdout
+    end
+
+    it 'prints “cached” if cached' do
+      Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
+      Nanoc::Int::NotificationCenter.post(:cached_content_used, rep)
+      Timecop.freeze(Time.local(2008, 9, 1, 10, 5, 1))
+
+      expect { Nanoc::Int::NotificationCenter.post(:rep_written, rep, false, '/foo.html', false, false) }
+        .to output(/cached/).to_stdout
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.4
+  version: 4.8.5
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-03 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -453,6 +453,7 @@ files:
 - spec/nanoc/base/views/post_compile_item_rep_collection_view_spec.rb
 - spec/nanoc/base/views/post_compile_item_rep_view_spec.rb
 - spec/nanoc/base/views/post_compile_item_view_spec.rb
+- spec/nanoc/checking/runner_spec.rb
 - spec/nanoc/cli/command_runner_spec.rb
 - spec/nanoc/cli/commands/compile/diff_generator_spec.rb
 - spec/nanoc/cli/commands/compile/file_action_printer_spec.rb