add git scm-data-generator

Author: ghedamat

index.js

@@ -14,6 +14,7 @@ module.exports = {
       defaultConfig: {
         type: 'file-hash',
         filePattern: 'index.html',
+        scm: 'git',
         distDir: function(context) {
           return context.distDir;
         },
@@ -22,17 +23,20 @@ module.exports = {
         },
         versionFile: 'package.json',
       },
+
       prepare: function(context) {
         var self = this;
-        var type = this.readConfig('type');
-        var DataGenerator = require('./lib/data-generators')[type];
-        var dataGenerator = new DataGenerator({
-          plugin: this
-        });
 
-        this.log('creating revision data using `' + type + '`', { verbose: true });
-        return dataGenerator.generate()
-          .then(function(data) {
+
+        var promises = {
+            data: this._getData(),
+            scm: this._getScmData()
+        };
+
+        return Promise.hash(promises)
+          .then(function(results) {
+            var data = results.data;
+            data.scm = results.scm;
             self.log('generated revision data for revision: `' + data.revisionKey + '`', { verbose: true });
             return data;
           })
@@ -41,6 +45,28 @@ module.exports = {
           })
           .catch(this._errorMessage.bind(this));
       },
+
+      _getData: function() {
+        var type = this.readConfig('type');
+        this.log('creating revision data using `' + type + '`', { verbose: true });
+        var DataGenerator = require('./lib/data-generators')[type];
+        return new DataGenerator({
+          plugin: this
+        }).generate();
+      },
+
+      _getScmData: function() {
+        var scm = this.readConfig('scm');
+        if (scm) {
+          var ScmDataGenerator = require('./lib/scm-data-generators')[scm];
+          return new ScmDataGenerator({
+            plugin: this
+          }).generate()
+        } else {
+          return Promise.resolve();
+        }
+      },
+
       _errorMessage: function(error) {
         this.log(error, { color: 'red' });
         return Promise.reject(error);

lib/scm-data-generators/git.js

@@ -0,0 +1,27 @@
+var CoreObject  = require('core-object');
+var Promise     = require('ember-cli/lib/ext/promise');
+var gitRepoInfo = require('git-repo-info');
+var simpleGit = require('simple-git');
+
+module.exports = CoreObject.extend({
+  init: function(path) {
+    this.path = path;
+  },
+
+  generate: function() {
+    var _this = this;
+    return new Promise(function(resolve, reject) {
+      simpleGit(_this.path).log(function(err, log) {
+        var info = log.latest;
+        var sha = info.hash.slice(0, 7);
+        resolve({
+          sha: info.hash.substring(1),
+          email: info.author_email.substring(0, info.author_email.length - 1),
+          name: info.author_name,
+          timestamp: new Date(info.date).toISOString(),
+          branch: gitRepoInfo().branch
+        });
+      });
+    });
+  }
+});

lib/scm-data-generators/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  "git": require('./git'),
+};

package.json

@@ -50,7 +50,8 @@
     "ember-cli-deploy-plugin": "^0.2.1",
     "git-repo-info": "^1.1.2",
     "minimatch": "^2.0.4",
-    "rsvp": "^3.0.18"
+    "rsvp": "^3.0.18",
+    "simple-git": "^1.26.2"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

tests/unit/index-nodetest.js

@@ -78,7 +78,7 @@ describe('the index', function() {
         return previous;
       }, []);
 
-      assert.equal(messages.length, 5);
+      assert.equal(messages.length, 6);
     });
 
     it('adds default config to the config object', function() {
@@ -99,6 +99,7 @@ describe('the index', function() {
 
       assert.isDefined(context.config['revision-data'].type);
       assert.isDefined(context.config['revision-data'].filePattern);
+      assert.isDefined(context.config['revision-data'].scm);
     });
   });
 
@@ -116,6 +117,7 @@ describe('the index', function() {
           "revision-data": {
             type: 'file-hash',
             filePattern: 'index.html',
+            scm: 'git',
             distDir: function(context) {
               return context.distDir;
             },
@@ -131,8 +133,8 @@ describe('the index', function() {
         .then(function(result) {
           assert.equal(result.revisionData.revisionKey, 'ae1569f72495012cd5e8588e0f2f5d49');
           assert.isNotNull(result.revisionData.timestamp);
+          assert.isNotNull(result.revisionData.scm.email);
         });
     });
   });
 });
-

tests/unit/lib/scm-data-generators/git-nodetest.js

@@ -0,0 +1,39 @@
+'use strict';
+
+var assert = require('ember-cli/tests/helpers/assert');
+var gitRepoInfo = require('git-repo-info');
+
+describe('the git scm data generator', function() {
+  var ScmDataGenerator;
+  var cwd;
+
+  before(function() {
+    ScmDataGenerator = require('../../../../lib/scm-data-generators/git');
+    gitRepoInfo._changeGitDir('dotgit');
+  });
+
+  beforeEach(function() {
+    cwd = process.cwd();
+  });
+
+  afterEach(function() {
+    process.chdir(cwd);
+  });
+
+  describe('#generate', function() {
+    it('returns the correct data', function() {
+      process.chdir('tests/fixtures/repo');
+
+      var subject = new ScmDataGenerator('dotgit');
+
+      return assert.isFulfilled(subject.generate())
+        .then(function(data) {
+          assert.equal(data.sha, '41d41f081b45ad50935c08b1203220737d9739b4');
+          assert.equal(data.email, 'alisdair@mcdiarmid.org');
+          assert.equal(data.name, 'Alisdair McDiarmid');
+          assert.isNotNull(data.timestamp);
+          assert.equal(data.branch, 'master');
+        });
+    });
+  });
+});