nanoc 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcf1b9df213270119c9391459276baf1156c8c2b
-  data.tar.gz: 57939ccb41f7b9800f3e60309d425a7e3232e3e8
+  metadata.gz: ebe690aeb8d31bf2425569f41d9df2e5b8dcbe81
+  data.tar.gz: 8b41f5683d233d963a3fd6a9c5384052d7265d8e
 SHA512:
-  metadata.gz: 103f4ea43eb903dfdaab16054ea0dfaab142d061bc905a48493dfbdcbeccf04c4846239ed9ea5cb85c92c0c3b69c83f3f97481d4e559a791f00c9a99ce4ff5ef
-  data.tar.gz: 9e93d95dd041a8492c3c29a472dc26b8422442a80646f8389ba8603fc0c11276b2b03e8aebeb6b181a949835b8a6cdff8b3c5bf3b1ee69afa71e28bb15ea721b
+  metadata.gz: 4527c9d34fbe098dc58cac90906a1f1e643b595736006c92d18a222c0558c2965226f06db271cb01ca1ce8f939b05ea13013f1b0650293b53a659fcf8bd10fbd
+  data.tar.gz: 59dbc24916845b1c98adfac716162fdc1c9b0984564d307741377da08c34c9ef3057574192ce9cd620eb89ed34d45bb45820dcde999f6f07bf23a77dedefbce3

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    nanoc (4.2.1)
+    nanoc (4.2.2)
       cri (~> 2.3)
+      hamster (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -15,7 +16,7 @@ GEM
     ast (2.3.0)
     bluecloth (2.2.0)
     builder (3.2.2)
-    chunky_png (1.3.5)
+    chunky_png (1.3.6)
     coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
@@ -35,6 +36,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
+    concurrent-ruby (1.0.2)
     contracts (0.14.0)
     coveralls (0.8.13)
       json (~> 1.8)
@@ -49,7 +51,7 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    excon (0.49.0)
+    excon (0.50.1)
     execjs (2.7.0)
     ffi (1.9.10)
     fission (0.5.0)
@@ -91,8 +93,8 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.9.2)
-      fog-core (~> 1.27)
+    fog-aws (0.9.4)
+      fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
@@ -105,7 +107,7 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.40.0)
+    fog-core (1.41.0)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
@@ -125,8 +127,8 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.0)
       fog-core (~> 1.27)
-    fog-openstack (0.1.6)
-      fog-core (>= 1.39)
+    fog-openstack (0.1.7)
+      fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
     fog-powerdns (0.1.1)
@@ -198,6 +200,8 @@ GEM
       rake
     haml (4.0.7)
       tilt
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
     handlebars (0.8.0)
       handlebars-source (~> 4.0.5)
       therubyracer (~> 0.12.1)
@@ -249,7 +253,7 @@ GEM
     pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2.0)
-    rack (1.6.4)
+    rack (2.0.1)
     rainbow (2.1.0)
     rainpress (1.0)
     rake (11.2.2)
@@ -265,22 +269,22 @@ GEM
       json (~> 1.4)
     redcarpet (3.3.4)
     ref (2.0.0)
-    rouge (2.0.1)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rouge (2.0.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.40.0)
-      parser (>= 2.3.1.0, < 3.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.41.1)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -314,7 +318,7 @@ GEM
       rubypants
     uglifier (3.0.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.0.5)
+    unicode-display_width (1.1.0)
     vcr (3.0.3)
     w3c_validators (1.2)
       json

data/NEWS.md

@@ -1,5 +1,18 @@
 # Nanoc news
 
+## 4.2.2 (2016-07-02)
+
+Fixes:
+
+* Fixed confusing “invalid prefix” error message (#873, #879)
+* Ensured filter arguments are frozen, to prevent outdatedness checker errors (#881, #886)
+* Fixed issue with dependencies of items generated in the preprocessor not being tracked (#885, #891, #893)
+
+Enhancements:
+
+* Added specific handling for `Sass::Importers::Filesystem` in the checksummer, which should reduce unnecessary recompiles in sites using Compass (#866, #884)
+* Improved speed of checksummer (#864, #887)
+
 ## 4.2.1 (2016-06-19)
 
 Fixes:

data/lib/nanoc/base/checksummer.rb

@@ -1,3 +1,5 @@
+require 'hamster'
+
 module Nanoc::Int
   # Creates checksums for given objects.
   #
@@ -46,14 +48,14 @@ module Nanoc::Int
 
       private
 
-      def update(obj, digest, visited = Set.new)
+      def update(obj, digest, visited = Hamster::Set.new)
         digest.update(obj.class.to_s)
 
         if visited.include?(obj)
           digest.update('<recur>')
         else
           digest.update('<')
-          behavior_for(obj).update(obj, digest) { |o| update(o, digest, visited + [obj]) }
+          behavior_for(obj).update(obj, digest) { |o| update(o, digest, visited.add(obj)) }
           digest.update('>')
         end
       end
@@ -194,6 +196,12 @@ module Nanoc::Int
 
     class RescueUpdateBehavior < UpdateBehavior
       def self.update(obj, digest)
+        if obj.class.to_s == 'Sass::Importers::Filesystem'
+          digest.update('root=')
+          digest.update(obj.root)
+          return
+        end
+
         data = begin
           Marshal.dump(obj)
         rescue

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

@@ -98,6 +98,10 @@ module Nanoc::Int
     end
 
     def load_stores
+      # FIXME: icky hack to update the dependency store’s list of objects
+      # (does not include preprocessed objects otherwise)
+      dependency_store.objects = site.items.to_a + site.layouts.to_a
+
       stores.each(&:load)
     end
 

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

@@ -22,9 +22,9 @@ 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,
-      lib_dirs: %w( lib ),
-      commands_dirs: %w( commands ),
+      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,
+      lib_dirs: %w(lib),
+      commands_dirs: %w(commands),
       output_dir: 'output',
       data_sources: [{}],
       index_filenames: ['index.html'],

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

@@ -69,7 +69,11 @@ module Nanoc
       def ==(other)
         other.respond_to?(:identifier) && identifier == other.identifier
       end
-      alias eql? ==
+
+      contract C::Any => C::Bool
+      def eql?(other)
+        other.is_a?(self.class) && identifier == other.identifier
+      end
     end
   end
 end

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

@@ -76,7 +76,11 @@ module Nanoc
         false
       end
     end
-    alias eql? ==
+
+    contract C::Any => C::Bool
+    def eql?(other)
+      other.is_a?(self.class) && to_s == other.to_s
+    end
 
     contract C::None => C::Num
     def hash
@@ -123,7 +127,7 @@ module Nanoc
     # @return [Nanoc::Identifier]
     def prefix(string)
       if string !~ /\A\//
-        raise InvalidPrefixError.new(@string)
+        raise InvalidPrefixError.new(string)
       end
       Nanoc::Identifier.new(string.sub(/\/+\z/, '') + @string, type: @type)
     end

data/lib/nanoc/base/repos/config_loader.rb

@@ -26,7 +26,7 @@ module Nanoc::Int
 
     # @return [String]
     def self.config_filename_for_cwd
-      filenames = %w( nanoc.yaml config.yaml )
+      filenames = %w(nanoc.yaml config.yaml)
       candidate = filenames.find { |f| File.file?(f) }
       candidate && File.expand_path(candidate)
     end

data/lib/nanoc/base/repos/dependency_store.rb

@@ -2,7 +2,7 @@ module Nanoc::Int
   # @api private
   class DependencyStore < ::Nanoc::Int::Store
     # @return [Array<Nanoc::Int::Item, Nanoc::Int::Layout>]
-    attr_reader :objects
+    attr_accessor :objects
 
     # @param [Array<Nanoc::Int::Item, Nanoc::Int::Layout>] objects
     def initialize(objects)

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

@@ -21,6 +21,7 @@ module Nanoc
           # Run filter
           last = rep.snapshot_contents[:last]
           source = rep.binary? ? last.filename : last.string
+          filter_args.freeze
           result = filter.setup_and_run(source, filter_args)
           rep.snapshot_contents[:last] =
             if filter.class.to_binary?
@@ -48,6 +49,7 @@ module Nanoc
           raise Nanoc::Int::Errors::Generic, "Cannot find rule for layout matching #{layout_identifier}"
         end
         filter_args = filter_args.merge(extra_filter_args || {})
+        filter_args.freeze
 
         # Check whether item can be laid out
         raise Nanoc::Int::Errors::CannotLayoutBinaryItem.new(rep) if rep.binary?

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

@@ -15,7 +15,13 @@ module Nanoc
     def ==(other)
       other.respond_to?(:item) && other.respond_to?(:name) && item == other.item && name == other.name
     end
-    alias eql? ==
+
+    # @see Object#eql?
+    def eql?(other)
+      other.is_a?(self.class) &&
+        item.eql?(other.item) &&
+        name.eql?(other.name)
+    end
 
     # @see Object#hash
     def hash

data/lib/nanoc/base/views/mixins/document_view_mixin.rb

@@ -18,7 +18,11 @@ module Nanoc
     def ==(other)
       other.respond_to?(:identifier) && identifier == other.identifier
     end
-    alias eql? ==
+
+    # @see Object#eql?
+    def eql?(other)
+      other.is_a?(self.class) && identifier.eql?(other.identifier)
+    end
 
     # @see Object#hash
     def hash

data/lib/nanoc/cli.rb

@@ -203,7 +203,7 @@ module Nanoc::CLI
   def self.enable_utf8?(io)
     return true unless io.tty?
 
-    %w( LC_ALL LC_CTYPE LANG ).any? { |e| ENV[e] =~ /UTF/i }
+    %w(LC_ALL LC_CTYPE LANG).any? { |e| ENV[e] =~ /UTF/i }
   end
 
   # @return [Boolean] true if color support is present, false if not

data/lib/nanoc/cli/error_handler.rb

@@ -42,7 +42,7 @@ module Nanoc::CLI
     # @return [void]
     def handle_while(&_block)
       # Set exit handler
-      %w( INT TERM ).each do |signal|
+      %w(INT TERM).each do |signal|
         Signal.trap(signal) do
           puts
           exit!(0)
@@ -233,11 +233,9 @@ module Nanoc::CLI
         end
       when RuntimeError
         if error.message =~ /^can't modify frozen/
-          'You attempted to modify immutable data. Some data, such as ' \
-          'item/layout attributes and raw item/layout content, can not ' \
-          'be modified once compilation has started. (This was ' \
-          'unintentionally possible in 3.1.x and before, but has been ' \
-          'disabled in 3.2.x in order to allow compiler optimisations.)'
+          'You attempted to modify immutable data. Some data cannot ' \
+          'be modified once compilation has started. Such data includes ' \
+          'content and attributes of items and layouts, and filter arguments.'
         end
       end
     end

data/lib/nanoc/filters/asciidoc.rb

@@ -13,7 +13,7 @@ module Nanoc::Filters
       stdout = StringIO.new
       stderr = $stderr
       piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
-      piper.run(%w( asciidoc -o - - ), content)
+      piper.run(%w(asciidoc -o - -), content)
       stdout.string
     end
   end

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.2.1'.freeze
+  VERSION = '4.2.2'.freeze
 end

data/nanoc.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.1.0'
 
   s.add_runtime_dependency('cri', '~> 2.3')
+  s.add_runtime_dependency('hamster', '~> 3.0')
 
   s.add_development_dependency('bundler', '>= 1.7.10', '< 2.0')
 end

data/test/base/test_compiler.rb

@@ -156,7 +156,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
   def test_disallow_routes_not_starting_with_slash
     # Create site
-    Nanoc::CLI.run %w( create_site bar)
+    Nanoc::CLI.run %w(create_site bar)
 
     FileUtils.cd('bar') do
       # Create routes
@@ -183,7 +183,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
   def test_disallow_duplicate_routes
     # Create site
-    Nanoc::CLI.run %w( create_site bar)
+    Nanoc::CLI.run %w(create_site bar)
 
     FileUtils.cd('bar') do
       # Create routes
@@ -209,10 +209,10 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_compile_should_recompile_all_reps
-    Nanoc::CLI.run %w( create_site bar )
+    Nanoc::CLI.run %w(create_site bar)
 
     FileUtils.cd('bar') do
-      Nanoc::CLI.run %w( compile )
+      Nanoc::CLI.run %w(compile)
 
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
@@ -225,7 +225,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
   def test_disallow_multiple_snapshots_with_the_same_name
     # Create site
-    Nanoc::CLI.run %w( create_site bar )
+    Nanoc::CLI.run %w(create_site bar)
 
     FileUtils.cd('bar') do
       # Create routes
@@ -447,8 +447,8 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
-      assert_equal Set.new(%w( content/blah.dat )), Set.new(Dir['content/*'])
-      assert_equal Set.new(%w( output/blah.dat )), Set.new(Dir['output/*'])
+      assert_equal Set.new(%w(content/blah.dat)), Set.new(Dir['content/*'])
+      assert_equal Set.new(%w(output/blah.dat)), Set.new(Dir['output/*'])
     end
   end
 
@@ -469,7 +469,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_find_layouts_by_glob
-    Nanoc::CLI.run %w( create_site bar )
+    Nanoc::CLI.run %w(create_site bar)
     FileUtils.cd('bar') do
       File.open('Rules', 'w') do |io|
         io.write "compile '/**/*' do\n"

data/test/base/test_site.rb

@@ -96,7 +96,7 @@ EOF
   end
 
   def test_identifier_classes
-    Nanoc::CLI.run %w( create_site bar)
+    Nanoc::CLI.run %w(create_site bar)
     FileUtils.cd('bar') do
       FileUtils.mkdir_p('content')
       FileUtils.mkdir_p('layouts')

data/test/cli/commands/test_check.rb

@@ -4,12 +4,12 @@ class Nanoc::CLI::Commands::CheckTest < Nanoc::TestCase
       FileUtils.mkdir_p('output')
 
       # Should not raise now
-      Nanoc::CLI.run %w( check stale )
+      Nanoc::CLI.run %w(check stale)
 
       # Should raise now
       File.open('output/blah.html', 'w') { |io| io.write 'moo' }
       assert_raises Nanoc::Int::Errors::GenericTrivial do
-        Nanoc::CLI.run %w( check stale )
+        Nanoc::CLI.run %w(check stale)
       end
     end
   end

data/test/cli/commands/test_compile.rb

@@ -21,7 +21,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
         io.write "layout '*', :erb\n"
       end
 
-      Nanoc::CLI.run %w( compile --verbose )
+      Nanoc::CLI.run %w(compile --verbose)
     end
   end
 
@@ -58,7 +58,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       end
 
       assert File.file?('output/stray.html')
-      Nanoc::CLI.run %w( compile )
+      Nanoc::CLI.run %w(compile)
       assert File.file?('output/stray.html')
 
       File.open('nanoc.yaml', 'w') do |io|
@@ -68,7 +68,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       end
 
       assert File.file?('output/stray.html')
-      Nanoc::CLI.run %w( compile )
+      Nanoc::CLI.run %w(compile)
       refute File.file?('output/stray.html')
     end
   end
@@ -108,7 +108,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       end
 
       assert File.file?('output/stray.html')
-      Nanoc::CLI.run %w( compile )
+      Nanoc::CLI.run %w(compile)
       assert File.file?('output/stray.html')
 
       File.open('nanoc.yaml', 'w') do |io|
@@ -119,7 +119,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       end
 
       assert File.file?('output/stray.html')
-      Nanoc::CLI.run %w( compile )
+      Nanoc::CLI.run %w(compile)
       refute File.file?('output/stray.html')
       assert File.directory?('output/excluded_dir'), 'excluded_dir should still be there'
     end
@@ -205,7 +205,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
   def new_file_action_printer(reps)
     # Ensure CLI is loaded
     begin
-      Nanoc::CLI.run(%w( help %))
+      Nanoc::CLI.run(%w(help %))
     rescue SystemExit
     end
 

data/test/cli/commands/test_create_site.rb

@@ -1,13 +1,13 @@
 class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   def test_create_site_with_existing_name
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
     assert_raises(::Nanoc::Int::Errors::GenericTrivial) do
-      Nanoc::CLI.run %w( create_site foo )
+      Nanoc::CLI.run %w(create_site foo)
     end
   end
 
   def test_can_compile_new_site
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
 
     FileUtils.cd('foo') do
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
@@ -19,14 +19,14 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     FileUtils.mkdir('foo')
 
     FileUtils.cd('foo') do
-      Nanoc::CLI.run %w( create_site ./ )
+      Nanoc::CLI.run %w(create_site ./)
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
   end
 
   def test_can_compile_new_site_with_binary_items
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
 
     FileUtils.cd('foo') do
       File.open('content/blah', 'w') { |io| io << 'asdf' }
@@ -40,7 +40,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   def test_can_compile_site_in_nonempty_directory
     FileUtils.mkdir('foo')
     FileUtils.touch(File.join('foo', 'SomeFile.txt'))
-    Nanoc::CLI.run %w( create_site foo --force )
+    Nanoc::CLI.run %w(create_site foo --force)
 
     FileUtils.cd('foo') do
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
@@ -51,7 +51,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   def test_compiled_site_output
     FileUtils.mkdir('foo')
     FileUtils.touch(File.join('foo', 'SomeFile.txt'))
-    Nanoc::CLI.run %w( create_site foo --force )
+    Nanoc::CLI.run %w(create_site foo --force)
 
     FileUtils.cd('foo') do
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
@@ -70,7 +70,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     original_encoding = Encoding.default_external
     Encoding.default_external = 'ISO-8859-1' # ew!
 
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
 
     FileUtils.cd('foo') do
       # Try with encoding = default encoding = utf-8
@@ -97,9 +97,9 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   end
 
   def test_new_site_has_correct_stylesheets
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
     FileUtils.cd('foo') do
-      Nanoc::CLI.run %w( compile )
+      Nanoc::CLI.run %w(compile)
 
       assert File.file?('content/stylesheet.css')
       assert_match(/\/stylesheet.css/, File.read('output/index.html'))
@@ -109,12 +109,12 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   def test_new_site_prunes_by_default
     FileUtils.mkdir('foo')
     FileUtils.touch(File.join('foo', 'SomeFile.txt'))
-    Nanoc::CLI.run %w( create_site foo --force )
+    Nanoc::CLI.run %w(create_site foo --force)
 
     FileUtils.cd('foo') do
       File.write('output/blah.txt', 'stuff')
 
-      Nanoc::CLI.run %w( compile )
+      Nanoc::CLI.run %w(compile)
 
       refute File.file?('output/blah.txt')
     end

data/test/cli/commands/test_help.rb

@@ -1,6 +1,6 @@
 class Nanoc::CLI::Commands::HelpTest < Nanoc::TestCase
   def test_run
-    Nanoc::CLI.run %w( help )
-    Nanoc::CLI.run %w( help co )
+    Nanoc::CLI.run %w(help)
+    Nanoc::CLI.run %w(help co)
   end
 end

data/test/cli/commands/test_info.rb

@@ -1,5 +1,5 @@
 class Nanoc::CLI::Commands::InfoTest < Nanoc::TestCase
   def test_run
-    Nanoc::CLI.run %w( info )
+    Nanoc::CLI.run %w(info)
   end
 end

data/test/cli/commands/test_prune.rb

@@ -13,7 +13,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       File.open('output2/index.html', 'w') { |io| io.write 'this is a index.' }
 
       assert_raises SystemExit do
-        Nanoc::CLI.run %w( prune )
+        Nanoc::CLI.run %w(prune)
       end
 
       assert File.file?('output2/index.html')
@@ -41,7 +41,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       File.open('output2/foo.html', 'w')   { |io| io.write 'this is a foo.' }
       File.open('output2/index.html', 'w') { |io| io.write 'this is a index.' }
 
-      Nanoc::CLI.run %w( prune --yes )
+      Nanoc::CLI.run %w(prune --yes)
 
       assert File.file?('output2/index.html')
       assert !File.file?('output2/foo.html')
@@ -61,7 +61,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       File.open('output2/foo.html', 'w')   { |io| io.write 'this is a foo.' }
       File.open('output2/index.html', 'w') { |io| io.write 'this is a index.' }
 
-      Nanoc::CLI.run %w( prune --dry-run )
+      Nanoc::CLI.run %w(prune --dry-run)
 
       assert File.file?('output2/index.html')
       assert File.file?('output2/foo.html')
@@ -94,7 +94,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       File.open('output/bad-dir/blah', 'w')   { |io| io.write 'stuff' }
       File.open('output/index.html', 'w')     { |io| io.write 'stuff' }
 
-      Nanoc::CLI.run %w( prune --yes )
+      Nanoc::CLI.run %w(prune --yes)
 
       assert File.file?('output/index.html')
       assert File.file?('output/good-dir/blah')
@@ -124,7 +124,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       File.open('output-real/some-file.html', 'w') { |io| io.write 'stuff' }
       File.open('output-real/index.html', 'w')     { |io| io.write 'stuff' }
 
-      Nanoc::CLI.run %w( prune --yes )
+      Nanoc::CLI.run %w(prune --yes)
 
       assert File.file?('output-real/index.html')
       assert !File.directory?('output-real/some-dir')
@@ -142,7 +142,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       FileUtils.mkdir_p('output/a/b/c')
       File.open('output/a/b/c/index.html', 'w') { |io| io.write 'stuff' }
 
-      Nanoc::CLI.run %w( prune --yes )
+      Nanoc::CLI.run %w(prune --yes)
 
       assert !File.file?('output/a/b/c/index.html')
       assert !File.directory?('output/a/b/c')

data/test/cli/test_cli.rb

@@ -20,7 +20,7 @@ end
 EOS
 
   def test_load_custom_commands
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
 
     FileUtils.cd('foo') do
       # Create command
@@ -29,7 +29,7 @@ EOS
 
       # Run command
       begin
-        Nanoc::CLI.run %w( _test )
+        Nanoc::CLI.run %w(_test)
       rescue SystemExit
         assert false, 'Running _test should not cause system exit'
       end
@@ -41,7 +41,7 @@ EOS
   end
 
   def test_load_custom_commands_nested
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
     FileUtils.cd('foo') do
       # Create command
       FileUtils.mkdir_p('commands')
@@ -57,7 +57,7 @@ EOS
 
       # Run command
       begin
-        Nanoc::CLI.run %w( _test _sub )
+        Nanoc::CLI.run %w(_test _sub)
       rescue SystemExit
         assert false, 'Running _test sub should not cause system exit'
       end
@@ -69,7 +69,7 @@ EOS
   end
 
   def test_load_custom_commands_non_default_commands_dirs
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
     FileUtils.cd('foo') do
       File.open('nanoc.yaml', 'w') { |io| io.write('commands_dirs: [commands, commands_alt]') }
 
@@ -87,7 +87,7 @@ EOS
 
       # Run command
       begin
-        Nanoc::CLI.run %w( _test _sub )
+        Nanoc::CLI.run %w(_test _sub)
       rescue SystemExit
         assert false, 'Running _test sub should not cause system exit'
       end
@@ -99,7 +99,7 @@ EOS
   end
 
   def test_load_custom_commands_broken
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
 
     FileUtils.cd('foo') do
       # Create command
@@ -110,11 +110,11 @@ EOS
       position_before = $stderr.tell
       Nanoc::CLI::ErrorHandler.disable
       assert_raises RuntimeError do
-        Nanoc::CLI.run %w( _test )
+        Nanoc::CLI.run %w(_test)
       end
       Nanoc::CLI::ErrorHandler.enable
       assert_raises SystemExit do
-        Nanoc::CLI.run %w( _test )
+        Nanoc::CLI.run %w(_test)
       end
       position_after = $stderr.tell
 

data/test/data_sources/test_filesystem.rb

@@ -563,12 +563,12 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Write sample files
     FileUtils.mkdir_p('foo')
-    %w( foo.html foo.yaml bar.entry.html foo/qux.yaml ).each do |filename|
+    %w(foo.html foo.yaml bar.entry.html foo/qux.yaml).each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 
     # Write stray files
-    %w( foo.html~ foo.yaml.orig bar.entry.html.bak ).each do |filename|
+    %w(foo.html~ foo.yaml.orig bar.entry.html.bak).each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 
@@ -590,12 +590,12 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Write sample files
     FileUtils.mkdir_p('foo')
-    %w( foo.html foo.yaml bar.html.erb foo/qux.yaml ).each do |filename|
+    %w(foo.html foo.yaml bar.html.erb foo/qux.yaml).each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 
     # Write stray files
-    %w( foo.html~ foo.yaml.orig bar.entry.html.bak ).each do |filename|
+    %w(foo.html~ foo.yaml.orig bar.entry.html.bak).each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 
@@ -616,7 +616,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
 
     # Write sample files
-    %w( aaa/foo.html bbb/foo.html ccc/foo.html ).each do |filename|
+    %w(aaa/foo.html bbb/foo.html ccc/foo.html).each do |filename|
       FileUtils.mkdir_p(File.dirname(filename))
       File.open(filename, 'w') { |io| io.write('test') }
     end
@@ -636,7 +636,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, config)
 
     # Write sample files
-    %w( stuff/foo.html stuff/foo.md stuff/foo.yaml ).each do |filename|
+    %w(stuff/foo.html stuff/foo.md stuff/foo.yaml).each do |filename|
       FileUtils.mkdir_p(File.dirname(filename))
       File.open(filename, 'w') { |io| io.write('test') }
     end
@@ -655,7 +655,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
 
     # Write sample files
-    %w( foo.html foo.xhtml foo.txt foo.yaml bar.html qux.yaml ).each do |filename|
+    %w(foo.html foo.xhtml foo.txt foo.yaml bar.html qux.yaml).each do |filename|
       File.open(filename, 'w') { |io| io.write('test') }
     end
 

data/test/extra/checking/test_runner.rb

@@ -3,7 +3,7 @@ class Nanoc::Extra::Checking::RunnerTest < Nanoc::TestCase
     with_site do |site|
       File.open('output/blah', 'w') { |io| io.write('I am stale! Haha!') }
       runner = Nanoc::Extra::Checking::Runner.new(site)
-      runner.run_specific(%w( stale ))
+      runner.run_specific(%w(stale))
     end
   end
 
@@ -15,7 +15,7 @@ class Nanoc::Extra::Checking::RunnerTest < Nanoc::TestCase
 
       runner = Nanoc::Extra::Checking::Runner.new(site)
       ios = capturing_stdio do
-        runner.run_specific(%w( my_foo_check ))
+        runner.run_specific(%w(my_foo_check))
       end
 
       assert ios[:stdout].include?('I AM FOO!')

data/test/extra/core_ext/test_pathname.rb

@@ -1,6 +1,6 @@
 class Nanoc::Extra::CoreExtPathnameTest < Nanoc::TestCase
   def test_components
-    assert_equal %w( / a bb ccc dd e ), Pathname.new('/a/bb/ccc/dd/e').__nanoc_components
+    assert_equal %w(/ a bb ccc dd e), Pathname.new('/a/bb/ccc/dd/e').__nanoc_components
   end
 
   def test_include_component

data/test/extra/test_link_collector.rb

@@ -22,7 +22,7 @@ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
     end
 
     # Create validator
-    collector = Nanoc::Extra::LinkCollector.new(%w( file-a.html file-b.html ))
+    collector = Nanoc::Extra::LinkCollector.new(%w(file-a.html file-b.html))
 
     # Test
     hrefs_with_filenames = collector.filenames_per_href
@@ -58,7 +58,7 @@ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
     end
 
     # Create validator
-    collector = Nanoc::Extra::LinkCollector.new(%w( file-a.html file-b.html ), :external)
+    collector = Nanoc::Extra::LinkCollector.new(%w(file-a.html file-b.html), :external)
 
     # Test
     hrefs_with_filenames = collector.filenames_per_href
@@ -91,7 +91,7 @@ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
     end
 
     # Create validator
-    collector = Nanoc::Extra::LinkCollector.new(%w( file-a.html file-b.html ), :internal)
+    collector = Nanoc::Extra::LinkCollector.new(%w(file-a.html file-b.html), :internal)
 
     # Test
     hrefs_with_filenames = collector.filenames_per_href

data/test/extra/test_piper.rb

@@ -3,7 +3,7 @@ class Nanoc::Extra::PiperTest < Nanoc::TestCase
     stdout = StringIO.new
     stderr = StringIO.new
 
-    cmd = %w( ls -l )
+    cmd = %w(ls -l)
 
     File.open('foo.txt', 'w') { |io| io.write('hi') }
     File.open('bar.txt', 'w') { |io| io.write('ho') }
@@ -21,7 +21,7 @@ class Nanoc::Extra::PiperTest < Nanoc::TestCase
     stderr = StringIO.new
 
     input = 'Hello World!'
-    cmd = %w( cat )
+    cmd = %w(cat)
 
     piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
     piper.run(cmd, input)
@@ -34,7 +34,7 @@ class Nanoc::Extra::PiperTest < Nanoc::TestCase
     stdout = StringIO.new
     stderr = StringIO.new
 
-    cmd = %w( cat kafhawilgoiwaejagoualjdsfilofiewaguihaifeowuiga )
+    cmd = %w(cat kafhawilgoiwaejagoualjdsfilofiewaguihaifeowuiga)
 
     piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
     assert_raises(Nanoc::Extra::Piper::Error) do

data/test/helpers/test_capturing.rb

@@ -71,7 +71,7 @@ EOS
 
     result = ::ERB.new(content).result(binding)
 
-    expected = %w( head before basic after foot )
+    expected = %w(head before basic after foot)
     actual   = result.scan(/[a-z]+/)
     assert_equal expected, actual
   end

data/test/rule_dsl/test_action_provider.rb

@@ -18,7 +18,7 @@ class Nanoc::RuleDSL::ActionProviderTest < Nanoc::TestCase
 
   def test_per_rules_file_preprocessor
     # Create site
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
     FileUtils.cd('foo') do
       # Create a bonus rules file
       File.write(
@@ -49,7 +49,7 @@ class Nanoc::RuleDSL::ActionProviderTest < Nanoc::TestCase
 
   def test_per_rules_file_postprocessor
     # Create site
-    Nanoc::CLI.run %w( create_site foo )
+    Nanoc::CLI.run %w(create_site foo)
     FileUtils.cd('foo') do
       # Create a bonus rules file
       File.write(

data/test/test_gem.rb

@@ -13,7 +13,7 @@ class Nanoc::GemTest < Nanoc::TestCase
     stdout = StringIO.new
     stderr = StringIO.new
     piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
-    piper.run(%w( gem build nanoc.gemspec ), nil)
+    piper.run(%w(gem build nanoc.gemspec), nil)
     files_after = Set.new Dir['**/*']
 
     # Check new files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-19 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: hamster
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement