Various tweaks

Author: kevva

.editorconfig

@@ -1,14 +1,13 @@
 root = true
 
 [*]
-indent_size = 4
 indent_style = tab
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.json]
+[*.{json,yml}]
 indent_size = 2
 indent_style = space
 

.gitignore

@@ -1,2 +1 @@
 node_modules
-test/tmp*

.jshintrc

@@ -2,13 +2,11 @@
 	"bitwise": true,
 	"camelcase": true,
 	"curly": true,
-	"eqeqeq": true,
 	"esnext": true,
 	"immed": true,
 	"newcap": true,
 	"noarg": true,
 	"node": true,
-	"quotmark": "single",
 	"strict": true,
 	"undef": true,
 	"unused": "vars"

index.js

@@ -114,89 +114,74 @@ BinWrapper.prototype.path = function () {
  */
 
 BinWrapper.prototype.run = function (cmd, cb) {
-	var self = this;
-
 	if (typeof cmd === 'function' && !cb) {
 		cb = cmd;
 		cmd = ['--version'];
 	}
 
-	this.search(function (err, file) {
+	this.findExisting(function (err, files) {
 		if (err) {
 			cb(err);
 			return;
 		}
 
-		if (!file) {
-			return self.get(function (err) {
-				if (err) {
-					cb(err);
-					return;
-				}
-
-				self.test(cmd, cb);
-			});
+		if (this.opts.skipCheck) {
+			cb();
+			return;
 		}
 
-		self.test(cmd, cb);
-	});
+		this.runCheck(cb);
+	}.bind(this));
 };
 
 /**
- * Search for the binary
+ * Run binary check
  *
  * @param {Function} cb
  * @api private
  */
 
-BinWrapper.prototype.search = function (cb) {
-	var self = this;
-
-	globby(this.path(), function (err, files) {
+BinWrapper.prototype.runCheck = function (cb) {
+	binCheck(this.path(), function (err, works) {
 		if (err) {
 			cb(err);
 			return;
 		}
 
-		cb(null, files[0]);
-	});
+		if (!works) {
+			cb(new Error('The `' + this.path() + '` binary doesn\'t seem to work correctly'));
+			return;
+		}
+
+		if (this.version()) {
+			return binVersionCheck(this.path(), this.version(), cb);
+		}
+
+		cb();
+	}.bind(this));
 };
 
 /**
- * Check if binary is working
-
- * @param {Array} cmd
+ * Find existing files
+ *
  * @param {Function} cb
  * @api private
  */
 
-BinWrapper.prototype.test = function (cmd, cb) {
-	var self = this;
-	var name = path.basename(this.path());
-	var version = this.version();
-
-	if (this.opts.skip) {
-		cb();
-		return;
-	}
-
-	binCheck(this.path(), cmd, function (err, works) {
+BinWrapper.prototype.findExisting = function (cb) {
+	globby(this.path(), function (err, files) {
 		if (err) {
 			cb(err);
 			return;
 		}
 
-		if (!works) {
-			cb(new Error('The `' + name + '` binary doesn\'t seem to work correctly'));
+		if (!files.length) {
+			this.download(cb);
 			return;
 		}
 
-		if (version) {
-			return binVersionCheck(self.path(), version, cb);
-		}
-
-		cb();
-	});
+		cb(null, files);
+	}.bind(this));
 };
 
 /**
@@ -206,7 +191,7 @@ BinWrapper.prototype.test = function (cmd, cb) {
  * @api private
  */
 
-BinWrapper.prototype.get = function (cb) {
+BinWrapper.prototype.download = function (cb) {
 	var files = osFilterObj(this.src());
 	var download = new Download({
 		extract: true,
@@ -223,8 +208,9 @@ BinWrapper.prototype.get = function (cb) {
 		download.get(file.url);
 	});
 
-	download.dest(this.dest());
-	download.run(cb);
+	download
+		.dest(this.dest())
+		.run(cb);
 };
 
 /**

LICENSE.md licenseLICENSE.md renamed to license

@@ -1,19 +1,21 @@
-Copyright (c) Kevin Mårtensson
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
+Copyright (c) Kevin Mårtensson <[email protected]>
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md readme.mdREADME.md renamed to readme.md

@@ -43,7 +43,7 @@ console.log(bin.path()); // => path/to/vendor/gifsicle
 
 Creates a new `BinWrapper` instance. The available options are:
 
-* `skip`: Whether to skip checking if the binary works or not. Defaults to `false`.
+* `skipCheck`: Whether to skip checking if the binary works or not. Defaults to `false`.
 * `strip`: Strip a number of leading paths from file names on extraction. Defaults to `1`.
 
 ### .src(url, os, arch)