nanoc 4.2.0b1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc5bddbd9c1b7b365b227cd69def799b2a8da4a2
-  data.tar.gz: 1da63342f4909056377af782094d03c3293ca75f
+  metadata.gz: 62464e0106788a92d1c8ebe9ff6b186fe6f00f10
+  data.tar.gz: a6d7768e4124360a3d48f5805d1b1fd4aa86dd69
 SHA512:
-  metadata.gz: de802f2ea52c8b4ee7e9d72bfeffb4870f09b83b6d0edf64fd35508092eb74104b76201754f88382ffcbbab1458af520071e5e77d02b100cb5f76cf62f2ab13c
-  data.tar.gz: d6f3d7751f3c8d0d8f95d7913cb7df7ebf972a47dbe1ad35a91d4d4491cf30919311011846e420c49fb8b9b559bca7f90c18442aa80021d929efa717ed62a7b7
+  metadata.gz: be55ec0837f06213c9673cb0ebe91e8a973f494a8b90a4c63c6757cdb7083401825a075ed952f994158f3ef72bdee204e98fe516b9c72806ab5c5a27f87effff
+  data.tar.gz: af81c35ffea130df18be4018e5f20ed18f5d348f9b923c2ebb2521113512d89e2e05238d6a955eadc339c1d553abfd6568f672b8441a61a94cde5a8cb43076e0

data/Gemfile

@@ -42,9 +42,9 @@ group :plugins do
   gem 'pygments.rb', platforms: [:ruby, :mswin]
   gem 'rack'
   gem 'rainpress'
-  gem 'rdiscount', platforms: [:ruby, :mswin]
+  gem 'rdiscount', '~> 2.2', platforms: [:ruby, :mswin]
   gem 'redcarpet', platforms: [:ruby, :mswin]
-  gem 'RedCloth'
+  gem 'RedCloth', platforms: :ruby
   gem 'rouge'
   gem 'rubypants'
   gem 'sass'

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    nanoc (4.2.0b1)
+    nanoc (4.2.0)
       cri (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.2)
-    RedCloth (4.2.9)
+    RedCloth (4.3.2)
     addressable (2.4.0)
     adsf (1.2.1)
       rack (>= 1.0.0)
@@ -49,7 +49,7 @@ GEM
     docile (1.1.5)
     erubis (2.7.0)
     excon (0.49.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     ffi (1.9.10)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
@@ -104,9 +104,9 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.37.0)
+    fog-core (1.40.0)
       builder
-      excon (~> 0.45)
+      excon (~> 0.49)
       formatador (~> 0.2)
     fog-dynect (0.0.3)
       fog-core
@@ -124,10 +124,9 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.0)
       fog-core (~> 1.27)
-    fog-openstack (0.1.2)
-      fog-core (>= 1.35)
+    fog-openstack (0.1.6)
+      fog-core (>= 1.39)
       fog-json (>= 1.0)
-      fog-xml (>= 0.1)
       ipaddress (>= 0.8)
     fog-powerdns (0.1.1)
       fog-core (~> 1.27)
@@ -156,7 +155,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.1.0)
+    fog-softlayer (1.1.1)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -171,7 +170,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (0.6.3)
+    fog-vsphere (0.7.0)
       fog-core
       rbvmomi (~> 1.8)
     fog-xenserver (0.2.3)
@@ -181,9 +180,9 @@ GEM
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
-    guard (2.13.0)
+    guard (2.14.0)
       formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -203,36 +202,37 @@ GEM
     inflecto (0.0.2)
     ipaddress (0.8.3)
     json (1.8.3)
-    kramdown (1.10.0)
+    kramdown (1.11.1)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    libv8 (3.16.14.13)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+    libv8 (3.16.14.15)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     lumberjack (1.0.10)
     markaby (0.8.0)
       builder
     maruku (0.7.2)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (3.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     mustache (1.0.3)
     nenv (0.3.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    notiffany (0.0.8)
+    notiffany (0.1.0)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pandoc-ruby (2.0.0)
-    parser (2.3.0.7)
+    pandoc-ruby (2.0.1)
+    parser (2.3.1.2)
       ast (~> 2.2)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
@@ -254,7 +254,7 @@ GEM
       builder
       nokogiri (>= 1.4.1)
       trollop
-    rdiscount (2.1.8)
+    rdiscount (2.2.0.1)
     rdoc (4.2.2)
       json (~> 1.4)
     redcarpet (3.3.4)
@@ -273,13 +273,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
+    ruby-progressbar (1.8.1)
+    ruby_dep (1.3.1)
     rubypants (0.2.0)
     safe_yaml (1.0.4)
     sass (3.4.22)
@@ -289,30 +290,30 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slim (3.0.6)
-      temple (~> 0.7.3)
+    slim (3.0.7)
+      temple (~> 0.7.6)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    temple (0.7.6)
+    temple (0.7.7)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    tilt (2.0.2)
+    tilt (2.0.5)
     tins (1.6.0)
     trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
     uglifier (3.0.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.0.3)
-    vcr (3.0.1)
+    unicode-display_width (1.0.5)
+    vcr (3.0.3)
     w3c_validators (1.2)
       json
       nokogiri
-    webmock (1.24.3)
+    webmock (2.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -356,7 +357,7 @@ DEPENDENCIES
   rack
   rainpress
   rake
-  rdiscount
+  rdiscount (~> 2.2)
   rdoc
   redcarpet
   rouge
@@ -376,4 +377,4 @@ DEPENDENCIES
   yuicompressor
 
 BUNDLED WITH
-   1.11.2
+   1.12.4

data/NEWS.md

@@ -1,5 +1,20 @@
 # Nanoc news
 
+## 4.2 (2016-06-04)
+
+Enhancements:
+
+* Dropped Ruby 2.1 support (#856)
+
+This release also includes the changes from 4.2.0b1.
+
+## 4.1.6 (2016-04-17)
+
+Fixes:
+
+* Strip index.html only if it is a full component (#850, #851)
+* Force UTF-8 for item rep paths (#837, #852)
+
 ## 4.2.0b1 (2016-04-17)
 
 Features:
@@ -73,6 +88,8 @@ Enhancements:
 
 * Added a base path to the Checks file, so that it supports `#require_relative` (#774)
 
+This release also includes the changes from 4.1.0a1 to 4.1.0rc2.
+
 ## 4.1.0rc2 (2015-12-13)
 
 Fixes:
@@ -149,6 +166,8 @@ Enhancements:
 
 * `#parent` and `#children` now raise an exception when used on items with a non-legacy identifier (#710)
 
+This release also includes the changes from 4.0.0a1 to 4.0.0rc3.
+
 ## 4.0.0rc3 (2015-09-20)
 
 Features:

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, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Gregory Pakosz, Grégory Karékinian, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Louis T., Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Michal Cichra, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, 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, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada
+Ale Muñoz, Alexander Mankuta, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, 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, Gregory Pakosz, Grégory Karékinian, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Louis T., Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Michal Cichra, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, 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, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada

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

@@ -90,9 +90,11 @@ module Nanoc::Int
       store
     ensure
       Nanoc::Int::TempFilenameFactory.instance.cleanup(
-        Nanoc::Filter::TMP_BINARY_ITEMS_DIR)
+        Nanoc::Filter::TMP_BINARY_ITEMS_DIR,
+      )
       Nanoc::Int::TempFilenameFactory.instance.cleanup(
-        Nanoc::Int::ItemRepWriter::TMP_TEXT_ITEMS_DIR)
+        Nanoc::Int::ItemRepWriter::TMP_TEXT_ITEMS_DIR,
+      )
     end
 
     def load_stores
@@ -121,7 +123,8 @@ module Nanoc::Int
 
     def build_reps
       builder = Nanoc::Int::ItemRepBuilder.new(
-        site, action_provider, @reps)
+        site, action_provider, @reps
+      )
       builder.run
     end
 

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

@@ -17,24 +17,31 @@ module Nanoc::Int
     end
 
     CodeSnippetsModified = Generic.new(
-      'The code snippets have been modified since the last time the site was compiled.')
+      'The code snippets have been modified since the last time the site was compiled.',
+    )
 
     ConfigurationModified = Generic.new(
-      'The site configuration has been modified since the last time the site was compiled.')
+      'The site configuration has been modified since the last time the site was compiled.',
+    )
 
     DependenciesOutdated = Generic.new(
-      'This item uses content or attributes that have changed since the last time the site was compiled.')
+      'This item uses content or attributes that have changed since the last time the site was compiled.',
+    )
 
     NotEnoughData = Generic.new(
-      'Not enough data is present to correctly determine whether the item is outdated.')
+      'Not enough data is present to correctly determine whether the item is outdated.',
+    )
 
     NotWritten = Generic.new(
-      'This item representation has not yet been written to the output directory (but it does have a path).')
+      'This item representation has not yet been written to the output directory (but it does have a path).',
+    )
 
     RulesModified = Generic.new(
-      'The rules file has been modified since the last time the site was compiled.')
+      'The rules file has been modified since the last time the site was compiled.',
+    )
 
     SourceModified = Generic.new(
-      'The source file of this item has been modified since the last time the site was compiled.')
+      'The source file of this item has been modified since the last time the site was compiled.',
+    )
   end
 end

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

@@ -39,7 +39,8 @@ module Nanoc::Int
       # Read
       apply_parent_config(
         Nanoc::Int::Configuration.new(YAML.load_file(filename)),
-        [filename]).with_defaults
+        [filename],
+      ).with_defaults
     end
 
     # @api private

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

@@ -28,6 +28,7 @@ module Nanoc::Int
     def route_rep(rep, snapshot_action, paths_to_reps)
       basic_path = snapshot_action.path
       return if basic_path.nil?
+      basic_path = basic_path.encode('UTF-8')
 
       # Check for duplicate paths
       if paths_to_reps.key?(basic_path)
@@ -42,10 +43,10 @@ module Nanoc::Int
 
     def strip_index_filename(basic_path)
       @site.config[:index_filenames].each do |index_filename|
-        rep_path_ending = basic_path[-index_filename.length..-1]
-        next unless rep_path_ending == index_filename
-
-        return basic_path[0..-index_filename.length - 1]
+        slashed_index_filename = '/' + index_filename
+        if basic_path.end_with?(slashed_index_filename)
+          return basic_path[0..-index_filename.length - 1]
+        end
       end
 
       basic_path

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

@@ -12,7 +12,8 @@ module Nanoc::Int
 
       # Notify
       Nanoc::Int::NotificationCenter.post(
-        :will_write_rep, item_rep, raw_path)
+        :will_write_rep, item_rep, raw_path
+      )
 
       content = item_rep.snapshot_contents[:last]
       if content.binary?
@@ -32,7 +33,8 @@ module Nanoc::Int
 
       # Notify
       Nanoc::Int::NotificationCenter.post(
-        :rep_written, item_rep, raw_path, is_created, is_modified)
+        :rep_written, item_rep, raw_path, is_created, is_modified
+      )
     end
 
     def temp_filename

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

@@ -320,15 +320,13 @@ module Nanoc::CLI::Commands
         Nanoc::Int::NotificationCenter.on(:rep_written) do |_rep, path, is_created, is_modified|
           duration = path && @start_times[path] ? Time.now - @start_times[path] : nil
           action =
-            case
-            when is_created  then :create
-            when is_modified then :update
+            if is_created then :create
+            elsif is_modified then :update
             else :identical
             end
           level =
-            case
-            when is_created  then :high
-            when is_modified then :high
+            if is_created then :high
+            elsif is_modified then :high
             else :low
             end
           log(level, action, path, duration)

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

@@ -15,10 +15,9 @@ module Nanoc::CLI::Commands
     def run
       prepare
 
-      case
-      when options[:'list-deployers']
+      if options[:'list-deployers']
         list_deployers
-      when options[:list]
+      elsif options[:list]
         list_deploy_configs
       else
         deploy

data/lib/nanoc/data_sources/filesystem.rb

@@ -345,9 +345,7 @@ module Nanoc::DataSources
 
       pieces = data.split(/^(-{5}|-{3})[ \t]*\r?\n?/, 3)
       if pieces.size < 4
-        raise RuntimeError.new(
-          "The file '#{content_filename}' appears to start with a metadata section (three or five dashes at the top) but it does not seem to be in the correct format.",
-        )
+        raise "The file '#{content_filename}' appears to start with a metadata section (three or five dashes at the top) but it does not seem to be in the correct format."
       end
 
       meta = parse_metadata(pieces[2], content_filename)
@@ -402,7 +400,7 @@ module Nanoc::DataSources
       begin
         data = File.read(filename)
       rescue => e
-        raise RuntimeError.new("Could not read #{filename}: #{e.inspect}")
+        raise "Could not read #{filename}: #{e.inspect}"
       end
 
       # Fix
@@ -433,7 +431,7 @@ module Nanoc::DataSources
 
     # Raises an invalid encoding error for the given filename and encoding.
     def raise_encoding_error(filename, encoding)
-      raise RuntimeError.new("Could not read #{filename} because the file is not valid #{encoding}.")
+      raise "Could not read #{filename} because the file is not valid #{encoding}."
     end
   end
 end

data/lib/nanoc/extra/checking/checks/external_links.rb

@@ -24,7 +24,8 @@ module ::Nanoc::Extra::Checking::Checks
         filenames.each do |filename|
           add_issue(
             "broken reference to #{res.href}: #{res.explanation}",
-            subject: filename)
+            subject: filename,
+          )
         end
       end
     end

data/lib/nanoc/extra/checking/checks/internal_links.rb

@@ -21,7 +21,8 @@ module Nanoc::Extra::Checking::Checks
 
           add_issue(
             "broken reference to #{href}",
-            subject: filename)
+            subject: filename,
+          )
         end
       end
     end

data/lib/nanoc/extra/checking/checks/mixed_content.rb

@@ -15,7 +15,8 @@ module Nanoc::Extra::Checking::Checks
         fns.each do |filename|
           add_issue(
             "mixed content include: #{uri}",
-            subject: filename)
+            subject: filename,
+          )
         end
       end
     end

data/lib/nanoc/extra/checking/checks/stale.rb

@@ -10,7 +10,8 @@ module Nanoc::Extra::Checking::Checks
 
         add_issue(
           'file without matching item',
-          subject: f)
+          subject: f,
+        )
       end
     end
 
@@ -23,7 +24,8 @@ module Nanoc::Extra::Checking::Checks
             .flat_map(&:reps)
             .map(&:unwrap)
             .flat_map(&:raw_paths)
-            .flat_map(&:values))
+            .flat_map(&:values),
+        )
     end
 
     def pruner

data/lib/nanoc/filters/relativize_paths.rb

@@ -39,10 +39,9 @@ module Nanoc::Filters
       when :html, :xml, :xhtml
         relativize_html_like(content, params)
       else
-        raise RuntimeError.new(
-          'The relativize_paths needs to know the type of content to ' \
+        raise 'The relativize_paths needs to know the type of content to ' \
           'process. Pass a :type to the filter call (:html for HTML, ' \
-          ':xhtml for XHTML, :xml for XML, or :css for CSS).')
+          ':xhtml for XHTML, :xml for XML, or :css for CSS).'
       end
     end
 

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -48,7 +48,7 @@ module Nanoc::Helpers
 
       # Check for required attributes
       if @config[:base_url].nil?
-        raise RuntimeError.new('The Nanoc::Helpers::XMLSitemap helper requires the site configuration to specify the base URL for the site.')
+        raise 'The Nanoc::Helpers::XMLSitemap helper requires the site configuration to specify the base URL for the site.'
       end
 
       # Build sitemap

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -10,7 +10,8 @@ module Nanoc::RuleDSL
 
       rule_memory_calculator =
         Nanoc::RuleDSL::RuleMemoryCalculator.new(
-          rules_collection: rules_collection, site: site)
+          rules_collection: rules_collection, site: site,
+        )
 
       action_provider = new(rules_collection, rule_memory_calculator)
 

data/lib/nanoc/rule_dsl/rule.rb

@@ -54,7 +54,8 @@ module Nanoc::RuleDSL
     # @return [void]
     def apply_to(rep, site:, executor:, view_context:)
       context = Nanoc::RuleDSL::RuleContext.new(
-        rep: rep, executor: executor, site: site, view_context: view_context)
+        rep: rep, executor: executor, site: site, view_context: view_context,
+      )
       context.instance_exec(matches(rep.item.identifier), &@block)
     end
 

data/lib/nanoc/version.rb

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

data/nanoc.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
 
   s.files =
     Dir['[A-Z]*'] +
-  Dir['doc/yardoc_{templates,handlers}/**/*'] +
-  Dir['{bin,lib,tasks,test}/**/*'] +
-  ['nanoc.gemspec']
+    Dir['doc/yardoc_{templates,handlers}/**/*'] +
+    Dir['{bin,lib,tasks,test}/**/*'] +
+    ['nanoc.gemspec']
   s.executables        = ['nanoc']
   s.require_paths      = ['lib']
 

data/test/base/test_compiler.rb

@@ -16,7 +16,8 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
       checksum_store: Nanoc::Int::ChecksumStore.new(site: site),
       rule_memory_store: Nanoc::Int::RuleMemoryStore.new,
       dependency_store: Nanoc::Int::DependencyStore.new(
-        site.items.to_a + site.layouts.to_a),
+        site.items.to_a + site.layouts.to_a,
+      ),
       action_provider: action_provider,
       reps: reps,
     }

data/test/extra/deployers/test_fog.rb

@@ -2,7 +2,8 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
   def test_read_etags_with_local_provider
     if_have 'fog' do
       fog = Nanoc::Extra::Deployers::Fog.new(
-        'output/', provider: 'local')
+        'output/', provider: 'local'
+      )
 
       files = [
         mock('file_a'),
@@ -16,7 +17,8 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
   def test_read_etags_with_aws_provider
     if_have 'fog' do
       fog = Nanoc::Extra::Deployers::Fog.new(
-        'output/', provider: 'aws')
+        'output/', provider: 'aws'
+      )
 
       files = [
         mock('file_a', key: 'key_a', etag: 'etag_a'),
@@ -35,7 +37,8 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
   def test_calc_local_etag_with_local_provider
     if_have 'fog' do
       fog = Nanoc::Extra::Deployers::Fog.new(
-        'output/', provider: 'local')
+        'output/', provider: 'local'
+      )
 
       file_path = 'blah.tmp'
       File.write(file_path, 'hallo')
@@ -47,21 +50,24 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
   def test_calc_local_etag_with_aws_provider
     if_have 'fog' do
       fog = Nanoc::Extra::Deployers::Fog.new(
-        'output/', provider: 'aws')
+        'output/', provider: 'aws'
+      )
 
       file_path = 'blah.tmp'
       File.write(file_path, 'hallo')
 
       assert_equal(
         '598d4c200461b81522a3328565c25f7c',
-        fog.send(:calc_local_etag, file_path))
+        fog.send(:calc_local_etag, file_path),
+      )
     end
   end
 
   def test_needs_upload_with_missing_remote_etag
     if_have 'fog' do
       fog = Nanoc::Extra::Deployers::Fog.new(
-        'output/', provider: 'aws')
+        'output/', provider: 'aws'
+      )
 
       file_path = 'blah.tmp'
       File.write(file_path, 'hallo')
@@ -76,7 +82,8 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
   def test_needs_upload_with_different_etags
     if_have 'fog' do
       fog = Nanoc::Extra::Deployers::Fog.new(
-        'output/', provider: 'aws')
+        'output/', provider: 'aws'
+      )
 
       file_path = 'blah.tmp'
       File.write(file_path, 'hallo')
@@ -91,7 +98,8 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
   def test_needs_upload_with_identical_etags
     if_have 'fog' do
       fog = Nanoc::Extra::Deployers::Fog.new(
-        'output/', provider: 'aws')
+        'output/', provider: 'aws'
+      )
 
       file_path = 'blah.tmp'
       File.write(file_path, 'hallo')

data/test/extra/deployers/test_rsync.rb

@@ -3,7 +3,8 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     # Create deployer
     rsync = Nanoc::Extra::Deployers::Rsync.new(
       'output/',
-      {})
+      {},
+    )
 
     # Mock run_shell_cmd
     def rsync.run_shell_cmd(args)
@@ -23,7 +24,8 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     # Create deployer
     rsync = Nanoc::Extra::Deployers::Rsync.new(
       'output/',
-      { dst: 'asdf/' })
+      { dst: 'asdf/' },
+    )
 
     # Mock run_shell_cmd
     def rsync.run_shell_cmd(args)
@@ -43,7 +45,8 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     # Create deployer
     rsync = Nanoc::Extra::Deployers::Rsync.new(
       'output',
-      { dst: 'asdf' })
+      { dst: 'asdf' },
+    )
 
     # Mock run_shell_cmd
     def rsync.run_shell_cmd(args)
@@ -66,7 +69,8 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     rsync = Nanoc::Extra::Deployers::Rsync.new(
       'output',
       { dst: 'asdf' },
-      dry_run: true)
+      dry_run: true,
+    )
 
     # Mock run_shell_cmd
     def rsync.run_shell_cmd(args)

data/test/filters/test_colorize_syntax.rb

@@ -261,7 +261,8 @@ EOS
             input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
             filter.setup_and_run(
               input,
-              colorizers: { ruby: colorizer })
+              colorizers: { ruby: colorizer },
+            )
             flunk 'expected colorizer to raise if no executable is available'
           rescue
           end

data/test/filters/test_handlebars.rb

@@ -5,11 +5,13 @@ class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
       item = Nanoc::Int::Item.new(
         'content',
         { title: 'Max Payne', protagonist: 'Max Payne', location: 'here' },
-        '/games/max-payne/')
+        '/games/max-payne/',
+      )
       layout = Nanoc::Int::Layout.new(
         'layout content',
         { name: 'Max Payne' },
-        '/default/')
+        '/default/',
+      )
       config = { animals: 'cats and dogs' }
 
       # Create filter
@@ -37,7 +39,8 @@ class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
       item = Nanoc::Int::Item.new(
         'content',
         { title: 'Max Payne', protagonist: 'Max Payne', location: 'here' },
-        '/games/max-payne/')
+        '/games/max-payne/',
+      )
 
       # Create filter
       assigns = {

data/test/filters/test_mustache.rb

@@ -28,7 +28,8 @@ class Nanoc::Filters::MustacheTest < Nanoc::TestCase
 
       # Create filter
       filter = ::Nanoc::Filters::Mustache.new(
-        { content: 'No Payne No Gayne', item: item })
+        { content: 'No Payne No Gayne', item: item },
+      )
 
       # Run filter
       result = filter.setup_and_run('Max says: {{yield}}.')

data/test/filters/test_rdiscount.rb

@@ -10,16 +10,17 @@ class Nanoc::Filters::RDiscountTest < Nanoc::TestCase
     end
   end
 
-  def test_with_extensions
-    if_have 'rdiscount' do
-      # Create filter
-      filter = ::Nanoc::Filters::RDiscount.new
-
-      # Run filter
-      input           = "The quotation 'marks' sure make this look sarcastic!"
-      output_expected = /The quotation &lsquo;marks&rsquo; sure make this look sarcastic!/
-      output_actual   = filter.setup_and_run(input, extensions: [:smart])
-      assert_match(output_expected, output_actual)
-    end
-  end
+  # FIXME: Re-enable this test (flaky; quotation marks are not transformed consistently)
+  # def test_with_extensions
+  #   if_have 'rdiscount' do
+  #     # Create filter
+  #     filter = ::Nanoc::Filters::RDiscount.new
+  #
+  #     # Run filter
+  #     input           = "The quotation 'marks' sure make this look sarcastic!"
+  #     output_expected = /The quotation &lsquo;marks&rsquo; sure make this look sarcastic!/
+  #     output_actual   = filter.setup_and_run(input, extensions: [:smart])
+  #     assert_match(output_expected, output_actual)
+  #   end
+  # end
 end

data/test/filters/test_relativize_paths.rb

@@ -9,8 +9,10 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -33,8 +35,10 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -57,8 +61,10 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -81,8 +87,10 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -117,8 +125,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -141,8 +151,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -165,8 +177,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -189,8 +203,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/woof/meow/'
     end
 
@@ -213,8 +229,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/woof/meow/'
     end
 
@@ -237,8 +255,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/woof/meow/'
     end
 
@@ -261,8 +281,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/woof/meow/'
     end
 
@@ -285,8 +307,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/woof/meow/'
     end
 
@@ -309,8 +333,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/woof/meow/'
     end
 
@@ -341,8 +367,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -365,8 +393,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -389,8 +419,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -413,8 +445,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 
@@ -440,8 +474,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/woof/meow/'
     end
 
@@ -464,8 +500,10 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/woof/meow/'
     end
 
@@ -489,8 +527,10 @@ EOS
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/bar/baz/'),
-          :blah)
+            '/foo/bar/baz/',
+          ),
+          :blah,
+        )
         @item_rep.paths[:last] = '/foo/bar/baz/'
       end
 
@@ -520,8 +560,10 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/bar/baz/'),
-          :blah)
+            '/foo/bar/baz/',
+          ),
+          :blah,
+        )
         @item_rep.paths[:last] = '/foo/bar/baz/'
       end
 
@@ -550,8 +592,10 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/bar/baz/'),
-          :blah)
+            '/foo/bar/baz/',
+          ),
+          :blah,
+        )
         @item_rep.paths[:last] = '/foo/bar/baz/'
       end
 
@@ -585,8 +629,10 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/bar/baz/'),
-          :blah)
+            '/foo/bar/baz/',
+          ),
+          :blah,
+        )
         @item_rep.paths[:last] = '/foo/bar/baz/'
       end
 
@@ -625,8 +671,10 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/bar/baz/'),
-          :blah)
+            '/foo/bar/baz/',
+          ),
+          :blah,
+        )
         @item_rep.paths[:last] = '/foo/bar/baz/'
       end
 
@@ -658,8 +706,10 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/baz/'),
-          :blah)
+            '/foo/baz/',
+          ),
+          :blah,
+        )
         @item_rep.paths[:last] = '/foo/baz/'
       end
 
@@ -690,8 +740,10 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/baz/'),
-          :blah)
+            '/foo/baz/',
+          ),
+          :blah,
+        )
         @item_rep.paths[:last] = '/foo/baz/'
       end
 
@@ -719,8 +771,10 @@ XML
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/'),
-        :blah)
+          '/foo/bar/baz/',
+        ),
+        :blah,
+      )
       @item_rep.paths[:last] = '/foo/bar/baz/'
     end
 

data/test/rule_dsl/test_action_provider.rb

@@ -4,10 +4,12 @@ class Nanoc::RuleDSL::ActionProviderTest < Nanoc::TestCase
 
     rule_memory_calculator =
       Nanoc::RuleDSL::RuleMemoryCalculator.new(
-        rules_collection: rules_collection, site: site)
+        rules_collection: rules_collection, site: site,
+      )
 
     action_provider = Nanoc::RuleDSL::ActionProvider.new(
-      rules_collection, rule_memory_calculator)
+      rules_collection, rule_memory_calculator
+    )
 
     Nanoc::RuleDSL::RulesLoader.new(site.config, rules_collection).load
 
@@ -21,12 +23,14 @@ class Nanoc::RuleDSL::ActionProviderTest < Nanoc::TestCase
       # Create a bonus rules file
       File.write(
         'more_rules.rb',
-        "preprocess { @items['/index.*'][:preprocessed] = true }")
+        "preprocess { @items['/index.*'][:preprocessed] = true }",
+      )
 
       # Adjust normal rules file
       File.write(
         'Rules',
-        "include_rules 'more_rules'\n\npreprocess {}\n\n" + File.read('Rules'))
+        "include_rules 'more_rules'\n\npreprocess {}\n\n" + File.read('Rules'),
+      )
 
       # Create site and compiler
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
@@ -50,12 +54,14 @@ class Nanoc::RuleDSL::ActionProviderTest < Nanoc::TestCase
       # Create a bonus rules file
       File.write(
         'more_rules.rb',
-        'postprocess {}')
+        'postprocess {}',
+      )
 
       # Adjust normal rules file
       File.write(
         'Rules',
-        "include_rules 'more_rules'\n\npostprocess {}\n\n" + File.read('Rules'))
+        "include_rules 'more_rules'\n\npostprocess {}\n\n" + File.read('Rules'),
+      )
 
       # Create site and compiler
       site = Nanoc::Int::SiteLoader.new.new_from_cwd

data/test/rule_dsl/test_compiler_dsl.rb

@@ -80,14 +80,16 @@ EOS
       # Create a bonus rules file
       File.write(
         'more_rules.rb',
-        "passthrough '/index.*'")
+        "passthrough '/index.*'",
+      )
 
       # Adjust normal rules file
       File.write(
         'Rules',
         "include_rules 'more_rules'\n\n" \
           "route '/**/*' do ; nil ; end\n\n" \
-          "compile '/**/*' do ; end\n")
+          "compile '/**/*' do ; end\n",
+      )
 
       # Create items
       File.write('content/index.html', 'hello!')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.2.0b1
+  version: 4.2.0
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -367,12 +367,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.