Add git committer/author info

Author: achambers

index.js

@@ -125,6 +125,11 @@ module.exports = function(gitPath) {
     abbreviatedSha: null,
     branch: null,
     tag: null,
+    committer: null,
+    committerDate: null,
+    author: null,
+    authorDate: null,
+    commitMessage: null,
     root: null
   };
 
@@ -160,6 +165,15 @@ module.exports = function(gitPath) {
 
       result.abbreviatedSha = result.sha.slice(0,10);
 
+      // Find commit data
+      var commitData = getCommitData(gitPath, result.sha);
+      if (commitData) {
+        result = Object.keys(commitData).reduce(function(r, key) {
+          result[key] = commitData[key];
+          return result;
+        }, result);
+      }
+
       // Find tag
       var tag = findTag(gitPath, result.sha);
       if (tag) {
@@ -180,3 +194,49 @@ module.exports = function(gitPath) {
 module.exports._suppressErrors = true;
 module.exports._findRepo     = findRepo;
 module.exports._changeGitDir = changeGitDir;
+
+function getCommitData(gitPath, sha) {
+  var objectPath = path.join(gitPath, 'objects', sha.slice(0, 2), sha.slice(2));
+
+  if (zlib.inflateSync && fs.existsSync(objectPath)) {
+    var objectContents = zlib.inflateSync(fs.readFileSync(objectPath)).toString();
+
+    return objectContents.split(/\0|\n/)
+      .filter(function(item) {
+        return !!item;
+      })
+      .reduce(function(data, section) {
+        var part = section.slice(0, section.indexOf(' ')).trim();
+
+        switch(part) {
+          case 'commit':
+          case 'tag':
+          case 'object':
+          case 'type':
+          case 'tree':
+          case 'parent':
+            //ignore these for now
+            break;
+          case 'author':
+          case 'committer':
+            var parts = section.match(/^(?:author|committer)\s(.+)\s(\d+\s(?:\+|\-)\d{4})$/);
+
+            if (parts) {
+              data[part] = parts[1];
+              data[part + 'Date'] = parseDate(parts[2]);
+            }
+            break;
+          default:
+            //should just be the commit message left
+            data.commitMessage = section;
+        }
+
+        return data;
+      }, {});
+  }
+}
+
+function parseDate(d) {
+  var epoch = d.split(' ')[0];
+  return new Date(epoch * 1000).toISOString();
+}

tests/index.js

@@ -71,6 +71,11 @@ describe('git-repo-info', function() {
         sha: '5359aabd3872d9ffd160712e9615c5592dfe6745',
         abbreviatedSha: '5359aabd38',
         tag: null,
+        committer: null,
+        committerDate: null,
+        author: null,
+        authorDate: null,
+        commitMessage: null,
         root: repoRoot
       };
 
@@ -86,6 +91,11 @@ describe('git-repo-info', function() {
         sha: '9dac893d5a83c02344d91e79dad8904889aeacb1',
         abbreviatedSha: '9dac893d5a',
         tag: null,
+        committer: null,
+        committerDate: null,
+        author: null,
+        authorDate: null,
+        commitMessage: null,
         root: repoRoot
       };
 
@@ -101,6 +111,11 @@ describe('git-repo-info', function() {
         sha: 'd670460b4b4aece5915caf5c68d12f560a9fe3e4',
         abbreviatedSha: 'd670460b4b',
         tag: null,
+        committer: null,
+        committerDate: null,
+        author: null,
+        authorDate: null,
+        commitMessage: null,
         root: repoRoot
       };
 
@@ -116,26 +131,58 @@ describe('git-repo-info', function() {
         sha: '5359aabd3872d9ffd160712e9615c5592dfe6745',
         abbreviatedSha: '5359aabd38',
         tag: 'my-tag',
+        committer: null,
+        committerDate: null,
+        author: null,
+        authorDate: null,
+        commitMessage: null,
         root: repoRoot
       };
 
       assert.deepEqual(result, expected);
     });
 
-    it('returns an object with repo info, including the tag (unpacked tags)', function() {
-      var repoRoot = path.join(testFixturesPath, 'tagged-commit-unpacked');
-      var result = repoInfo(path.join(repoRoot, gitDir));
+    if (zlib.inflateSync) {
+      it('returns an object with repo info, including the tag (unpacked tags)', function() {
+        var repoRoot = path.join(testFixturesPath, 'tagged-commit-unpacked');
+        var result = repoInfo(path.join(repoRoot, gitDir));
 
-      var expected = {
-        branch: 'master',
-        sha: 'c1ee41c325d54f410b133e0018c7a6b1316f6cda',
-        abbreviatedSha: 'c1ee41c325',
-        tag: 'awesome-tag',
-        root: repoRoot
-      };
+        var expected = {
+          branch: 'master',
+          sha: 'c1ee41c325d54f410b133e0018c7a6b1316f6cda',
+          abbreviatedSha: 'c1ee41c325',
+          tag: 'awesome-tag',
+          committer: 'Robert Jackson <[email protected]>',
+          committerDate: '2015-04-15T12:10:06.000Z',
+          author: 'Robert Jackson <[email protected]>',
+          authorDate: '2015-04-15T12:10:06.000Z',
+          commitMessage: 'Initial commit.',
+          root: repoRoot
+        };
 
-      assert.deepEqual(result, expected);
-    });
+        assert.deepEqual(result, expected);
+      });
+    } else {
+      it('returns an object with repo info, including the tag (unpacked tags)', function() {
+        var repoRoot = path.join(testFixturesPath, 'tagged-commit-unpacked');
+        var result = repoInfo(path.join(repoRoot, gitDir));
+
+        var expected = {
+          branch: 'master',
+          sha: 'c1ee41c325d54f410b133e0018c7a6b1316f6cda',
+          abbreviatedSha: 'c1ee41c325',
+          tag: 'awesome-tag',
+          committer: null,
+          committerDate: null,
+          author: null,
+          authorDate: null,
+          commitMessage: null,
+          root: repoRoot
+        };
+
+        assert.deepEqual(result, expected);
+      });
+    }
 
     it('returns an object with repo info, including the tag (unpacked tags) when a tag object does not exist', function() {
       var repoRoot = path.join(testFixturesPath, 'tagged-commit-unpacked-no-object');
@@ -146,6 +193,11 @@ describe('git-repo-info', function() {
         sha: 'c1ee41c325d54f410b133e0018c7a6b1316f6cda',
         abbreviatedSha: 'c1ee41c325',
         tag: 'awesome-tag',
+        committer: null,
+        committerDate: null,
+        author: null,
+        authorDate: null,
+        commitMessage: null,
         root: repoRoot
       };
 
@@ -162,6 +214,11 @@ describe('git-repo-info', function() {
           sha: 'c1ee41c325d54f410b133e0018c7a6b1316f6cda',
           abbreviatedSha: 'c1ee41c325',
           tag: 'awesome-tag',
+          committer: 'Robert Jackson <[email protected]>',
+          committerDate: '2015-04-15T12:10:06.000Z',
+          author: 'Robert Jackson <[email protected]>',
+          authorDate: '2015-04-15T12:10:06.000Z',
+          commitMessage: 'Initial commit.',
           root: repoRoot
         };
 
@@ -178,6 +235,11 @@ describe('git-repo-info', function() {
         sha: '5359aabd3872d9ffd160712e9615c5592dfe6745',
         abbreviatedSha: '5359aabd38',
         tag: null,
+        committer: null,
+        committerDate: null,
+        author: null,
+        authorDate: null,
+        commitMessage: null,
         root: repoRoot
       };