jekyll 3.2.1 → 3.3.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 623eb4b161f9348d78dc2ea345b5a6cc4da0297b
-  data.tar.gz: 3420c64ceca3753c2c0830c158c8269bd6c92211
+  metadata.gz: 0f37d320b2fa6347d5fd020d17cf815ba0fcd32a
+  data.tar.gz: 6832433b42442d9eed559699b6a49078425bd537
 SHA512:
-  metadata.gz: ca9f677cb215ab07b323ab6d8245f87c3859b57eec6b21473cc8ec21eaae5475373f0779040ff022dc187013a6cb4053e45f16d0295c12a2b054f09a30dae9bf
-  data.tar.gz: 21301e3cc0088ef1ffba069aa0b7d19b59ffb3bfed86b575efb29fb69fb467dc51dc0a35e2ecd2db338cddc06359271d3be6a5fa25d599bf86491d82b256c00c
+  metadata.gz: c02a41ead91f7f078cd3333efb390623d214110523b6e86cdf5fad590e01d150629d7dea302220ffdc595eea72d53ffffea34eef2cb62173812fb833f894ff43
+  data.tar.gz: 521abff35bc9f59edee2737440ee700e50508da2b11e6a0af33360e4ffb31318b0cbb2ea19a94828be179d4d93fbc5d7a82b2bbb6433f373f05a30cc8fd885ae

data/.rubocop.yml

@@ -4,8 +4,6 @@ AllCops:
   Include:
     - lib/**/*.rb
   Exclude:
-    - lib/jekyll/convertible.rb
-    - lib/jekyll/document.rb
     - lib/jekyll/renderer.rb
     - bin/**/*
     - benchmark/**/*
@@ -18,14 +16,14 @@ Lint/UnreachableCode:
 Lint/UselessAccessModifier:
   Enabled: false
 Metrics/AbcSize:
-  Max: 20
+  Max: 21
 Metrics/ClassLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb$/
     - !ruby/regexp /test\/.*.rb$/
   Max: 300
 Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 9
 Metrics/LineLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb/

data/exe/jekyll

@@ -1,7 +1,7 @@
 #!/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__), "..", "lib"))
 
 require "jekyll"
 require "mercenary"

data/lib/jekyll.rb

@@ -41,7 +41,6 @@ module Jekyll
   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"
@@ -55,6 +54,7 @@ module Jekyll
   autoload :PostReader,          "jekyll/readers/post_reader"
   autoload :PageReader,          "jekyll/readers/page_reader"
   autoload :StaticFileReader,    "jekyll/readers/static_file_reader"
+  autoload :ThemeAssetsReader,   "jekyll/readers/theme_assets_reader"
   autoload :LogAdapter,          "jekyll/log_adapter"
   autoload :Page,                "jekyll/page"
   autoload :PluginManager,       "jekyll/plugin_manager"
@@ -160,11 +160,13 @@ module Jekyll
 
       questionable_path.insert(0, "/") if questionable_path.start_with?("~")
       clean_path = File.expand_path(questionable_path, "/")
-      clean_path.sub!(%r!\A\w:/!, "/")
 
-      if clean_path.start_with?(base_directory.sub(%r!\A\w:/!, "/"))
+      return clean_path if clean_path.eql?(base_directory)
+
+      if clean_path.start_with?(base_directory.sub(%r!\z!, "/"))
         clean_path
       else
+        clean_path.sub!(%r!\A\w:/!, "/")
         File.join(base_directory, clean_path)
       end
     end

data/lib/jekyll/commands/build.rb

@@ -71,12 +71,23 @@ module Jekyll
         #
         # Returns nothing.
         def watch(site, options)
-          External.require_with_graceful_fail "jekyll-watch"
-          watch_method = Jekyll::Watcher.method(:watch)
-          if watch_method.parameters.size == 1
-            watch_method.call(options)
+          if Utils::Platforms.windows?
+            Jekyll.logger.warn "", "--watch arg is unsupported on Windows. "
+            Jekyll.logger.warn "", "If you are on Windows Bash, please see: " \
+              "https://github.com/Microsoft/BashOnWindows/issues/216"
+
           else
-            watch_method.call(options, site)
+            External.require_with_graceful_fail "jekyll-watch"
+            watch_method = Jekyll::Watcher.method(:watch)
+            if watch_method.parameters.size == 1
+              watch_method.call(
+                options
+              )
+            else
+              watch_method.call(
+                options, site
+              )
+            end
           end
         end
       end # end of class << self

data/lib/jekyll/commands/new.rb

@@ -11,6 +11,7 @@ module Jekyll
 
             c.option "force", "--force", "Force creation even if PATH already exists"
             c.option "blank", "--blank", "Creates scaffolding but with empty files"
+            c.option "skip-bundle", "--skip-bundle", "Skip 'bundle install'"
 
             c.action do |args, options|
               Jekyll::Commands::New.process(args, options)
@@ -34,7 +35,7 @@ module Jekyll
             create_site new_blog_path
           end
 
-          Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
+          after_install(new_blog_path, options)
         end
 
         def create_blank_site(path)
@@ -80,9 +81,9 @@ gem "minima"
 # gem "github-pages", group: :jekyll_plugins
 
 # If you have any plugins, put them here!
-# group :jekyll_plugins do
-#   gem "jekyll-github-metadata", "~> 1.0"
-# end
+group :jekyll_plugins do
+   gem "jekyll-feed", "~> 0.6"
+end
 RUBY
         end
 
@@ -114,6 +115,31 @@ RUBY
         def scaffold_path
           "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
         end
+
+        # After a new blog has been created, print a success notification and
+        # then automatically execute bundle install from within the new blog dir
+        # unless the user opts to generate a blank blog or skip 'bundle install'.
+
+        def after_install(path, options = {})
+          Jekyll.logger.info "New jekyll site installed in #{path.cyan}."
+          Jekyll.logger.info "Bundle install skipped." if options["skip-bundle"]
+
+          unless options["blank"] || options["skip-bundle"]
+            bundle_install path
+          end
+        end
+
+        def bundle_install(path)
+          Jekyll::External.require_with_graceful_fail "bundler"
+          Jekyll.logger.info "Running bundle install in #{path.cyan}..."
+          Dir.chdir(path) do
+            if ENV["CI"]
+              system("bundle", "install", "--quiet")
+            else
+              system("bundle", "install")
+            end
+          end
+        end
       end
     end
   end

data/lib/jekyll/commands/new_theme.rb

@@ -16,6 +16,7 @@ class Jekyll::Commands::NewTheme < Jekyll::Command
       end
     end
 
+    # rubocop:disable Metrics/AbcSize
     def process(args, opts)
       if !args || args.empty?
         raise Jekyll::Errors::InvalidThemeName, "You must specify a theme name."
@@ -28,9 +29,10 @@ class Jekyll::Commands::NewTheme < Jekyll::Command
       end
 
       theme.create!
-      Jekyll.logger.info "Your new Jekyll theme, #{theme.name}," \
-        " is ready for you in #{theme.path}!"
+      Jekyll.logger.info "Your new Jekyll theme, #{theme.name.cyan}," \
+        " is ready for you in #{theme.path.to_s.cyan}!"
       Jekyll.logger.info "For help getting started, read #{theme.path}/README.md."
     end
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/jekyll/commands/serve.rb

@@ -33,6 +33,7 @@ module Jekyll
               opts["serving"] = true
               opts["watch"  ] = true unless opts.key?("watch")
               config = opts["config"]
+              opts["url"] = default_url(opts) if Jekyll.env == "development"
               Build.process(opts)
               opts["config"] = config
               Serve.process(opts)
@@ -47,11 +48,7 @@ module Jekyll
           destination = opts["destination"]
           setup(destination)
 
-          server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
-          server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
-          Jekyll.logger.info "Server address:", server_address(server, opts)
-          launch_browser server, opts if opts["open_url"]
-          boot_or_detach server, opts
+          start_up_webrick(opts, destination)
         end
 
         # Do a base pre-setup of WEBRick so that everything is in place
@@ -101,6 +98,22 @@ module Jekyll
           opts
         end
 
+        #
+
+        private
+        def start_up_webrick(opts, destination)
+          server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
+          server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
+          Jekyll.logger.info "Server address:", server_address(
+            server.config[:SSLEnable],
+            server.config[:BindAddress],
+            server.config[:Port],
+            opts["baseurl"]
+          )
+          launch_browser server, opts if opts["open_url"]
+          boot_or_detach server, opts
+        end
+
         # Recreate NondisclosureName under utf-8 circumstance
 
         private
@@ -116,17 +129,29 @@ module Jekyll
         #
 
         private
-        def server_address(server, opts)
+        def server_address(prefix, address, port, baseurl = nil)
           format("%{prefix}://%{address}:%{port}%{baseurl}", {
-            :prefix  => server.config[:SSLEnable] ? "https" : "http",
-            :baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "",
-            :address => server.config[:BindAddress],
-            :port    => server.config[:Port]
+            :prefix  => prefix ? "https" : "http",
+            :address => address,
+            :port    => port,
+            :baseurl => baseurl ? "#{baseurl}/" : ""
           })
         end
 
         #
 
+        private
+        def default_url(opts)
+          config = configuration_from_options(opts)
+          server_address(
+            config["ssl_cert"] && config["ssl_key"],
+            config["host"] == "127.0.0.1" ? "localhost" : config["host"],
+            config["port"]
+          )
+        end
+
+        #
+
         private
         def launch_browser(server, opts)
           address = server_address(server, opts)

data/lib/jekyll/configuration.rb

@@ -17,7 +17,7 @@ module Jekyll
       # Handling Reading
       "safe"              => false,
       "include"           => [".htaccess"],
-      "exclude"           => [],
+      "exclude"           => %w(node_modules vendor),
       "keep_files"        => [".git", ".svn"],
       "encoding"          => "utf-8",
       "markdown_ext"      => "markdown,mkdown,mkdn,mkd,md",

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

@@ -104,7 +104,7 @@ module Jekyll
 
         private
         def modernize_coderay_config
-          if highlighter == "coderay"
+          unless @config["coderay"].empty?
             Jekyll::Deprecator.deprecation_message(
               "You are using 'kramdown.coderay' in your configuration, " \
               "please use 'syntax_highlighter_opts' instead."

data/lib/jekyll/convertible.rb

@@ -35,6 +35,7 @@ module Jekyll
     # opts - optional parameter to File.read, default at site configs
     #
     # Returns nothing.
+    # rubocop:disable Metrics/AbcSize
     def read_yaml(base, name, opts = {})
       filename = File.join(base, name)
 
@@ -58,6 +59,7 @@ module Jekyll
 
       self.data
     end
+    # rubocop:enable Metrics/AbcSize
 
     def validate_data!(filename)
       unless self.data.is_a?(Hash)
@@ -76,18 +78,7 @@ module Jekyll
     #
     # Returns the transformed contents.
     def transform
-      converters.reduce(content) do |output, converter|
-        begin
-          converter.convert output
-        rescue => e
-          Jekyll.logger.error(
-            "Conversion error:",
-            "#{converter.class} encountered an error while converting '#{path}':"
-          )
-          Jekyll.logger.error("", e.to_s)
-          raise e
-        end
-      end
+      _renderer.transform
     end
 
     # Determine the extension depending on content_type.
@@ -95,7 +86,7 @@ module Jekyll
     # Returns the String extension for the output file.
     #   e.g. ".html" for an HTML output file.
     def output_ext
-      Jekyll::Renderer.new(site, self).output_ext
+      _renderer.output_ext
     end
 
     # Determine which converter to use based on this convertible's
@@ -103,7 +94,7 @@ module Jekyll
     #
     # Returns the Converter instance.
     def converters
-      @converters ||= site.converters.select { |c| c.matches(ext) }.sort
+      _renderer.converters
     end
 
     # Render Liquid in the content
@@ -114,17 +105,7 @@ module Jekyll
     #
     # Returns the converted content
     def render_liquid(content, payload, info, path)
-      template = site.liquid_renderer.file(path).parse(content)
-      template.warnings.each do |e|
-        Jekyll.logger.warn "Liquid Warning:",
-          LiquidRenderer.format_error(e, path || self.path)
-      end
-      template.render!(payload, info)
-    # rubocop: disable RescueException
-    rescue Exception => e
-      Jekyll.logger.error "Liquid Exception:",
-        LiquidRenderer.format_error(e, path || self.path)
-      raise e
+      _renderer.render_liquid(content, payload, info, path)
     end
     # rubocop: enable RescueException
 
@@ -211,40 +192,10 @@ module Jekyll
     #
     # Returns nothing
     def render_all_layouts(layouts, payload, info)
-      # recursively render layouts
-      layout = layouts[data["layout"]]
-
-      Jekyll.logger.warn(
-        "Build Warning:",
-        "Layout '#{data["layout"]}' requested in #{path} does not exist."
-      ) if invalid_layout? layout
-
-      used = Set.new([layout])
-
-      # Reset the payload layout data to ensure it starts fresh for each page.
-      payload["layout"] = nil
-
-      while layout
-        Jekyll.logger.debug "Rendering Layout:", path
-        payload["content"] = output
-        payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
-
-        self.output = render_liquid(layout.content,
-                                    payload,
-                                    info,
-                                    layout.relative_path)
-
-        # Add layout to dependency tree
-        site.regenerator.add_dependency(
-          site.in_source_dir(path),
-          site.in_source_dir(layout.path)
-        )
-
-        if (layout = layouts[layout.data["layout"]])
-          break if used.include?(layout)
-          used << layout
-        end
-      end
+      _renderer.layouts = layouts
+      self.output = _renderer.place_in_layouts(output, payload, info)
+    ensure
+      @_renderer = nil # this will allow the modifications above to disappear
     end
 
     # Add any necessary layouts to this convertible document.
@@ -254,32 +205,15 @@ module Jekyll
     #
     # Returns nothing.
     def do_layout(payload, layouts)
-      Jekyll.logger.debug "Rendering:", self.relative_path
-
-      Jekyll.logger.debug "Pre-Render Hooks:", self.relative_path
-      Jekyll::Hooks.trigger hook_owner, :pre_render, self, payload
-      info = {
-        :filters   => [Jekyll::Filters],
-        :registers => { :site => site, :page => payload["page"] }
-      }
+      self.output = _renderer.tap do |renderer|
+        renderer.layouts = layouts
+        renderer.payload = payload
+      end.run
 
-      # render and transform content (this becomes the final content of the object)
-      payload["highlighter_prefix"] = converters.first.highlighter_prefix
-      payload["highlighter_suffix"] = converters.first.highlighter_suffix
-
-      if render_with_liquid?
-        Jekyll.logger.debug "Rendering Liquid:", self.relative_path
-        self.content = render_liquid(content, payload, info, path)
-      end
-      Jekyll.logger.debug "Rendering Markup:", self.relative_path
-      self.content = transform
-
-      # output keeps track of what will finally be written
-      self.output = content
-
-      render_all_layouts(layouts, payload, info) if place_in_layout?
       Jekyll.logger.debug "Post-Render Hooks:", self.relative_path
       Jekyll::Hooks.trigger hook_owner, :post_render, self
+    ensure
+      @_renderer = nil # this will allow the modifications above to disappear
     end
 
     # Write the generated page file to the destination directory.
@@ -306,5 +240,10 @@ module Jekyll
         data[property]
       end
     end
+
+    private
+    def _renderer
+      @_renderer ||= Jekyll::Renderer.new(site, self)
+    end
   end
 end