jekyll-last-modified-at 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40b5f4f5c479ae2ab0289ab0ba8f6c008971832ccba7d4a89bd28c10df21e265
-  data.tar.gz: 4f5b2603be5d8a2654bbf24b720c8854db71ebef55fa1b102933e2af347fdba1
+  metadata.gz: edd7fa5df077c32a987925fd4054649bf7d5ab5f4bcbd9462ae9959f9a48ea44
+  data.tar.gz: 8568fc838acae9482e614e37e44d7f6969754b11e908019f08aeda1b807890a2
 SHA512:
-  metadata.gz: 87044be27075f0318254c6d40963c50803d23e230a69a55bf15ec5564cc9e832d37fca39b080a3adb46814abca0cf476c3bd3f40e789d75061c30eb25d25c469
-  data.tar.gz: f52773184e0315adc839525a405489f9f9e56e58b917a310231f21370df867c7706c22b7745b77c701fede01a715f6605af22a592cfff3878ab93e412ab74266
+  metadata.gz: 0710007c714ee79c797c5790341c08cb2e67ee9e812d2d0c6cb84c9b72273e368832fe05635d5aae26b21a279932901a84e8f357e11674d238b86ec6d749c2e3
+  data.tar.gz: c436b1d4d0bc674b9ac5fa6a3c1f842f02b591aa40cbc65a9fd9b44782cf20d85bd1c527b0678926c334cd6908844ee01e68d0fba3c16ebe58b55a04c99974c9

data/lib/jekyll-last-modified-at.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Jekyll
   module LastModifiedAt
@@ -6,9 +7,9 @@ module Jekyll
     autoload :Determinator, 'jekyll-last-modified-at/determinator'
     autoload :Tag, 'jekyll-last-modified-at/tag'
     autoload :Hook, 'jekyll-last-modified-at/hook'
+    autoload :Git, 'jekyll-last-modified-at/git'
 
-    Tag ; Hook
-
-    PATH_CACHE = {}
+    PATH_CACHE = {} # rubocop:disable Style/MutableConstant
+    REPO_CACHE = {} # rubocop:disable Style/MutableConstant
   end
 end

data/lib/jekyll-last-modified-at/determinator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module LastModifiedAt
     class Determinator
@@ -9,34 +11,42 @@ module Jekyll
         @opts        = opts
       end
 
+      def git
+        return REPO_CACHE[site_source] unless REPO_CACHE[site_source].nil?
+
+        REPO_CACHE[site_source] = Git.new(site_source)
+        REPO_CACHE[site_source]
+      end
+
       def formatted_last_modified_date
         return PATH_CACHE[page_path] unless PATH_CACHE[page_path].nil?
+
         last_modified = last_modified_at_time.strftime(format)
         PATH_CACHE[page_path] = last_modified
         last_modified
       end
 
       def last_modified_at_time
-        unless File.exists? absolute_path_to_article
-          raise Errno::ENOENT, "#{absolute_path_to_article} does not exist!"
-        end
+        raise Errno::ENOENT, "#{absolute_path_to_article} does not exist!" unless File.exist? absolute_path_to_article
 
         Time.at(last_modified_at_unix.to_i)
       end
 
       def last_modified_at_unix
-        if is_git_repo?(site_source)
+        if git.git_repo?
           last_commit_date = Executor.sh(
             'git',
             '--git-dir',
-            top_level_git_directory,
+            git.top_level_directory,
             'log',
+            '-n',
+            '1',
             '--format="%ct"',
             '--',
             relative_path_from_git_dir
           )[/\d+/]
           # last_commit_date can be nil iff the file was not committed.
-          (last_commit_date.nil? || last_commit_date.empty?) ? mtime(absolute_path_to_article) : last_commit_date
+          last_commit_date.nil? || last_commit_date.empty? ? mtime(absolute_path_to_article) : last_commit_date
         else
           mtime(absolute_path_to_article)
         end
@@ -51,7 +61,7 @@ module Jekyll
       end
 
       def format
-        opts['format'] ||= "%d-%b-%y"
+        opts['format'] ||= '%d-%b-%y'
       end
 
       def format=(new_format)
@@ -61,39 +71,20 @@ module Jekyll
       private
 
       def absolute_path_to_article
-        @article_file_path ||= Jekyll.sanitized_path(site_source, @page_path)
+        @absolute_path_to_article ||= Jekyll.sanitized_path(site_source, @page_path)
       end
 
       def relative_path_from_git_dir
-        return nil unless is_git_repo?(site_source)
-        @relative_path_from_git_dir ||= Pathname.new(absolute_path_to_article)
-          .relative_path_from(
-            Pathname.new(File.dirname(top_level_git_directory))
-          ).to_s
-      end
-
-      def top_level_git_directory
-        @top_level_git_directory ||= begin
-          Dir.chdir(site_source) do
-            top_level_git_directory = File.join(Executor.sh("git", "rev-parse", "--show-toplevel"), ".git")
-          end
-        rescue
-          ""
-        end
-      end
+        return nil unless git.git_repo?
 
-      def is_git_repo?(site_source)
-        @is_git_repo ||= begin
-          Dir.chdir(site_source) do
-            Executor.sh("git", "rev-parse", "--is-inside-work-tree").eql? "true"
-          end
-        rescue
-          false
-        end
+        @relative_path_from_git_dir ||= Pathname.new(absolute_path_to_article)
+                                                .relative_path_from(
+                                                  Pathname.new(File.dirname(git.top_level_directory))
+                                                ).to_s
       end
 
       def mtime(file)
-        File.mtime(file)
+        File.mtime(file).to_i.to_s
       end
     end
   end

data/lib/jekyll-last-modified-at/executor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'posix/spawn'
 
 module Jekyll
@@ -8,23 +10,26 @@ module Jekyll
       def self.sh(*args)
         r, w = IO.pipe
         e, eo = IO.pipe
-        pid = spawn(*args, {
-          :out => w, r => :close,
-          :err => eo, e => :close
-        })
+        pid = spawn(*args,
+                    :out => w, r => :close,
+                    :err => eo, e => :close)
 
-        if pid > 0
+        if pid.positive?
           w.close
           eo.close
           out = r.read
           err = e.read
           ::Process.waitpid(pid)
-          if out
-            "#{out} #{err}".strip
-          end
+          "#{out} #{err}".strip if out
         end
       ensure
-        [r, w, e, eo].each{ |io| io.close rescue nil }
+        [r, w, e, eo].each do |io|
+          begin
+                                   io.close
+          rescue StandardError
+            nil
+                                 end
+        end
       end
     end
   end

data/lib/jekyll-last-modified-at/git.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module LastModifiedAt
+    class Git
+      attr_reader :site_source
+
+      def initialize(site_source)
+        @site_source = site_source
+        @is_git_repo = nil
+      end
+
+      def top_level_directory
+        return nil unless git_repo?
+
+        @top_level_directory ||= begin
+          Dir.chdir(@site_source) do
+            @top_level_directory = File.join(Executor.sh('git', 'rev-parse', '--show-toplevel'), '.git')
+          end
+                                 rescue StandardError
+                                   ''
+        end
+      end
+
+      def git_repo?
+        return @is_git_repo unless @is_git_repo.nil?
+
+        @is_git_repo = begin
+          Dir.chdir(@site_source) do
+            Executor.sh('git', 'rev-parse', '--is-inside-work-tree').eql? 'true'
+          end
+                       rescue StandardError
+                         false
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-last-modified-at/hook.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module LastModifiedAt
     module Hook

data/lib/jekyll-last-modified-at/tag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module LastModifiedAt
     class Tag < Liquid::Tag
@@ -8,11 +10,10 @@ module Jekyll
 
       def render(context)
         site_source = context.registers[:site].source
-        article_file = context.environments.first["page"]["path"]
+        article_file = context.environments.first['page']['path']
 
-        Determinator.new(site_source, article_file, {
-          "format" => @format
-        }).formatted_last_modified_date
+        Determinator.new(site_source, article_file,
+                         'format' => @format).formatted_last_modified_date
       end
     end
   end

data/lib/jekyll-last-modified-at/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Jekyll
   module LastModifiedAt
-    VERSION = "1.1.0"
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-last-modified-at
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.9
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spork
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +101,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rubocop-standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: spork
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,6 +137,7 @@ files:
 - lib/jekyll-last-modified-at.rb
 - lib/jekyll-last-modified-at/determinator.rb
 - lib/jekyll-last-modified-at/executor.rb
+- lib/jekyll-last-modified-at/git.rb
 - lib/jekyll-last-modified-at/hook.rb
 - lib/jekyll-last-modified-at/tag.rb
 - lib/jekyll-last-modified-at/version.rb
@@ -131,8 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A liquid tag for Jekyll to indicate the last time a file was modified.