jekyll-last-modified-at 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34d60a5a0412cfc9da1ebfa6cc8f8302d4cd0e2f
-  data.tar.gz: 72e24790730c60941e1e4cb25cdb5b739e24ad59
+  metadata.gz: 1e40cd5bfe078781583ad9cf56e006a4b4ee2cfc
+  data.tar.gz: cddd2dad3bbfac52208411af467ecccdb6272b20
 SHA512:
-  metadata.gz: 179bd2fac3c1d429b96d3523cbe66a8a4b6d192d078d22048512da915bf0780374af21a2c3dd20d91ff6e3eee2465354de6f7829b2de0bdd735709a2ad9c7e93
-  data.tar.gz: 62818ed381127f6668a8597832bf2a4428baae36d676804cbd65a5ce38a821a716b31173725056706da73b02932608c9591a16b86cb8ffbb489dc98aed8c1c68
+  metadata.gz: e4ceefbac50cf94df8bd5ff8f14ae2ab0d470f40afa39424ba5a3f015ac7782d378a675f88f12d79c4e2d3851d6b9b36da7b8249444a0e5eee28fe9049e35131
+  data.tar.gz: c544631a70779551de0d98577cc2633d6eeca4c42199b32c6f46bb5a7bcfc09968d939119c4e3b6ad73279f166420798665a4745e316ac19f9f488b730139210

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

@@ -6,12 +6,41 @@ module Jekyll
     end
 
     def render(context)
+      site_source = context.registers[:site].source
       article_file = context.environments.first["page"]["path"]
-      article_file_path = File.expand_path(article_file, context.registers[:site].source)
-      last_commit_date = `git log --format="%ct" -- #{article_file_path}`.strip
-      last_modified_time = !last_commit_date.empty? ? last_commit_date : File.mtime(article_file_path)
+      article_file_path = File.expand_path(article_file, site_source)
+
+      unless File.exists? article_file_path
+        raise Errno::ENOENT, "#{article_file_path} does not exist!"
+      end 
+
+      if is_git_repo?(site_source)
+        top_level_git_directory = ""
+        Dir.chdir(site_source) do
+          top_level_git_directory = File.join(`git rev-parse --show-toplevel`.strip, ".git")
+        end
+        relative_file_path = File.expand_path(article_file_path, top_level_git_directory)
+        last_commit_date = IO.popen(['git', '--git-dir', top_level_git_directory, 'log', '--format="%ct"', '--', relative_file_path]).read[/\d+/]
+        # last_commit_date can be nil iff the file was not committed.
+        last_modified_time = (last_commit_date.nil? || last_commit_date.empty?) ? mtime(article_file_path) : last_commit_date
+      else
+        last_modified_time = mtime(article_file_path)
+      end
+
       Time.at(last_modified_time.to_i).strftime(@format || "%d-%b-%y")
     end
+
+    def is_git_repo?(site_source)
+      Dir.chdir(site_source) do
+        `git rev-parse --is-inside-work-tree`.strip == "true"
+      end
+    rescue
+      false
+    end
+
+    def mtime(file)
+      File.mtime(file)
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-last-modified-at
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll