From 757a7fea97e5e93a098b663498d8da08f176256b Mon Sep 17 00:00:00 2001
From: Dmitry Starostin <incrop@gmail.com>
Date: Wed, 26 Aug 2015 19:12:41 +0300
Subject: [PATCH] Support author and committer info for write()

---
 README.md         |  6 +++++-
 github.js         |  8 +++++++-
 test/test.repo.js | 26 ++++++++++++++++++++++----
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 84d870dc..0601c6fb 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,11 @@ repo.listBranches(function(err, branches) {});
 Store contents at a certain path, where files that don't yet exist are created on the fly.
 
 ```js
-repo.write('master', 'path/to/file', 'YOUR_NEW_CONTENTS', 'YOUR_COMMIT_MESSAGE', function(err) {});
+var options = {
+  author: {name: 'Author Name', email: 'author@example.com'},
+  committer: {name: 'Committer Name', email: 'committer@example.com'}
+}
+repo.write('master', 'path/to/file', 'YOUR_NEW_CONTENTS', 'YOUR_COMMIT_MESSAGE', options, function(err) {});
 ```
 
 Not only can you can write files, you can of course read them.
diff --git a/github.js b/github.js
index 6f8dc215..4e5f76a2 100644
--- a/github.js
+++ b/github.js
@@ -674,13 +674,19 @@
       // Write file contents to a given branch and path
       // -------
 
-      this.write = function(branch, path, content, message, cb) {
+      this.write = function(branch, path, content, message, options, cb) {
+        if (typeof cb === 'undefined') {
+          cb = options;
+          options = {};
+        }
         that.getSha(branch, encodeURI(path), function(err, sha) {
           if (err && err.error !== 404) return cb(err);
           _request("PUT", repoPath + "/contents/" + encodeURI(path), {
             message: message,
             content: btoa(content),
             branch: branch,
+            committer: options.committer,
+            author: options.author,
             sha: sha
           }, cb);
         });
diff --git a/test/test.repo.js b/test/test.repo.js
index 6196cccf..07508dec 100644
--- a/test/test.repo.js
+++ b/test/test.repo.js
@@ -58,7 +58,7 @@ test("Repo API", function(t) {
 
     t.test('repo.read', function(q) {
         repo.read('master', 'README.md', function(err, res) {
-            q.ok(res.indexOf('##Setup') !== -1, true, 'Returned REAMDE');
+            q.notEquals(res.indexOf('##Setup'), -1, 'Returned REAMDE');
             q.end();
         });
     });
@@ -66,8 +66,8 @@ test("Repo API", function(t) {
     t.test('repo.getCommit', function(q) {
         repo.getCommit('master', '20fcff9129005d14cc97b9d59b8a3d37f4fb633b', function(err, commit) {
             q.error(err, 'get commit' + err);
-            q.ok(commit.message, 'v0.10.4', 'Returned commit message.');
-            q.ok(commit.author.date, '2015-03-20T17:01:42Z', 'Got correct date.');
+            q.equals(commit.message, 'v0.10.4', 'Returned commit message.');
+            q.equals(commit.author.date, '2015-03-20T17:01:42Z', 'Got correct date.');
             q.end();
         });
     });
@@ -75,7 +75,7 @@ test("Repo API", function(t) {
     t.test('repo.getSha', function(q) {
         repo.getSha('master', '.gitignore', function(err, sha) {
             q.error(err, 'get sha error: ' + err);
-            q.ok(sha, '153216eb946aedc51f4fe88a51008b4abcac5308', 'Returned sha message.');
+            q.equals(sha, '153216eb946aedc51f4fe88a51008b4abcac5308', 'Returned sha message.');
             q.end();
         });
     });
@@ -126,6 +126,24 @@ test('Create Repo', function(t) {
     });
   });
 
+  t.test('repo.writeAuthorAndCommitter', function(q) {
+    var options = {
+      author: {name: 'Author Name', email: 'author@example.com'},
+      committer: {name: 'Committer Name', email: 'committer@example.com'}
+    };
+    repo.write('dev', 'TEST.md', 'THIS IS A TEST BY AUTHOR AND COMMITTER', 'Updating', options, function(err, res) {
+      q.error(err);
+      repo.getCommit('dev', res.commit.sha, function(err, commit) {
+        q.error(err);
+        q.equals(commit.author.name, 'Author Name', 'Got correct author name.');
+        q.equals(commit.author.email, 'author@example.com', 'Got correct author email.');
+        q.equals(commit.committer.name, 'Committer Name', 'Got correct committer name.');
+        q.equals(commit.committer.email, 'committer@example.com', 'Got correct committer email.');
+        q.end();
+      });
+    });
+  });
+
   t.test('repo.writeChinese', function(q) {
     repo.write('master', '中文测试.md', 'THIS IS A TEST', 'Creating test', function(err) {
       q.error(err);