[minor] A couple of small formatting updates

ajbetteridge · Jan 6, 2012 · f1b3b17 · f1b3b17
1 parent 5319375
commit f1b3b17
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/bin/haibu b/bin/haibu
@@ -25,8 +25,8 @@ if (argv.h || argv.help) {
   return util.puts(help);
 }
 
-var env      = argv.env || 'development',
-    port     = argv.p   || 9002;
+var env  = argv.env || 'development',
+    port = argv.p   || 9002;
 
 if (argv.chroot) {
   haibu.use(haibu.chroot, {});

diff --git a/lib/haibu.js b/lib/haibu.js
@@ -31,7 +31,6 @@ require('pkginfo')(module, 'version');
 // Set the allowed executables
 //
 haibu.config.set('allowedExecutables', ['node', 'coffee']);
-console.error(haibu.config.stores)
 
 haibu.common     = haibu.utils = require('./haibu/common');
 haibu.Spawner    = require('./haibu/core/spawner').Spawner;
@@ -46,13 +45,17 @@ haibu.sendResponse = function sendResponse(res, status, body) {
 }
 
 haibu.getSpawnOptions = function getSpawnOptions (app) {
-  var env = app.env, cwd, command = 'node';
-  var version;
+  var env = app.env, 
+      command = 'node',
+      nodeDir,
+      version,
+      cwd;
+
   if (haibu.nodeVersions && app.engine) {
     version = semver.maxSatisfying(haibu.nodeVersions, (app.engine || {}).node);
-    var nodeDir = path.join(haibu.engineDir, version);
+    nodeDir = path.join(haibu.engineDir, version);
   }
-console.error(haibu.nodeVersions, version)
+
   if (version) {
     //
     // Add node (should be configured with --no-npm) and -g modules to path of repo
@@ -67,10 +70,14 @@ console.error(haibu.nodeVersions, version)
       var concatLIBRARY_PATH = (process.env.LIBRARY_PATH ? ':' + process.env.LIBRARY_PATH : '');
       env.LIBRARY_PATH = path.join(nodeDir, 'lib') + ':' + path.join(nodeDir, 'lib', 'node') + concatLIBRARY_PATH;
     }
+
     cwd = nodeDir;
     command = path.join(nodeDir, 'bin', 'node');
   }
-  var nodeDir = path.join(haibu.nodeInstallDir, version);return {
+
+  nodeDir = path.join(haibu.nodeInstallDir, version);
+
+  return {
     env: env,
     cwd: cwd,
     command: command
@@ -88,6 +95,4 @@ haibu.__defineGetter__('coffee', function () {
 });
 haibu.__defineGetter__('advanced-replies', function () {
   return require('./haibu/plugins/advanced-replies');
-});
-
-
+});
diff --git a/lib/haibu/core/spawner.js b/lib/haibu/core/spawner.js
@@ -83,6 +83,7 @@ Spawner.prototype.spawn = function spawn (repo, callback) {
       stdout = [],
       options = [],
       foreverOptions,
+      carapaceBin,
       error,
       drone;
 
@@ -153,8 +154,8 @@ Spawner.prototype.spawn = function spawn (repo, callback) {
     });
 
     foreverOptions.options.push(script);
-    var cara = foreverOptions.options.shift();
-    drone = new forever.Monitor(cara, foreverOptions);
+    carapaceBin = foreverOptions.options.shift();
+    drone = new forever.Monitor(carapaceBin, foreverOptions);
     drone.on('error', function () {
       //
       // 'error' event needs to be caught, otherwise

diff --git a/lib/haibu/plugins/chroot.js b/lib/haibu/plugins/chroot.js
@@ -5,7 +5,8 @@ var fs = require('fs'),
     spawn = require('child_process').spawn,
     haibu = require('../../haibu');
 
-var chroot = exports;
+var chroot = exports,
+    _getSpawnOptions = haibu.getSpawnOptions;
 
 //
 // Name this plugin so it can be accessed by name
@@ -97,16 +98,20 @@ chroot.argv = function (repo) {
   };
 };
 
-var _getSpawnOptions = haibu.getSpawnOptions;
 haibu.getSpawnOptions = function getSpawnOptions(app) {
   var options = _getSpawnOptions.apply(this, arguments);
+
   if (options.env) {
     var pattern = new RegExp('(^|:)'+haibu.config.get('chroot').root.replace(/\W/g,'\\$&'));
     ['CPATH','LIBRARY_PATH','NODE_PREFIX','NODE_PATH','PATH', ].forEach(function(key) {
-      if (!options[key]) return;
+      if (!options[key]) {
+        return;
+      }
+
       options[key] = options[key].replace(pattern,'$1')
     });
   }
+
   return options;
 }