jekyll-last-modified 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d34b842ba3dd823353cb96ce4c5cefb2719ae78d999e61c4da84289e0409df72
-  data.tar.gz: d8437c2a143ee76fa9ba9e7f6c1ce3df3f1707b9cb1ff4ceb3676f3f05408603
+  metadata.gz: 143348a5570bace6dd2dbeac85f664cfc0598aeb3bf92ee6a529dbaf41a95d17
+  data.tar.gz: 63b642021d85d6d2a354305d00aa7df5bb4b68768f17ddc8ed847d26fe3423ae
 SHA512:
-  metadata.gz: 564a89ce5c7a1810c92d4d25ccd3975ecb92b5dc2eca6e41d8672eca59f4b4c3ff240f3e4eccd93c3f7e17f26a1ac7b5280b276c97db44a4b5740f4adb248713
-  data.tar.gz: 7a2c74004faf143f58df9e7ad1bac836eb218b750dd5caffbf993f044202faa7d8c6bb7180f7b370b4367c992494b284d1f5881d00044637f4f824b2c0e0dd3b
+  metadata.gz: 66f9afaa75fe06d94d7c193847cdb74cb52ec98c2394916115aa10f594e10d5140a4dcc9a680ad3d11281b0e77da1d4ff405d6a9e7957caa2c7edb693f60ea14
+  data.tar.gz: 890fe98ed9457563c38a6147f77115d8b66ef1b7b704234543d78c02af8f8a0ba2e2e691f2e115141e686f479f46d166143396115b0ebfdd83c6e06a28aec988

data/jekyll-last-modified.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-last-modified"
-  spec.version       = '1.0.3'
+  spec.version       = '1.0.5'
   spec.authors       = ["iBug"]
   spec.email         = ["i@ibugone.com"]
   spec.summary       = %q{Set page date from Git database}
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "jekyll", '>= 3.5'
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", ">= 1.6"
   spec.add_development_dependency "shoulda"
   spec.add_development_dependency "mocha"
 end

data/lib/jekyll/last_modified.rb

@@ -23,7 +23,7 @@ module Jekyll
             end
             page.data['git'] = data['pages_data'][path]
             unless page.data['git'].nil?
-              page.data['last_modified_at'] = page.data['git']['last_commit']['commit_date']
+              page.data['last_modified_at'] ||= page.data['git']['last_commit']['commit_date']
               if page.data['date'] == site.time
                 page.data['date'] = page.data['git']['first_commit']['commit_date']
               end
@@ -33,7 +33,7 @@ module Jekyll
       end
 
       def load_git_metadata(site)
-        current_sha = %x{ git rev-parse HEAD }.strip
+        current_sha = normalize_git_output(%x{ git rev-parse HEAD }).strip
 
         cache_dir = File.join site.source, '.git-metadata'
         FileUtils.mkdir_p(cache_dir) unless File.directory?(cache_dir)
@@ -87,7 +87,7 @@ module Jekyll
         results = []
         cmd = 'git shortlog -se HEAD'
         cmd << " -- #{file}" if file
-        result = %x{ #{cmd} }
+        result = normalize_git_output(%x{ #{cmd} })
         result.lines.each do |line|
           commits, name, email = line.scan(/(.*)\t(.*)<(.*)>/).first.map(&:strip)
           results << { 'commits' => commits.to_i, 'name' => name, 'email' => email }
@@ -98,7 +98,7 @@ module Jekyll
       def lines(file = nil)
         cmd = "git log --numstat --format=%h"
         cmd << " -- #{file}" if file
-        result = %x{ #{cmd} }
+        result = normalize_git_output(%x{ #{cmd} })
         results = result.scan(/(.*)\n\n((?:.*\t.*\t.*\n)*)/)
         results.map do |line|
           files = line[1].scan(/(.*)\t(.*)\t(.*)\n/)
@@ -111,7 +111,7 @@ module Jekyll
       end
 
       def commit(sha)
-        result = %x{ git show --format=fuller --name-only #{sha} }
+        result = normalize_git_output(%x{ git show --format=fuller --name-only #{sha} })
         long_sha, author_name, author_email, author_date, commit_name, commit_email, commit_date, message, changed_files = result.scan(/commit (.*)\nAuthor:(.*)<(.*)>\nAuthorDate:(.*)\nCommit:(.*)<(.*)>\nCommitDate:(.*)\n\n((?:^\s{4}[^\r\n]*\n)*)\n(.*)/m).first.map(&:strip)
         message.gsub! /^\s{4}/, ''
         {
@@ -131,15 +131,15 @@ module Jekyll
       end
 
       def tracked_files
-        @tracked_files ||= %x{ git ls-tree --full-tree -r --name-only HEAD }.split("\n")
+        @tracked_files ||= normalize_git_output(%x{ git ls-tree --full-tree -r --name-only HEAD }).split("\n")
       end
 
       def project_name
-        File.basename(%x{ git rev-parse --show-toplevel }.strip)
+        File.basename(normalize_git_output(%x{ git rev-parse --show-toplevel }).strip)
       end
 
       def files_count
-        %x{ git ls-tree -r HEAD }.lines.count
+        normalize_git_output(%x{ git ls-tree -r HEAD }).lines.count
       end
 
       def git_installed?
@@ -149,6 +149,10 @@ module Jekyll
 
       private
 
+      def normalize_git_output(output)
+        output.force_encoding(Encoding::UTF_8).scrub
+      end
+
       def jekyll_items(site)
         site.pages + site.collections.values.map(&:docs).flatten
       end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-last-modified
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - iBug
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -28,14 +27,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -85,7 +84,6 @@ homepage: https://github.com/iBug/jekyll-last-modified
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -100,8 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Set page date from Git database
 test_files: []