jekyll 3.5.2 → 3.6.0.pre.beta1

data/lib/jekyll/tags/include.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Tags
@@ -135,7 +136,13 @@ eos
 
         context.stack do
           context["include"] = parse_params(context) if @params
-          partial.render!(context)
+          begin
+            partial.render!(context)
+          rescue Liquid::Error => e
+            e.template_name = path
+            e.markup_context = "included " if e.markup_context.nil?
+            raise e
+          end
         end
       end
 
@@ -160,8 +167,10 @@ eos
             .file(path)
           begin
             cached_partial[path] = unparsed_file.parse(read_file(path, context))
-          rescue Liquid::SyntaxError => ex
-            raise IncludeTagError.new(ex.message, path)
+          rescue Liquid::Error => e
+            e.template_name = path
+            e.markup_context = "included " if e.markup_context.nil?
+            raise e
           end
         end
       end

data/lib/jekyll/tags/link.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Tags
     class Link < Liquid::Tag

data/lib/jekyll/tags/post_url.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Tags
     class PostComparer

data/lib/jekyll/theme.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Theme
     extend Forwardable

data/lib/jekyll/theme_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Jekyll::ThemeBuilder
   SCAFFOLD_DIRECTORIES = %w(
     assets _layouts _includes _sass

data/lib/jekyll/url.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "addressable/uri"
 
 # Public: Methods that generate a URL for a resource such as a Post or a Page.
@@ -93,7 +95,7 @@ module Jekyll
 
     def generate_url_from_drop(template)
       template.gsub(%r!:([a-z_]+)!) do |match|
-        pool = possible_keys(match.sub(":".freeze, "".freeze))
+        pool = possible_keys(match.sub(":", ""))
 
         winner = pool.find { |key| @placeholders.key?(key) }
         if winner.nil?

data/lib/jekyll/utils.rb

@@ -1,10 +1,13 @@
 
+# frozen_string_literal: true
+
 module Jekyll
   module Utils
     extend self
     autoload :Ansi, "jekyll/utils/ansi"
     autoload :Exec, "jekyll/utils/exec"
     autoload :Platforms, "jekyll/utils/platforms"
+    autoload :Rouge, "jekyll/utils/rouge"
     autoload :WinTZ, "jekyll/utils/win_tz"
 
     # Constants for use in #slugify
@@ -247,6 +250,8 @@ module Jekyll
     #
     # Returns the updated permalink template
     def add_permalink_suffix(template, permalink_style)
+      template = template.dup
+
       case permalink_style
       when :pretty
         template << "/"
@@ -256,6 +261,7 @@ module Jekyll
         template << "/" if permalink_style.to_s.end_with?("/")
         template << ":output_ext" if permalink_style.to_s.end_with?(":output_ext")
       end
+
       template
     end
 
@@ -296,7 +302,7 @@ module Jekyll
     def merged_file_read_opts(site, opts)
       merged = (site ? site.file_read_opts : {}).merge(opts)
       if merged["encoding"] && !merged["encoding"].start_with?("bom|")
-        merged["encoding"].insert(0, "bom|")
+        merged["encoding"] = "bom|#{merged["encoding"]}"
       end
       merged
     end

data/lib/jekyll/utils/exec.rb

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

data/lib/jekyll/utils/platforms.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Utils
     module Platforms

data/lib/jekyll/utils/rouge.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Utils
+    module Rouge
+
+      def self.html_formatter(*args)
+        Jekyll::External.require_with_graceful_fail("rouge")
+        if old_api?
+          ::Rouge::Formatters::HTML.new(*args)
+        else
+          ::Rouge::Formatters::HTMLLegacy.new(*args)
+        end
+      end
+
+      def self.old_api?
+        ::Rouge.version.to_s < "2"
+      end
+    end
+  end
+end

data/lib/jekyll/utils/win_tz.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Utils
     module WinTZ

data/lib/jekyll/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
-  VERSION = "3.5.2".freeze
+  VERSION = "3.6.0.pre.beta1".freeze
 end

data/lib/site_template/_config.yml

@@ -15,7 +15,7 @@
 # in the templates via {{ site.myvariable }}.
 title: Your awesome title
 email: your-email@example.com
-description: > # this means to ignore newlines until "baseurl:"
+description: >- # this means to ignore newlines until "baseurl:"
   Write an awesome description for your new site here. You can edit this
   line in _config.yml. It will appear in your document head meta (for
   Google search results) and in your feed.xml site description.

data/lib/theme_template/Gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 gemspec

data/lib/theme_template/README.md.erb

@@ -1,9 +1,12 @@
 # <%= theme_name %>
 
-Welcome to your new Jekyll theme! In this directory, you'll find the files you need to be able to package up your theme into a gem. Put your layouts in `_layouts`, your includes in `_includes` and your sass in `_sass`. To experiment with this code, add some sample content and run `bundle exec jekyll serve` – this directory is setup just like a Jekyll site!
+Welcome to your new Jekyll theme! In this directory, you'll find the files you need to be able to package up your theme into a gem. Put your layouts in `_layouts`, your includes in `_includes`, your sass files in `_sass` and any other assets in `assets`.
+
+To experiment with this code, add some sample content and run `bundle exec jekyll serve` – this directory is setup just like a Jekyll site!
 
 TODO: Delete this and the text above, and describe your gem
 
+
 ## Installation
 
 Add this line to your Jekyll site's `Gemfile`:
@@ -28,7 +31,7 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here. Describe your available layouts, includes, and/or sass.
+TODO: Write usage instructions here. Describe your available layouts, includes, sass and/or assets.
 
 ## Contributing
 
@@ -40,7 +43,8 @@ To set up your environment to develop this theme, run `bundle install`.
 
 Your theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
 
-When your theme is released, only the files in `_layouts`, `_includes`, and `_sass` tracked with Git will be released.
+When your theme is released, only the files in `_layouts`, `_includes`, `_sass` and `assets` tracked with Git will be bundled.
+To add a custom directory to your theme-gem, please edit the regexp in `<%= theme_name %>.gemspec` accordingly.
 
 ## License
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.6.0.pre.beta1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-12 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,22 @@ dependencies:
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +247,7 @@ files:
 - lib/jekyll/utils/ansi.rb
 - lib/jekyll/utils/exec.rb
 - lib/jekyll/utils/platforms.rb
+- lib/jekyll/utils/rouge.rb
 - lib/jekyll/utils/win_tz.rb
 - lib/jekyll/version.rb
 - lib/site_template/.gitignore
@@ -275,12 +282,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11