nanoc 4.11.12 → 4.11.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 022d4d52cb5ae57bd458ef8d4272d255a4845cec76627311020dbd4680143d03
-  data.tar.gz: 21f357e65efed5e243627a2c9aaab4e688c0cd8ec2c7d1d0d789317435f853d8
+  metadata.gz: d4bdf2044fdcb57121b2bf93bd5bd3ec37a02ed08fab916285325b4223c87757
+  data.tar.gz: 81bc09561a285bd25d058c522b3339ec64eeb7b027b10c3869c9c6dafc4a1cab
 SHA512:
-  metadata.gz: d8d8d5e86ff63450ce7e4d9a80cb7c850468ebc96aebe5e0a0245dc4464a6b65a4757929ef587119942e7961e8e397e250e54f32b41b1a7afc0989857a19c48e
-  data.tar.gz: 36309e62ab8c585dab399ac8f5c09fe56c8ce10c19c3df86a317f07a0fd3a0d4f89eca2f0d943f4a1c918978c65f74f8ffff7d61acb8f958b33daf7c7789495b
+  metadata.gz: 7b7284bf4a11dfe0a813abc9f5e75970d718fa23827649aa1eddf3d9c81d93a313b09b7d6ea41cf05e24b6bc53e87592bace2ddcc44dc3083ea475cfb97f19df
+  data.tar.gz: f6d8976bb5e212b802e54cb6d6690a06e10dbda60f7ca640da0311af224434f8536b97b9d0fff4ffe23db596ef6399af3d0d22d610c4f536bb909c225ef1ced0

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.11.13 (2019-11-02)
+
+Fixes:
+
+* Fixed an issue which could cause Nanoc to freeze when generating the output diff on Windows
+
 ## 4.11.12 (2019-09-21)
 
 Fixes:
@@ -1466,7 +1472,7 @@ Extensions:
 * Removed bin/nanoc3 (use nanoc3 gem if you want it)
 * Fixed wrong “no such snapshot” errors
 * Made deployer default to rsync for backwards compatibility
-* Fixed missing Nanoc::CLI in deployment tasks
+* Fixed missing Nanoc::OrigCLI in deployment tasks
 * Fixed “unrecognised kind” deployer error
 
 ## 3.3.1 (2012-02-18)

data/bin/nanoc

@@ -9,7 +9,7 @@ begin
 rescue LoadError
 end
 
-require 'nanoc/cli'
+require 'nanoc/orig_cli'
 
 if File.file?('Gemfile') && !defined?(Bundler)
   warn 'A Gemfile was detected, but Bundler is not loaded. This is probably not what you want. To run Nanoc with Bundler, use `bundle exec nanoc`.'

data/lib/nanoc.rb

@@ -8,38 +8,14 @@ require 'json'
 require 'parallel'
 
 module Nanoc
-  # @return [String] A string containing information about this Nanoc version
-  #   and its environment (Ruby engine and version, Rubygems version if any).
-  #
-  # @api private
-  def self.version_information
-    "Nanoc #{Nanoc::VERSION} © 2007–2019 Denis Defreyne.\n" \
-    "Running #{RUBY_ENGINE} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} with RubyGems #{Gem::VERSION}.\n"
-  end
-
-  # @return [Boolean] True if the current platform is Windows, false otherwise.
-  #
-  # @api private
-  def self.on_windows?
-    @_on_windows ||= TTY::Platform.new.windows?
-  end
-
-  # Similar to `nil` except that it can only be compared against using
-  # `UNDEFINED.equal?(x)`. Used in places where `nil` already has meaning, and
-  # thus cannot be used to mean the presence of nothing.
-  UNDEFINED = Object.new
 end
 
 # Load general requirements
 require 'base64'
 require 'cgi'
-require 'diff/lcs'
-require 'diff/lcs/hunk'
 require 'digest'
 require 'English'
-require 'fiber'
 require 'fileutils'
-require 'find'
 require 'forwardable'
 require 'logger'
 require 'net/http'
@@ -52,12 +28,9 @@ require 'stringio'
 require 'tempfile'
 require 'time'
 require 'timeout'
-require 'tomlrb'
 require 'tmpdir'
-require 'tty-platform'
 require 'tty-which'
 require 'uri'
-require 'yaml'
 
 # Load extracted Nanoc dependencies
 require 'nanoc-core'
@@ -65,6 +38,8 @@ require 'nanoc-core'
 # Re-export from Nanoc::Core
 Nanoc::Identifier = Nanoc::Core::Identifier
 Nanoc::DataSource = Nanoc::Core::DataSource
+Nanoc::Filter = Nanoc::Core::Filter
+Nanoc::Error = Nanoc::Core::Error
 
 # Load Nanoc
 require 'nanoc/version'

data/lib/nanoc/base.rb

@@ -4,13 +4,10 @@
 module Nanoc
   module Int
   end
+
+  module Base
+  end
 end
 
-require_relative 'base/error'
 require_relative 'base/errors'
 require_relative 'base/changes_stream'
-
-require_relative 'base/feature'
-require_relative 'base/repos'
-require_relative 'base/services'
-require_relative 'base/views'

data/lib/nanoc/base/errors.rb

@@ -6,51 +6,15 @@ module Nanoc
     #
     # @api private
     module Errors
-      Generic = ::Nanoc::Error
+      Generic = ::Nanoc::Core::Error
 
-      UnmetDependency = ::Nanoc::Core::Errors::UnmetDependency
       NoSuchSnapshot = ::Nanoc::Core::Errors::NoSuchSnapshot
       CannotGetCompiledContentOfBinaryItem = ::Nanoc::Core::Errors::CannotGetCompiledContentOfBinaryItem
-
-      # Generic trivial error. Superclass for all Nanoc-specific errors that are
-      # considered "trivial", i.e. errors that do not require a full crash report.
-      class GenericTrivial < Generic
-      end
-
-      # Error that is raised when compilation of an item rep fails. The
-      # underlying error is available by calling `#unwrap`.
-      class CompilationError < Generic
-        attr_reader :item_rep
-
-        def initialize(wrapped, item_rep)
-          @wrapped = wrapped
-          @item_rep = item_rep
-        end
-
-        def unwrap
-          @wrapped
-        end
-      end
-
-      # Error that is raised when a site is loaded that uses a data source with
-      # an unknown identifier.
-      class UnknownDataSource < Generic
-        # @param [String] data_source_name The data source name for which no
-        #   data source could be found
-        def initialize(data_source_name)
-          super("The data source specified in the site’s configuration file, “#{data_source_name}”, does not exist.")
-        end
-      end
-
-      # Error that is raised during site compilation when an item uses a layout
-      # that is not present in the site.
-      class UnknownLayout < Generic
-        # @param [String] layout_identifier The layout identifier for which no
-        #   layout could be found
-        def initialize(layout_identifier)
-          super("The site does not have a layout with identifier “#{layout_identifier}”.")
-        end
-      end
+      CannotGetParentOrChildrenOfNonLegacyItem = ::Nanoc::Core::Errors::CannotGetParentOrChildrenOfNonLegacyItem
+      CannotLayoutBinaryItem = ::Nanoc::Core::Errors::CannotLayoutBinaryItem
+      UnknownLayout = ::Nanoc::Core::Errors::UnknownLayout
+      CannotUseBinaryFilter = ::Nanoc::Core::Errors::CannotUseBinaryFilter
+      CannotUseTextualFilter = ::Nanoc::Core::Errors::CannotUseTextualFilter
 
       # Error that is raised during site compilation when a layout is compiled
       # for which the filter cannot be determined. This is similar to the
@@ -63,25 +27,6 @@ module Nanoc
         end
       end
 
-      # Error that is raised during site compilation when an item (directly or
-      # indirectly) includes its own item content, leading to endless recursion.
-      class DependencyCycle < Generic
-        def initialize(stack)
-          start_idx = stack.index(stack.last)
-          cycle = stack[start_idx..-2]
-
-          msg_bits = []
-          msg_bits << 'The site cannot be compiled because there is a dependency cycle:'
-          msg_bits << ''
-          cycle.each.with_index do |r, i|
-            msg_bits << "    (#{i + 1}) item #{r.item.identifier}, rep #{r.name.inspect}, uses compiled content of"
-          end
-          msg_bits << msg_bits.pop + ' (1)'
-
-          super(msg_bits.map { |x| x + "\n" }.join(''))
-        end
-      end
-
       # Error that is raised when no rules file can be found in the current
       # working directory.
       class NoRulesFileFound < Generic
@@ -110,54 +55,11 @@ module Nanoc
         end
       end
 
-      # Error that is raised when a binary item is attempted to be laid out.
-      class CannotLayoutBinaryItem < Generic
-        # @param [Nanoc::Core::ItemRep] rep The item representation that was attempted
-        #   to be laid out
-        def initialize(rep)
-          super("The “#{rep.item.identifier}” item (rep “#{rep.name}”) cannot be laid out because it is a binary item. If you are getting this error for an item that should be textual instead of binary, make sure that its extension is included in the text_extensions array in the site configuration.")
-        end
-      end
-
-      # Error that is raised when a textual filter is attempted to be applied to
-      # a binary item representation.
-      class CannotUseTextualFilter < Generic
-        # @param [Nanoc::Core::ItemRep] rep The item representation that was
-        #   attempted to be filtered
-        #
-        # @param [Class] filter_class The filter class that was used
-        def initialize(rep, filter_class)
-          super("The “#{filter_class.inspect}” filter cannot be used to filter the “#{rep.item.identifier}” item (rep “#{rep.name}”), because textual filters cannot be used on binary items.")
-        end
-      end
-
-      # Error that is raised when a binary filter is attempted to be applied to
-      # a textual item representation.
-      class CannotUseBinaryFilter < Generic
-        # @param [Nanoc::Core::ItemRep] rep The item representation that was
-        #   attempted to be filtered
-        #
-        # @param [Class] filter_class The filter class that was used
-        def initialize(rep, filter_class)
-          super("The “#{filter_class.inspect}” filter cannot be used to filter the “#{rep.item.identifier}” item (rep “#{rep.name}”), because binary filters cannot be used on textual items. If you are getting this error for an item that should be textual instead of binary, make sure that its extension is included in the text_extensions array in the site configuration.")
-        end
-      end
-
-      # Error that is raised when attempting to call #parent or #children on an item with a legacy identifier.
-      class CannotGetParentOrChildrenOfNonLegacyItem < Generic
-        def initialize(identifier)
-          super("You cannot get the parent or children of an item that has a “full” identifier (#{identifier}). Getting the parent or children of an item is only possible for items that have a legacy identifier.")
-        end
-      end
-
       class AmbiguousMetadataAssociation < Generic
         def initialize(content_filenames, meta_filename)
           super("There are multiple content files (#{content_filenames.sort.join(', ')}) that could match the file containing metadata (#{meta_filename}).")
         end
       end
-
-      class InternalInconsistency < Generic
-      end
     end
   end
 end

data/lib/nanoc/checking/check.rb

@@ -32,7 +32,7 @@ module Nanoc::Checking
       output_filenames = Dir[output_dir + '/**/*'].select { |f| File.file?(f) }
 
       # FIXME: ugly
-      compiler = Nanoc::Int::Compiler.new_for(site)
+      compiler = Nanoc::Core::Compiler.new_for(site)
       res = compiler.run_until_reps_built
       reps = res.fetch(:reps)
       view_context =
@@ -42,9 +42,9 @@ module Nanoc::Checking
         )
 
       context = {
-        items: Nanoc::PostCompileItemCollectionView.new(site.items, view_context),
-        layouts: Nanoc::LayoutCollectionView.new(site.layouts, view_context),
-        config: Nanoc::ConfigView.new(site.config, view_context),
+        items: Nanoc::Core::PostCompileItemCollectionView.new(site.items, view_context),
+        layouts: Nanoc::Core::LayoutCollectionView.new(site.layouts, view_context),
+        config: Nanoc::Core::ConfigView.new(site.config, view_context),
         output_filenames: output_filenames,
       }
 

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

@@ -91,7 +91,7 @@ module ::Nanoc::Checking::Checks
       if last_err
         return Result.new(href, last_err.message)
       else
-        raise Nanoc::Int::Errors::InternalInconsistency, 'last_err cannot be nil'
+        raise Nanoc::Core::Errors::InternalInconsistency, 'last_err cannot be nil'
       end
     end
 

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

@@ -35,7 +35,7 @@ module Nanoc::Checking::Checks
       exclude_config = @config.fetch(:prune, {}).fetch(:exclude, [])
       # FIXME: specifying reps this way is icky
       reps = Nanoc::Core::ItemRepRepo.new
-      @pruner ||= Nanoc::Pruner.new(@config._unwrap, reps, exclude: exclude_config)
+      @pruner ||= Nanoc::Core::Pruner.new(@config._unwrap, reps, exclude: exclude_config)
     end
   end
 end

data/lib/nanoc/checking/runner.rb

@@ -80,7 +80,7 @@ module Nanoc::Checking
       names.map do |name|
         name = name.to_s.tr('-', '_').to_sym
         klass = Nanoc::Checking::Check.named(name)
-        raise Nanoc::Int::Errors::GenericTrivial, "Unknown check: #{name}" if klass.nil?
+        raise Nanoc::Core::TrivialError, "Unknown check: #{name}" if klass.nil?
 
         klass
       end
@@ -90,7 +90,7 @@ module Nanoc::Checking
       return [] if classes.empty?
 
       # TODO: remove me
-      Nanoc::Int::Compiler.new_for(@site).run_until_reps_built
+      Nanoc::Core::Compiler.new_for(@site).run_until_reps_built
 
       checks = []
       issues = Set.new

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

@@ -6,7 +6,7 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
   # @api private
   module Tools
     # Error that is raised when too many symlink indirections are encountered.
-    class MaxSymlinkDepthExceededError < ::Nanoc::Int::Errors::GenericTrivial
+    class MaxSymlinkDepthExceededError < ::Nanoc::Core::TrivialError
       # @return [String] The last filename that was attempted to be
       #   resolved before giving up
       attr_reader :filename
@@ -21,7 +21,7 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
 
     # Error that is raised when a file of an unknown type is encountered
     # (something other than file, directory or link).
-    class UnsupportedFileTypeError < ::Nanoc::Int::Errors::GenericTrivial
+    class UnsupportedFileTypeError < ::Nanoc::Core::TrivialError
       # @return [String] The filename of the file whose type is not supported
       attr_reader :filename
 
@@ -93,7 +93,7 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
     #
     # @return [Array<String>] A list of files and directories
     #
-    # @raise [GenericTrivial] when pattern can not be handled
+    # @raise [Nanoc::Core::TrivialError] when pattern can not be handled
     def all_files_and_dirs_in(dir_name, extra_files)
       base_patterns = ["#{dir_name}/**/*"]
 
@@ -107,7 +107,7 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
           extra_files.map { |extra_file| "#{dir_name}/#{extra_file}" }
         else
           raise(
-            Nanoc::Int::Errors::GenericTrivial,
+            Nanoc::Core::TrivialError,
             "Do not know how to handle extra_files: #{extra_files.inspect}",
           )
         end

data/lib/nanoc/extra.rb

@@ -12,7 +12,7 @@ module Nanoc::Extra
   Deployer = Nanoc::Deploying::Deployer
 
   # @deprecated
-  Pruner = Nanoc::Pruner
+  Pruner = Nanoc::Core::Pruner
 end
 
 require_relative 'extra/link_collector'

data/lib/nanoc/helpers/blogging.rb

@@ -83,28 +83,28 @@ module Nanoc::Helpers
 
       def validate_config
         if @config[:base_url].nil?
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: site configuration has no base_url')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: site configuration has no base_url')
         end
       end
 
       def validate_feed_item
         if title.nil?
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: no title in params, item or site config')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: no title in params, item or site config')
         end
         if author_name.nil?
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: no author_name in params, item or site config')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: no author_name in params, item or site config')
         end
         if author_uri.nil?
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: no author_uri in params, item or site config')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: no author_uri in params, item or site config')
         end
       end
 
       def validate_articles
         if relevant_articles.empty?
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: no articles')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: no articles')
         end
         if relevant_articles.any? { |a| a[:created_at].nil? }
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: one or more articles lack created_at')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: one or more articles lack created_at')
         end
       end
 
@@ -218,7 +218,7 @@ module Nanoc::Helpers
     def url_for(item)
       # Check attributes
       if @config[:base_url].nil?
-        raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: site configuration has no base_url')
+        raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: site configuration has no base_url')
       end
 
       # Build URL
@@ -235,7 +235,7 @@ module Nanoc::Helpers
     def feed_url
       # Check attributes
       if @config[:base_url].nil?
-        raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: site configuration has no base_url')
+        raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: site configuration has no base_url')
       end
 
       @item[:feed_url] || @config[:base_url] + @item.path

data/lib/nanoc/helpers/capturing.rb

@@ -68,7 +68,7 @@ module Nanoc::Helpers
 
           unless rep.compiled?
             # FIXME: is :last appropriate?
-            Fiber.yield(Nanoc::Int::Errors::UnmetDependency.new(rep, :last))
+            Fiber.yield(Nanoc::Core::Errors::UnmetDependency.new(rep, :last))
             return run
           end
         end

data/lib/nanoc/helpers/link_to.rb

@@ -17,7 +17,7 @@ module Nanoc::Helpers
         case target
         when String
           target
-        when Nanoc::CompilationItemView, Nanoc::BasicItemView, Nanoc::BasicItemRepView
+        when Nanoc::Core::CompilationItemView, Nanoc::Core::BasicItemView, Nanoc::Core::BasicItemRepView
           raise "Cannot create a link to #{target.inspect} because this target is not outputted (its routing rule returns nil)" if target.path.nil?
 
           target.path

data/lib/nanoc/orig_cli.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'nanoc-cli'
+
+# @api private
+module Nanoc::OrigCLI
+  module Commands
+  end
+end
+
+Nanoc::CLI.after_setup do
+  root = File.dirname(__FILE__)
+  commands_path = File.join(root, 'orig_cli', 'commands')
+  Nanoc::CLI.add_command(Cri::Command.load_file(File.join(commands_path, 'check.rb'), infer_name: true))
+  Nanoc::CLI.add_command(Cri::Command.load_file(File.join(commands_path, 'deploy.rb'), infer_name: true))
+  Nanoc::CLI.add_command(Cri::Command.load_file(File.join(commands_path, 'show-rules.rb'), infer_name: true))
+
+  # TODO: move into nanoc-deploying, once that exists as a package
+  Nanoc::CLI::Commands::ShowPlugins.add_plugin_class(Nanoc::Deploying::Deployer, 'Deployers')
+end