nanoc 4.4.7 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0167178257988b6aaf09493db7ca9913b18d2961'
-  data.tar.gz: ff4d70d12e3e147010857f60f216d102f17e5ba3
+  metadata.gz: e9fe24df25829104e02f16485e69acb439b50860
+  data.tar.gz: fd6c49bc1c0bf21d94cfd0a74b436a70ead571d3
 SHA512:
-  metadata.gz: 561f6907b5ae8fe75ac79038a9ca563846c6015b83c78bce7e20f2fdbdcd63f9d9df8d0d052f3810b49be3fa388fa56ec47a52c285ba86312bc5fb8506e64a67
-  data.tar.gz: d28b4eb99ca9dba7e154018201a19f3cef48d6aa0af69e671324e9b5548c675eade4549a9b9d81ef7257c958e3f79a5b6a5986bfbfdf3e8f09ac15aa6cfbccee
+  metadata.gz: 1ec49097ecfdc9ad9de7e70fe52368d13c5a6ddcc1ffa4a6894ce26de86a94385c4dc173c4e0f5051a89046ecdd6df782d1fc9c85b20feda26414d92a2daee14
+  data.tar.gz: 0d05e92cab7232aa0fb057d0e3ed2159cdb25309f884e372271e2123baf7d4b67ddaa159791d7a62ee4e040ea261cbd4b572b7f96d008d52f5830747f2e10201

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/bbatsov/rubocop.git
-  revision: 7c95534e1906539e53341cd53265fadfc0aba0e2
+  revision: 1121924ee2ebe09053b7ca95b50aac03e01acada
   specs:
     rubocop (0.46.0)
       parser (>= 2.3.3.1, < 3.0)
@@ -11,7 +11,7 @@ GIT
 
 GIT
   remote: git://github.com/cowboyd/therubyracer.git
-  revision: a635aee79b2057c396f8af92417cadf93415c275
+  revision: 466a1f0d4f696acfe971899272359623ec0a7a97
   specs:
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
@@ -27,8 +27,9 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.4.7)
+    nanoc (4.5.0)
       cri (~> 2.3)
+      ddplugin (~> 1.0)
       hamster (~> 3.0)
       ref (~> 2.0)
 
@@ -80,6 +81,7 @@ GEM
       safe_yaml (~> 1.0.0)
     cri (2.7.1)
       colored (~> 1.2)
+    ddplugin (1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
@@ -159,7 +161,7 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.1)
       fog-core (~> 1.27)
-    fog-openstack (0.1.18)
+    fog-openstack (0.1.19)
       fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -170,7 +172,7 @@ GEM
     fog-profitbricks (3.0.0)
       fog-core (~> 1.42)
       fog-json (~> 1.0)
-    fog-rackspace (0.1.2)
+    fog-rackspace (0.1.3)
       fog-core (>= 1.35)
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
@@ -241,7 +243,7 @@ GEM
     inflecto (0.0.2)
     ipaddress (0.8.3)
     json (2.0.2)
-    kramdown (1.13.1)
+    kramdown (1.13.2)
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.17)
@@ -352,7 +354,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff
     xml-simple (1.1.5)
-    yard (0.9.5)
+    yard (0.9.6)
     yard-contracts (0.1.5)
       contracts (~> 0.7)
       yard (~> 0.8)

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.5.0 (2017-01-09)
+
+Features:
+
+* Added Git deployer (#997)
+
 ## 4.4.7 (2017-01-05)
 
 Fixes:

data/lib/nanoc.rb

@@ -23,6 +23,7 @@ end
 # Load external dependencies
 require 'hamster'
 require 'ref'
+require 'ddplugin'
 
 # Load general requirements
 require 'digest'

data/lib/nanoc/base.rb

@@ -5,7 +5,6 @@ end
 require_relative 'base/core_ext'
 require_relative 'base/contracts_support'
 require_relative 'base/memoization'
-require_relative 'base/plugin_registry'
 require_relative 'base/error'
 require_relative 'base/errors'
 

data/lib/nanoc/base/feature.rb

@@ -89,4 +89,4 @@ module Nanoc
   end
 end
 
-Nanoc::Feature.define('profiler', version: '4.4')
+Nanoc::Feature.define('profiler', version: '4.5')

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

@@ -27,7 +27,7 @@ module Nanoc
     #   online data sources could contain authentication details.
     attr_reader :config
 
-    extend Nanoc::Int::PluginRegistry::PluginMethods
+    extend DDPlugin::Plugin
 
     def initialize(site_config, items_root, layouts_root, config)
       @site_config  = site_config

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

@@ -61,7 +61,7 @@ module Nanoc::Int
     def create_data_sources(config)
       config[:data_sources].map do |data_source_hash|
         # Get data source class
-        data_source_class = Nanoc::DataSource.named(data_source_hash[:type])
+        data_source_class = Nanoc::DataSource.named(data_source_hash[:type].to_sym)
         if data_source_class.nil?
           raise Nanoc::Int::Errors::UnknownDataSource.new(data_source_hash[:type])
         end

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

@@ -1,7 +1,7 @@
 module Nanoc::Int
   # @private
   class ActionProvider
-    extend Nanoc::Int::PluginRegistry::PluginMethods
+    extend DDPlugin::Plugin
 
     def self.for(_site)
       raise NotImplementedError

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

@@ -35,7 +35,7 @@ module Nanoc
     # @api private
     attr_reader :assigns
 
-    extend Nanoc::Int::PluginRegistry::PluginMethods
+    extend DDPlugin::Plugin
 
     class << self
       def define(ident, &block)

data/lib/nanoc/checking.rb

@@ -1,11 +1,9 @@
-module Nanoc
-  # @api private
-  module Checking
-    autoload 'Check',  'nanoc/checking/check'
-    autoload 'DSL',    'nanoc/checking/dsl'
-    autoload 'Runner', 'nanoc/checking/runner.rb'
-    autoload 'Issue',  'nanoc/checking/issue'
-  end
+# @api private
+module Nanoc::Checking
 end
 
-require 'nanoc/checking/checks'
+require_relative 'checking/check'
+require_relative 'checking/checks'
+require_relative 'checking/dsl'
+require_relative 'checking/runner.rb'
+require_relative 'checking/issue'

data/lib/nanoc/checking/check.rb

@@ -8,7 +8,7 @@ module Nanoc::Checking
 
   # @api private
   class Check < Nanoc::Int::Context
-    extend Nanoc::Int::PluginRegistry::PluginMethods
+    extend DDPlugin::Plugin
 
     attr_reader :issues
 

data/lib/nanoc/checking/checks.rb

@@ -1,20 +1,12 @@
-require_relative 'checks/w3c_validator'
-
 # @api private
 module Nanoc::Checking::Checks
-  autoload 'CSS',           'nanoc/checking/checks/css'
-  autoload 'ExternalLinks', 'nanoc/checking/checks/external_links'
-  autoload 'HTML',          'nanoc/checking/checks/html'
-  autoload 'InternalLinks', 'nanoc/checking/checks/internal_links'
-  autoload 'Stale',         'nanoc/checking/checks/stale'
-  autoload 'MixedContent',  'nanoc/checking/checks/mixed_content'
-
-  Nanoc::Checking::Check.register '::Nanoc::Checking::Checks::CSS',           :css
-  Nanoc::Checking::Check.register '::Nanoc::Checking::Checks::ExternalLinks', :external_links
-  Nanoc::Checking::Check.register '::Nanoc::Checking::Checks::ExternalLinks', :elinks
-  Nanoc::Checking::Check.register '::Nanoc::Checking::Checks::HTML',          :html
-  Nanoc::Checking::Check.register '::Nanoc::Checking::Checks::InternalLinks', :internal_links
-  Nanoc::Checking::Check.register '::Nanoc::Checking::Checks::InternalLinks', :ilinks
-  Nanoc::Checking::Check.register '::Nanoc::Checking::Checks::Stale',         :stale
-  Nanoc::Checking::Check.register '::Nanoc::Checking::Checks::MixedContent',  :mixed_content
 end
+
+require_relative 'checks/w3c_validator'
+
+require_relative 'checks/css'
+require_relative 'checks/external_links'
+require_relative 'checks/html'
+require_relative 'checks/internal_links'
+require_relative 'checks/mixed_content'
+require_relative 'checks/stale'

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

@@ -5,6 +5,8 @@ module Nanoc::Checking::Checks
   #
   # @api private
   class InternalLinks < ::Nanoc::Checking::Check
+    identifiers :internal_links, :ilinks
+
     # Starts the validator. The results will be printed to stdout.
     #
     # Internal links that match a regexp pattern in `@config[:checks][:internal_links][:exclude]` will

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

@@ -4,6 +4,8 @@ module Nanoc::Checking::Checks
   #
   # @api private
   class MixedContent < ::Nanoc::Checking::Check
+    identifier :mixed_content
+
     PROTOCOL_PATTERN = /^(\w+):\/\//
 
     def run

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

@@ -1,6 +1,8 @@
 module Nanoc::Checking::Checks
   # @api private
   class Stale < ::Nanoc::Checking::Check
+    identifier :stale
+
     def run
       require 'set'
 

data/lib/nanoc/checking/runner.rb

@@ -93,12 +93,12 @@ module Nanoc::Checking
     end
 
     def all_check_classes
-      Nanoc::Checking::Check.all.map(&:last).uniq
+      Nanoc::Checking::Check.all
     end
 
     def check_classes_named(n)
       n.map do |a|
-        klass = Nanoc::Checking::Check.named(a)
+        klass = Nanoc::Checking::Check.named(a.to_sym)
         raise Nanoc::Int::Errors::GenericTrivial, "Unknown check: #{a}" if klass.nil?
         klass
       end

data/lib/nanoc/cli.rb

@@ -10,14 +10,17 @@ end
 module Nanoc::CLI
   module Commands
   end
+end
 
-  autoload 'ANSIStringColorizer', 'nanoc/cli/ansi_string_colorizer'
-  autoload 'Logger',              'nanoc/cli/logger'
-  autoload 'CommandRunner',       'nanoc/cli/command_runner'
-  autoload 'CleaningStream',      'nanoc/cli/cleaning_stream'
-  autoload 'StreamCleaners',      'nanoc/cli/stream_cleaners'
-  autoload 'ErrorHandler',        'nanoc/cli/error_handler'
+require_relative 'cli/ansi_string_colorizer'
+require_relative 'cli/logger'
+require_relative 'cli/command_runner'
+require_relative 'cli/cleaning_stream'
+require_relative 'cli/stream_cleaners'
+require_relative 'cli/error_handler'
 
+# @api private
+module Nanoc::CLI
   # @return [Boolean] true if debug output is enabled, false if not
   def self.debug?
     @debug || false

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

@@ -27,8 +27,8 @@ module Nanoc::CLI::Commands
     private
 
     def list_deployers
-      deployers      = Nanoc::Int::PluginRegistry.instance.find_all(Nanoc::Deploying::Deployer)
-      deployer_names = deployers.keys.sort_by(&:to_s)
+      deployers      = Nanoc::Deploying::Deployer.all
+      deployer_names = deployers.map(&:identifier).sort
       puts 'Available deployers:'
       deployer_names.each do |name|
         puts "  #{name}"
@@ -105,14 +105,14 @@ module Nanoc::CLI::Commands
     end
 
     def deployer_class_for_config(config)
-      names = Nanoc::Deploying::Deployer.all.keys
       name = config.fetch(:kind) do
         $stderr.puts 'Warning: The specified deploy target does not have a kind attribute. Assuming rsync.'
         'rsync'
       end
 
-      deployer_class = Nanoc::Deploying::Deployer.named(name)
+      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(', ')})."
       end
       deployer_class

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

@@ -15,24 +15,24 @@ module Nanoc::CLI::Commands
       end
 
       # Get list of plugins (before and after)
-      plugins_before = Nanoc::Int::PluginRegistry.instance.all
+      plugins_before = PLUGIN_CLASSES.keys.each_with_object({}) { |c, acc| acc[c] = c.all }
       site.code_snippets if site
-      plugins_after = Nanoc::Int::PluginRegistry.instance.all
+      plugins_after = PLUGIN_CLASSES.keys.each_with_object({}) { |c, acc| acc[c] = c.all }
 
       # Divide list of plugins into builtin and custom
       plugins_builtin = plugins_before
-      plugins_custom  = plugins_after - plugins_before
+      plugins_custom  = plugins_after.each_with_object({}) do |(superclass, klasses), acc|
+        acc[superclass] = klasses - plugins_before[superclass]
+      end
 
       # Find max identifiers length
-      plugin_with_longest_identifiers = plugins_after.reduce do |longest, current|
-        longest[:identifiers].join(', ').size > current[:identifiers].join(', ').size ? longest : current
-      end
-      max_identifiers_length = plugin_with_longest_identifiers[:identifiers].join(', ').size
+      all_identifiers = plugins_after.values.flatten.map(&:identifiers)
+      max_identifiers_length = all_identifiers.map(&:to_s).map(&:size).max
 
       PLUGIN_CLASS_ORDER.each do |superclass|
         plugins_with_this_superclass = {
-          builtin: plugins_builtin.select { |p| p[:superclass] == superclass },
-          custom: plugins_custom.select { |p| p[:superclass] == superclass },
+          builtin: plugins_builtin.fetch(superclass, []),
+          custom: plugins_custom.fetch(superclass, []),
         }
 
         # Print kind
@@ -53,12 +53,12 @@ module Nanoc::CLI::Commands
           end
 
           # Print plugins
-          relevant_plugins.sort_by { |k| k[:identifiers].join(', ') }.each do |plugin|
+          relevant_plugins.sort_by { |k| k.identifiers.join(', ') }.each do |plugin|
             # Display
             puts format(
               "    %-#{max_identifiers_length}s (%s)",
-              plugin[:identifiers].join(', '),
-              plugin[:class].to_s.sub(/^::/, ''),
+              plugin.identifiers.join(', '),
+              plugin.to_s.sub(/^::/, ''),
             )
           end
         end

data/lib/nanoc/cli/stream_cleaners.rb

@@ -1,8 +1,8 @@
-module Nanoc::CLI
-  # @api private
-  module StreamCleaners
-    autoload 'Abstract',   'nanoc/cli/stream_cleaners/abstract'
-    autoload 'ANSIColors', 'nanoc/cli/stream_cleaners/ansi_colors'
-    autoload 'UTF8',       'nanoc/cli/stream_cleaners/utf8'
-  end
+# @api private
+module Nanoc::CLI::StreamCleaners
 end
+
+require_relative 'stream_cleaners/abstract'
+
+require_relative 'stream_cleaners/ansi_colors'
+require_relative 'stream_cleaners/utf8'

data/lib/nanoc/data_sources.rb

@@ -3,6 +3,3 @@ module Nanoc::DataSources
 end
 
 require_relative 'data_sources/filesystem'
-
-Nanoc::DataSource.register ::Nanoc::DataSources::Filesystem, :filesystem
-Nanoc::DataSource.register ::Nanoc::DataSources::Filesystem, :filesystem_unified

data/lib/nanoc/data_sources/filesystem.rb

@@ -46,6 +46,8 @@ module Nanoc::DataSources
   #
   # @api private
   class Filesystem < Nanoc::DataSource
+    identifiers :filesystem, :filesystem_unified
+
     # See {Nanoc::DataSource#up}.
     def up; end
 

data/lib/nanoc/deploying/deployer.rb

@@ -6,7 +6,7 @@ module Nanoc::Deploying
   #
   # @api private
   class Deployer
-    extend Nanoc::Int::PluginRegistry::PluginMethods
+    extend DDPlugin::Plugin
 
     # @return [String] The path to the directory that contains the files to
     #   upload. It should not have a trailing slash.

data/lib/nanoc/deploying/deployers.rb

@@ -1,10 +1,7 @@
-module Nanoc::Deploying
-  # @api private
-  module Deployers
-    autoload 'Fog',   'nanoc/deploying/deployers/fog'
-    autoload 'Rsync', 'nanoc/deploying/deployers/rsync'
-
-    Nanoc::Deploying::Deployer.register '::Nanoc::Deploying::Deployers::Fog',   :fog
-    Nanoc::Deploying::Deployer.register '::Nanoc::Deploying::Deployers::Rsync', :rsync
-  end
+# @api private
+module Nanoc::Deploying::Deployers
 end
+
+require_relative 'deployers/fog'
+require_relative 'deployers/git'
+require_relative 'deployers/rsync'

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

@@ -21,6 +21,8 @@ module Nanoc::Deploying::Deployers
   #
   # @api private
   class Fog < ::Nanoc::Deploying::Deployer
+    identifier :fog
+
     class FogWrapper
       def initialize(directory, is_dry_run)
         @directory = directory