nanoc 4.7.9 → 4.7.10

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 usage 'deploy [target] [options]'
 summary 'deploy the compiled site'
 description "

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 usage 'nanoc command [options] [arguments]'
 summary 'Nanoc, a static site compiler written in Ruby'
 default_subcommand 'compile'

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

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 usage 'prune'
 summary 'remove files not managed by Nanoc from the output directory'
-description <<-EOS
-Find all files in the output directory that do not correspond to an item
-managed by Nanoc and remove them. Since this is a hazardous operation, an
-additional `--yes` flag is needed as confirmation.
+description <<~EOS
+  Find all files in the output directory that do not correspond to an item
+  managed by Nanoc and remove them. Since this is a hazardous operation, an
+  additional `--yes` flag is needed as confirmation.
 
-Also see the `auto_prune` configuration option in `nanoc.yaml` (`config.yaml`
-for older Nanoc sites), which will automatically prune after compilation.
+  Also see the `auto_prune` configuration option in `nanoc.yaml` (`config.yaml`
+  for older Nanoc sites), which will automatically prune after compilation.
 EOS
 
 flag :y, :yes,       'confirm deletion'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 usage 'shell'
 summary 'open a shell on the Nanoc environment'
 aliases 'console'

data/lib/nanoc/cli/commands/show-data.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 usage 'show-data'
 aliases :debug
 summary 'show data in this site'
-description <<-EOS
-Show information about all items, item representations and layouts in the
-current site, along with dependency information.
+description <<~EOS
+  Show information about all items, item representations and layouts in the
+  current site, along with dependency information.
 EOS
 
 module Nanoc::CLI::Commands
@@ -89,7 +91,7 @@ module Nanoc::CLI::Commands
               'item'
             end
 
-          props = ''
+          props = String.new
           props << (dep.props.raw_content? ? 'r' : '_')
           props << (dep.props.attributes? ? 'a' : '_')
           props << (dep.props.compiled_content? ? 'c' : '_')

data/lib/nanoc/cli/commands/show-plugins.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 summary 'show all available plugins'
 aliases :info
 usage 'show-plugins [options]'
-description <<-EOS
-Show a list of available plugins, including filters and data sources.
-If the current directory contains a Nanoc web site, the plugins defined in this site will be shown as well.
+description <<~EOS
+  Show a list of available plugins, including filters and data sources.
+  If the current directory contains a Nanoc web site, the plugins defined in this site will be shown as well.
 EOS
 
 module Nanoc::CLI::Commands
@@ -16,7 +18,7 @@ module Nanoc::CLI::Commands
 
       # Get list of plugins (before and after)
       plugins_before = PLUGIN_CLASSES.keys.each_with_object({}) { |c, acc| acc[c] = c.all }
-      site.code_snippets if site
+      site&.code_snippets
       plugins_after = PLUGIN_CLASSES.keys.each_with_object({}) { |c, acc| acc[c] = c.all }
 
       # Divide list of plugins into builtin and custom

data/lib/nanoc/cli/commands/show-rules.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 usage 'show-rules [thing]'
 aliases :explain
 summary 'describe the rules for each item'

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 usage 'view [options]'
 summary 'start the web server that serves static files'
-description <<-EOS
-Start the static web server. Unless specified, the web server will run on port
-3000 and listen on all IP addresses. Running this static web server requires
-`adsf` (not `asdf`!).
+description <<~EOS
+  Start the static web server. Unless specified, the web server will run on port
+  3000 and listen on all IP addresses. Running this static web server requires
+  `adsf` (not `asdf`!).
 EOS
 
 required :H, :handler, 'specify the handler to use (webrick/mongrel/...)'

data/lib/nanoc/cli/error_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::CLI
   # Catches errors and prints nice diagnostic messages, then exits.
   #

data/lib/nanoc/cli/logger.rb

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

data/lib/nanoc/cli/stream_cleaners.rb

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

data/lib/nanoc/cli/stream_cleaners/abstract.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::CLI::StreamCleaners
   # Superclass for all stream cleaners. Stream cleaners have a single method,
   # {#clean}, that takes a string and returns a cleaned string. Stream cleaners

data/lib/nanoc/cli/stream_cleaners/ansi_colors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::CLI::StreamCleaners
   # Removes ANSI color escape sequences.
   #

data/lib/nanoc/cli/stream_cleaners/utf8.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::CLI::StreamCleaners
   # Simplifies output by replacing UTF-8 characters with their ASCII decompositions.
   #
@@ -6,7 +8,10 @@ module Nanoc::CLI::StreamCleaners
     # @see Nanoc::CLI::StreamCleaners::Abstract#clean
     def clean(s)
       # FIXME: this decomposition is not generally usable
-      s.tr('─┼“”‘’', '-+""\'\'').gsub('…', '...').gsub('©', '(c)')
+      s
+        .unicode_normalize(:nfkd)
+        .tr('─┼“”‘’', '-+""\'\'')
+        .gsub('©', '(c)')
     end
   end
 end

data/lib/nanoc/data_sources.rb

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

data/lib/nanoc/data_sources/filesystem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::DataSources
   # The filesystem data source stores its items and layouts in nested
   # directories. Items and layouts are represented by one or two files; if it

data/lib/nanoc/data_sources/filesystem/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Nanoc::DataSources::Filesystem < Nanoc::DataSource
   # @api private
   module Errors

data/lib/nanoc/data_sources/filesystem/tools.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Nanoc::DataSources::Filesystem < Nanoc::DataSource
   # Contains useful functions for managing the filesystem.
   #

data/lib/nanoc/deploying.rb

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

data/lib/nanoc/deploying/deployer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Deploying
   # Represents a deployer, an object that allows uploading the compiled site
   # to a specific (remote) location.

data/lib/nanoc/deploying/deployers.rb

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

data/lib/nanoc/deploying/deployers/fog.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Deploying::Deployers
   # A deployer that deploys a site using [fog](https://github.com/geemus/fog).
   #

data/lib/nanoc/deploying/deployers/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Deploying::Deployers
   # A deployer that deploys a site using [Git](http://git-scm.com).
   #

data/lib/nanoc/deploying/deployers/rsync.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Deploying::Deployers
   # A deployer that deploys a site using rsync.
   #

data/lib/nanoc/extra.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nanoc/checking'
 require 'nanoc/deploying'
 

data/lib/nanoc/extra/core_ext.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'nanoc/extra/core_ext/pathname'
 require 'nanoc/extra/core_ext/time'

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

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

data/lib/nanoc/extra/core_ext/time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @api private
 module Nanoc::Extra::TimeExtensions
   # @return [String] The time in an ISO-8601 date format.

data/lib/nanoc/extra/jruby_nokogiri_warner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'singleton'
 
 module Nanoc::Extra
@@ -5,22 +7,22 @@ module Nanoc::Extra
   class JRubyNokogiriWarner
     include Singleton
 
-    TEXT = <<EOS.freeze
---------------------------------------------------------------------------------
-Note:
+    TEXT = <<~EOS
+      --------------------------------------------------------------------------------
+      Note:
 
-The behavior of Pure Java Nokogiri differs from the Nokogiri used on the
-standard Ruby interpreter (MRI) due to differences in underlying libraries.
+      The behavior of Pure Java Nokogiri differs from the Nokogiri used on the
+      standard Ruby interpreter (MRI) due to differences in underlying libraries.
 
-These sometimes problematic behavioral differences can cause Nanoc filters not
-to function properly, if at all. If you need reliable (X)HTML and XML handling
-functionality, consider not using Nokogiri on JRuby for the time being.
+      These sometimes problematic behavioral differences can cause Nanoc filters not
+      to function properly, if at all. If you need reliable (X)HTML and XML handling
+      functionality, consider not using Nokogiri on JRuby for the time being.
 
-These issues are being worked on both from the Nokogiri and the Nanoc side. Keep
-your Nokogiri and Nanoc versions up to date!
+      These issues are being worked on both from the Nokogiri and the Nanoc side. Keep
+      your Nokogiri and Nanoc versions up to date!
 
-For details, see https://github.com/nanoc/nanoc/pull/422.
---------------------------------------------------------------------------------
+      For details, see https://github.com/nanoc/nanoc/pull/422.
+      --------------------------------------------------------------------------------
 EOS
 
     def self.check_and_warn

data/lib/nanoc/extra/link_collector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 
 module ::Nanoc::Extra

data/lib/nanoc/extra/parallel_collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 
 module Nanoc::Extra

data/lib/nanoc/extra/piper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 
 module Nanoc::Extra

data/lib/nanoc/filters.rb

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

data/lib/nanoc/filters/asciidoc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class AsciiDoc < Nanoc::Filter

data/lib/nanoc/filters/bluecloth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class BlueCloth < Nanoc::Filter

data/lib/nanoc/filters/coffeescript.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class CoffeeScript < Nanoc::Filter

data/lib/nanoc/filters/colorize_syntax.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class ColorizeSyntax < Nanoc::Filter
@@ -34,7 +36,7 @@ module Nanoc::Filters
 
         # Add language-something class
         unless extracted_language.from_class
-          klass = element['class'] || ''
+          klass = element['class'] || String.new
           klass << ' ' unless [' ', nil].include?(klass[-1, 1])
           klass << "language-#{extracted_language.language}"
           element['class'] = klass

data/lib/nanoc/filters/colorize_syntax/colorizers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters::ColorizeSyntax::Colorizers
   class Abstract
     extend DDPlugin::Plugin

data/lib/nanoc/filters/erb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class ERB < Nanoc::Filter

data/lib/nanoc/filters/erubi.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Erubi < Nanoc::Filter

data/lib/nanoc/filters/erubis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Erubis < Nanoc::Filter

data/lib/nanoc/filters/haml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Haml < Nanoc::Filter

data/lib/nanoc/filters/handlebars.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Handlebars < Nanoc::Filter

data/lib/nanoc/filters/kramdown.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Kramdown < Nanoc::Filter

data/lib/nanoc/filters/less.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Less < Nanoc::Filter

data/lib/nanoc/filters/markaby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Markaby < Nanoc::Filter