jekyll-git_metadata 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b04abb3fc947d4408d6678a8f897498605d8337d
-  data.tar.gz: 174fb87059b38b4ae3f1079407cfabb9d5fff318
+  metadata.gz: f3014ab1dbe6939519a268f017994fc5402dcf78
+  data.tar.gz: 8ac69a4517a11d9376d208a432c49779dec58415
 SHA512:
-  metadata.gz: 0f39fff0b23fe6146ae663a212495ffced805bde7202c0aebe13ecdbaf62ed9b83dae4b03eecb9c2bc3375a4cc142017afb3342aa9e97896f93b98972bded7ef
-  data.tar.gz: 9aba3c7ffefbd555add6b1cfc12fa0c7567df09f336d05c22bf04811c159a6a1fbc2b9257b5857cdefce54c529609ee47e49c79b1c4ce66bca22ec295462147e
+  metadata.gz: aedc7a9c9eb90b13a2f40376f6ff75cb7fef94f1589a0eba33b505fcd2e0774838aae9ddc8f24d9aac9118ad652253b5be59ecd6d1a208d86ffae25dc34939a5
+  data.tar.gz: a48999e28a7a543206258ea9f87b441640ca49be840927c60ee97d7e0fd17edd8cf0f8ea21a22e60da1df42ee51cde28f0b69e4476275302642e778e905a5b3c

data/.travis.yml

@@ -1,2 +1,4 @@
 language: ruby
+before_script: sudo apt-get update && sudo apt-get install git
 script: bundle exec rake test
+

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/ivantsepp/jekyll-git_metadata.svg?branch=master)](https://travis-ci.org/ivantsepp/jekyll-git_metadata)
+
 # Jekyll::GitMetadata
 
 Expose Git metadata to Jekyll. Just like how Github exposes [repository metadata](https://help.github.com/articles/repository-metadata-on-github-pages), this plugin will expose information about your git repository for your templates. For example:

data/lib/jekyll/git_metadata/generator.rb

@@ -73,11 +73,8 @@ module Jekyll
       end
 
       def commit(sha)
-        result = %x{ git show --format=fuller -s #{sha} }
-        long_sha, author_name, author_email, author_date, commit_name, commit_email, commit_date, message = result
-          .scan(/commit (.*)\nAuthor:(.*)<(.*)>\nAuthorDate:(.*)\nCommit:(.*)<(.*)>\nCommitDate:(.*)\n\n(.*)/)
-          .first
-          .map(&:strip)
+        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)
         {
           'short_sha' => sha,
           'long_sha' => long_sha,
@@ -87,7 +84,8 @@ module Jekyll
           'commit_name' => commit_name,
           'commit_email' => commit_email,
           'commit_date' => commit_date,
-          'message' => message
+          'message' => message.gsub(/    /, ''),
+          'changed_files' => changed_files.split("\n")
         }
       end
 

data/lib/jekyll/git_metadata/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module GitMetadata
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/test/test_git_metadata.rb

@@ -33,14 +33,14 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
 
       should 'have correct totals count' do
-        assert_equal 5, @site_data['total_commits']
-        assert_equal 670, @site_data['total_additions']
+        assert_equal 6, @site_data['total_commits']
+        assert_equal 674, @site_data['total_additions']
         assert_equal 11, @site_data['total_subtractions']
       end
 
       should 'have correct authors data' do
         assert_equal 2, @site_data['authors'].count
-        assert @site_data['authors'].include?({"commits"=>4, "name"=>"Ivan Tse", "email"=>"ivan.tse1@gmail.com"})
+        assert @site_data['authors'].include?({"commits"=>5, "name"=>"Ivan Tse", "email"=>"ivan.tse1@gmail.com"})
         assert @site_data['authors'].include?({"commits"=>1, "name"=>"LeBron James", "email"=>"lbj@example.com"})
       end
 
@@ -57,15 +57,16 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
 
       should 'have correct last commit data' do
-        assert_equal '25d62f6', @site_data['last_commit']['short_sha']
-        assert_equal '25d62f6feeb7190483f81564f4a76c1ec33d5118', @site_data['last_commit']['long_sha']
-        assert_equal 'LeBron James', @site_data['last_commit']['author_name']
-        assert_equal 'lbj@example.com', @site_data['last_commit']['author_email']
-        assert_equal 'Mon Jul 14 02:12:31 2014 -0400', @site_data['last_commit']['author_date']
+        assert_equal '2410dac', @site_data['last_commit']['short_sha']
+        assert_equal '2410dac67d5dc5f47a6d790edfed4f65acd9477b', @site_data['last_commit']['long_sha']
+        assert_equal 'Ivan Tse', @site_data['last_commit']['author_name']
+        assert_equal 'ivan.tse1@gmail.com', @site_data['last_commit']['author_email']
+        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @site_data['last_commit']['author_date']
         assert_equal 'Ivan Tse', @site_data['last_commit']['commit_name']
         assert_equal 'ivan.tse1@gmail.com', @site_data['last_commit']['commit_email']
-        assert_equal 'Mon Jul 14 02:12:31 2014 -0400', @site_data['last_commit']['commit_date']
-        assert_equal 'Be more friendly', @site_data['last_commit']['message']
+        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @site_data['last_commit']['commit_date']
+        assert_equal "This is a long commit message\n\nAs you can tell this commit message will span several lines long because\nI need to test long comit messages too!", @site_data['last_commit']['message']
+        assert_equal ["_posts/2014-07-14-welcome-to-jekyll.markdown", "about.md"], @site_data['last_commit']['changed_files']
       end
     end
 
@@ -76,14 +77,14 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
 
       should 'have correct totals count' do
-        assert_equal 3, @page_data['total_commits']
-        assert_equal 14, @page_data['total_additions']
+        assert_equal 4, @page_data['total_commits']
+        assert_equal 16, @page_data['total_additions']
         assert_equal 5, @page_data['total_subtractions']
       end
 
       should 'have correct authors data' do
         assert_equal 2, @page_data['authors'].count
-        assert @page_data['authors'].include?({"commits"=>2, "name"=>"Ivan Tse", "email"=>"ivan.tse1@gmail.com"})
+        assert @page_data['authors'].include?({"commits"=>3, "name"=>"Ivan Tse", "email"=>"ivan.tse1@gmail.com"})
         assert @page_data['authors'].include?({"commits"=>1, "name"=>"LeBron James", "email"=>"lbj@example.com"})
       end
 
@@ -100,15 +101,15 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
 
       should 'have correct last commit data' do
-        assert_equal '25d62f6', @page_data['last_commit']['short_sha']
-        assert_equal '25d62f6feeb7190483f81564f4a76c1ec33d5118', @page_data['last_commit']['long_sha']
-        assert_equal 'LeBron James', @page_data['last_commit']['author_name']
-        assert_equal 'lbj@example.com', @page_data['last_commit']['author_email']
-        assert_equal 'Mon Jul 14 02:12:31 2014 -0400', @page_data['last_commit']['author_date']
+        assert_equal '2410dac', @page_data['last_commit']['short_sha']
+        assert_equal '2410dac67d5dc5f47a6d790edfed4f65acd9477b', @page_data['last_commit']['long_sha']
+        assert_equal 'Ivan Tse', @page_data['last_commit']['author_name']
+        assert_equal 'ivan.tse1@gmail.com', @page_data['last_commit']['author_email']
+        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @page_data['last_commit']['author_date']
         assert_equal 'Ivan Tse', @page_data['last_commit']['commit_name']
         assert_equal 'ivan.tse1@gmail.com', @page_data['last_commit']['commit_email']
-        assert_equal 'Mon Jul 14 02:12:31 2014 -0400', @page_data['last_commit']['commit_date']
-        assert_equal 'Be more friendly', @page_data['last_commit']['message']
+        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @page_data['last_commit']['commit_date']
+        assert_equal "This is a long commit message\n\nAs you can tell this commit message will span several lines long because\nI need to test long comit messages too!", @page_data['last_commit']['message']
       end
     end
 
@@ -119,14 +120,14 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
 
       should 'have correct totals count' do
-        assert_equal 2, @page_data['total_commits']
-        assert_equal 28, @page_data['total_additions']
+        assert_equal 3, @page_data['total_commits']
+        assert_equal 30, @page_data['total_additions']
         assert_equal 0, @page_data['total_subtractions']
       end
 
       should 'have correct authors data' do
         assert_equal 1, @page_data['authors'].count
-        assert @page_data['authors'].include?({"commits"=>2, "name"=>"Ivan Tse", "email"=>"ivan.tse1@gmail.com"})
+        assert @page_data['authors'].include?({"commits"=>3, "name"=>"Ivan Tse", "email"=>"ivan.tse1@gmail.com"})
       end
 
       should 'have correct first commit data' do
@@ -142,15 +143,15 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
 
       should 'have correct last commit data' do
-        assert_equal '8365a44', @page_data['last_commit']['short_sha']
-        assert_equal '8365a44c640d5c7cafc8788607a274dfd91b89bb', @page_data['last_commit']['long_sha']
+        assert_equal '2410dac', @page_data['last_commit']['short_sha']
+        assert_equal '2410dac67d5dc5f47a6d790edfed4f65acd9477b', @page_data['last_commit']['long_sha']
         assert_equal 'Ivan Tse', @page_data['last_commit']['author_name']
         assert_equal 'ivan.tse1@gmail.com', @page_data['last_commit']['author_email']
-        assert_equal 'Mon Jul 14 02:10:03 2014 -0400', @page_data['last_commit']['author_date']
+        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @page_data['last_commit']['author_date']
         assert_equal 'Ivan Tse', @page_data['last_commit']['commit_name']
         assert_equal 'ivan.tse1@gmail.com', @page_data['last_commit']['commit_email']
-        assert_equal 'Mon Jul 14 02:10:03 2014 -0400', @page_data['last_commit']['commit_date']
-        assert_equal 'Edit first post', @page_data['last_commit']['message']
+        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @page_data['last_commit']['commit_date']
+        assert_equal "This is a long commit message\n\nAs you can tell this commit message will span several lines long because\nI need to test long comit messages too!", @page_data['last_commit']['message']
       end
     end
 

data/test/test_repo/_posts/2014-07-14-welcome-to-jekyll.markdown

@@ -20,6 +20,8 @@ print_hi('Tom')
 
 Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll's GitHub repo][jekyll-gh].
 
+Appending to a post.
+
 ---
 
 I hope Jekyll::GitMetadata will be a useful plugin!

data/test/test_repo/about.md

@@ -7,3 +7,5 @@ permalink: /about/
 This is a test Jekyll site for Jekyll::GitMetadata. You can view the plugin at [Github](https://github.com/ivantsepp/jekyll-git_metadata).
 
 You are welcome to submit pull requests or suggest ideas!
+
+Adding some content

data/test/test_repo/dot_git/COMMIT_EDITMSG

@@ -1 +1,14 @@
-Be more friendly
+This is a long commit message
+
+As you can tell this commit message will span several lines long because
+I need to test long comit messages too!
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+# On branch master
+# Changes to be committed:
+#	modified:   _posts/2014-07-14-welcome-to-jekyll.markdown
+#	modified:   about.md
+#
+# Untracked files:
+#	dot_git/
+#

data/test/test_repo/dot_git/logs/HEAD

@@ -3,3 +3,4 @@
 da077394cb4d5bf7ffac527dbfc652ec0592b423 9e00340e45d33e52bb16100f1b613a36f82f9c57 Ivan Tse <ivan.tse1@gmail.com> 1405318112 -0400	commit: Change about page text
 9e00340e45d33e52bb16100f1b613a36f82f9c57 8365a44c640d5c7cafc8788607a274dfd91b89bb Ivan Tse <ivan.tse1@gmail.com> 1405318203 -0400	commit: Edit first post
 8365a44c640d5c7cafc8788607a274dfd91b89bb 25d62f6feeb7190483f81564f4a76c1ec33d5118 Ivan Tse <ivan.tse1@gmail.com> 1405318351 -0400	commit: Be more friendly
+25d62f6feeb7190483f81564f4a76c1ec33d5118 2410dac67d5dc5f47a6d790edfed4f65acd9477b Ivan Tse <ivan.tse1@gmail.com> 1486879251 -0500	commit: This is a long commit message

data/test/test_repo/dot_git/logs/refs/heads/master

@@ -3,3 +3,4 @@
 da077394cb4d5bf7ffac527dbfc652ec0592b423 9e00340e45d33e52bb16100f1b613a36f82f9c57 Ivan Tse <ivan.tse1@gmail.com> 1405318112 -0400	commit: Change about page text
 9e00340e45d33e52bb16100f1b613a36f82f9c57 8365a44c640d5c7cafc8788607a274dfd91b89bb Ivan Tse <ivan.tse1@gmail.com> 1405318203 -0400	commit: Edit first post
 8365a44c640d5c7cafc8788607a274dfd91b89bb 25d62f6feeb7190483f81564f4a76c1ec33d5118 Ivan Tse <ivan.tse1@gmail.com> 1405318351 -0400	commit: Be more friendly
+25d62f6feeb7190483f81564f4a76c1ec33d5118 2410dac67d5dc5f47a6d790edfed4f65acd9477b Ivan Tse <ivan.tse1@gmail.com> 1486879251 -0500	commit: This is a long commit message

data/test/test_repo/dot_git/refs/heads/master

@@ -1 +1 @@
-25d62f6feeb7190483f81564f4a76c1ec33d5118
+2410dac67d5dc5f47a6d790edfed4f65acd9477b

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-git_metadata
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ivan Tse