Refactoring.

Author: wbyoung

bin/_avn

@@ -5,35 +5,26 @@
 var program = require('commander');
 var fs = require('fs');
 var path = require('path');
+var chalk = require('chalk');
 var avn = require('..');
 
-var hook = function(fn) {
-  return function() {
-    // set up stdcmd stream
-    try { process.stdcmd = fs.createWriteStream(null, { fd: 3 }); }
-    catch (e) { process.stdcmd = process.stderr; }
-
-    // setup colors based on program options
-    require('chalk').enabled = program.color;
-    fn.apply(this, arguments);
-  };
-};
-
 program
   .version(JSON.parse(fs.readFileSync(__dirname + '/../package.json', 'utf8')).version)
   .option('-v --verbose', 'run verbosely')
   .option('-c --color', 'use colors (automatic for some commands)');
 
 program
-  .command('chpwd <path> [avnvc]')
+  .command('chpwd <path> [versionFile]')
   .description('eval actions for chpwd')
-  .action(hook(function(dir, versionFile) {
+  .action(function(dir, versionFile) {
+    chalk.enabled = program.color;
+    process.stdcmd = fs.createWriteStream(null, { fd: 3 });
     avn.hooks.chpwd(path.resolve(dir), versionFile,
       { verbose: program.verbose }).done();
-  }));
+  });
 
 program
-  .command('explain <path> [avnvc]')
+  .command('explain <path> [versionFile]')
   .description('show what will happen for a given path')
   .action(function(dir, versionFile) {
     process.stdcmd = process.stderr;

lib/hooks.js

@@ -2,11 +2,11 @@
 
 var _ = require('lodash');
 var Promise = require('bluebird');
-var fs = Promise.promisifyAll(require('fs'));
+var fs = require('mz/fs');
 var path = require('path');
 var plugins = require('./plugins');
 var fmt = require('./fmt');
-var rethrowUnlessNoEntry;
+var isNoEntry = require('./util/codes').isNoEntry;
 
 /**
  * Find the first plugin that can activate the requested version.
@@ -71,28 +71,16 @@ exports.chpwd = function(/*dir, [versionFile], [options]*/) {
   }
 
   return Promise.bind({})
-  .then(function() { return fs.readFileAsync(path.join(dir, file), 'utf8'); })
+  .then(function() { return fs.readFile(path.join(dir, file), 'utf8'); })
   .then(function(version) { this.version = version.trim(); })
   .then(function() { return match(this.version); })
   .then(function(result) {
     process.stdout.write(fmt.success(this.version, result, via));
     process.stdcmd.write(result.command + '\n');
   })
-  .catch(rethrowUnlessNoEntry)
+  .catch(isNoEntry, _.noop)
   .catch(function(e) {
     if (e.code !== 'PREDICATE_FAILED') { throw e; }
     else { console.warn(fmt.failure(this.version, e, opts.verbose)); }
   });
 };
-
-/**
- * Rethrow when the error code is not `ENOENT`.
- *
- * @private
- * @function hooks.~rethrowUnlessNoEntry
- * @param {Error} error The error to check.
- */
-rethrowUnlessNoEntry = function(e) {
-  if (e.code === 'ENOENT') { }
-  else { throw e; }
-};

lib/plugins.js

@@ -3,7 +3,8 @@
 var _ = require('lodash');
 var Promise = require('bluebird');
 var path = require('path');
-var fs = require('fs');
+var fs = require('mz/fs');
+var isNoEntry = require('./util/codes').isNoEntry;
 var errorify;
 var rethrowUnlessFailedRequire;
 
@@ -16,9 +17,9 @@ var rethrowUnlessFailedRequire;
  * `~/.avnrc` configuration file.
  */
 exports.all = (function() {
-  var loaded;
+  var cache;
   return function() {
-    return loaded || (loaded = exports._all());
+    return cache || (cache = exports._all());
   };
 })();
 
@@ -47,10 +48,13 @@ exports._all = function() {
   // look at ~/.avnrc file to get the order of plugins, but fall back on a
   // default order if there's no config.
   var file = path.join(process.env.HOME, '.avnrc');
-  var contents = fs.existsSync(file) && fs.readFileSync(file, 'utf8');
-  var config = contents && JSON.parse(contents) || {};
-  var order = _.union(config.plugins, ['nvm', 'n']);
-  return order.reduce(function(array, name) {
+
+  return fs.readFile(file, 'utf8').catch(isNoEntry, _.noop)
+  .then(function(contents) {
+    var config = contents && JSON.parse(contents) || {};
+    return _.union(config.plugins, ['nvm', 'n']);
+  })
+  .reduce(function(array, name) {
     var plugin;
     var installed = path.join(process.env.HOME, '.avn/plugins', 'avn-' + name);
     try { plugin = require(installed); }
@@ -77,19 +81,17 @@ exports._all = function() {
  * `details` containing any sub-errors raised by the predicate's promise.
  */
 exports.first = function(predicate) {
-  var result;
   var errors = [];
-  /** local */
-  var reduction = function(sequence, plugin) {
-    return sequence
-    .then(function() { return result || predicate(plugin); })
-    .then(
-      function(r) { result = result || r && plugin; },
-      function(e) { errors.push(errorify(e, { plugin: plugin })); });
-  };
-  return exports.all().reduce(reduction, Promise.resolve()).then(function() {
+  return Promise.reduce(exports.all(), function(result, plugin) {
+    return result || Promise.resolve(predicate(plugin))
+    .then(function(r) { return r && plugin; })
+    .catch(function(e) {
+      errors.push(errorify(e, { plugin: plugin }));
+    });
+  }, null)
+  .then(function(result) {
     if (!result) {
-      throw errorify('no plugin passed predicate', {
+      throw _.extend(new Error('no plugin passed predicate'), {
         code: 'PREDICATE_FAILED',
         details: errors,
       });

lib/setup/config.js

@@ -1,11 +1,11 @@
 'use strict';
 
 var _ = require('lodash');
-var Promise = require('bluebird');
-var fs = Promise.promisifyAll(require('fs'));
+var fs = require('mz/fs');
 var path = require('path');
 var chalk = require('chalk');
 var installedPlugins = require('./plugins').installed;
+var isNoEntry = require('../util/codes').isNoEntry;
 
 /**
  * Update `~/.avnrc` configuration file.
@@ -28,12 +28,16 @@ var installedPlugins = require('./plugins').installed;
  * @see {@link plugins.~all}
  */
 module.exports.update = function() {
-  var file = path.join(process.env.HOME, '.avnrc');
-  var contents = fs.existsSync(file) && fs.readFileSync(file);
-  var config = contents && JSON.parse(contents) || {};
+  var contents, config;
   var change = 'unchanged';
+  var file = path.join(process.env.HOME, '.avnrc');
 
-  return Promise.resolve()
+  return fs.readFile(file)
+  .catch(isNoEntry, _.noop)
+  .then(function(result) {
+    contents = result;
+    config = contents && JSON.parse(contents) || {};
+  })
   .then(function() { return installedPlugins(); })
   .then(function(plugins) {
     plugins = _.map(plugins, 'name');
@@ -42,7 +46,7 @@ module.exports.update = function() {
     if (!_.isEqual(config.plugins, plugins)) {
       config.plugins = plugins;
       change = (contents ? 'updated' : 'complete');
-      return fs.writeFileAsync(file, JSON.stringify(config, null, 2));
+      return fs.writeFile(file, JSON.stringify(config, null, 2));
     }
   })
   .then(function() {

lib/setup/install.js

@@ -1,11 +1,29 @@
 'use strict';
 
+var _ = require('lodash');
 var Promise = require('bluebird');
-var fs = require('fs');
+var fs = require('mz/fs');
 var cp = require('child_process');
 var path = require('path');
 var chalk = require('chalk');
 var installedPlugins = require('./plugins').installed;
+var isNoEntry = require('../util/codes').isNoEntry;
+
+/**
+ * Get a module version by reading it's package.json.
+ *
+ * @private
+ * @function setup.install.~moduleVersion
+ * @param {String} module The path to the module.
+ * @return {Promise}
+ */
+var moduleVersion = function(module) {
+  return fs.readFile(path.join(module, 'package.json'), 'utf8')
+  .catch(isNoEntry, _.noop).then(function(contents) {
+    try { return JSON.parse(contents).version; }
+    catch (e) {}
+  });
+};
 
 /**
  * Install a module by copying it from the source to the destination.
@@ -17,28 +35,26 @@ var installedPlugins = require('./plugins').installed;
  * @return {Promise}
  */
 var install = function(src, dst) {
-  /** local */
-  var version = function(root) {
-    try {
-      var contents = fs.readFileSync(path.join(root, 'package.json'), 'utf8');
-      return JSON.parse(contents).version;
-    }
-    catch (e) {}
-  };
+  var srcVersion, dstVersion;
+  return Promise.resolve()
+  .then(function() { return moduleVersion(src); })
+  .then(function(v) { srcVersion = v; })
+  .then(function() { return moduleVersion(dst); })
+  .then(function(v) { dstVersion = v; })
+  .then(function() {
+    return new Promise(function(resolve, reject) {
+      if (srcVersion === dstVersion) { resolve(); }
+      else {
+        var cmd = cp.spawn('/bin/cp', ['-RL', src, dst]);
+        cmd.stdout.pipe(process.stdout);
+        cmd.stderr.pipe(process.stderr);
+        cmd.on('close', function(code) {
+          if (code === 0) { resolve(dstVersion ? 'updated' : 'complete'); }
+          else { reject(new Error('cp exited with status: ' + code)); }
+        });
+      }
+    });
 
-  return new Promise(function(resolve, reject) {
-    var srcVersion = version(src);
-    var dstVersion = version(dst);
-    if (srcVersion === dstVersion) { resolve(); }
-    else {
-      var cmd = cp.spawn('/bin/cp', ['-RL', src, dst]);
-      cmd.stdout.pipe(process.stdout);
-      cmd.stderr.pipe(process.stderr);
-      cmd.on('close', function(code) {
-        if (code === 0) { resolve(dstVersion ? 'updated' : 'complete'); }
-        else { reject(new Error('cp exited with status: ' + code)); }
-      });
-    }
   });
 };