jekyll 3.2.0.pre.beta1 → 3.2.0.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7707dfb4ade1518698a36a852ac7cd164d8f094
-  data.tar.gz: afad1c82e3c93f9e33c6c307d572810e088516f0
+  metadata.gz: 6b7bb5f6deedf2cb6282ffec118cc3f9a3f76759
+  data.tar.gz: 77353178dc51e04a8b773150beb7c987ec49f8c0
 SHA512:
-  metadata.gz: 23b2878e2d752a8cab1997381fe0dd999562c77dbba4d7fb19d52c0c24fe82c726508cbb4e22e3f48e5b9d793e981fb67a6e7bb2707754cbbf8ec8ac780b22a9
-  data.tar.gz: b463648247640ca9d3f60bb25a592cfd0569bce4627fd6cd2396ec394eb123fe352620472c8d1e4dab1b2edc66844f1c1d2f5d7e1896834b4c377b8ba3744f2d
+  metadata.gz: a3b5990ea04d2f19653f522a1e0f853ad6b005c470483ecf37b93e37d872629963c50eed480b833afb9ea6af548d686ffd032f1f8e051a5b699547f22e414872
+  data.tar.gz: 1430e36ff3d6e8a08cf7b708d90eb27d584b21a2e4243f2e5465761a63814b2aeef40ac0f2861d1b8cc058166380a167ff90a8fa40a857446e966cf4c8cf5b13

data/.rubocop.yml

@@ -2,94 +2,15 @@
 AllCops:
   TargetRubyVersion: 2.0
   Include:
-  - lib/**/*.rb
+    - lib/**/*.rb
   Exclude:
-  - lib/jekyll/collection.rb
-  - lib/jekyll/command.rb
-  - lib/jekyll/configuration.rb
-  - lib/jekyll/converter.rb
-  - lib/jekyll/converters/identity.rb
-  - lib/jekyll/converters/markdown
-  - lib/jekyll/converters/markdown/kramdown_parser.rb
-  - lib/jekyll/converters/markdown/rdiscount_parser.rb
-  - lib/jekyll/converters/markdown/redcarpet_parser.rb
-  - lib/jekyll/converters/markdown.rb
-  - lib/jekyll/converters/smartypants.rb
-  - lib/jekyll/convertible.rb
-  - lib/jekyll/deprecator.rb
-  - lib/jekyll/document.rb
-  - lib/jekyll/drops/collection_drop.rb
-  - lib/jekyll/drops/document_drop.rb
-  - lib/jekyll/drops/drop.rb
-  - lib/jekyll/drops/jekyll_drop.rb
-  - lib/jekyll/drops/site_drop.rb
-  - lib/jekyll/drops/unified_payload_drop.rb
-  - lib/jekyll/drops/url_drop.rb
-  - lib/jekyll/entry_filter.rb
-  - lib/jekyll/errors.rb
-  - lib/jekyll/excerpt.rb
-  - lib/jekyll/external.rb
-  - lib/jekyll/filters.rb
-  - lib/jekyll/frontmatter_defaults.rb
-  - lib/jekyll/generator.rb
-  - lib/jekyll/hooks.rb
-  - lib/jekyll/layout.rb
-  - lib/jekyll/liquid_extensions.rb
-  - lib/jekyll/liquid_renderer/file.rb
-  - lib/jekyll/liquid_renderer/table.rb
-  - lib/jekyll/liquid_renderer.rb
-  - lib/jekyll/log_adapter.rb
-  - lib/jekyll/page.rb
-  - lib/jekyll/plugin.rb
-  - lib/jekyll/plugin_manager.rb
-  - lib/jekyll/publisher.rb
-  - lib/jekyll/reader.rb
-  - lib/jekyll/readers/collection_reader.rb
-  - lib/jekyll/readers/data_reader.rb
-  - lib/jekyll/readers/layout_reader.rb
-  - lib/jekyll/readers/page_reader.rb
-  - lib/jekyll/readers/post_reader.rb
-  - lib/jekyll/readers/static_file_reader.rb
-  - lib/jekyll/regenerator.rb
-  - lib/jekyll/related_posts.rb
-  - lib/jekyll/renderer.rb
-  - lib/jekyll/site.rb
-  - lib/jekyll/static_file.rb
-  - lib/jekyll/stevenson.rb
-  - lib/jekyll/tags/highlight.rb
-  - lib/jekyll/tags/include.rb
-  - lib/jekyll/tags/link.rb
-  - lib/jekyll/tags/post_url.rb
-  - lib/jekyll/theme.rb
-  - lib/jekyll/url.rb
-  - lib/jekyll/utils/ansi.rb
-  - lib/jekyll/utils/platforms.rb
-  - lib/jekyll/utils.rb
-  - lib/jekyll/version.rb
-  - lib/jekyll.rb
-  - features/step_definitions.rb
-  - features/support/formatter.rb
-  - features/support/helpers.rb
-  - test/test_configuration.rb
-  - test/test_document.rb
-  - test/test_entry_filter.rb
-  - test/test_filters.rb
-  - test/test_kramdown.rb
-  - test/test_liquid_renderer.rb
-  - test/test_page.rb
-  - test/test_regenerator.rb
-  - test/test_related_posts.rb
-  - test/test_sass.rb
-  - test/test_site.rb
-  - test/test_static_file.rb
-  - test/test_tags.rb
-  - test/test_theme.rb
-  - test/test_url.rb
-  - test/test_utils.rb
-  - bin/**/*
-  - benchmark/**/*
-  - script/**/*
-  - vendor/**/*
+    - lib/jekyll/convertible.rb
+    - lib/jekyll/document.rb
+    - lib/jekyll/renderer.rb
+    - bin/**/*
+    - benchmark/**/*
+    - script/**/*
+    - vendor/**/*
 Lint/EndAlignment:
   Severity: error
 Lint/UnreachableCode:
@@ -99,19 +20,20 @@ Lint/UselessAccessModifier:
 Metrics/AbcSize:
   Max: 20
 Metrics/ClassLength:
-  Max: 240
   Exclude:
-  - !ruby/regexp /features\/.*.rb$/
+    - !ruby/regexp /features\/.*.rb$/
+    - !ruby/regexp /test\/.*.rb$/
+  Max: 300
 Metrics/CyclomaticComplexity:
   Max: 8
 Metrics/LineLength:
+  Exclude:
+    - !ruby/regexp /features\/.*.rb/
   Max: 90
   Severity: warning
-  Exclude:
-  - !ruby/regexp /features\/.*.rb/
 Metrics/MethodLength:
-  Max: 20
   CountComments: false
+  Max: 20
   Severity: error
 Metrics/ModuleLength:
   Max: 240
@@ -126,8 +48,8 @@ Style/AlignArray:
 Style/AlignHash:
   EnforcedHashRocketStyle: table
 Style/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
   Enabled: false
+  EnforcedStyle: with_fixed_indentation
 Style/AndOr:
   Severity: error
 Style/Attr:
@@ -139,7 +61,7 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
   Exclude:
-  - !ruby/regexp /features\/.*.rb$/
+    - !ruby/regexp /features\/.*.rb$/
 Style/DoubleNegation:
   Enabled: false
 Style/EmptyLinesAroundAccessModifier:
@@ -187,7 +109,7 @@ Style/RedundantReturn:
 Style/RedundantSelf:
   Enabled: false
 Style/RegexpLiteral:
-  EnforcedStyle: slashes
+  EnforcedStyle: percent_r
 Style/RescueModifier:
   Enabled: false
 Style/SignalException:

data/README.markdown

@@ -1,10 +1,11 @@
 # [Jekyll](https://jekyllrb.com/)
 
 [![Gem Version](https://img.shields.io/gem/v/jekyll.svg)][ruby-gems]
-[![Build Status](https://travis-ci.org/jekyll/jekyll.svg?branch=master)][travis]
-[![Test Coverage](https://codeclimate.com/github/jekyll/jekyll/badges/coverage.svg)][coverage]
-[![Code Climate](https://codeclimate.com/github/jekyll/jekyll/badges/gpa.svg)][codeclimate]
-[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)][gemnasium]
+[![Linux Build Status](https://img.shields.io/travis/jekyll/jekyll/master.svg?label=Linux%20build)][travis]
+[![Windows Build status](https://img.shields.io/appveyor/ci/jekyll/jekyll/master.svg?label=Windows%20build)][appveyor]
+[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/jekyll/jekyll.svg)][coverage]
+[![Code Climate](https://img.shields.io/codeclimate/github/jekyll/jekyll.svg)][codeclimate]
+[![Dependency Status](https://img.shields.io/gemnasium/jekyll/jekyll.svg)][gemnasium]
 [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri]
 
 [ruby-gems]: https://rubygems.org/gems/jekyll
@@ -13,6 +14,7 @@
 [coverage]: https://codeclimate.com/github/jekyll/jekyll/coverage
 [hakiri]: https://hakiri.io/github/jekyll/jekyll/master
 [travis]: https://travis-ci.org/jekyll/jekyll
+[appveyor]: https://ci.appveyor.com/project/jekyll/jekyll/branch/master
 
 Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served by Apache, Nginx or another web server. Jekyll is the engine behind [GitHub Pages](https://pages.github.com), which you can use to host sites right from your GitHub repositories.
 

data/{bin → exe}/jekyll

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 STDOUT.sync = true
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w(.. lib)))
 
-require 'jekyll'
-require 'mercenary'
+require "jekyll"
+require "mercenary"
 
 Jekyll::PluginManager.require_from_bundler
 
@@ -12,22 +12,26 @@ Jekyll::Deprecator.process(ARGV)
 
 Mercenary.program(:jekyll) do |p|
   p.version Jekyll::VERSION
-  p.description 'Jekyll is a blog-aware, static site generator in Ruby'
-  p.syntax 'jekyll <subcommand> [options]'
-
-  p.option 'source', '-s', '--source [DIR]', 'Source directory (defaults to ./)'
-  p.option 'destination', '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
-  p.option 'safe', '--safe', 'Safe mode (defaults to false)'
-  p.option 'plugins_dir', '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
-  p.option 'layouts_dir', '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'
-  p.option 'profile', '--profile', 'Generate a Liquid rendering profile'
+  p.description "Jekyll is a blog-aware, static site generator in Ruby"
+  p.syntax "jekyll <subcommand> [options]"
+
+  p.option "source", "-s", "--source [DIR]", "Source directory (defaults to ./)"
+  p.option "destination", "-d", "--destination [DIR]",
+    "Destination directory (defaults to ./_site)"
+  p.option "safe", "--safe", "Safe mode (defaults to false)"
+  p.option "plugins_dir", "-p", "--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]", Array,
+    "Plugins directory (defaults to ./_plugins)"
+  p.option "layouts_dir", "--layouts DIR", String,
+    "Layouts directory (defaults to ./_layouts)"
+  p.option "profile", "--profile", "Generate a Liquid rendering profile"
 
   Jekyll::External.require_if_present(Jekyll::External.blessed_gems) do |g|
-    cmd = g.split('-').last
+    cmd = g.split("-").last
     p.command(cmd.to_sym) do |c|
       c.syntax cmd
       c.action do
-        Jekyll.logger.abort_with "You must install the '#{g}' gem to use the 'jekyll #{cmd}' command."
+        Jekyll.logger.abort_with "You must install the '#{g}' gem" \
+          " to use the 'jekyll #{cmd}' command."
       end
     end
   end

data/lib/jekyll.rb

@@ -6,79 +6,79 @@ $LOAD_PATH.unshift File.dirname(__FILE__) # For use/testing when no gem is insta
 #
 # Returns nothing.
 def require_all(path)
-  glob = File.join(File.dirname(__FILE__), path, '*.rb')
-  Dir[glob].each do |f|
+  glob = File.join(File.dirname(__FILE__), path, "*.rb")
+  Dir[glob].sort.each do |f|
     require f
   end
 end
 
 # rubygems
-require 'rubygems'
+require "rubygems"
 
 # stdlib
 require "pathutil"
-require 'forwardable'
-require 'fileutils'
-require 'time'
-require 'English'
-require 'pathname'
-require 'logger'
-require 'set'
+require "forwardable"
+require "fileutils"
+require "time"
+require "English"
+require "pathname"
+require "logger"
+require "set"
 
 # 3rd party
-require 'safe_yaml/load'
-require 'liquid'
-require 'kramdown'
-require 'colorator'
+require "safe_yaml/load"
+require "liquid"
+require "kramdown"
+require "colorator"
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
   # internal requires
-  autoload :Cleaner,             'jekyll/cleaner'
-  autoload :Collection,          'jekyll/collection'
-  autoload :Configuration,       'jekyll/configuration'
-  autoload :Convertible,         'jekyll/convertible'
-  autoload :Deprecator,          'jekyll/deprecator'
-  autoload :Document,            'jekyll/document'
-  autoload :Draft,               'jekyll/draft'
-  autoload :EntryFilter,         'jekyll/entry_filter'
-  autoload :Errors,              'jekyll/errors'
-  autoload :Excerpt,             'jekyll/excerpt'
-  autoload :External,            'jekyll/external'
-  autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
-  autoload :Hooks,               'jekyll/hooks'
-  autoload :Layout,              'jekyll/layout'
-  autoload :CollectionReader,    'jekyll/readers/collection_reader'
-  autoload :DataReader,          'jekyll/readers/data_reader'
-  autoload :LayoutReader,        'jekyll/readers/layout_reader'
-  autoload :PostReader,          'jekyll/readers/post_reader'
-  autoload :PageReader,          'jekyll/readers/page_reader'
-  autoload :StaticFileReader,    'jekyll/readers/static_file_reader'
-  autoload :LogAdapter,          'jekyll/log_adapter'
-  autoload :Page,                'jekyll/page'
-  autoload :PluginManager,       'jekyll/plugin_manager'
-  autoload :Publisher,           'jekyll/publisher'
-  autoload :Reader,              'jekyll/reader'
-  autoload :Regenerator,         'jekyll/regenerator'
-  autoload :RelatedPosts,        'jekyll/related_posts'
-  autoload :Renderer,            'jekyll/renderer'
-  autoload :LiquidRenderer,      'jekyll/liquid_renderer'
-  autoload :Site,                'jekyll/site'
-  autoload :StaticFile,          'jekyll/static_file'
-  autoload :Stevenson,           'jekyll/stevenson'
-  autoload :Theme,               'jekyll/theme'
-  autoload :ThemeBuilder,        'jekyll/theme_builder'
-  autoload :URL,                 'jekyll/url'
-  autoload :Utils,               'jekyll/utils'
-  autoload :VERSION,             'jekyll/version'
+  autoload :Cleaner,             "jekyll/cleaner"
+  autoload :Collection,          "jekyll/collection"
+  autoload :Configuration,       "jekyll/configuration"
+  autoload :Convertible,         "jekyll/convertible"
+  autoload :Deprecator,          "jekyll/deprecator"
+  autoload :Document,            "jekyll/document"
+  autoload :Draft,               "jekyll/draft"
+  autoload :EntryFilter,         "jekyll/entry_filter"
+  autoload :Errors,              "jekyll/errors"
+  autoload :Excerpt,             "jekyll/excerpt"
+  autoload :External,            "jekyll/external"
+  autoload :FrontmatterDefaults, "jekyll/frontmatter_defaults"
+  autoload :Hooks,               "jekyll/hooks"
+  autoload :Layout,              "jekyll/layout"
+  autoload :CollectionReader,    "jekyll/readers/collection_reader"
+  autoload :DataReader,          "jekyll/readers/data_reader"
+  autoload :LayoutReader,        "jekyll/readers/layout_reader"
+  autoload :PostReader,          "jekyll/readers/post_reader"
+  autoload :PageReader,          "jekyll/readers/page_reader"
+  autoload :StaticFileReader,    "jekyll/readers/static_file_reader"
+  autoload :LogAdapter,          "jekyll/log_adapter"
+  autoload :Page,                "jekyll/page"
+  autoload :PluginManager,       "jekyll/plugin_manager"
+  autoload :Publisher,           "jekyll/publisher"
+  autoload :Reader,              "jekyll/reader"
+  autoload :Regenerator,         "jekyll/regenerator"
+  autoload :RelatedPosts,        "jekyll/related_posts"
+  autoload :Renderer,            "jekyll/renderer"
+  autoload :LiquidRenderer,      "jekyll/liquid_renderer"
+  autoload :Site,                "jekyll/site"
+  autoload :StaticFile,          "jekyll/static_file"
+  autoload :Stevenson,           "jekyll/stevenson"
+  autoload :Theme,               "jekyll/theme"
+  autoload :ThemeBuilder,        "jekyll/theme_builder"
+  autoload :URL,                 "jekyll/url"
+  autoload :Utils,               "jekyll/utils"
+  autoload :VERSION,             "jekyll/version"
 
   # extensions
-  require 'jekyll/plugin'
-  require 'jekyll/converter'
-  require 'jekyll/generator'
-  require 'jekyll/command'
-  require 'jekyll/liquid_extensions'
+  require "jekyll/plugin"
+  require "jekyll/converter"
+  require "jekyll/generator"
+  require "jekyll/command"
+  require "jekyll/liquid_extensions"
   require "jekyll/filters"
 
   class << self
@@ -94,22 +94,22 @@ module Jekyll
     # options with anything in _config.yml, and adding the given options on top.
     #
     # override - A Hash of config directives that override any options in both
-    #            the defaults and the config file. See Jekyll::Configuration::DEFAULTS for a
+    #            the defaults and the config file.
+    #            See Jekyll::Configuration::DEFAULTS for a
     #            list of option names and their defaults.
     #
     # Returns the final configuration Hash.
     def configuration(override = {})
-      config = Configuration[Configuration::DEFAULTS]
+      config = Configuration.new
       override = Configuration[override].stringify_keys
-      unless override.delete('skip_config_files')
+      unless override.delete("skip_config_files")
         config = config.read_config_files(config.config_files(override))
       end
 
       # Merge DEFAULTS < _config.yml < override
-      config = Utils.deep_merge_hashes(config, override).stringify_keys
-      set_timezone(config['timezone']) if config['timezone']
-
-      config
+      Configuration.from(Utils.deep_merge_hashes(config, override)).tap do |obj|
+        set_timezone(obj["timezone"]) if obj["timezone"]
+      end
     end
 
     # Public: Set the TZ environment variable to use the timezone specified
@@ -117,9 +117,11 @@ module Jekyll
     # timezone - the IANA Time Zone
     #
     # Returns nothing
+    # rubocop:disable Style/AccessorMethodName
     def set_timezone(timezone)
-      ENV['TZ'] = timezone
+      ENV["TZ"] = timezone
     end
+    # rubocop:enable Style/AccessorMethodName
 
     # Public: Fetch the logger instance for this Jekyll process.
     #
@@ -156,11 +158,11 @@ module Jekyll
     def sanitized_path(base_directory, questionable_path)
       return base_directory if base_directory.eql?(questionable_path)
 
-      questionable_path.insert(0, '/') if questionable_path.start_with?('~')
+      questionable_path.insert(0, "/") if questionable_path.start_with?("~")
       clean_path = File.expand_path(questionable_path, "/")
-      clean_path.sub!(/\A\w\:\//, '/')
+      clean_path.sub!(%r!\A\w:/!, "/")
 
-      if clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
+      if clean_path.start_with?(base_directory.sub(%r!\A\w:/!, "/"))
         clean_path
       else
         File.join(base_directory, clean_path)
@@ -168,16 +170,17 @@ module Jekyll
     end
 
     # Conditional optimizations
-    Jekyll::External.require_if_present('liquid-c')
+    Jekyll::External.require_if_present("liquid-c")
   end
 end
 
 require "jekyll/drops/drop"
-require_all 'jekyll/commands'
-require_all 'jekyll/converters'
-require_all 'jekyll/converters/markdown'
-require_all 'jekyll/drops'
-require_all 'jekyll/generators'
-require_all 'jekyll/tags'
-
-require 'jekyll-sass-converter'
+require "jekyll/drops/document_drop"
+require_all "jekyll/commands"
+require_all "jekyll/converters"
+require_all "jekyll/converters/markdown"
+require_all "jekyll/drops"
+require_all "jekyll/generators"
+require_all "jekyll/tags"
+
+require "jekyll-sass-converter"