jekyll 3.5.2 → 3.6.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46ce21bfe35d93f05890bde9cd6d656ba480a532
-  data.tar.gz: c7e16c4b99b5d535cd3795b4b57a5729b692c44a
+  metadata.gz: d76285f73396d2606fd208d2d5312ce9e476fa58
+  data.tar.gz: 4322fc510b5b61eb60c0a77c19a9f64b2467b6f2
 SHA512:
-  metadata.gz: 2e78f392ba4ac4757a7b5ccb047c72ec6f9951f816394122c898e9bdb52478e931ff16d8d4776fdfa102152a184ed1e8c8a88d954ed3b1f93417c027d34a2893
-  data.tar.gz: '0867babd246831e8401a276adabe8200577e31eb79f037627aade98b2f838c48b946b545fd9c64cd1e2f95c29275173c2aaea5816d2967f84a3d8c77bbc6c276'
+  metadata.gz: 46e578f29d339fd9703380e41b59396efd324f5e6ea29e8ff0a2f2b2632bb4285c5ed81d4dc64c3b9d4669390187f41c5ae07e85803119e0d18b0443757db394
+  data.tar.gz: a4013df1019299b04bf63597654eb1d06305b63eaf7ab3785a6b585f2606b6d0477e902e91aea0d3f060c198655b0384bcdde9891c6b769c79c93a40f40a2a44

data/.rubocop.yml

@@ -9,6 +9,7 @@ AllCops:
     - benchmark/**/*
     - script/**/*
     - vendor/**/*
+    - tmp/**/*
 Layout/AlignArray:
   Enabled: false
 Layout/AlignHash:
@@ -99,6 +100,9 @@ Style/BracesAroundHashParameters:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
 Style/Documentation:
   Enabled: false
   Exclude:

data/README.markdown

@@ -22,7 +22,9 @@ Jekyll is a simple, blog-aware, static site generator perfect for personal, proj
 
 Jekyll does what you tell it to do — no more, no less. It doesn't try to outsmart users by making bold assumptions, nor does it burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content.
 
-## Having trouble with OS X/macOS?
+See: https://jekyllrb.com/philosophy
+
+## Having trouble?
 
 See: https://jekyllrb.com/docs/troubleshooting/
 
@@ -37,13 +39,13 @@ See: https://jekyllrb.com/docs/troubleshooting/
 ## Code of Conduct
 
 In order to have a more open and welcoming community, Jekyll adheres to a
-[code of conduct](CONDUCT.markdown) adapted from the Ruby on Rails code of
+[code of conduct](CODE_OF_CONDUCT.markdown) adapted from the Ruby on Rails code of
 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](https://github.com/parkr), [@envygeeks](https://github.com/envygeeks), [@mattr-](https://github.com/mattr-), or [@alfredxing](https://github.com/alfredxing)) know and we will address it as soon as possible.
+these terms, please let a [team captain](https://github.com/orgs/jekyll/teams/affinity-team-captains/members) know and we will address it as soon as possible.
 
 ## Diving In
 

data/exe/jekyll

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 STDOUT.sync = true
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
 require "jekyll"
 require "mercenary"

data/lib/jekyll.rb

@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift __dir__ # For use/testing when no gem is installed
 
 # Require all of the Ruby files in the given directory.
 #
@@ -6,7 +8,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")
+  glob = File.join(__dir__, path, "*.rb")
   Dir[glob].sort.each do |f|
     require f
   end
@@ -162,8 +164,9 @@ 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?("~")
-      clean_path = File.expand_path(questionable_path, "/")
+      clean_path = questionable_path.dup
+      clean_path.insert(0, "/") if clean_path.start_with?("~")
+      clean_path = File.expand_path(clean_path, "/")
 
       return clean_path if clean_path.eql?(base_directory)
 

data/lib/jekyll/cleaner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "set"
 
 module Jekyll

data/lib/jekyll/collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Collection
     attr_reader :site, :label, :metadata

data/lib/jekyll/command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Command
     class << self

data/lib/jekyll/commands/build.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Build < Command

data/lib/jekyll/commands/clean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Clean < Command

data/lib/jekyll/commands/doctor.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "addressable/uri"
+
 module Jekyll
   module Commands
     class Doctor < Command
@@ -36,6 +40,7 @@ module Jekyll
             !deprecated_relative_permalinks(site),
             !conflicting_urls(site),
             !urls_only_differ_by_case(site),
+            proper_site_url?(site),
           ].all?
         end
 
@@ -91,6 +96,15 @@ module Jekyll
           urls_only_differ_by_case
         end
 
+        def proper_site_url?(site)
+          url = site.config["url"]
+          [
+            url_exists?(url),
+            url_valid?(url),
+            url_absolute(url),
+          ].all?
+        end
+
         private
         def collect_urls(urls, things, destination)
           things.each do |thing|
@@ -110,6 +124,29 @@ module Jekyll
             (memo[dest.downcase] ||= []) << dest
           end
         end
+
+        def url_exists?(url)
+          return true unless url.nil? || url.empty?
+          Jekyll.logger.warn "Warning:", "You didn't set an URL in the config file, "\
+              "you may encounter problems with some plugins."
+          false
+        end
+
+        def url_valid?(url)
+          Addressable::URI.parse(url)
+          true
+        rescue
+          Jekyll.logger.warn "Warning:", "The site URL does not seem to be valid, "\
+              "check the value of `url` in your config file."
+          false
+        end
+
+        def url_absolute(url)
+          return true if Addressable::URI.parse(url).absolute?
+          Jekyll.logger.warn "Warning:", "Your site URL does not seem to be absolute, "\
+              "check the value of `url` in your config file."
+          false
+        end
       end
     end
   end

data/lib/jekyll/commands/help.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Help < Command

data/lib/jekyll/commands/new.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "erb"
 
 module Jekyll
@@ -70,7 +72,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "#{Jekyll::VERSION}"
+gem "jekyll", "~> #{Jekyll::VERSION}"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minima", "~> 2.0"
@@ -81,7 +83,7 @@ gem "minima", "~> 2.0"
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-   gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed", "~> 0.6"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -113,7 +115,7 @@ RUBY
         end
 
         def site_template
-          File.expand_path("../../site_template", File.dirname(__FILE__))
+          File.expand_path("../../site_template", __dir__)
         end
 
         def scaffold_path

data/lib/jekyll/commands/new_theme.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "erb"
 
 class Jekyll::Commands::NewTheme < Jekyll::Command

data/lib/jekyll/commands/serve.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Serve < Command
@@ -234,7 +236,7 @@ module Jekyll
 
         private
         def mime_types
-          file = File.expand_path("../mime.types", File.dirname(__FILE__))
+          file = File.expand_path("../mime.types", __dir__)
           WEBrick::HTTPUtils.load_mime_types(file)
         end
       end

data/lib/jekyll/commands/serve/servlet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "webrick"
 
 module Jekyll
@@ -22,7 +24,7 @@ module Jekyll
 
         def search_file(req, res, basename)
           # /file.* > /file/index.html > /file.html
-          super || super(req, res, "#{basename}.html")
+          super || super(req, res, ".html") || super(req, res, "#{basename}.html")
         end
 
         # rubocop:disable Style/MethodName

data/lib/jekyll/configuration.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   class Configuration < Hash
@@ -155,7 +156,7 @@ module Jekyll
       )
 
       # Get configuration from <source>/_config.yml or <source>/<config_file>
-      config_files = override.delete("config")
+      config_files = override["config"]
       if config_files.to_s.empty?
         default = %w(yml yaml).find(-> { "yml" }) do |ext|
           File.exist?(Jekyll.sanitized_path(source(override), "_config.#{ext}"))

data/lib/jekyll/converter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Converter < Plugin
     # Public: Get or set the highlighter prefix. When an argument is specified,

data/lib/jekyll/converters/identity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Converters
     class Identity < Converter

data/lib/jekyll/converters/markdown.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Converters
     class Markdown < Converter

data/lib/jekyll/converters/markdown/rdiscount_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Converters
     class Markdown

data/lib/jekyll/converters/markdown/redcarpet_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Jekyll::Converters::Markdown::RedcarpetParser
   module CommonMethods
     def add_code_tags(code, lang)
@@ -48,14 +50,12 @@ class Jekyll::Converters::Markdown::RedcarpetParser
     def block_code(code, lang)
       code = "<pre>#{super}</pre>"
 
-      output = "<div class=\"highlight\">"
-      output << add_code_tags(code, lang)
-      output << "</div>"
+      "<div class=\"highlight\">#{add_code_tags(code, lang)}</div>"
     end
 
     protected
     def rouge_formatter(_lexer)
-      Rouge::Formatters::HTML.new(:wrap => false)
+      Jekyll::Utils::Rouge.html_formatter(:wrap => false)
     end
   end
 

data/lib/jekyll/converters/smartypants.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Kramdown::Parser::SmartyPants < Kramdown::Parser::Kramdown
   def initialize(source, options)
     super

data/lib/jekyll/convertible.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require "set"
 

data/lib/jekyll/deprecator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Deprecator
     extend self
@@ -5,7 +7,7 @@ module Jekyll
     def process(args)
       arg_is_present? args, "--server", "The --server command has been replaced by the \
                           'serve' subcommand."
-      arg_is_present? args, "--serve", "The --server command has been replaced by the \
+      arg_is_present? args, "--serve", "The --serve command has been replaced by the \
                           'serve' subcommand."
       arg_is_present? args, "--no-server", "To build Jekyll without launching a server, \
                           use the 'build' subcommand."
@@ -46,6 +48,5 @@ module Jekyll
       Jekyll.logger.warn "Defaults:", "Please update your front-matter defaults to use \
                         'type: #{current}'."
     end
-
   end
 end

data/lib/jekyll/document.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   class Document

data/lib/jekyll/drops/collection_drop.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops

data/lib/jekyll/drops/document_drop.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops

data/lib/jekyll/drops/drop.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops

data/lib/jekyll/drops/excerpt_drop.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops

data/lib/jekyll/drops/jekyll_drop.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops

data/lib/jekyll/drops/site_drop.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops
@@ -37,6 +38,9 @@ module Jekyll
         @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
       end
 
+      # return nil for `{{ site.config }}` even if --config was passed via CLI
+      def config; end
+
       private
       def_delegator :@obj, :config, :fallback_data
     end

data/lib/jekyll/drops/static_file_drop.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Drops
     class StaticFileDrop < Drop

data/lib/jekyll/drops/unified_payload_drop.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops

data/lib/jekyll/drops/url_drop.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops