nanoc 4.11.12 → 4.11.13

data/lib/nanoc/{cli → orig_cli}/commands/check.rb

@@ -10,7 +10,7 @@ flag :a, :all,    'run all checks'
 flag :L, :list,   'list all checks'
 flag :d, :deploy, '(deprecated)'
 
-module Nanoc::CLI::Commands
+module Nanoc::OrigCLI::Commands
   class Check < ::Nanoc::CLI::CommandRunner
     def run
       site = load_site
@@ -34,10 +34,10 @@ module Nanoc::CLI::Commands
         end
 
       unless success
-        raise Nanoc::Int::Errors::GenericTrivial, 'One or more checks failed'
+        raise Nanoc::Core::TrivialError, 'One or more checks failed'
       end
     end
   end
 end
 
-runner Nanoc::CLI::Commands::Check
+runner Nanoc::OrigCLI::Commands::Check

data/lib/nanoc/{cli → orig_cli}/commands/deploy.rb

@@ -12,11 +12,11 @@ flag :L, :list,             'list available locations to deploy to'
 flag :D, :'list-deployers', 'list available deployers'
 option :n, :'dry-run',      'show what would be deployed'
 
-module Nanoc::CLI::Commands
+module Nanoc::OrigCLI::Commands
   class Deploy < ::Nanoc::CLI::CommandRunner
     def run
       @site = load_site
-      Nanoc::Int::Compiler.new_for(@site).run_until_preprocessed
+      Nanoc::Core::Compiler.new_for(@site).run_until_preprocessed
 
       if options[:'list-deployers']
         list_deployers
@@ -60,22 +60,22 @@ module Nanoc::CLI::Commands
 
     def deploy_config
       if deploy_configs.empty?
-        raise Nanoc::Int::Errors::GenericTrivial, 'The site has no deployment configurations.'
+        raise Nanoc::Core::TrivialError, 'The site has no deployment configurations.'
       end
 
       if arguments.length > 1
-        raise Nanoc::Int::Errors::GenericTrivial, "usage: #{command.usage}"
+        raise Nanoc::Core::TrivialError, "usage: #{command.usage}"
       end
 
       target_from_arguments = arguments[0]
       target_from_options = options.fetch(:target, nil)
       if target_from_arguments && target_from_options
-        raise Nanoc::Int::Errors::GenericTrivial, 'Only one deployment target can be specified on the command line.'
+        raise Nanoc::Core::TrivialError, 'Only one deployment target can be specified on the command line.'
       end
 
       target = target_from_arguments || target_from_options || :default
       deploy_configs.fetch(target.to_sym) do
-        raise Nanoc::Int::Errors::GenericTrivial, "The site has no deployment configuration named `#{target}`."
+        raise Nanoc::Core::TrivialError, "The site has no deployment configuration named `#{target}`."
       end
     end
 
@@ -116,11 +116,11 @@ module Nanoc::CLI::Commands
       deployer_class = Nanoc::Deploying::Deployer.named(name.to_sym)
       if deployer_class.nil?
         names = Nanoc::Deploying::Deployer.all.map(&:identifier)
-        raise Nanoc::Int::Errors::GenericTrivial, "The specified deploy target has an unrecognised kind “#{name}” (expected one of #{names.join(', ')})."
+        raise Nanoc::Core::TrivialError, "The specified deploy target has an unrecognised kind “#{name}” (expected one of #{names.join(', ')})."
       end
       deployer_class
     end
   end
 end
 
-runner Nanoc::CLI::Commands::Deploy
+runner Nanoc::OrigCLI::Commands::Deploy

data/lib/nanoc/{cli → orig_cli}/commands/show-rules.rb

@@ -8,12 +8,12 @@ Prints the rules used for all items and layouts in the current site.
 "
 no_params
 
-module Nanoc::CLI::Commands
+module Nanoc::OrigCLI::Commands
   class ShowRules < ::Nanoc::CLI::CommandRunner
     def run
       site = load_site
 
-      res = Nanoc::Int::Compiler.new_for(site).run_until_reps_built
+      res = Nanoc::Core::Compiler.new_for(site).run_until_reps_built
       reps = res.fetch(:reps)
 
       action_provider = Nanoc::Core::ActionProvider.named(site.config.action_provider).for(site)
@@ -61,4 +61,4 @@ module Nanoc::CLI::Commands
   end
 end
 
-runner Nanoc::CLI::Commands::ShowRules
+runner Nanoc::OrigCLI::Commands::ShowRules

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -80,17 +80,17 @@ module Nanoc::RuleDSL
         Nanoc::Core::ViewContextForPreCompilation.new(items: site.items)
 
       Nanoc::Core::Context.new(
-        config: Nanoc::MutableConfigView.new(site.config, view_context),
-        items: Nanoc::MutableItemCollectionView.new(site.items, view_context),
-        layouts: Nanoc::MutableLayoutCollectionView.new(site.layouts, view_context),
+        config: Nanoc::Core::MutableConfigView.new(site.config, view_context),
+        items: Nanoc::Core::MutableItemCollectionView.new(site.items, view_context),
+        layouts: Nanoc::Core::MutableLayoutCollectionView.new(site.layouts, view_context),
       )
     end
 
     # @api private
     def new_postprocessor_context(site, view_context)
       Nanoc::Core::Context.new(
-        config: Nanoc::ConfigView.new(site.config, view_context),
-        items: Nanoc::PostCompileItemCollectionView.new(site.items, view_context),
+        config: Nanoc::Core::ConfigView.new(site.config, view_context),
+        items: Nanoc::Core::PostCompileItemCollectionView.new(site.items, view_context),
       )
     end
   end

data/lib/nanoc/rule_dsl/action_recorder.rb

@@ -37,15 +37,15 @@ module Nanoc
         @any_layouts = true
       end
 
-      MaybePathlike = C::Or[nil, Nanoc::UNDEFINED, String, Nanoc::Core::Identifier]
+      MaybePathlike = C::Or[nil, Nanoc::Core::UNDEFINED, String, Nanoc::Core::Identifier]
       contract Symbol, C::KeywordArgs[path: C::Optional[MaybePathlike]] => nil
-      def snapshot(snapshot_name, path: Nanoc::UNDEFINED)
-        unless Nanoc::UNDEFINED.equal?(path)
+      def snapshot(snapshot_name, path: Nanoc::Core::UNDEFINED)
+        unless Nanoc::Core::UNDEFINED.equal?(path)
           @snapshots_for_which_to_skip_routing_rule << snapshot_name
         end
 
         path =
-          if Nanoc::UNDEFINED.equal?(path) || path.nil?
+          if Nanoc::Core::UNDEFINED.equal?(path) || path.nil?
             nil
           else
             path.to_s

data/lib/nanoc/rule_dsl/compilation_rule_context.rb

@@ -55,7 +55,7 @@ module Nanoc::RuleDSL
     # @param [String, nil] path
     #
     # @return [void]
-    def snapshot(snapshot_name, path: Nanoc::UNDEFINED)
+    def snapshot(snapshot_name, path: Nanoc::Core::UNDEFINED)
       @_recorder.snapshot(snapshot_name, path: path)
     end
 

data/lib/nanoc/rule_dsl/compiler_dsl.rb

@@ -259,7 +259,7 @@ module Nanoc::RuleDSL
         Nanoc::Core::Pattern.from(identifier_to_regex(arg))
       else
         raise(
-          Nanoc::Int::Errors::GenericTrivial,
+          Nanoc::Core::TrivialError,
           "Invalid string_pattern_type: #{@config[:string_pattern_type]}",
         )
       end

data/lib/nanoc/rule_dsl/rule_context.rb

@@ -11,12 +11,12 @@ module Nanoc::RuleDSL
     ] => C::Any
     def initialize(rep:, site:, view_context:)
       super({
-        item: Nanoc::BasicItemView.new(rep.item, view_context),
-        rep: Nanoc::BasicItemRepView.new(rep, view_context),
-        item_rep: Nanoc::BasicItemRepView.new(rep, view_context),
-        items: Nanoc::ItemCollectionWithoutRepsView.new(site.items, view_context),
-        layouts: Nanoc::LayoutCollectionView.new(site.layouts, view_context),
-        config: Nanoc::ConfigView.new(site.config, view_context),
+        item: Nanoc::Core::BasicItemView.new(rep.item, view_context),
+        rep: Nanoc::Core::BasicItemRepView.new(rep, view_context),
+        item_rep: Nanoc::Core::BasicItemRepView.new(rep, view_context),
+        items: Nanoc::Core::ItemCollectionWithoutRepsView.new(site.items, view_context),
+        layouts: Nanoc::Core::LayoutCollectionView.new(site.layouts, view_context),
+        config: Nanoc::Core::ConfigView.new(site.config, view_context),
       })
     end
   end

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.11.12
+  version: 4.11.13
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-21 00:00:00.000000000 Z
+date: 2019-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -39,47 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: cri
+  name: nanoc-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.15'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.15'
-- !ruby/object:Gem::Dependency
-  name: diff-lcs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 4.11.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 4.11.13
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.12
+        version: 4.11.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.12
+        version: 4.11.13
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: tomlrb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: tty-command
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: tty-platform
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
@@ -167,78 +125,7 @@ files:
 - lib/nanoc.rb
 - lib/nanoc/base.rb
 - lib/nanoc/base/changes_stream.rb
-- lib/nanoc/base/error.rb
 - lib/nanoc/base/errors.rb
-- lib/nanoc/base/feature.rb
-- lib/nanoc/base/repos.rb
-- lib/nanoc/base/repos/config_loader.rb
-- lib/nanoc/base/repos/site_loader.rb
-- lib/nanoc/base/services.rb
-- lib/nanoc/base/services/compiler.rb
-- lib/nanoc/base/services/compiler/phases.rb
-- lib/nanoc/base/services/compiler/phases/abstract.rb
-- lib/nanoc/base/services/compiler/phases/cache.rb
-- lib/nanoc/base/services/compiler/phases/mark_done.rb
-- lib/nanoc/base/services/compiler/phases/notify.rb
-- lib/nanoc/base/services/compiler/phases/recalculate.rb
-- lib/nanoc/base/services/compiler/phases/resume.rb
-- lib/nanoc/base/services/compiler/phases/write.rb
-- lib/nanoc/base/services/compiler/stages.rb
-- lib/nanoc/base/services/compiler/stages/build_reps.rb
-- lib/nanoc/base/services/compiler/stages/calculate_checksums.rb
-- lib/nanoc/base/services/compiler/stages/cleanup.rb
-- lib/nanoc/base/services/compiler/stages/compile_reps.rb
-- lib/nanoc/base/services/compiler/stages/determine_outdatedness.rb
-- lib/nanoc/base/services/compiler/stages/forget_outdated_dependencies.rb
-- lib/nanoc/base/services/compiler/stages/load_stores.rb
-- lib/nanoc/base/services/compiler/stages/postprocess.rb
-- lib/nanoc/base/services/compiler/stages/preprocess.rb
-- lib/nanoc/base/services/compiler/stages/prune.rb
-- lib/nanoc/base/services/compiler/stages/store_post_compilation_state.rb
-- lib/nanoc/base/services/compiler/stages/store_pre_compilation_state.rb
-- lib/nanoc/base/services/compiler_loader.rb
-- lib/nanoc/base/services/executor.rb
-- lib/nanoc/base/services/filter.rb
-- lib/nanoc/base/services/item_rep_builder.rb
-- lib/nanoc/base/services/item_rep_selector.rb
-- lib/nanoc/base/services/item_rep_writer.rb
-- lib/nanoc/base/services/outdatedness_checker.rb
-- lib/nanoc/base/services/outdatedness_rules.rb
-- lib/nanoc/base/services/outdatedness_rules/attributes_modified.rb
-- lib/nanoc/base/services/outdatedness_rules/code_snippets_modified.rb
-- lib/nanoc/base/services/outdatedness_rules/content_modified.rb
-- lib/nanoc/base/services/outdatedness_rules/item_collection_extended.rb
-- lib/nanoc/base/services/outdatedness_rules/layout_collection_extended.rb
-- lib/nanoc/base/services/outdatedness_rules/not_written.rb
-- lib/nanoc/base/services/outdatedness_rules/rules_modified.rb
-- lib/nanoc/base/services/outdatedness_rules/uses_always_outdated_filter.rb
-- lib/nanoc/base/services/pruner.rb
-- lib/nanoc/base/views.rb
-- lib/nanoc/base/views/basic_item_rep_collection_view.rb
-- lib/nanoc/base/views/basic_item_rep_view.rb
-- lib/nanoc/base/views/basic_item_view.rb
-- lib/nanoc/base/views/compilation_item_rep_collection_view.rb
-- lib/nanoc/base/views/compilation_item_rep_view.rb
-- lib/nanoc/base/views/compilation_item_view.rb
-- lib/nanoc/base/views/config_view.rb
-- lib/nanoc/base/views/identifiable_collection_view.rb
-- lib/nanoc/base/views/item_collection_with_reps_view.rb
-- lib/nanoc/base/views/item_collection_without_reps_view.rb
-- lib/nanoc/base/views/layout_collection_view.rb
-- lib/nanoc/base/views/layout_view.rb
-- lib/nanoc/base/views/mixins/document_view_mixin.rb
-- lib/nanoc/base/views/mixins/mutable_document_view_mixin.rb
-- lib/nanoc/base/views/mutable_config_view.rb
-- lib/nanoc/base/views/mutable_identifiable_collection_view.rb
-- lib/nanoc/base/views/mutable_item_collection_view.rb
-- lib/nanoc/base/views/mutable_item_view.rb
-- lib/nanoc/base/views/mutable_layout_collection_view.rb
-- lib/nanoc/base/views/mutable_layout_view.rb
-- lib/nanoc/base/views/post_compile_item_collection_view.rb
-- lib/nanoc/base/views/post_compile_item_rep_collection_view.rb
-- lib/nanoc/base/views/post_compile_item_rep_view.rb
-- lib/nanoc/base/views/post_compile_item_view.rb
-- lib/nanoc/base/views/view.rb
 - lib/nanoc/checking.rb
 - lib/nanoc/checking/check.rb
 - lib/nanoc/checking/checks.rb
@@ -253,35 +140,6 @@ files:
 - 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
-- lib/nanoc/cli/cleaning_stream.rb
-- lib/nanoc/cli/command_runner.rb
-- lib/nanoc/cli/commands/check.rb
-- lib/nanoc/cli/commands/compile.rb
-- lib/nanoc/cli/commands/compile_listeners/abstract.rb
-- lib/nanoc/cli/commands/compile_listeners/aggregate.rb
-- lib/nanoc/cli/commands/compile_listeners/debug_printer.rb
-- lib/nanoc/cli/commands/compile_listeners/diff_generator.rb
-- lib/nanoc/cli/commands/compile_listeners/file_action_printer.rb
-- lib/nanoc/cli/commands/compile_listeners/timing_recorder.rb
-- lib/nanoc/cli/commands/create-site.rb
-- lib/nanoc/cli/commands/deploy.rb
-- lib/nanoc/cli/commands/nanoc.rb
-- lib/nanoc/cli/commands/prune.rb
-- lib/nanoc/cli/commands/shell.rb
-- lib/nanoc/cli/commands/show-data.rb
-- lib/nanoc/cli/commands/show-plugins.rb
-- lib/nanoc/cli/commands/show-rules.rb
-- lib/nanoc/cli/commands/view.rb
-- lib/nanoc/cli/error_handler.rb
-- lib/nanoc/cli/logger.rb
-- lib/nanoc/cli/stack_trace_writer.rb
-- lib/nanoc/cli/stream_cleaners.rb
-- lib/nanoc/cli/stream_cleaners/abstract.rb
-- lib/nanoc/cli/stream_cleaners/ansi_colors.rb
-- lib/nanoc/cli/stream_cleaners/utf8.rb
-- lib/nanoc/cli/transform.rb
 - lib/nanoc/data_sources.rb
 - lib/nanoc/data_sources/filesystem.rb
 - lib/nanoc/data_sources/filesystem/errors.rb
@@ -344,6 +202,10 @@ files:
 - lib/nanoc/helpers/tagging.rb
 - lib/nanoc/helpers/text.rb
 - lib/nanoc/helpers/xml_sitemap.rb
+- lib/nanoc/orig_cli.rb
+- lib/nanoc/orig_cli/commands/check.rb
+- lib/nanoc/orig_cli/commands/deploy.rb
+- lib/nanoc/orig_cli/commands/show-rules.rb
 - lib/nanoc/rule_dsl.rb
 - lib/nanoc/rule_dsl/action_provider.rb
 - lib/nanoc/rule_dsl/action_recorder.rb
@@ -357,7 +219,6 @@ files:
 - lib/nanoc/rule_dsl/rule_context.rb
 - lib/nanoc/rule_dsl/rules_collection.rb
 - lib/nanoc/rule_dsl/rules_loader.rb
-- lib/nanoc/spec.rb
 - lib/nanoc/version.rb
 homepage: https://nanoc.ws/
 licenses:

data/lib/nanoc/base/error.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  # Generic error. Superclass for all Nanoc-specific errors.
-  class Error < ::StandardError
-  end
-end

data/lib/nanoc/base/feature.rb

@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  # @api private
-  #
-  # @example Defining a feature and checking its enabledness
-  #
-  #     Nanoc::Feature.define('environments', version: '4.3')
-  #     Nanoc::Feature.enabled?(Nanoc::Feature::ENVIRONMENTS)
-  #
-  module Feature
-    # Defines a new feature with the given name, experimental in the given
-    # version. The feature will be made available as a constant with the same
-    # name, in uppercase, on the Nanoc::Feature module.
-    #
-    # @example Defining Nanoc::Feature::ENVIRONMENTS
-    #
-    #     Nanoc::Feature.define('environments', version: '4.3')
-    #
-    # @param name The name of the feature
-    #
-    # @param version The minor version in which the feature is considered
-    #   experimental.
-    #
-    # @return [void]
-    def self.define(name, version:)
-      repo[name] = version
-      const_set(name.upcase, name)
-    end
-
-    # Undefines the feature with the given name. For testing purposes only.
-    #
-    # @param name The name of the feature
-    #
-    # @return [void]
-    #
-    # @private
-    def self.undefine(name)
-      repo.delete(name)
-      remove_const(name.upcase)
-    end
-
-    # @param [String] feature_name
-    #
-    # @return [Boolean] Whether or not the feature with the given name is enabled
-    def self.enabled?(feature_name)
-      enabled_features.include?(feature_name) ||
-        enabled_features.include?('all')
-    end
-
-    # @api private
-    def self.enable(feature_name)
-      raise ArgumentError, 'no block given' unless block_given?
-
-      if enabled?(feature_name)
-        yield
-      else
-        begin
-          enabled_features << feature_name
-          yield
-        ensure
-          enabled_features.delete(feature_name)
-        end
-      end
-    end
-
-    # @api private
-    def self.reset_caches
-      @enabled_features = nil
-    end
-
-    # @api private
-    def self.enabled_features
-      @enabled_features ||= Set.new(ENV.fetch('NANOC_FEATURES', '').split(','))
-    end
-
-    # @api private
-    def self.repo
-      @repo ||= {}
-    end
-
-    # @return [Enumerable<String>] Names of features that still exist, but
-    #   should not be considered as experimental in the current version of
-    #   Nanoc.
-    def self.all_outdated
-      repo.keys.reject do |name|
-        version = repo[name]
-        Nanoc::VERSION.start_with?(version)
-      end
-    end
-  end
-end
-
-# Tracking issue:
-# https://github.com/nanoc/features/issues/24
-Nanoc::Feature.define('live_cmd', version: '4.11')
-
-# Tracking issue:
-# https://github.com/nanoc/features/issues/40
-Nanoc::Feature.define('toml', version: '4.11')
-
-# Tracking issue:
-# https://github.com/nanoc/features/issues/20
-Nanoc::Feature.define('binary_compiled_content_cache', version: '4.11')