Hello community,

here is the log from the commit of package rubygem-jekyll for openSUSE:Factory 
checked in at 2018-11-26 10:32:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-jekyll (Old)
 and      /work/SRC/openSUSE:Factory/.rubygem-jekyll.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rubygem-jekyll"

Mon Nov 26 10:32:57 2018 rev:10 rq:651608 version:3.8.5

Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-jekyll/rubygem-jekyll.changes    
2018-07-18 22:50:05.039728040 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-jekyll.new.19453/rubygem-jekyll.changes 
2018-11-26 10:34:19.400745611 +0100
@@ -1,0 +2,6 @@
+Thu Nov 22 05:18:21 UTC 2018 - Stephan Kulow <[email protected]>
+
+- updated to version 3.8.5
+  no changelog found
+
+-------------------------------------------------------------------

Old:
----
  jekyll-3.8.3.gem

New:
----
  jekyll-3.8.5.gem

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rubygem-jekyll.spec ++++++
--- /var/tmp/diff_new_pack.rtzd4c/_old  2018-11-26 10:34:24.536739598 +0100
+++ /var/tmp/diff_new_pack.rtzd4c/_new  2018-11-26 10:34:24.540739593 +0100
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -24,7 +24,7 @@
 #
 
 Name:           rubygem-jekyll
-Version:        3.8.3
+Version:        3.8.5
 Release:        0
 %define mod_name jekyll
 %define mod_full_name %{mod_name}-%{version}

++++++ jekyll-3.8.3.gem -> jekyll-3.8.5.gem ++++++
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/jekyll/entry_filter.rb 
new/lib/jekyll/entry_filter.rb
--- old/lib/jekyll/entry_filter.rb      2018-06-05 15:26:21.000000000 +0200
+++ new/lib/jekyll/entry_filter.rb      2018-11-04 21:19:53.000000000 +0100
@@ -31,9 +31,12 @@
 
     def filter(entries)
       entries.reject do |e|
-        unless included?(e)
-          special?(e) || backup?(e) || excluded?(e) || symlink?(e)
-        end
+        # Reject this entry if it is a symlink.
+        next true if symlink?(e)
+        # Do not reject this entry if it is included.
+        next false if included?(e)
+        # Reject this entry if it is special, a backup file, or excluded.
+        special?(e) || backup?(e) || excluded?(e)
       end
     end
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/jekyll/excerpt.rb new/lib/jekyll/excerpt.rb
--- old/lib/jekyll/excerpt.rb   2018-06-05 15:26:21.000000000 +0200
+++ new/lib/jekyll/excerpt.rb   2018-11-04 21:19:53.000000000 +0100
@@ -128,36 +128,47 @@
     #
     # Returns excerpt String
 
-    LIQUID_TAG_REGEX = %r!{%-?\s*(\w+).+\s*-?%}!m
+    LIQUID_TAG_REGEX = %r!{%-?\s*(\w+)\s*.*?-?%}!m
     MKDWN_LINK_REF_REGEX = %r!^ {0,3}\[[^\]]+\]:.+$!
 
     def extract_excerpt(doc_content)
       head, _, tail = doc_content.to_s.partition(doc.excerpt_separator)
 
-      # append appropriate closing tag (to a Liquid block), to the "head" if 
the
-      # partitioning resulted in leaving the closing tag somewhere in the 
"tail"
-      # partition.
+      # append appropriate closing tag(s) (for each Liquid block), to the 
`head`
+      # if the partitioning resulted in leaving the closing tag somewhere
+      # in the `tail` partition.
+
       if head.include?("{%")
-        head =~ LIQUID_TAG_REGEX
-        tag_name = Regexp.last_match(1)
+        modified  = false
+        tag_names = head.scan(LIQUID_TAG_REGEX)
+        tag_names.flatten!
+        tag_names.reverse_each do |tag_name|
+          next unless liquid_block?(tag_name)
+          next if head =~ endtag_regex_stash(tag_name)
 
-        if liquid_block?(tag_name) && 
head.match(%r!{%-?\s*end#{tag_name}\s*-?%}!).nil?
-          print_build_warning
+          modified = true
           head << "\n{% end#{tag_name} %}"
         end
+        print_build_warning if modified
       end
 
-      if tail.empty?
-        head
-      else
-        head.to_s.dup << "\n\n" << tail.scan(MKDWN_LINK_REF_REGEX).join("\n")
-      end
+      return head if tail.empty?
+
+      head << "\n\n" << tail.scan(MKDWN_LINK_REF_REGEX).join("\n")
     end
 
     private
 
+    def endtag_regex_stash(tag_name)
+      @endtag_regex_stash ||= {}
+      @endtag_regex_stash[tag_name] ||= %r!{%-?\s*end#{tag_name}.*?\s*-?%}!m
+    end
+
     def liquid_block?(tag_name)
-      Liquid::Template.tags[tag_name].superclass == Liquid::Block
+      return false unless tag_name.is_a?(String)
+      return false if tag_name.start_with?("end")
+
+      Liquid::Template.tags[tag_name].ancestors.include?(Liquid::Block)
     rescue NoMethodError
       Jekyll.logger.error "Error:",
         "A Liquid tag in the excerpt of #{doc.relative_path} couldn't be " \
@@ -167,12 +178,13 @@
 
     def print_build_warning
       Jekyll.logger.warn "Warning:", "Excerpt modified in 
#{doc.relative_path}!"
-      Jekyll.logger.warn "",
-        "Found a Liquid block containing separator '#{doc.excerpt_separator}' 
and has " \
-        "been modified with the appropriate closing tag."
-      Jekyll.logger.warn "",
-        "Feel free to define a custom excerpt or excerpt_separator in the 
document's " \
-        "Front Matter if the generated excerpt is unsatisfactory."
+      Jekyll.logger.warn "", "Found a Liquid block containing the excerpt 
separator" \
+                         " #{doc.excerpt_separator.inspect}. "
+      Jekyll.logger.warn "", "The block has been modified with the 
appropriate" \
+                         " closing tag."
+      Jekyll.logger.warn "", "Feel free to define a custom excerpt or" \
+                         " excerpt_separator in the document's front matter" \
+                         " if the generated excerpt is unsatisfactory."
     end
   end
 end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/jekyll/version.rb new/lib/jekyll/version.rb
--- old/lib/jekyll/version.rb   2018-06-05 15:26:21.000000000 +0200
+++ new/lib/jekyll/version.rb   2018-11-04 21:19:53.000000000 +0100
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.8.3".freeze
+  VERSION = "3.8.5".freeze
 end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata        2018-06-05 15:26:21.000000000 +0200
+++ new/metadata        2018-11-04 21:19:53.000000000 +0100
@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.8.5
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -328,7 +328,7 @@
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.


Reply via email to