nanoc 4.8.19 → 4.9.0

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

@@ -89,7 +89,7 @@ module Nanoc::CLI::Commands
 
     def check
       runner = Nanoc::Checking::Runner.new(@site)
-      if runner.dsl_present?
+      if runner.any_enabled_checks?
         puts 'Running issue checks…'
         is_success = runner.run_for_deploy
         if is_success

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

@@ -54,8 +54,8 @@ module Nanoc::CLI::Commands
       puts
     end
 
-    def fmt_heading(s)
-      Nanoc::CLI::ANSIStringColorizer.c(s, :bold, :yellow)
+    def fmt_heading(str)
+      Nanoc::CLI::ANSIStringColorizer.c(str, :bold, :yellow)
     end
   end
 end

data/lib/nanoc/cli/error_handler.rb

@@ -150,10 +150,7 @@ module Nanoc::CLI
 
     # @api private
     def forwards_stack_trace?
-      feature_enabled = Nanoc::Feature.enabled?(Nanoc::Feature::SENSIBLE_STACK_TRACES)
-      ruby_2_5_used = ruby_version.start_with?('2.5')
-
-      feature_enabled || ruby_2_5_used
+      ruby_version.start_with?('2.5')
     end
 
     # @api private

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

@@ -11,10 +11,10 @@ module Nanoc::CLI::StreamCleaners
   class Abstract
     # Returns a cleaned version of the given string.
     #
-    # @param [String] s The string to clean
+    # @param [String] str The string to clean
     #
     # @return [String] The cleaned string
-    def clean(s) # rubocop:disable Lint/UnusedMethodArgument
+    def clean(str) # rubocop:disable Lint/UnusedMethodArgument
       raise NotImplementedError, 'Subclasses of Nanoc::CLI::StreamCleaners::Abstract must implement #clean'
     end
   end

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

@@ -6,8 +6,8 @@ module Nanoc::CLI::StreamCleaners
   # @api private
   class ANSIColors < Abstract
     # @see Nanoc::CLI::StreamCleaners::Abstract#clean
-    def clean(s)
-      s.gsub(/\e\[.+?m/, '')
+    def clean(str)
+      str.gsub(/\e\[.+?m/, '')
     end
   end
 end

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

@@ -6,9 +6,9 @@ module Nanoc::CLI::StreamCleaners
   # @api private
   class UTF8 < Abstract
     # @see Nanoc::CLI::StreamCleaners::Abstract#clean
-    def clean(s)
+    def clean(str)
       # FIXME: this decomposition is not generally usable
-      s
+      str
         .unicode_normalize(:nfkd)
         .tr('─┼“”‘’', '-+""\'\'')
         .gsub('©', '(c)')

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

@@ -52,7 +52,7 @@ class Nanoc::DataSources::Filesystem
       end
 
       meta = parse_metadata(pieces[2], content_filename)
-      content = pieces[4]
+      content = pieces[4].sub(/\A\n/, '')
 
       ParseResult.new(content: content, attributes: meta, attributes_data: pieces[2])
     end

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

@@ -71,11 +71,11 @@ module Nanoc::Deploying::Deployers
         @is_dry_run
       end
 
-      def log_effectful(s)
+      def log_effectful(str)
         if @is_dry_run
-          puts "[dry run] #{s}"
+          puts "[dry run] #{str}"
         else
-          puts s
+          puts str
         end
       end
     end

data/lib/nanoc/extra.rb

@@ -15,8 +15,7 @@ module Nanoc::Extra
   Pruner = Nanoc::Pruner
 end
 
-require_relative 'extra/link_collector.rb'
+require_relative 'extra/link_collector'
 require_relative 'extra/piper'
 require_relative 'extra/jruby_nokogiri_warner'
 require_relative 'extra/core_ext'
-require_relative 'extra/parallel_collection'

data/lib/nanoc/filters/colorize_syntax.rb

@@ -128,8 +128,8 @@ module Nanoc::Filters
     protected
 
     # Removes the first blank lines and any whitespace at the end.
-    def strip(s)
-      s.lines.drop_while { |line| line.strip.empty? }.join.rstrip
+    def strip(str)
+      str.lines.drop_while { |line| line.strip.empty? }.join.rstrip
     end
 
     def colorizer_name_for(language)

data/lib/nanoc/filters/relativize_paths.rb

@@ -136,8 +136,8 @@ module Nanoc::Filters
       node.replace(Nokogiri::XML::Comment.new(doc, content))
     end
 
-    def path_is_relativizable?(s)
-      s.start_with?('/')
+    def path_is_relativizable?(path)
+      path.start_with?('/')
     end
   end
 end

data/lib/nanoc/helpers/blogging.rb

@@ -137,25 +137,25 @@ module Nanoc::Helpers
         end
       end
 
-      def build_for_article(a, xml)
+      def build_for_article(article, xml)
         # Get URL
-        url = url_for(a)
+        url = url_for(article)
         return if url.nil?
 
         xml.entry do
           # Add primary attributes
-          xml.id atom_tag_for(a)
-          xml.title a[:title], type: 'html'
+          xml.id atom_tag_for(article)
+          xml.title article[:title], type: 'html'
 
           # Add dates
-          xml.published attribute_to_time(a[:created_at]).__nanoc_to_iso8601_time
-          xml.updated attribute_to_time(a[:updated_at] || a[:created_at]).__nanoc_to_iso8601_time
+          xml.published attribute_to_time(article[:created_at]).__nanoc_to_iso8601_time
+          xml.updated attribute_to_time(article[:updated_at] || article[:created_at]).__nanoc_to_iso8601_time
 
           # Add specific author information
-          if a[:author_name] || a[:author_uri]
+          if article[:author_name] || article[:author_uri]
             xml.author do
-              xml.name a[:author_name] || author_name
-              xml.uri a[:author_uri] || author_uri
+              xml.name article[:author_name] || author_name
+              xml.uri article[:author_uri] || author_uri
             end
           end
 
@@ -163,8 +163,8 @@ module Nanoc::Helpers
           xml.link(rel: 'alternate', href: url)
 
           # Add content
-          summary = excerpt_proc.call(a)
-          xml.content content_proc.call(a), type: 'html'
+          summary = excerpt_proc.call(article)
+          xml.content content_proc.call(article), type: 'html'
           xml.summary summary, type: 'html' unless summary.nil?
         end
       end

data/lib/nanoc/rule_dsl/compilation_rule_context.rb

@@ -64,7 +64,7 @@ module Nanoc::RuleDSL
     #
     # @see #snapshot
     #
-    # @param [String] path
+    # @param [String] arg
     #
     # @return [void]
     def write(arg)

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.19
+  version: 4.9.0
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-01 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -42,18 +42,18 @@ dependencies:
   name: ddmemoize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0a3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0a3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: ddplugin
+  name: ddmetrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: ddtelemetry
+  name: ddplugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0a2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0a2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hamster
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: ref
   requirement: !ruby/object:Gem::Requirement
@@ -282,6 +296,7 @@ files:
 - lib/nanoc/checking/checks/w3c_validator.rb
 - lib/nanoc/checking/dsl.rb
 - lib/nanoc/checking/issue.rb
+- lib/nanoc/checking/loader.rb
 - lib/nanoc/checking/runner.rb
 - lib/nanoc/cli.rb
 - lib/nanoc/cli/ansi_string_colorizer.rb
@@ -328,7 +343,6 @@ files:
 - lib/nanoc/extra/core_ext/time.rb
 - lib/nanoc/extra/jruby_nokogiri_warner.rb
 - lib/nanoc/extra/link_collector.rb
-- lib/nanoc/extra/parallel_collection.rb
 - lib/nanoc/extra/piper.rb
 - lib/nanoc/filters.rb
 - lib/nanoc/filters/asciidoc.rb

data/lib/nanoc/extra/parallel_collection.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Extra
-  # @api private
-  class ParallelCollection
-    STOP = Object.new
-
-    include Nanoc::Int::ContractsSupport
-
-    contract C::RespondTo[:each], C::KeywordArgs[parallelism: Integer] => C::Any
-    def initialize(enum, parallelism: 2)
-      @enum = enum
-      @parallelism = parallelism
-    end
-
-    contract C::Func[C::Any => C::Any] => self
-    def each
-      queue = SizedQueue.new(2 * @parallelism)
-      error = nil
-
-      threads = (1..@parallelism).map do
-        Thread.new do
-          loop do
-            begin
-              elem = queue.pop
-              break if error
-              break if STOP.equal?(elem)
-              yield elem
-            rescue => err
-              error = err
-              break
-            end
-          end
-        end
-      end
-
-      @enum.each { |e| queue << e }
-      @parallelism.times { queue << STOP }
-
-      threads.each(&:join)
-
-      raise error if error
-      self
-    end
-
-    contract C::Func[C::Any => C::Any] => C::RespondTo[:each]
-    def map
-      [].tap do |all|
-        mutex = Mutex.new
-        each do |e|
-          res = yield(e)
-          mutex.synchronize { all << res }
-        end
-      end
-    end
-  end
-end