Merge branch 'kpdecker-path-error'

Author: sokra

lib/MemoryFileSystem.js

@@ -20,7 +20,7 @@ function isFile(item) {
 function pathToArray(path) {
 	var nix = /^\//.test(path);
 	if(!nix) {
-		if(!/^[A-Za-z]:/.test(path)) throw new Error("Invalid path " + path);
+		if(!/^[A-Za-z]:/.test(path)) throw new Error("Invalid path '" + path + "'");
 		path = path.replace(/[\\\/]+/g, "\\"); // multi slashs
 		path = path.split(/[\\\/]/);
 		path[0] = path[0].toUpperCase();
@@ -32,15 +32,15 @@ function pathToArray(path) {
 	return path;
 }
 
-function trueFn() { return true }
-function falseFn() { return false }
+function trueFn() { return true; }
+function falseFn() { return false; }
 
 MemoryFileSystem.prototype.statSync = function(_path) {
 	var path = pathToArray(_path);
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exist " + _path);
+			throw new Error("Path doesn't exist '" + _path + "'");
 		current = current[path[i]];
 	}
 	if(_path === "/" || isDir(current[path[i]])) {
@@ -64,22 +64,22 @@ MemoryFileSystem.prototype.statSync = function(_path) {
 			isSocket: falseFn
 		};
 	} else
-		throw new Error("Path doesn't exist " + _path);
+		throw new Error("Path doesn't exist '" + _path + "'");
 };
 
 MemoryFileSystem.prototype.readFileSync = function(_path, encoding) {
 	var path = pathToArray(_path);
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exist " + _path);
+			throw new Error("Path doesn't exist '" + _path + "'");
 		current = current[path[i]];
 	}
 	if(!isFile(current[path[i]])) {
 		if(isDir(current[path[i]]))
-			throw new Error("Cannot readFile on directory " + _path);
+			throw new Error("Cannot readFile on directory '" + _path + "'");
 		else
-			throw new Error("File doesn't exist " + _path);
+			throw new Error("Path doesn't exist '" + _path + "'");
 	}
 	current = current[path[i]];
 	return encoding ? current.toString(encoding) : current;
@@ -91,14 +91,14 @@ MemoryFileSystem.prototype.readdirSync = function(_path) {
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exist " + _path);
+			throw new Error("Path doesn't exist '" + _path + "'");
 		current = current[path[i]];
 	}
 	if(!isDir(current[path[i]])) {
 		if(isFile(current[path[i]]))
-			throw new Error("Cannot readdir on file " + _path);
+			throw new Error("Cannot readdir on file '" + _path + "'");
 		else
-			throw new Error("File doesn't exist " + _path);
+			throw new Error("Path doesn't exist '" + _path + "'");
 	}
 	return Object.keys(current[path[i]]).filter(Boolean);
 };
@@ -109,7 +109,7 @@ MemoryFileSystem.prototype.mkdirpSync = function(_path) {
 	var current = this.data;
 	for(var i = 0; i < path.length; i++) {
 		if(isFile(current[path[i]]))
-			throw new Error("Path is a file " + _path);
+			throw new Error("Path is a file '" + _path + "'");
 		else if(!isDir(current[path[i]]))
 			current[path[i]] = {"":true};
 		current = current[path[i]];
@@ -123,28 +123,28 @@ MemoryFileSystem.prototype.mkdirSync = function(_path) {
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exist " + _path);
+			throw new Error("Path doesn't exist '" + _path + "'");
 		current = current[path[i]];
 	}
 	if(isDir(current[path[i]]))
-		throw new new Error("Directory already exist " + _path);
+		throw new new Error("Directory already exist '" + _path + "'");
 	else if(isFile(current[path[i]]))
-		throw new Error("Cannot mkdir on file " + _path);
+		throw new Error("Cannot mkdir on file '" + _path + "'");
 	current[path[i]] = {"":true};
 	return;
 };
 
 MemoryFileSystem.prototype._remove = function(_path, name, testFn) {
 	var path = pathToArray(_path);
-	if(path.length === 0) throw new Error("Path cannot be removed " + _path);
+	if(path.length === 0) throw new Error("Path cannot be removed '" + _path + "'");
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exist " + _path);
+			throw new Error("Path doesn't exist '" + _path + "'");
 		current = current[path[i]];
 	}
 	if(!testFn(current[path[i]]))
-		throw new Error(name + " doesn't exist " + _path);
+		throw new Error("'" + name + "' doesn't exist '" + _path + "'");
 	delete current[path[i]];
 	return;
 };
@@ -160,15 +160,15 @@ MemoryFileSystem.prototype.unlinkSync = function(_path) {
 MemoryFileSystem.prototype.writeFileSync = function(_path, content, encoding) {
 	if(!content && !encoding) throw new Error("No content");
 	var path = pathToArray(_path);
-	if(path.length === 0) throw new Error("Path is not a file " + _path);
+	if(path.length === 0) throw new Error("Path is not a file '" + _path + "'");
 	var current = this.data;
 	for(var i = 0; i < path.length - 1; i++) {
 		if(!isDir(current[path[i]]))
-			throw new Error("Path doesn't exist " + _path);
+			throw new Error("Path doesn't exist '" + _path + "'");
 		current = current[path[i]];
 	}
 	if(isDir(current[path[i]]))
-		throw new Error("Cannot writeFile on directory " + _path);
+		throw new Error("Cannot writeFile on directory '" + _path + "'");
 	current[path[i]] = encoding || typeof content === "string" ? new Buffer(content, encoding) : content;
 	return;
 };