jekyll 3.1.6 → 3.2.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94f9cf84e2e166318a010d9830c88946ae04deec
-  data.tar.gz: c004941e48a5ac91b1a1d4621d4d5b46fae3ae5a
+  metadata.gz: a7707dfb4ade1518698a36a852ac7cd164d8f094
+  data.tar.gz: afad1c82e3c93f9e33c6c307d572810e088516f0
 SHA512:
-  metadata.gz: 416cf930d756be71e48285d54fc35a6baa54033d9589c2cdecd7e3372d82f1d67c81051a267768ffb3ebdd18735db8514ad9df88272d78d4824fb56f681934f5
-  data.tar.gz: e19b78a77f2b60f5f212811b5f461a94d2f8149d18c1267b01544a88f2c7e1b4122a6e698f228d9f482fda6aa4c49944e3eea483a3fc5c176ae4943c9fe236ba
+  metadata.gz: 23b2878e2d752a8cab1997381fe0dd999562c77dbba4d7fb19d52c0c24fe82c726508cbb4e22e3f48e5b9d793e981fb67a6e7bb2707754cbbf8ec8ac780b22a9
+  data.tar.gz: b463648247640ca9d3f60bb25a592cfd0569bce4627fd6cd2396ec394eb123fe352620472c8d1e4dab1b2edc66844f1c1d2f5d7e1896834b4c377b8ba3744f2d

data/.rubocop.yml

@@ -1,80 +1,206 @@
-Metrics/MethodLength: { Max:  24 }
-Metrics/ClassLength:  { Max: 240 }
-Metrics/ModuleLength: { Max: 240 }
-Metrics/LineLength:   { Max: 112 }
-Metrics/CyclomaticComplexity: { Max: 8 }
-Metrics/PerceivedComplexity: { Max: 8 }
-Metrics/ParameterLists: { Max: 4 }
-Metrics/MethodLength: { Max: 24 }
-Metrics/AbcSize: { Max: 20 }
-
-Style/IndentHash: { EnforcedStyle: consistent }
-Style/HashSyntax: { EnforcedStyle: hash_rockets }
-Style/SignalException: { EnforcedStyle: only_raise }
-Style/AlignParameters: { EnforcedStyle: with_fixed_indentation }
-Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes }
-Style/MultilineMethodCallIndentation: { EnforcedStyle: indented }
-Style/MultilineOperationIndentation: { EnforcedStyle: indented }
-Style/FirstParameterIndentation: { EnforcedStyle: consistent }
-Style/StringLiterals: { EnforcedStyle: double_quotes }
-Style/RegexpLiteral: { EnforcedStyle: slashes }
-Style/IndentArray: { EnforcedStyle: consistent }
-Style/ExtraSpacing: { AllowForAlignment: true }
-
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%q': '{}'
-    '%Q': '{}'
-    '%r': '!!'
-    '%s': '()'
-    '%w': '()'
-    '%W': '()'
-    '%x': '()'
-
-Style/AlignArray:                     { Enabled: false }
-Style/StringLiterals:                 { Enabled: false }
-Style/Documentation:                  { Enabled: false }
-Style/DoubleNegation:                 { Enabled: false }
-Style/UnneededCapitalW:               { Enabled: false }
-Style/EmptyLinesAroundModuleBody:     { Enabled: false }
-Style/EmptyLinesAroundAccessModifier: { Enabled: false }
-Style/BracesAroundHashParameters:     { Enabled: false }
-Style/SpaceInsideBrackets:            { Enabled: false }
-Style/IfUnlessModifier:               { Enabled: false }
-Style/ModuleFunction:                 { Enabled: false }
-Style/RescueModifier:                 { Enabled: false }
-Style/GuardClause:                    { Enabled: false }
-Style/FileName:                       { Enabled: false }
-Lint/UselessAccessModifier:           { Enabled: false }
-Style/SpaceAroundOperators:           { Enabled: false }
-Style/RedundantReturn:                { Enabled: false }
-Style/SingleLineMethods:              { Enabled: false }
-
+---
 AllCops:
   TargetRubyVersion: 2.0
   Include:
   - lib/**/*.rb
-
   Exclude:
-  - .rubocop.yml
-  - .codeclimate.yml
-  - .travis.yml
-  - .gitignore
-  - .rspec
-
-  - Gemfile.lock
-  - CHANGELOG.{md,markdown,txt,textile}
-  - CONTRIBUTING.{md,markdown,txt,textile}
-  - readme.{md,markdown,txt,textile}
-  - README.{md,markdown,txt,textile}
-  - Readme.{md,markdown,txt,textile}
-  - ReadMe.{md,markdown,txt,textile}
-  - COPYING
-  - LICENSE
-
-  - site/**/*
-  - test/**/*
-  - vendor/**/*
-  - features/**/*
+  - 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/**/*
-  - spec/**/*
+  - vendor/**/*
+Lint/EndAlignment:
+  Severity: error
+Lint/UnreachableCode:
+  Severity: error
+Lint/UselessAccessModifier:
+  Enabled: false
+Metrics/AbcSize:
+  Max: 20
+Metrics/ClassLength:
+  Max: 240
+  Exclude:
+  - !ruby/regexp /features\/.*.rb$/
+Metrics/CyclomaticComplexity:
+  Max: 8
+Metrics/LineLength:
+  Max: 90
+  Severity: warning
+  Exclude:
+  - !ruby/regexp /features\/.*.rb/
+Metrics/MethodLength:
+  Max: 20
+  CountComments: false
+  Severity: error
+Metrics/ModuleLength:
+  Max: 240
+Metrics/ParameterLists:
+  Max: 4
+Metrics/PerceivedComplexity:
+  Max: 8
+Style/Alias:
+  Enabled: false
+Style/AlignArray:
+  Enabled: false
+Style/AlignHash:
+  EnforcedHashRocketStyle: table
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+  Enabled: false
+Style/AndOr:
+  Severity: error
+Style/Attr:
+  Enabled: false
+Style/BracesAroundHashParameters:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+  Exclude:
+  - !ruby/regexp /features\/.*.rb$/
+Style/DoubleNegation:
+  Enabled: false
+Style/EmptyLinesAroundAccessModifier:
+  Enabled: false
+Style/EmptyLinesAroundModuleBody:
+  Enabled: false
+Style/ExtraSpacing:
+  AllowForAlignment: true
+Style/FileName:
+  Enabled: false
+Style/FirstParameterIndentation:
+  EnforcedStyle: consistent
+Style/GuardClause:
+  Enabled: false
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+  Severity: error
+Style/IfUnlessModifier:
+  Enabled: false
+Style/IndentArray:
+  EnforcedStyle: consistent
+Style/IndentHash:
+  EnforcedStyle: consistent
+Style/IndentationWidth:
+  Severity: error
+Style/ModuleFunction:
+  Enabled: false
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+Style/MultilineTernaryOperator:
+  Severity: error
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    "%q": "{}"
+    "%Q": "{}"
+    "%r": "!!"
+    "%s": "()"
+    "%w": "()"
+    "%W": "()"
+    "%x": "()"
+Style/RedundantReturn:
+  Enabled: false
+Style/RedundantSelf:
+  Enabled: false
+Style/RegexpLiteral:
+  EnforcedStyle: slashes
+Style/RescueModifier:
+  Enabled: false
+Style/SignalException:
+  EnforcedStyle: only_raise
+Style/SingleLineMethods:
+  Enabled: false
+Style/SpaceAroundOperators:
+  Enabled: false
+Style/SpaceInsideBrackets:
+  Enabled: false
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+Style/UnneededCapitalW:
+  Enabled: false

data/README.markdown

@@ -1,4 +1,4 @@
-# [Jekyll](http://jekyllrb.com/)
+# [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]
@@ -14,7 +14,7 @@
 [hakiri]: https://hakiri.io/github/jekyll/jekyll/master
 [travis]: https://travis-ci.org/jekyll/jekyll
 
-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](http://pages.github.com), which you can use to host sites right from your GitHub repositories.
+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.
 
 ## Philosophy
 
@@ -22,14 +22,14 @@ Jekyll does what you tell it to do — no more, no less. It doesn't try to outs
 
 ## Having trouble with OS X El Capitan?
 
-See: http://jekyllrb.com/docs/troubleshooting/#jekyll-amp-mac-os-x-1011
+See: https://jekyllrb.com/docs/troubleshooting/#jekyll-amp-mac-os-x-1011
 
 ## Getting Started
 
-* [Install](http://jekyllrb.com/docs/installation/) the gem
-* Read up about its [Usage](http://jekyllrb.com/docs/usage/) and [Configuration](http://jekyllrb.com/docs/configuration/)
+* [Install](https://jekyllrb.com/docs/installation/) the gem
+* Read up about its [Usage](https://jekyllrb.com/docs/usage/) and [Configuration](https://jekyllrb.com/docs/configuration/)
 * Take a gander at some existing [Sites](https://wiki.github.com/jekyll/jekyll/sites)
-* Fork and [Contribute](http://jekyllrb.com/docs/contributing/) your own modifications
+* [Fork](https://github.com/jekyll/jekyll/fork) and [Contribute](https://jekyllrb.com/docs/contributing/) your own modifications
 * Have questions? Check out our official forum community [Jekyll Talk](https://talk.jekyllrb.com/) or [`#jekyll` on irc.freenode.net](https://botbot.me/freenode/jekyll/)
 
 ## Code of Conduct
@@ -41,18 +41,18 @@ conduct.
 Please adhere to this code of conduct in any interactions you have in the
 Jekyll community. It is strictly enforced on all official Jekyll
 repositories, websites, and resources. If you encounter someone violating
-these terms, please let a maintainer (@parkr, @envygeeks, or @mattr-) know
+these terms, please let a maintainer ([@parkr](https://github.com/parkr), [@envygeeks](https://github.com/envygeeks), or [@mattr-](https://github.com/mattr-)) know
 and we will address it as soon as possible.
 
 ## Diving In
 
 * [Migrate](http://import.jekyllrb.com/docs/home/) from your previous system
-* Learn how the [YAML Front Matter](http://jekyllrb.com/docs/frontmatter/) works
-* Put information on your site with [Variables](http://jekyllrb.com/docs/variables/)
-* Customize the [Permalinks](http://jekyllrb.com/docs/permalinks/) your posts are generated with
-* Use the built-in [Liquid Extensions](http://jekyllrb.com/docs/templates/) to make your life easier
-* Use custom [Plugins](http://jekyllrb.com/docs/plugins/) to generate content specific to your site
+* Learn how the [YAML Front Matter](https://jekyllrb.com/docs/frontmatter/) works
+* Put information on your site with [Variables](https://jekyllrb.com/docs/variables/)
+* Customize the [Permalinks](https://jekyllrb.com/docs/permalinks/) your posts are generated with
+* Use the built-in [Liquid Extensions](https://jekyllrb.com/docs/templates/) to make your life easier
+* Use custom [Plugins](https://jekyllrb.com/docs/plugins/) to generate content specific to your site
 
 ## License
 
-See [LICENSE](https://github.com/jekyll/jekyll/blob/master/LICENSE).
+See the [LICENSE](https://github.com/jekyll/jekyll/blob/master/LICENSE) file.

data/lib/jekyll.rb

@@ -7,7 +7,7 @@ $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].sort.each do |f|
+  Dir[glob].each do |f|
     require f
   end
 end
@@ -16,6 +16,7 @@ end
 require 'rubygems'
 
 # stdlib
+require "pathutil"
 require 'forwardable'
 require 'fileutils'
 require 'time'
@@ -45,7 +46,6 @@ module Jekyll
   autoload :Errors,              'jekyll/errors'
   autoload :Excerpt,             'jekyll/excerpt'
   autoload :External,            'jekyll/external'
-  autoload :Filters,             'jekyll/filters'
   autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
   autoload :Hooks,               'jekyll/hooks'
   autoload :Layout,              'jekyll/layout'
@@ -67,6 +67,8 @@ module Jekyll
   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'
@@ -77,6 +79,7 @@ module Jekyll
   require 'jekyll/generator'
   require 'jekyll/command'
   require 'jekyll/liquid_extensions'
+  require "jekyll/filters"
 
   class << self
     # Public: Tells you which Jekyll environment you are building in so you can skip tasks
@@ -95,16 +98,18 @@ module Jekyll
     #            list of option names and their defaults.
     #
     # Returns the final configuration Hash.
-    def configuration(override = Hash.new)
-      config = Configuration.new
+    def configuration(override = {})
+      config = Configuration[Configuration::DEFAULTS]
+      override = Configuration[override].stringify_keys
       unless override.delete('skip_config_files')
         config = config.read_config_files(config.config_files(override))
       end
 
       # Merge DEFAULTS < _config.yml < override
-      Configuration.from(Utils.deep_merge_hashes(config, override)).tap do |config|
-        set_timezone(config['timezone']) if config['timezone']
-      end
+      config = Utils.deep_merge_hashes(config, override).stringify_keys
+      set_timezone(config['timezone']) if config['timezone']
+
+      config
     end
 
     # Public: Set the TZ environment variable to use the timezone specified
@@ -168,7 +173,6 @@ module Jekyll
 end
 
 require "jekyll/drops/drop"
-require "jekyll/drops/document_drop"
 require_all 'jekyll/commands'
 require_all 'jekyll/converters'
 require_all 'jekyll/converters/markdown'

data/lib/jekyll/cleaner.rb

@@ -1,9 +1,9 @@
-require 'set'
+require "set"
 
 module Jekyll
   # Handles the cleanup of a site's destination before it is built.
   class Cleaner
-    HIDDEN_FILE_REGEX = /\/\.{1,2}$/
+    HIDDEN_FILE_REGEX = %r!\/\.{1,2}$!
     attr_reader :site
 
     def initialize(site)
@@ -32,7 +32,8 @@ module Jekyll
       [site.regenerator.metadata_file]
     end
 
-    # Private: The list of existing files, apart from those included in keep_files and hidden files.
+    # Private: The list of existing files, apart from those included in
+    # keep_files and hidden files.
     #
     # Returns a Set with the file paths
     def existing_files
@@ -77,15 +78,16 @@ module Jekyll
       end
     end
 
-    # Private: The list of existing files that will be replaced by a directory during build
+    # Private: The list of existing files that will be replaced by a directory
+    # during build
     #
     # Returns a Set with the file paths
     def replaced_files
       new_dirs.select { |dir| File.file?(dir) }.to_set
     end
 
-    # Private: The list of directories that need to be kept because they are parent directories
-    # of files specified in keep_files
+    # Private: The list of directories that need to be kept because they are
+    # parent directories of files specified in keep_files
     #
     # Returns a Set with the directory paths
     def keep_dirs
@@ -95,11 +97,12 @@ module Jekyll
     # Private: Creates a regular expression from the config's keep_files array
     #
     # Examples
-    #   ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/
+    #   ['.git','.svn'] with site.dest "/myblog/_site" creates
+    #   the following regex: /\A\/myblog\/_site\/(\.git|\/.svn)/
     #
     # Returns the regular expression
     def keep_file_regex
-      Regexp.union(site.keep_files)
+      %r!\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})!
     end
   end
 end