feat: Add predictable git author

groupon · Feb 24, 2017 · e941fda · e941fda
1 parent 68ae9e5
commit e941fda
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,7 @@
 language: node_js
 node_js:
-  - '0.10'
   - '4'
-before_install:
-  - npm install -g npm@latest-2
-before_deploy:
-  - 'git config --global user.email "opensource@groupon.com"'
-  - 'git config --global user.name "Groupon"'
+  - '6'
 deploy:
   provider: script
   script: ./bin/nlm.js release

diff --git a/lib/steps/version-commit.js b/lib/steps/version-commit.js
@@ -38,12 +38,23 @@ var _ = require('lodash');
 
 var run = require('../run');
 
+var NLM_GIT_NAME = 'nlm';
+var NLM_GIT_EMAIL = 'opensource@groupon.com';
+
 function addFiles(cwd) {
   return run('git', ['add', 'CHANGELOG.md', 'package.json'], { cwd: cwd });
 }
 
 function commit(cwd, message) {
-  return run('git', ['commit', '-m', message], { cwd: cwd });
+  return run('git', ['commit', '-m', message], {
+    cwd: cwd,
+    env: _.assign({}, process.env, {
+      GIT_AUTHOR_NAME: NLM_GIT_NAME,
+      GIT_AUTHOR_EMAIL: NLM_GIT_EMAIL,
+      GIT_COMMITTER_NAME: NLM_GIT_NAME,
+      GIT_COMMITTER_EMAIL: NLM_GIT_EMAIL,
+    }),
+  });
 }
 
 function getHEAD(cwd) {

diff --git a/test/fixture.js b/test/fixture.js
@@ -49,7 +49,13 @@ function withFixture(name) {
   before('running fixture setup', function runFixture(done) {
     execFile(script, [script], {
       cwd: dirname,
-      env: { HOME: '/does/not/exist' },
+      env: {
+        HOME: '/does/not/exist',
+        GIT_AUTHOR_NAME: 'Robin Developer',
+        GIT_AUTHOR_EMAIL: 'rdev@example.com',
+        GIT_COMMITTER_NAME: 'Robin Developer',
+        GIT_COMMITTER_EMAIL: 'rdev@example.com',
+      },
     }, function logErrorDetails(error, stdout, stderr) {
       if (error) {
         process.stdout.write(stdout + '\n');
@@ -59,9 +65,9 @@ function withFixture(name) {
     });
   });
 
-  // after('remove fixture directory', function removeFixture(done) {
-  //   execFile('rm', ['-rf', dirname], done);
-  // });
+  after('remove fixture directory', function removeFixture(done) {
+    execFile('rm', ['-rf', dirname], done);
+  });
 
   return dirname;
 }

diff --git a/test/fixtures/dirty-checkout b/test/fixtures/dirty-checkout
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -e
 git init
-git config user.name "nlm"
-git config user.email "nlm@example.com"
 
 bash $(dirname $0)/fix-commit
 

diff --git a/test/fixtures/empty-project b/test/fixtures/empty-project
@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 set -e
 git init
-git config user.name "nlm"
-git config user.email "nlm@example.com"
diff --git a/test/fixtures/fix-commit b/test/fixtures/fix-commit
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -e
 git init
-git config user.name "nlm"
-git config user.email "nlm@example.com"
 
 echo "console.log('do stuff');" > index.js
 git add index.js

diff --git a/test/fixtures/invalid-commit b/test/fixtures/invalid-commit
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -e
 git init
-git config user.name "nlm"
-git config user.email "nlm@example.com"
 
 echo "console.log('no type prefix');" > index.js
 git add index.js

diff --git a/test/fixtures/multiple-commits b/test/fixtures/multiple-commits
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -e
 git init
-git config user.name "nlm"
-git config user.email "nlm@example.com"
 
 bash $(dirname $0)/fix-commit
 

diff --git a/test/fixtures/ticket-commits b/test/fixtures/ticket-commits
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -e
 git init
-git config user.name "nlm"
-git config user.email "nlm@example.com"
 
 echo "console.log('Short stuff');" > index.js
 git add index.js

diff --git a/test/steps/version-commit.test.js b/test/steps/version-commit.test.js
@@ -31,6 +31,7 @@
  */
 'use strict';
 
+var execFile = require('child_process').execFile;
 var fs = require('fs');
 
 var assert = require('assertive');
@@ -50,6 +51,14 @@ describe('createVersionCommit', function () {
     changelog: '* New stuff\n* Interesting features',
   };
 
+  before('commits with the original author', function (done) {
+    execFile('git', ['show'], { cwd: dirname }, function (err, stdout) {
+      if (err) return done(err);
+      assert.include('Author: Robin Developer <rdev@example.com>', stdout);
+      done();
+    });
+  });
+
   before('create version commit', function () {
     return createVersionCommit(dirname, pkg, options);
   });
@@ -58,4 +67,12 @@ describe('createVersionCommit', function () {
     var HEAD = fs.readFileSync(dirname + '/.git/refs/heads/master', 'utf8');
     assert.equal(HEAD.trim(), options.versionCommitSha);
   });
+
+  it('commits with the proper user', function (done) {
+    execFile('git', ['show'], { cwd: dirname }, function (err, stdout) {
+      if (err) return done(err);
+      assert.include('Author: nlm <opensource@groupon.com>', stdout);
+      done();
+    });
+  });
 });