Skip to content
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.

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

Move syntax check functionality to an external lib file #154

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion AUTHORS
@@ -1 +1,2 @@
Sindre Sorhus (http://github.com/sindresorhus)
Sindre Sorhus (https://github.com/sindresorhus)
Radko Dinev (https://github.com/radkodinev)
51 changes: 51 additions & 0 deletions tasks/lib/check.js
@@ -0,0 +1,51 @@
'use strict';

var path = require('path');
var async = require('async');
var chalk = require('chalk');
var spawn = require('win-spawn');
var grunt = require('grunt');

module.exports = function (files, options, cb) {
var failCount = 0;
var filesToCheck = files.filter(function (src) {
return path.basename(src)[0] !== '_' && grunt.file.exists(src);
});

async.eachLimit(filesToCheck, options.numCPUs, function (src, next) {
var bin;
var args;

if (options.bundleExec) {
bin = 'bundle';
args = ['exec', 'sass', '--check', src];
} else {
bin = 'sass';
args = ['--check', src];
}

grunt.verbose.writeln('Command: ' + bin + ' ' + args.join(' '));

grunt.verbose.writeln('Checking file ' + chalk.cyan(src) + ' syntax.');
spawn(bin, args, { stdio: 'inherit' })
.on('error', grunt.warn)
.on('close', function (code) {
if (code > 0) {
failCount++;
grunt.log.error('Checking file ' + chalk.cyan(src) + ' - ' + chalk.red('failed') + '.');
} else {
grunt.verbose.ok('Checking file ' + chalk.cyan(src) + ' - ' + chalk.green('passed') + '.');
}

next();
});
}, function () {
if (failCount > 0) {
grunt.warn('Sass check failed for ' + failCount + ' files.');
} else {
grunt.log.ok('All ' + chalk.cyan(filesToCheck.length) + ' files passed.');
}

cb();
});
};
56 changes: 4 additions & 52 deletions tasks/sass.js
@@ -1,11 +1,5 @@
/*
* grunt-contrib-sass
* http://gruntjs.com/
*
* Copyright (c) 2013 Sindre Sorhus, contributors
* Licensed under the MIT license.
*/
'use strict';

var path = require('path');
var dargs = require('dargs');
var numCPUs = require('os').cpus().length || 1;
Expand All @@ -31,50 +25,6 @@ module.exports = function (grunt) {
}
};

var checkFiles = function (files, options, cb) {
var failCount = 0;
var filesToCheck = files.filter(function (src) {
return path.basename(src)[0] !== '_' && grunt.file.exists(src);
});

async.eachLimit(filesToCheck, numCPUs, function (src, next) {
var bin;
var args;

if (options.bundleExec) {
bin = 'bundle';
args = ['exec', 'sass', '--check', src];
} else {
bin = 'sass';
args = ['--check', src];
}

grunt.verbose.writeln('Command: ' + bin + ' ' + args.join(' '));

grunt.verbose.writeln('Checking file ' + chalk.cyan(src) + ' syntax.');
spawn(bin, args, { stdio: 'inherit' })
.on('error', grunt.warn)
.on('close', function (code) {
if (code > 0) {
failCount++;
grunt.log.error('Checking file ' + chalk.cyan(src) + ' - ' + chalk.red('failed') + '.');
} else {
grunt.verbose.ok('Checking file ' + chalk.cyan(src) + ' - ' + chalk.green('passed') + '.');
}

next();
});
}, function () {
if (failCount > 0) {
grunt.warn('Sass check failed for ' + failCount + ' files.');
} else {
grunt.log.ok('All ' + chalk.cyan(filesToCheck.length) + ' files passed.');
}

cb();
});
};

grunt.registerMultiTask('sass', 'Compile Sass to CSS', function () {
var cb = this.async();
var options = this.options();
Expand All @@ -93,7 +43,9 @@ module.exports = function (grunt) {
}

if (options.check) {
checkFiles(this.filesSrc, options, cb);
options.numCPUs = numCPUs;

require('./lib/check')(this.filesSrc, options, cb);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

require it at the top of the file.

var check = require('./lib/check');

return;
}

Expand Down