add XO

https://github.com/sindresorhus/xo

Author: sindresorhus

.jshintrc

@@ -2,7 +2,6 @@
 var fs = require('fs');
 var path = require('path');
 var Readable = require('stream').Readable;
-
 var assign = require('object-assign');
 var convert = require('convert-source-map');
 var dargs = require('dargs');
@@ -13,7 +12,6 @@ var osTmpdir = require('os-tmpdir');
 var pathExists = require('path-exists');
 var rimraf = require('rimraf');
 var spawn = require('cross-spawn-async');
-
 var logger = require('./logger');
 var utils = require('./utils');
 
@@ -28,9 +26,11 @@ var defaults = {
 	emitCompileError: false
 };
 
-function gulpRubySass (sources, options) {
+function gulpRubySass(sources, options) {
 	var stream = new Readable({objectMode: true});
-	stream._read = function () {}; 	// redundant but necessary
+
+	// redundant but necessary
+	stream._read = function () {};
 
 	options = assign({}, defaults, options);
 
@@ -53,7 +53,9 @@ function gulpRubySass (sources, options) {
 	options.update = true;
 
 	// simplified handling of array sources, like gulp.src
-	if (!Array.isArray(sources)) { sources = [sources]; }
+	if (!Array.isArray(sources)) {
+		sources = [sources];
+	}
 
 	var matches = [];
 	var bases = [];

index.js

@@ -3,7 +3,7 @@ var gutil = require('gulp-util');
 var emitErr = require('./utils').emitErr;
 
 // Remove intermediate directory for more Sass-like logging
-function prettifyDirectoryLogging (msg, intermediateDir) {
+function prettifyDirectoryLogging(msg, intermediateDir) {
 	return msg.replace(new RegExp(intermediateDir + '/?', 'g'), './');
 }
 
@@ -17,23 +17,17 @@ logger.verbose = function (command, args) {
 };
 
 logger.stdout = function (stream, intermediateDir, data) {
-	// Bundler error: no Sass version found
 	if (/bundler: command not found: sass/.test(data)) {
+		// Bundler error: no Sass version found
 		emitErr(stream, 'bundler: command not found: sass');
-	}
-
-	// Bundler error: Gemfile not found
-	else if (/Could not locate Gemfile or .bundle\/ directory/.test(data)) {
+	} else if (/Could not locate Gemfile or .bundle\/ directory/.test(data)) {
+		// Bundler error: Gemfile not found
 		emitErr(stream, 'bundler: could not locate Gemfile or .bundle directory');
-	}
-
-	// Sass error: directory missing
-	else if (/No such file or directory @ rb_sysopen/.test(data)) {
+	} else if (/No such file or directory @ rb_sysopen/.test(data)) {
+		// Sass error: directory missing
 		emitErr(stream, data.trim());
-	}
-
-	// Not an error: Sass logging
-	else {
+	} else {
+		// Not an error: Sass logging
 		data = prettifyDirectoryLogging(data, intermediateDir);
 		data = data.trim();
 		gutil.log(data);
@@ -44,37 +38,29 @@ logger.stderr = function (stream, intermediateDir, data) {
 	var bundlerMissing = /Could not find 'bundler' \((.*?)\)/.exec(data);
 	var sassVersionMissing = /Could not find gem 'sass \((.*?)\) ruby'/.exec(data);
 
-	// Ruby error: Bundler gem not installed
 	if (bundlerMissing) {
+		// Ruby error: Bundler gem not installed
 		emitErr(stream, 'ruby: Could not find \'bundler\' (' + bundlerMissing[1] + ').');
-	}
-
-	// Bundler error: no matching Sass version
-	else if (sassVersionMissing) {
+	} else if (sassVersionMissing) {
+		// Bundler error: no matching Sass version
 		emitErr(stream, 'bundler: Could not find gem \'sass (' + sassVersionMissing[1] + ')\'.');
-	}
-
-	// Sass error: file missing
-	else if (/No such file or directory @ rb_sysopen/.test(data)) {
+	} else if (/No such file or directory @ rb_sysopen/.test(data)) {
+		// Sass error: file missing
 		emitErr(stream, data.trim());
-	}
-
-	// Not an error: Sass warnings, debug statements
-	else {
+	} else {
+		// Not an error: Sass warnings, debug statements
 		data = prettifyDirectoryLogging(data, intermediateDir);
 		data = data.trim();
 		gutil.log(data);
 	}
 };
 
 logger.error = function (stream, err) {
-	// Spawn error: gems not installed
 	if (err.code === 'ENOENT') {
+		// Spawn error: gems not installed
 		emitErr(stream, 'Gem ' + err.path + ' is not installed.');
-	}
-
-	// Other errors
-	else {
+	} else {
+		// Other errors
 		emitErr(stream, err);
 	}
 };

logger.js

@@ -20,7 +20,7 @@
     "node": ">=0.10.0"
   },
   "scripts": {
-    "test": "cd test && mocha test.js"
+    "test": "xo && cd test && mocha test.js"
   },
   "files": [
     "index.js",
@@ -59,6 +59,7 @@
     "gulp": "^3.8.11",
     "gulp-sourcemaps": "^1.2.7",
     "mocha": "*",
-    "vinyl-file": "^1.2.1"
+    "vinyl-file": "^1.2.1",
+    "xo": "*"
   }
 }

package.json

@@ -3,8 +3,8 @@ var gulp = require('gulp');
 var sass = require('../');
 var sourcemaps = require('gulp-sourcemaps');
 
-gulp.task('sass', function() {
-	return sass('source/**/*.scss', { verbose: true })
+gulp.task('sass', function () {
+	return sass('source/**/*.scss', {verbose: true})
 	.on('error', sass.logError)
 	.pipe(sourcemaps.write())
 	.pipe(gulp.dest('result'));

test/gulpfile.js

@@ -1,27 +1,28 @@
+/* eslint-env mocha */
 'use strict';
 var path = require('path');
 var assert = require('assert');
 var assign = require('object-assign');
 var pathExists = require('path-exists');
 var rimraf = require('rimraf');
 var vinylFile = require('vinyl-file');
-
 var sass = require('../');
 
 var defaultOptions = {
 	quiet: true,
-	unixNewlines: true // normalize compilation results on Windows systems
+	// normalize compilation results on Windows systems
+	unixNewlines: true
 };
 
 // load the expected result file from the compiled results directory
 var loadExpectedFile = function (relativePath, base) {
 	base = base || 'result';
 	var file = path.join(base, relativePath);
-	return vinylFile.readSync(file, { base: base });
+	return vinylFile.readSync(file, {base: base});
 };
 
 var sortByRelative = function (a, b) {
-  return a.relative.localeCompare(b.relative);
+	return a.relative.localeCompare(b.relative);
 };
 
 describe('single file', function () {
@@ -100,8 +101,7 @@ describe('multiple files', function () {
 					file.contents.toString().indexOf(expectedError) !== -1,
 					'The error file does not contain the expected message "' + expectedError + '".'
 				);
-			}
-			else {
+			} else {
 				assert.deepEqual(
 					file.contents.toString(),
 					expected[i].contents.toString()
@@ -113,6 +113,7 @@ describe('multiple files', function () {
 
 describe('array sources', function () {
 	this.timeout(20000);
+
 	var files = [];
 	var expected = [
 		loadExpectedFile('file with spaces.css', 'result/directory with spaces'),
@@ -161,9 +162,13 @@ describe('concurrently run tasks', function () {
 	var bFiles = [];
 	var cFiles = [];
 	var counter = 0;
+
 	var isDone = function (done) {
 		counter++;
-		if (counter === 3) { done(); }
+
+		if (counter === 3) {
+			done();
+		}
 	};
 
 	before(function (done) {
@@ -201,8 +206,9 @@ describe('concurrently run tasks', function () {
 
 describe('sourcemap', function () {
 	this.timeout(20000);
+
 	var files = [];
-	var options = assign({}, defaultOptions, { sourcemap: true });
+	var options = assign({}, defaultOptions, {sourcemap: true});
 
 	before(function (done) {
 		sass('source/file.scss', options)
@@ -287,7 +293,7 @@ describe('options', function () {
 		var error;
 
 		before(function (done) {
-			var options = assign({}, defaultOptions, { emitCompileError: true });
+			var options = assign({}, defaultOptions, {emitCompileError: true});
 
 			sass('source/error.scss', options)
 			.on('data', function () {})
@@ -313,7 +319,7 @@ describe('options', function () {
 			loadExpectedFile('directory/file.css'),
 			loadExpectedFile('file.css')
 		];
-		var options = assign({}, defaultOptions, { base: 'source' });
+		var options = assign({}, defaultOptions, {base: 'source'});
 
 		before(function (done) {
 			sass(['source/file.scss', 'source/directory/file.scss'], options)
@@ -352,7 +358,7 @@ describe('options', function () {
 		it('compiles files to the specified directory', function (done) {
 			var source = 'source/file.scss';
 			var tempDir = './custom-temp-dir';
-			var options = assign({}, defaultOptions, { tempDir: tempDir });
+			var options = assign({}, defaultOptions, {tempDir: tempDir});
 
 			assert.equal(
 				pathExists.sync(tempDir),
@@ -392,9 +398,11 @@ describe('caching', function () {
 				var runtimeTwo = new Date() - endOne;
 
 				assert(
-					runtimeOne > runtimeTwo + 50, // pad time to avoid potential intermittents
+					// pad time to avoid potential intermittents
+					runtimeOne > runtimeTwo + 50,
 					'Compilation times were not decreased significantly. Caching may be broken.'
 				);
+
 				done();
 			});
 		});

test/test.js

@@ -5,16 +5,14 @@ var glob2base = require('glob2base');
 var gutil = require('gulp-util');
 var md5Hex = require('md5-hex');
 
-var utils = {};
-
-utils.emitErr = function (stream, err) {
+exports.emitErr = function (stream, err) {
 	stream.emit('error', new gutil.PluginError('gulp-ruby-sass', err));
 };
 
 // Create unique temporary directory path per task using cwd, options, sources,
 // and all matched files. Sourcemap option switching does not break Sass cache
 // so we do it ourselves. Possibly a bug: https://github.com/sass/sass/issues/1830
-utils.createIntermediatePath = function (sources, matches, options) {
+exports.createIntermediatePath = function (sources, matches, options) {
 	return path.join(
 		options.tempDir,
 		'gulp-ruby-sass',
@@ -27,15 +25,13 @@ utils.createIntermediatePath = function (sources, matches, options) {
 	);
 };
 
-utils.calculateBase = function (source) {
+exports.calculateBase = function (source) {
 	return glob2base(new glob.Glob(source));
 };
 
-utils.replaceLocation = function (origPath, currentLoc, newLoc) {
+exports.replaceLocation = function (origPath, currentLoc, newLoc) {
 	return path.join(
 		newLoc,
 		path.relative(currentLoc, origPath)
 	);
 };
-
-module.exports = utils;