jekyll 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb6d09c543908a9e92a03dec3e709e25bb0a291f
-  data.tar.gz: 3b306c86e96b2cf1ec0a4f7bf00abc1ef5970d02
+  metadata.gz: 623eb4b161f9348d78dc2ea345b5a6cc4da0297b
+  data.tar.gz: 3420c64ceca3753c2c0830c158c8269bd6c92211
 SHA512:
-  metadata.gz: 4df49dea68ad05648ea7d75a7142b57948f11a011d78810150253190de4c17e074278394a0e757ff4ac868883ad0ca7d7cc8a868a4e2d9bdad7da3bb2fb00042
-  data.tar.gz: 6a31318b580d36092a51a128f2ad8e8cec93251ac5c83c2b9be8517e965515520914013938c1c2babe3a51afb2685f42fb0aea0e6b61ae84c6fb02b259d84ed6
+  metadata.gz: ca9f677cb215ab07b323ab6d8245f87c3859b57eec6b21473cc8ec21eaae5475373f0779040ff022dc187013a6cb4053e45f16d0295c12a2b054f09a30dae9bf
+  data.tar.gz: 21301e3cc0088ef1ffba069aa0b7d19b59ffb3bfed86b575efb29fb69fb467dc51dc0a35e2ecd2db338cddc06359271d3be6a5fa25d599bf86491d82b256c00c

data/lib/jekyll/layout.rb

@@ -11,6 +11,9 @@ module Jekyll
     # Gets the path to this layout.
     attr_reader :path
 
+    # Gets the path to this layout relative to its base
+    attr_reader :relative_path
+
     # Gets/Sets the extension of this layout.
     attr_accessor :ext
 
@@ -37,6 +40,7 @@ module Jekyll
         @base_dir = site.source
         @path = site.in_source_dir(base, name)
       end
+      @relative_path = @path.sub(@base_dir, "")
 
       self.data = {}
 
@@ -52,15 +56,5 @@ module Jekyll
     def process(name)
       self.ext = File.extname(name)
     end
-
-    # The path to the layout, relative to the site source.
-    #
-    # Returns a String path which represents the relative path
-    #   from the site source to this layout
-    def relative_path
-      @relative_path ||= Pathname.new(path).relative_path_from(
-        Pathname.new(@base_dir)
-      ).to_s
-    end
   end
 end

data/lib/jekyll/theme.rb

@@ -10,7 +10,11 @@ module Jekyll
     end
 
     def root
-      @root ||= gemspec.full_gem_path
+      # Must use File.realpath to resolve symlinks created by rbenv
+      # Otherwise, Jekyll.sanitized path with prepend the unresolved root
+      @root ||= File.realpath(gemspec.full_gem_path)
+    rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
+      nil
     end
 
     def includes_path
@@ -34,11 +38,8 @@ module Jekyll
     private
 
     def path_for(folder)
-      resolved_dir = realpath_for(folder)
-      return unless resolved_dir
-
-      path = Jekyll.sanitized_path(root, resolved_dir)
-      path if File.directory?(path)
+      path = realpath_for(folder)
+      path if path && File.directory?(path)
     end
 
     def realpath_for(folder)

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.2.0".freeze
+  VERSION = "3.2.1".freeze
 end

data/lib/theme_template/theme.gemspec.erb

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "TODO: Put your gem's website or public repo URL here."
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(<%= theme_directories.join("|") %>)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(<%= theme_directories.join("|") %>|LICENSE|README)/i}) }
 
   spec.add_development_dependency "jekyll", "~> <%= jekyll_version_with_minor %>"
   spec.add_development_dependency "bundler", "~> 1.12"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid