jekyll-last-modified 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be742904ecb10d151c7180bd1388c2d4582aad9e5e03aa7c2d548773378adc7
-  data.tar.gz: 65f3395beb4de1a5e8abb742c50b19d2499b807c987e053bd74388945a43f2f7
+  metadata.gz: 6675a8cd6e3bab30f372a3983c96b59efba23996d3b24c88971ccce9bb405f40
+  data.tar.gz: 7a5b74a9e269c183571edb4954ec94d728309d83bff62204897fd172024197a4
 SHA512:
-  metadata.gz: 47bf13b2c85e7e15c4508e0548d2aad56eb0f9b0b31d7445e2c3154f504dc6bd495bd59efc9880c439deb45a2f7a52eca4b89f30b11749fdf194c3505c5dca53
-  data.tar.gz: 511a5cab6fb907b78750a9d586afccaa273541451b94f5eda7de5561e83f14f4f5c0530ec6f7c25a19efafcd859e41766bc92584de47a179641dc9e8a1f0cd7d
+  metadata.gz: e89d347882ab0f7cb91d612cc84c9e9b09e9ef909a79d22064c756f7f1856070544ec299fa405c55f19ed1a58e85e4b4ff6485d893f3dc81c234b2d39d9f8e74
+  data.tar.gz: 384449699adb7057dec73749066ed18c9c0fdc47efe53c797eeed8180e53f538df0178c8c92636fb66ef95ce9c3301649cb07e9d158f84b0deef1cefb18a367d

data/README.md

@@ -1,3 +1,5 @@
 # Jekyll::LastModified
 
 This is a fork of [ivantsepp/jekyll-git_metadata](https://github.com/ivantsepp/jekyll-git_metadata), with the addition that it populates `page.date` (if unset) and `page.last_modified_at` from retrieved Git metadata.
+
+Additionally, `subject` and `body` are available for commits, for retrieving the first line and the rest of the commit message separately.

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.1'
+  spec.version       = '1.0.4'
   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

@@ -3,7 +3,7 @@ require 'rbconfig'
 module Jekyll
   module LastModified
     class Generator < Jekyll::Generator
-      VERSION = '1.0.1'
+      VERSION = '1.0.2'
 
       safe true
 
@@ -11,7 +11,7 @@ module Jekyll
         raise "Git is not installed" unless git_installed?
 
         Dir.chdir(site.source) do
-          base_path = site.config['collections_dir']
+          base_path = site.config['collections_dir'] || ''
           data = load_git_metadata(site)
           site.config['git'] = data['site_data']
           jekyll_items(site).each do |page|
@@ -19,11 +19,11 @@ module Jekyll
               path = page.path
             else
               path = page.relative_path
-              path = File.join base_path, path if base_path
+              path = File.join base_path, path unless base_path.empty?
             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
@@ -35,22 +35,22 @@ module Jekyll
       def load_git_metadata(site)
         current_sha = %x{ git rev-parse HEAD }.strip
 
-        cache_dir = site.source + '/.git-metadata'
+        cache_dir = File.join site.source, '.git-metadata'
         FileUtils.mkdir_p(cache_dir) unless File.directory?(cache_dir)
-        cache_file = cache_dir + "/#{current_sha}.json"
+        cache_file = File.join cache_dir, "#{current_sha}.json"
 
         if File.exist?(cache_file)
           return JSON.parse(IO.read(cache_file))
         end
 
-        base_path = site.config['collections_dir']
+        base_path = site.config['collections_dir'] || ''
         pages_data = {}
         jekyll_items(site).each do |page|
           if page.is_a?(Jekyll::Page)
             path = page.path
           else
             path = page.relative_path
-            path = File.join base_path, path if base_path
+            path = File.join base_path, path unless base_path.empty?
           end
           pages_data[path] = page_data(path)
         end
@@ -112,7 +112,8 @@ module Jekyll
 
       def commit(sha)
         result = %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\s\s\s[^\r\n]*\n)*)\n(.*)/m).first.map(&:strip)
+        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}/, ''
         {
           'short_sha' => sha,
           'long_sha' => long_sha,
@@ -122,7 +123,9 @@ module Jekyll
           'commit_name' => commit_name,
           'commit_email' => commit_email,
           'commit_date' => commit_date,
-          'message' => message.gsub(/    /, ''),
+          'subject' => message.lines.first.strip,
+          'body' => message.lines[2..]&.join,
+          'message' => message,
           'changed_files' => changed_files.split("\n")
         }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-last-modified
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - iBug
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2022-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -28,14 +28,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
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Set page date from Git database