nanoc 4.8.1 → 4.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8537bc61d500ed5bae70dcae626b5991fd43dea7
-  data.tar.gz: 565524a4ffb2733eb6b05fe547c3ee7e2b0788e9
+  metadata.gz: 1d77db1ef0d5fababb5232e354b5e1bed88749d7
+  data.tar.gz: 5b3cd5972c29fa74a0bea92a59212861e24eb5c7
 SHA512:
-  metadata.gz: b174cadc89845ac6b8e7fec2cea4f9feb4022eef44653a6f505c9eb00d10c59c9ba3fc73d5b2f61cb9a928248fac433944d81e780eb0934dd309939def7ecd2a
-  data.tar.gz: 78c42adc2b1bc34501aaae163baffc6ab839b45f81d80430a924cca13d0d3a63573702c0a02bcdce4e788a7a5cf560c5250c09617fa065f1c0cc124086412516
+  metadata.gz: 0a5d0f6f801a97f57efce1d06c872dada0ff50a9c3f88f068b4c5a617509b81e513473b08a5c5dabb864ede7e18d96d3c6c465c46a259d5f3f06411782134b1b
+  data.tar.gz: 07a596f5a268ce116ac1d9dc1897ea0d1211bb051a5413965d2029d780008b3350668fe5224b4bb999eea52c505a83e3fc0b18db785ee7ea437470eda0fc37ae

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.8.2 (2017-08-19)
+
+Fixed:
+
+* Fixed compatibility issue with guard-nanoc
+
 ## 4.8.1 (2017-08-06)
 
 Enhancements:

data/lib/nanoc/cli.rb

@@ -21,6 +21,12 @@ require_relative 'cli/cleaning_stream'
 require_relative 'cli/stream_cleaners'
 require_relative 'cli/error_handler'
 
+require_relative 'cli/commands/compile_listeners/abstract'
+require_relative 'cli/commands/compile_listeners/debug_printer'
+require_relative 'cli/commands/compile_listeners/diff_generator'
+require_relative 'cli/commands/compile_listeners/file_action_printer'
+require_relative 'cli/commands/compile_listeners/timing_recorder'
+
 # @api private
 module Nanoc::CLI
   # @return [Boolean] true if debug output is enabled, false if not

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

@@ -7,12 +7,6 @@ description <<~EOS
 EOS
 flag nil, :diff, 'generate diff'
 
-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/timing_recorder'
-
 module Nanoc::CLI::Commands
   class Compile < ::Nanoc::CLI::CommandRunner
     attr_accessor :listener_classes

data/lib/nanoc/version.rb

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

data/spec/nanoc/cli_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+describe Nanoc::CLI do
+  let(:all_commands) do
+    ObjectSpace.each_object(Cri::Command)
+  end
+
+  let(:exceptions) do
+    # FIXME: Get rid of these exceptions by Nanoc 5.0
+    [
+      ['deploy', ['C']],
+      ['help', ['v']],
+      ['check', ['d']],
+    ]
+  end
+
+  def ancestors_of_command(command)
+    if command.is_a?(Cri::Command)
+      [command] + ancestors_of_command(command.supercommand)
+    else
+      []
+    end
+  end
+
+  def short_options_for_command(command)
+    ancestors = ancestors_of_command(command)
+    ancestors.flat_map { |a| a.option_definitions.to_a.map { |od| od[:short] } }.compact
+  end
+
+  it 'has no commands that have conflicting options' do
+    all_commands.each do |command|
+      short_options = short_options_for_command(command)
+
+      duplicate_options = short_options.select { |o| short_options.count(o) > 1 }.uniq
+
+      next if exceptions.include?([command.name, duplicate_options])
+
+      expect(duplicate_options).to(
+        be_empty,
+        "The #{command.name} command’s option shorthands #{duplicate_options.uniq} are used by multiple options",
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.1
+  version: 4.8.2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-06 00:00:00.000000000 Z
+date: 2017-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -464,6 +464,7 @@ files:
 - spec/nanoc/cli/commands/show_rules_spec.rb
 - spec/nanoc/cli/commands/view_spec.rb
 - spec/nanoc/cli/stream_cleaners/utf8_spec.rb
+- spec/nanoc/cli_spec.rb
 - spec/nanoc/data_sources/filesystem_spec.rb
 - spec/nanoc/deploying/fog_spec.rb
 - spec/nanoc/deploying/git_spec.rb