Skip to content

fix(gen): require q and grunt in gruntUtils #1291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Awk34 merged 1 commit into from
Sep 11, 2015
Merged

fix(gen): require q and grunt in gruntUtils #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ var shell = require('shelljs');
var child_process = require('child_process');
var Q = require('q');
var helpers = require('yeoman-generator').test;
var gruntUtils = require('./task-utils/grunt');
var fs = require('fs');
var path = require('path');

var gitCmd = gruntUtils.gitCmd;
var gitCmdAsync = gruntUtils.gitCmdAsync;

module.exports = function (grunt) {
var gruntUtils = require('./task-utils/grunt')(grunt);
var gitCmd = gruntUtils.gitCmd;
var gitCmdAsync = gruntUtils.gitCmdAsync;

// Load grunt tasks automatically, when needed
require('jit-grunt')(grunt, {
buildcontrol: 'grunt-build-control'
Expand Down
112 changes: 58 additions & 54 deletions task-utils/grunt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,72 +2,76 @@

var path = require('path');
var fs = require('fs');
var Q = require('q');

exports = module.exports = {
gitCmd: function gitCmd(args, opts, done) {
grunt.util.spawn({
cmd: process.platform === 'win32' ? 'git.cmd' : 'git',
args: args,
opts: opts || {}
}, done);
},
exports = module.exports = function(grunt) {
var self;
return self = {
gitCmd: function(args, opts, done) {
grunt.util.spawn({
cmd: process.platform === 'win32' ? 'git.cmd' : 'git',
args: args,
opts: opts || {}
}, done);
},

gitCmdAsync: function gitCmdAsync(args, opts) {
return function() {
var deferred = Q.defer();
gitCmd(args, opts, function(err) {
if (err) { return deferred.reject(err); }
deferred.resolve();
});
return deferred.promise;
};
},
gitCmdAsync: function(args, opts) {
return function() {
var deferred = Q.defer();
self.gitCmd(args, opts, function(err) {
if (err) { return deferred.reject(err); }
deferred.resolve();
});
return deferred.promise;
};
},

conventionalChangelog: {
finalizeContext: function(context, writerOpts, commits, keyCommit) {
var gitSemverTags = context.gitSemverTags;
var commitGroups = context.commitGroups;
conventionalChangelog: {
finalizeContext: function(context, writerOpts, commits, keyCommit) {
var gitSemverTags = context.gitSemverTags;
var commitGroups = context.commitGroups;

if ((!context.currentTag || !context.previousTag) && keyCommit) {
var match = /tag:\s*(.+?)[,\)]/gi.exec(keyCommit.gitTags);
var currentTag = context.currentTag = context.currentTag || match ? match[1] : null;
var index = gitSemverTags.indexOf(currentTag);
var previousTag = context.previousTag = gitSemverTags[index + 1];
if ((!context.currentTag || !context.previousTag) && keyCommit) {
var match = /tag:\s*(.+?)[,\)]/gi.exec(keyCommit.gitTags);
var currentTag = context.currentTag = context.currentTag || match ? match[1] : null;
var index = gitSemverTags.indexOf(currentTag);
var previousTag = context.previousTag = gitSemverTags[index + 1];

if (!previousTag) {
if (options.append) {
context.previousTag = context.previousTag || commits[0] ? commits[0].hash : null;
} else {
context.previousTag = context.previousTag || commits[commits.length - 1] ? commits[commits.length - 1].hash : null;
if (!previousTag) {
if (options.append) {
context.previousTag = context.previousTag || commits[0] ? commits[0].hash : null;
} else {
context.previousTag = context.previousTag || commits[commits.length - 1] ? commits[commits.length - 1].hash : null;
}
}
} else {
context.previousTag = context.previousTag || gitSemverTags[0];
context.currentTag = context.currentTag || 'v' + context.version;
}
} else {
context.previousTag = context.previousTag || gitSemverTags[0];
context.currentTag = context.currentTag || 'v' + context.version;
}

if (typeof context.linkCompare !== 'boolean' && context.previousTag && context.currentTag) {
context.linkCompare = true;
}
if (typeof context.linkCompare !== 'boolean' && context.previousTag && context.currentTag) {
context.linkCompare = true;
}

if (Array.isArray(commitGroups)) {
for (var i = 0, commitGroupsLength = commitGroups.length; i < commitGroupsLength; i++) {
var commits = commitGroups[i].commits;
if (Array.isArray(commits)) {
for (var n = 1, commitsLength = commits.length; n < commitsLength; n++) {
var commit = commits[n], prevCommit = commits[n - 1];
if (commit.scope && commit.scope === prevCommit.scope) {
commit.subScope = true;
if (prevCommit.scope && !prevCommit.subScope) {
prevCommit.leadScope = true;
if (Array.isArray(commitGroups)) {
for (var i = 0, commitGroupsLength = commitGroups.length; i < commitGroupsLength; i++) {
var commits = commitGroups[i].commits;
if (Array.isArray(commits)) {
for (var n = 1, commitsLength = commits.length; n < commitsLength; n++) {
var commit = commits[n], prevCommit = commits[n - 1];
if (commit.scope && commit.scope === prevCommit.scope) {
commit.subScope = true;
if (prevCommit.scope && !prevCommit.subScope) {
prevCommit.leadScope = true;
}
}
}
}
}
}
}
return context;
},
commitPartial: fs.readFileSync(path.resolve(__dirname, 'changelog-templates', 'commit.hbs')).toString()
}
return context;
},
commitPartial: fs.readFileSync(path.resolve(__dirname, 'changelog-templates', 'commit.hbs')).toString()
}
};
};