ES2015ify and require Node.js >=4 (#59)

* ES2015ify and support Node.js >=4

* Fix a failing unit test

* Switch from lazy-req to [email protected]

* Switch from tempfile to tempy

* Bump dev-dependencies unblocked by requiring Node.js 4

* Add supported Node.js versions to TravisCI config.

Author: realityking

.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: node_js
 node_js:
+  - 'stable'
+  - '8'
   - '6'
   - '4'

index.js

@@ -1,11 +1,12 @@
 'use strict';
-var fs = require('fs');
-var path = require('path');
-var lazyReq = require('lazy-req')(require);
-var binCheck = lazyReq('bin-check');
-var binVersionCheck = lazyReq('bin-version-check');
-var Download = lazyReq('download');
-var osFilterObj = lazyReq('os-filter-obj');
+const fs = require('fs');
+const path = require('path');
+const importLazy = require('import-lazy')(require);
+
+const binCheck = importLazy('bin-check');
+const binVersionCheck = importLazy('bin-version-check');
+const Download = importLazy('download');
+const osFilterObj = importLazy('os-filter-obj');
 
 /**
  * Initialize a new `BinWrapper`
@@ -40,15 +41,15 @@ module.exports = BinWrapper;
  */
 
 BinWrapper.prototype.src = function (src, os, arch) {
-	if (!arguments.length) {
+	if (arguments.length === 0) {
 		return this._src;
 	}
 
 	this._src = this._src || [];
 	this._src.push({
 		url: src,
-		os: os,
-		arch: arch
+		os,
+		arch
 	});
 
 	return this;
@@ -62,7 +63,7 @@ BinWrapper.prototype.src = function (src, os, arch) {
  */
 
 BinWrapper.prototype.dest = function (dest) {
-	if (!arguments.length) {
+	if (arguments.length === 0) {
 		return this._dest;
 	}
 
@@ -78,7 +79,7 @@ BinWrapper.prototype.dest = function (dest) {
  */
 
 BinWrapper.prototype.use = function (bin) {
-	if (!arguments.length) {
+	if (arguments.length === 0) {
 		return this._use;
 	}
 
@@ -94,7 +95,7 @@ BinWrapper.prototype.use = function (bin) {
  */
 
 BinWrapper.prototype.version = function (range) {
-	if (!arguments.length) {
+	if (arguments.length === 0) {
 		return this._version;
 	}
 
@@ -126,7 +127,7 @@ BinWrapper.prototype.run = function (cmd, cb) {
 		cmd = ['--version'];
 	}
 
-	this.findExisting(function (err) {
+	this.findExisting(err => {
 		if (err) {
 			cb(err);
 			return;
@@ -138,7 +139,7 @@ BinWrapper.prototype.run = function (cmd, cb) {
 		}
 
 		this.runCheck(cmd, cb);
-	}.bind(this));
+	});
 };
 
 /**
@@ -150,7 +151,7 @@ BinWrapper.prototype.run = function (cmd, cb) {
  */
 
 BinWrapper.prototype.runCheck = function (cmd, cb) {
-	binCheck()(this.path(), cmd, function (err, works) {
+	binCheck()(this.path(), cmd, (err, works) => {
 		if (err) {
 			cb(err);
 			return;
@@ -167,7 +168,7 @@ BinWrapper.prototype.runCheck = function (cmd, cb) {
 		}
 
 		cb();
-	}.bind(this));
+	});
 };
 
 /**
@@ -178,7 +179,7 @@ BinWrapper.prototype.runCheck = function (cmd, cb) {
  */
 
 BinWrapper.prototype.findExisting = function (cb) {
-	fs.stat(this.path(), function (err) {
+	fs.stat(this.path(), err => {
 		if (err && err.code === 'ENOENT') {
 			this.download(cb);
 			return;
@@ -190,7 +191,7 @@ BinWrapper.prototype.findExisting = function (cb) {
 		}
 
 		cb();
-	}.bind(this));
+	});
 };
 
 /**
@@ -201,21 +202,19 @@ BinWrapper.prototype.findExisting = function (cb) {
  */
 
 BinWrapper.prototype.download = function (cb) {
-	var files = osFilterObj()(this.src());
-	var download = new Download()({
+	const files = osFilterObj()(this.src());
+	const download = new Download()({
 		extract: true,
 		mode: '755',
 		strip: this.opts.strip
 	});
 
-	if (!files.length) {
+	if (files.length === 0) {
 		cb(new Error('No binary found matching your system. It\'s probably not supported.'));
 		return;
 	}
 
-	files.forEach(function (file) {
-		download.get(file.url);
-	});
+	files.forEach(file => download.get(file.url));
 
 	download
 		.dest(this.dest())

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/kevva"
   },
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=4"
   },
   "scripts": {
     "test": "xo && ava"
@@ -29,16 +29,16 @@
     "bin-version-check": "^2.1.0",
     "download": "^4.0.0",
     "each-async": "^1.1.1",
-    "lazy-req": "^1.0.0",
+    "import-lazy": "^2.1.0",
     "os-filter-obj": "^1.0.0"
   },
   "devDependencies": {
     "ava": "*",
-    "nock": "^8.0.0",
+    "nock": "^9.2.3",
     "path-exists": "^3.0.0",
-    "pify": "^2.3.0",
+    "pify": "^3.0.0",
     "rimraf": "^2.2.8",
-    "tempfile": "^1.1.1",
+    "tempy": "^0.2.1",
     "xo": "*"
   }
 }

test.js

@@ -5,8 +5,8 @@ import pathExists from 'path-exists';
 import pify from 'pify';
 import rimraf from 'rimraf';
 import test from 'ava';
-import tempfile from 'tempfile';
-import Fn from './';
+import tempy from 'tempy';
+import Fn from '.';
 
 const fsP = pify(fs);
 const rimrafP = pify(rimraf);
@@ -64,7 +64,7 @@ test('get the binary path', t => {
 test('verify that a binary is working', async t => {
 	const bin = new Fn()
 		.src('http://foo.com/gifsicle.tar.gz')
-		.dest(tempfile())
+		.dest(tempy.directory())
 		.use(process.platform === 'win32' ? 'gifsicle.exe' : 'gifsicle');
 
 	await pify(bin.run.bind(bin))();
@@ -75,7 +75,7 @@ test('verify that a binary is working', async t => {
 test('meet the desired version', async t => {
 	const bin = new Fn()
 		.src('http://foo.com/gifsicle.tar.gz')
-		.dest(tempfile())
+		.dest(tempy.directory())
 		.use(process.platform === 'win32' ? 'gifsicle.exe' : 'gifsicle')
 		.version('>=1.71');
 
@@ -89,7 +89,7 @@ test('download files even if they are not used', async t => {
 		.src('http://foo.com/gifsicle-darwin.tar.gz')
 		.src('http://foo.com/gifsicle-win32.tar.gz')
 		.src('http://foo.com/test.js')
-		.dest(tempfile())
+		.dest(tempy.directory())
 		.use(process.platform === 'win32' ? 'gifsicle.exe' : 'gifsicle');
 
 	await pify(bin.run.bind(bin))();
@@ -106,18 +106,18 @@ test('download files even if they are not used', async t => {
 test('skip running binary check', async t => {
 	const bin = new Fn({skipCheck: true})
 		.src('http://foo.com/gifsicle.tar.gz')
-		.dest(tempfile())
+		.dest(tempy.directory())
 		.use(process.platform === 'win32' ? 'gifsicle.exe' : 'gifsicle');
 
 	await pify(bin.run.bind(bin))(['--shouldNotFailAnyway']);
 	t.true(await pathExists(bin.path()));
 	await rimrafP(bin.dest());
 });
 
-test('error if no binary is found and no source is provided', t => {
+test('error if no binary is found and no source is provided', async t => {
 	const bin = new Fn()
-		.dest(tempfile())
+		.dest(tempy.directory())
 		.use(process.platform === 'win32' ? 'gifsicle.exe' : 'gifsicle');
 
-	t.throws(pify(bin.run.bind(bin))(), 'No binary found matching your system. It\'s probably not supported.');
+	await t.throws(pify(bin.run.bind(bin))(), 'No binary found matching your system. It\'s probably not supported.');
 });