Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix codacy issues
  • Loading branch information
svenschoenung committed Nov 27, 2016
1 parent 1f9969f commit af94e00
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/composition.js
Expand Up @@ -28,7 +28,7 @@ module.exports = function(config, parameterized, compName) {
return parameterized(parameterized(task, paramsFromArgs), params);
});

return gulp[compName].apply(gulp, parameterizedTasks)(_.done);
return gulp[compName].apply(gulp, parameterizedTasks)(cb);
});

var parameterizedTasks = tasks.map(function(task) {
Expand Down
16 changes: 9 additions & 7 deletions lib/task.js
Expand Up @@ -66,12 +66,14 @@ module.exports = function(config) {

var args = Array.prototype.slice.call(arguments);

var parsed, params;

if (args.length === 3) {

// parameterized.task(taskName, taskFn, params)
if (_.isString(args[0]) && _.isFunction(args[1]) && isParams(args[2])) {
var parsed = parseTaskAndParams(args[0]);
var params = _.assign({}, parseParams(args[2]), parsed.params);
parsed = parseTaskAndParams(args[0]);
params = _.assign({}, parseParams(args[2]), parsed.params);
return task(config, parsed.task, args[1], params);
}

Expand All @@ -82,20 +84,20 @@ module.exports = function(config) {

// parameterized.task(taskName, taskFn)
if (_.isString(args[0]) && _.isFunction(args[1])) {
var parsed = parseTaskAndParams(args[0]);
parsed = parseTaskAndParams(args[0]);
return task(config, parsed.task, args[1], parsed.params);
}

// parameterized.task(taskName, params)
if (_.isString(args[0]) && isParams(args[1])) {
var parsed = parseTaskAndParams(args[0]);
var params = _.assign({}, parseParams(args[1]), parsed.params);
parsed = parseTaskAndParams(args[0]);
params = _.assign({}, parseParams(args[1]), parsed.params);
return task(config, parsed.task, null, params);
}

// parameterized.task(taskFn, params)
if (_.isFunction(args[0]) && isParams(args[1])) {
var params = parseParams(args[1]);
params = parseParams(args[1]);
return task(config, getDisplayName(args[0]), args[0], params);
}

Expand All @@ -105,7 +107,7 @@ module.exports = function(config) {
if (args.length === 1) {
// parameterized.task(taskNameWithParams)
if (_.isString(args[0])) {
var parsed = parseTaskAndParams(args[0]);
parsed = parseTaskAndParams(args[0]);
return task(config, parsed.task, null, parsed.params);
}

Expand Down

0 comments on commit af94e00

Please sign in to comment.