nanoc 4.7.9 → 4.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecb0f82b4846a49ddfdb86ced975609223aeb598
-  data.tar.gz: b9554789ff878f63f7b42fe9d42576c105d93c95
+  metadata.gz: b056ea57fc16e94cee44d842ac7cc9d4f801b604
+  data.tar.gz: 743593e44dee1341ff69b3f799d322dc9361b743
 SHA512:
-  metadata.gz: 6ef8450a139b74d4eb3cfe84f5444c568d49e18046eddb5412f6c687a7aa22f64049d023a4da5b9406f677095e5d9fd0c94c700679ff9337cfdc1a24846f480d
-  data.tar.gz: 68b1f8b2fc52b50f2074b21271c45539b16f4db46b35c5fdf2bbee28dd0ae57ed31a975314fe2d48427eb8f2b815bb16eb4422b335a9397e68b41ed4e29394c1
+  metadata.gz: a6cd971e349f5d80baf44bcfe405788f6da72f9d7864ff4da44e708b72dcb0616ae26e740553037447b46390182e6d740b4e11735c8eb2dca369bba7e139ccbe
+  data.tar.gz: 84f84414da253488dde8866209c827928da5502c79f1d80c2a0e0dfc8bca2dbe504ebae7adbbfb7430c7ff0bb1e008926fe4589a86f4d1b54ff227b8dc40481d

data/Appraisals

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise 'rouge-1' do
   group :plugins do
     gem 'rouge', '~> 1.0'

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/bbatsov/rubocop.git
-  revision: cc04647e2b786ab5ef8337206f3dd71c0d843354
+  revision: 03bda6cde059c4a83f03db025c904f3fb60968c0
   specs:
     rubocop (0.48.1)
       parallel (~> 1.10)
@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.7.9)
+    nanoc (4.7.10)
       cri (~> 2.8)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
@@ -132,11 +132,10 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.44.0)
+    fog-core (1.44.1)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
-      xmlrpc
     fog-dynect (0.0.3)
       fog-core
       fog-json
@@ -198,7 +197,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.9.1)
+    fog-vsphere (1.9.2)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.3.0)
@@ -223,14 +222,15 @@ GEM
     guard-rake (1.0.0)
       guard
       rake
-    haml (4.0.7)
+    haml (5.0.1)
+      temple (>= 0.8.0)
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     handlebars (0.8.0)
       handlebars-source (~> 4.0.5)
       therubyracer (~> 0.12.1)
-    handlebars-source (4.0.7)
+    handlebars-source (4.0.8)
     hashdiff (0.3.4)
     inflecto (0.0.2)
     ipaddress (0.8.3)
@@ -243,7 +243,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.11)
+    lumberjack (1.0.12)
     m (1.5.0)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
@@ -256,13 +256,13 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     mustache (1.0.5)
     nenv (0.3.0)
-    nokogiri (1.7.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     nokogumbo (1.4.10)
       nokogiri
@@ -270,7 +270,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     pandoc-ruby (2.0.1)
-    parallel (1.11.1)
+    parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -281,7 +281,7 @@ GEM
     public_suffix (2.0.5)
     pygments.rb (1.1.2)
       multi_json (>= 1.0.0)
-    rack (2.0.1)
+    rack (2.0.2)
     rainbow (2.2.2)
       rake
     rainpress (1.0.1)
@@ -299,22 +299,22 @@ GEM
     redcarpet (3.4.0)
     ref (2.0.0)
     rouge (2.0.7)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
     rubypants (0.6.0)
@@ -326,11 +326,11 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slim (3.0.7)
-      temple (~> 0.7.6)
+    slim (3.0.8)
+      temple (>= 0.7.6, < 0.9)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    temple (0.7.7)
+    temple (0.8.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
     therubyracer (0.12.3)
@@ -356,7 +356,6 @@ GEM
       crack (>= 0.3.2)
       hashdiff
     xml-simple (1.1.5)
-    xmlrpc (0.3.0)
     yard (0.9.9)
     yard-contracts (0.1.5)
       contracts (~> 0.7)

data/Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 guard 'rake', task: 'default' do
   watch(%r{^(lib|test|spec)/})
 end

data/NEWS.md

@@ -1,5 +1,16 @@
 # Nanoc news
 
+## 4.7.10 (2017-05-14)
+
+Fixes:
+
+* Fixed behavior of `parent_config_file` so that it merges, rather than overwrites (#1176) [Gregory Pakosz]
+
+Enhancements:
+
+* Made `slim` filter show the filename in error messages (#1175) [Alexander Groß]
+* Added `#use_helper` as an alternative to `#include` for enabling helpers (#1170)
+
 ## 4.7.9 (2017-05-01)
 
 Fixes:

data/README.md

@@ -19,4 +19,4 @@ Contributions are greatly appreciated! Consult the [Development guidelines](http
 
 Many thanks to everyone who has contributed to Nanoc in one way or another:
 
-Ale Muñoz, Alexander Mankuta, Andy Drop, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Cédric Boutillier, Chris Burkhardt, Chris Chapman, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Denis Defreyne, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Grégory Karékinian, Gregory Pakosz, Guilherme Garnier, Hugo Peixoto, Jack Chu, Jake Benilov, Jan M. Faber, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Lorin Werthen, Louis T., Lucas Vuotto, Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Micha Rosenbaum, Michal Cichra, Michal Papis, Mike Pennisi, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Paul Boone, Peter Aronoff, Raphael von der Grün, Rémi Barraquand, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Šime Ramov, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Vlatko Kosturjak, whitequark, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada
+Ale Muñoz, Alexander Groß, Alexander Mankuta, Andy Drop, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Cédric Boutillier, Chris Burkhardt, Chris Chapman, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Denis Defreyne, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Grégory Karékinian, Gregory Pakosz, Guilherme Garnier, Hugo Peixoto, Jack Chu, Jake Benilov, Jan M. Faber, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Lorin Werthen, Louis T., Lucas Vuotto, Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Micha Rosenbaum, Michal Cichra, Michal Papis, Mike Pennisi, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Paul Boone, Peter Aronoff, Raphael von der Grün, Rémi Barraquand, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Šime Ramov, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Vlatko Kosturjak, whitequark, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubocop/rake_task'
 require 'rspec/core/rake_task'
 require 'rake/testtask'

data/bin/nanoc

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'nanoc'
 require 'nanoc/cli'
 

data/lib/nanoc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc
   # @return [String] A string containing information about this Nanoc version
   #   and its environment (Ruby engine and version, Rubygems version if any).
@@ -6,7 +8,7 @@ module Nanoc
   def self.version_information
     gem_info = defined?(Gem) ? "with RubyGems #{Gem::VERSION}" : 'without RubyGems'
     engine   = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
-    res = ''
+    res = String.new
     res << "Nanoc #{Nanoc::VERSION} © 2007-2017 Denis Defreyne.\n"
     res << "Running #{engine} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} #{gem_info}.\n"
     res

data/lib/nanoc/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @api private
 module Nanoc::Int
 end

data/lib/nanoc/base/contracts_support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'singleton'
 
 module Nanoc::Int

data/lib/nanoc/base/core_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nanoc/base/core_ext/array'
 require 'nanoc/base/core_ext/hash'
 require 'nanoc/base/core_ext/pathname'

data/lib/nanoc/base/core_ext/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @api private
 module Nanoc::ArrayExtensions
   # Returns a new array where all items' keys are recursively converted to

data/lib/nanoc/base/core_ext/hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @api private
 module Nanoc::HashExtensions
   # Returns a new hash where all keys are recursively converted to symbols by

data/lib/nanoc/base/core_ext/pathname.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @api private
 module Nanoc::PathnameExtensions
 end

data/lib/nanoc/base/core_ext/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @api private
 module Nanoc::StringExtensions
   # Transforms string into an actual identifier

data/lib/nanoc/base/entities.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'entities/context'
 require_relative 'entities/directed_graph'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   class ActionSequence
     include Nanoc::Int::ContractsSupport

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   class ChecksumCollection
     include Nanoc::Int::ContractsSupport

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # Nanoc::Int::CodeSnippet represent a piece of custom code of a Nanoc site.
   #
@@ -32,6 +34,7 @@ module Nanoc::Int
     #
     # @return [void]
     def load
+      eval('def self.use_helper(mod); Nanoc::Int::Context.instance_eval { include mod }; end', TOPLEVEL_BINDING)
       eval(@data, TOPLEVEL_BINDING, @filename)
       nil
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # Represents the site configuration.
   #
@@ -38,8 +40,8 @@ module Nanoc::Int
 
     # Configuration environments property key
     ENVIRONMENTS_CONFIG_KEY = :environments
-    NANOC_ENV = 'NANOC_ENV'.freeze
-    NANOC_ENV_DEFAULT = 'default'.freeze
+    NANOC_ENV = 'NANOC_ENV'
+    NANOC_ENV_DEFAULT = 'default'
 
     contract C::KeywordArgs[hash: C::Optional[Hash], env_name: C::Maybe[String]] => C::Any
     # Creates a new configuration with the given hash.
@@ -106,9 +108,14 @@ module Nanoc::Int
       @wrapped[key] = value
     end
 
+    def merge_recursively(c1, c2)
+      c1.merge(c2) { |_, v1, v2| v1.is_a?(Hash) && v2.is_a?(Hash) ? merge_recursively(v1, v2) : v2 }
+    end
+    private :merge_recursively
+
     contract C::Or[Hash, self] => self
     def merge(hash)
-      self.class.new(hash: @wrapped.merge(hash.to_h), env_name: @env_name)
+      self.class.new(hash: merge_recursively(@wrapped, hash.to_h), env_name: @env_name)
     end
 
     contract C::Any => self

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc
   module Int
     # Abstract content.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # Provides a context and a binding for use in filters such as the ERB and
   # Haml ones.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # @api private
   # A dependency between two items/layouts.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # Represents a directed graph. It is used by the dependency tracker for
   # storing and querying dependencies between items.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc
   module Int
     # @api private

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # @api private
   class IdentifiableCollection

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc
   class Identifier
     include Comparable

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # @api private
   class Item < ::Nanoc::Int::Document

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # @api private
   class ItemRep

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # @api private
   class Layout < ::Nanoc::Int::Document

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # Holds a value that might be generated lazily.
   #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Int
   # Module that contains all outdatedness reasons.
   #