Skip to content

Commit

Permalink
chore(build): Add 'enforce' task, custom changelog template
Browse files Browse the repository at this point in the history
  • Loading branch information
ajoslin authored and pkozlowski-opensource committed Jun 9, 2013
1 parent 201fdf8 commit 356cfb5
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 2 deletions.
12 changes: 10 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ module.exports = function(grunt) {
},
changelog: {
options: {
dest: 'CHANGELOG.md'
dest: 'CHANGELOG.md',
templateFile: 'misc/changelog.tpl.md'
}
},
shell: {
Expand Down Expand Up @@ -172,7 +173,7 @@ module.exports = function(grunt) {

//register before and after test tasks so we've don't have to change cli
//options on the goole's CI server
grunt.registerTask('before-test', ['jshint', 'html2js']);
grunt.registerTask('before-test', ['enforce', 'jshint', 'html2js']);
grunt.registerTask('after-test', ['build', 'copy']);

//Rename our watch task to 'delta', then make actual 'watch'
Expand All @@ -183,6 +184,13 @@ module.exports = function(grunt) {
// Default task.
grunt.registerTask('default', ['before-test', 'test', 'after-test']);

grunt.registerTask('enforce', 'Install commit message enforce script if it doesn\'t exist', function() {
if (!grunt.file.exists('.git/hooks/commit-msg')) {
grunt.file.copy('misc/validate-commit-msg.js', '.git/hooks/commit-msg');
require('fs').chmodSync('.git/hooks/commit-msg', '0755');
}
});

//Common ui.bootstrap module containing all modules for src and templates
//findModule: Adds a given module to config
var foundModules = {};
Expand Down
23 changes: 23 additions & 0 deletions misc/changelog.tpl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@

# <%= version%> (<%= today%>)

<% if (_(changelog.feat).size() > 0) { %> ## Features
<% _(changelog.feat).forEach(function(changes, scope) { %>
- **<%= scope%>:**
<% changes.forEach(function(change) { %> - <%= change.msg%> (<%= helpers.commitLink(change.sha1) %>)
<% }); %>
<% }); %> <% } %>

<% if (_(changelog.fix).size() > 0) { %> ## Fixes
<% _(changelog.fix).forEach(function(changes, scope) { %>
- **<%= scope%>:**
<% changes.forEach(function(change) { %> - <%= change.msg%> (<%= helpers.commitLink(change.sha1) %>)
<% }); %>
<% }); %> <% } %>

<% if (_(changelog.breaking).size() > 0) { %> ## Breaking Changes
<% _(changelog.breaking).forEach(function(changes, scope) { %>
- **<%= scope%>:**
<% changes.forEach(function(change) { %> <%= change.msg%>
<% }); %>
<% }); %> <% } %>
105 changes: 105 additions & 0 deletions misc/validate-commit-msg.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
#!/usr/bin/env node

/**
* Git COMMIT-MSG hook for validating commit message
* See https://docs.google.com/document/d/1rk04jEuGfk9kYzfqCuOlPTSJw3hEDZJTBN5E5f1SALo/edit
*
* Installation:
* >> cd <angular-repo>
* >> ln -s validate-commit-msg.js .git/hooks/commit-msg
*/
var fs = require('fs');
var util = require('util');


var MAX_LENGTH = 70;
var PATTERN = /^(?:fixup!\s*)?(\w*)(\((\w+)\))?\: (.*)$/;
var IGNORED = /^WIP\:/;
var TYPES = {
feat: true,
fix: true,
docs: true,
style: true,
refactor: true,
test: true,
chore: true,
revert: true
};


var error = function() {
// gitx does not display it
// http://gitx.lighthouseapp.com/projects/17830/tickets/294-feature-display-hook-error-message-when-hook-fails
// https://groups.google.com/group/gitx/browse_thread/thread/a03bcab60844b812
console.error('INVALID COMMIT MSG: ' + util.format.apply(null, arguments));
};


var validateMessage = function(message) {
var isValid = true;

if (IGNORED.test(message)) {
console.log('Commit message validation ignored.');
return true;
}

if (message.length > MAX_LENGTH) {
error('is longer than %d characters !', MAX_LENGTH);
isValid = false;
}

var match = PATTERN.exec(message);

if (!match) {
error('does not match "<type>(<scope>): <subject>" ! was: "' + message + '"\nNote: <scope> must be only letters.');
return false;
}

var type = match[1];
var scope = match[3];
var subject = match[4];

if (!TYPES.hasOwnProperty(type)) {
error('"%s" is not allowed type !', type);
return false;
}

// Some more ideas, do want anything like this ?
// - allow only specific scopes (eg. fix(docs) should not be allowed ?
// - auto correct the type to lower case ?
// - auto correct first letter of the subject to lower case ?
// - auto add empty line after subject ?
// - auto remove empty () ?
// - auto correct typos in type ?
// - store incorrect messages, so that we can learn

return isValid;
};


var firstLineFromBuffer = function(buffer) {
return buffer.toString().split('\n').shift();
};



// publish for testing
exports.validateMessage = validateMessage;

// hacky start if not run by jasmine :-D
if (process.argv.join('').indexOf('jasmine-node') === -1) {
var commitMsgFile = process.argv[2];
var incorrectLogFile = commitMsgFile.replace('COMMIT_EDITMSG', 'logs/incorrect-commit-msgs');

fs.readFile(commitMsgFile, function(err, buffer) {
var msg = firstLineFromBuffer(buffer);

if (!validateMessage(msg)) {
fs.appendFile(incorrectLogFile, msg + '\n', function() {
process.exit(1);
});
} else {
process.exit(0);
}
});
}

0 comments on commit 356cfb5

Please sign in to comment.