JS: Split node utils into their own file.

js/nodeutils.js

@@ -0,0 +1,88 @@
+var fs	  = require("fs");
+var path  = require("path");
+
+var utils  = require("./utils.js");
+
+// Empty a directory.
+var emptyPath = function(dirPath, done) {
+  fs.readdir(dirPath, function(err, files) {
+    if (err) {
+      done(err);
+    }
+    else {
+      utils.mapOr(rmPath, files.map(function(f) { return path.join(dirPath, f); }), done);
+    }
+  });
+};
+
+// Make a directory and sub-directories.
+var mkPath = function(dirPath, mode, done) {
+  fs.mkdir(dirPath, typeof mode === "string" ? parseInt(mode, 8) : mode, function(e) {
+      if (!e ||  e.code === "EEXIST") {
+	// Created or already exists, done.
+	done();
+      }
+      else if (e.code === "ENOENT") {
+	// Missing sub dir.
+
+	mkPath(path.dirname(dirPath), mode, function(e) {
+	    if (e) {
+	      throw e;
+	    }
+	    else {
+	      mkPath(dirPath, mode, done);
+	    }
+	  });
+      }
+      else {
+	throw e;
+      }
+  });
+};
+
+// Create directory if needed and empty if needed.
+var resetPath = function(dirPath, mode, done) {
+  mkPath(dirPath, mode, function(e) {
+      if (e) {
+	done(e);
+      }
+      else {
+	emptyPath(dirPath, done);
+      }
+    });
+};
+
+// Remove path recursively.
+var rmPath = function(dirPath, done) {
+//  console.log("rmPath: %s", dirPath);
+
+  fs.lstat(dirPath, function(err, stats) {
+      if (err && err.code == "ENOENT") {
+	done();
+      }
+      if (err) {
+	done(err);
+      }
+      else if (stats.isDirectory()) {
+	emptyPath(dirPath, function(e) {
+	    if (e) {
+	      done(e);
+	    }
+	    else {
+//	      console.log("rmdir: %s", dirPath); done();
+	      fs.rmdir(dirPath, done);
+	    }
+	  });
+      }
+      else {
+//	console.log("unlink: %s", dirPath); done();
+	fs.unlink(dirPath, done);
+      }
+    });
+};
+
+exports.mkPath	    = mkPath;
+exports.resetPath   = resetPath;
+exports.rmPath	    = rmPath;
+
+// vim:sw=2:sts=2:ts=8

js/utils.js

@@ -1,8 +1,3 @@
-// YYY Should probably have two versions: node vs browser
-
-var fs = require("fs");
-var path = require("path");
-
 Function.prototype.method = function(name,func) {
   this.prototype[name] = func;
 
@@ -42,84 +37,6 @@ var mapOr = function(func, array, done) {
   }
 };
 
-// Make a directory and sub-directories.
-var mkPath = function(dirPath, mode, done) {
-  fs.mkdir(dirPath, typeof mode === "string" ? parseInt(mode, 8) : mode, function(e) {
-      if (!e ||  e.code === "EEXIST") {
-	// Created or already exists, done.
-	done();
-      }
-      else if (e.code === "ENOENT") {
-	// Missing sub dir.
-
-	mkPath(path.dirname(dirPath), mode, function(e) {
-	    if (e) {
-	      throw e;
-	    }
-	    else {
-	      mkPath(dirPath, mode, done);
-	    }
-	  });
-      }
-      else {
-	throw e;
-      }
-  });
-};
-
-// Empty a directory.
-var emptyPath = function(dirPath, done) {
-  fs.readdir(dirPath, function(err, files) {
-    if (err) {
-      done(err);
-    }
-    else {
-      mapOr(rmPath, files.map(function(f) { return path.join(dirPath, f); }), done);
-    }
-  });
-};
-
-// Remove path recursively.
-var rmPath = function(dirPath, done) {
-//  console.log("rmPath: %s", dirPath);
-
-  fs.lstat(dirPath, function(err, stats) {
-      if (err && err.code == "ENOENT") {
-	done();
-      }
-      if (err) {
-	done(err);
-      }
-      else if (stats.isDirectory()) {
-	emptyPath(dirPath, function(e) {
-	    if (e) {
-	      done(e);
-	    }
-	    else {
-//	      console.log("rmdir: %s", dirPath); done();
-	      fs.rmdir(dirPath, done);
-	    }
-	  });
-      }
-      else {
-//	console.log("unlink: %s", dirPath); done();
-	fs.unlink(dirPath, done);
-      }
-    });
-};
-
-// Create directory if needed and empty if needed.
-var resetPath = function(dirPath, mode, done) {
-  mkPath(dirPath, mode, function(e) {
-      if (e) {
-	done(e);
-      }
-      else {
-	emptyPath(dirPath, done);
-      }
-    });
-};
-
 var trace = function(comment, func) {
   return function() {
       console.log("%s: %s", trace, arguments.toString);
@@ -151,11 +68,7 @@ var stringToHex = function (s) {
     }).join("");
 };
 
-exports.emptyPath   = emptyPath;
 exports.mapOr	    = mapOr;
-exports.mkPath	    = mkPath;
-exports.resetPath   = resetPath;
-exports.rmPath	    = rmPath;
 exports.trace	    = trace;
 exports.hexToString = hexToString;
 exports.stringToHex = stringToHex;

test/server.js

@@ -9,7 +9,7 @@
 //
 
 var config    = require("./config.js");
-var utils = require("../js/utils.js");
+var nodeutils = require("../js/nodeutils.js");
 
 var fs	      = require("fs");
 var path      = require("path");
@@ -24,29 +24,29 @@ var Server = function(name) {
 };
 
 // Return a server's newcoind.cfg as string.
-Server.method('configContent', function() {
+Server.prototype.configContent = function() {
     var	cfg = config.servers[this.name];
 
     return Object.keys(cfg).map(function(o) {
 	return util.format("[%s]\n%s\n", o, cfg[o]);
 	}).join("");
-});
+};
 
-Server.method('serverPath', function() {
+Server.prototype.serverPath = function() {
     return "tmp/server/" + this.name;
-});
+};
 
-Server.method('configPath', function() {
+Server.prototype.configPath = function() {
     return path.join(this.serverPath(), "newcoind.cfg");
-});
+};
 
 // Write a server's newcoind.cfg.
-Server.method('writeConfig', function(done) {
+Server.prototype.writeConfig = function(done) {
     fs.writeFile(this.configPath(), this.configContent(), 'utf8', done);
-});
+};
 
 // Spawn the server.
-Server.method('serverSpawnSync', function() {
+Server.prototype.serverSpawnSync = function() {
     // Spawn in standalone mode for now.
     this.child = child.spawn(
 	config.newcoind,
@@ -70,15 +70,15 @@ Server.method('serverSpawnSync', function() {
 	console.log("server: spawn: server exited code=%s: signal=%s", code, signal);
 	});
 
-});
+};
 
 // Prepare server's working directory.
-Server.method('makeBase', function(done) {
+Server.prototype.makeBase = function(done) {
     var	path	= this.serverPath();
     var self	= this;
 
     // Reset the server directory, build it if needed.
-    utils.resetPath(path, '0777', function(e) {
+    nodeutils.resetPath(path, '0777', function(e) {
 	    if (e) {
 		throw e;
 	    }
@@ -86,11 +86,11 @@ Server.method('makeBase', function(done) {
 		self.writeConfig(done);
 	    }
 	});
-});
+};
 
 // Create a standalone server.
 // Prepare the working directory and spawn the server.
-Server.method('start', function(done) {
+Server.prototype.start = function(done) {
     var self	= this;
 
     this.makeBase(function(e) {
@@ -102,10 +102,10 @@ Server.method('start', function(done) {
 		done();
 	    }
 	});
-});
+};
 
 // Stop a standalone server.
-Server.method('stop', function(done) {
+Server.prototype.stop = function(done) {
     if (this.child) {
 	// Update the on exit to invoke done.
 	this.child.on('exit', function(code, signal) {
@@ -117,9 +117,9 @@ Server.method('stop', function(done) {
     else
     {
 	console.log("server: stop: no such server");
-		done();	
+	done('noSuchServer');	
     }
-});
+};
 
 // Start the named server.
 exports.start = function(name, done) {
@@ -152,4 +152,4 @@ exports.stop = function(name, done) {
 
 exports.Server = Server;
 
-// vim:ts=4
+// vim:sw=2:sts=2:ts=8

test/standalone-test.js

@@ -1,9 +1,8 @@
-var fs	    = require("fs");
 var buster  = require("buster");
 
+var config  = require("./config.js");
 var server  = require("./server.js");
 var remote  = require("../js/remote.js");
-var config  = require("./config.js");
 
 // How long to wait for server to start.
 var serverDelay = 1500;