[fixes #4] better normalization of resolve opts

Author: imlucas

index.js

@@ -10,8 +10,7 @@ var async = require('async'),
   download = require('./lib/download'),
   extract = require('./lib/extract'),
   versions = require('./lib/versions'),
-  pluck = require('lodash.pluck'),
-  defaults = require('lodash.defaults'),
+  defaults = require('amp-defaults'),
   semver = require('semver'),
   debug = require('debug')('mongodb-version-manager');
 

lib/resolve.js

@@ -4,7 +4,8 @@ var os = require('os'),
   versions = require('./versions'),
   semver = require('semver'),
   request = require('request'),
-  async = require('async');
+  async = require('async'),
+  defaults = require('amp-defaults');
 
 module.exports = function(opts, fn){
   if(Array.isArray(opts)){
@@ -20,38 +21,49 @@ module.exports = function(opts, fn){
   if(typeof opts === 'string'){
     opts = {version: opts};
   }
+  var handler = versions;
+
+  defaults(opts, {
+    arch: ARCH,
+    platform: PLATFORM,
+    branch: 'master',
+    bits: '64',
+    debug: false
+  });
+
+  // 64bit -> 64
+  opts.bits = opts.bits.replace(/[^0-9]/g, '');
 
-  var arch = opts.arch || ARCH,
-    platform = opts.platform || PLATFORM,
-    handler = versions;
+  if(opts.platform === 'darwin') opts.platform = 'osx';
+  if(opts.platform === 'windows') opts.platform = 'win32';
 
-  opts.branch = opts.branch || 'master';
-  opts.platform = opts.platform || PLATFORM;
-  opts.bits = opts.bits || '64';
-  opts.ext = (platform === 'win32' ? '.zip' : '.tgz');
+  opts.ext = (opts.platform === 'win32' ? '.zip' : '.tgz');
+  // @todo: get list of distros from mci and make sure passed in is valid.
   opts.distro = opts.distro || null;
 
+  // A commit hash
+  if(opts.version.length === 40 || opts.version.length === 8){
+    // @todo: Use dyno rest api to resolve 8char short sha to full sha.
+    return mci(opts, fn);
+  }
+
   if(opts.version === 'latest' || opts.version === 'unstable'){
     handler = latest;
   }
   else if(opts.version === 'stable'){
     handler = stable;
   }
-  else if(opts.version.length === 40 || opts.version.length === 8){
-    // A commit hash
-    return mci(opts, fn);
-  }
   else {
     handler = search.bind(null, opts);
   }
 
   handler(function(err, v){
-    var basename = 'mongodb-' + platform+'-' + arch + (opts.debug ? '-debugsymbols' : '') + '-' + v,
+    var basename = 'mongodb-' + opts.platform+'-' + opts.arch + (opts.debug ? '-debugsymbols' : '') + '-' + v,
       pkg = {
         name: 'mongodb',
         version: v,
         artifact: basename + opts.ext,
-        url: 'http://fastdl.mongodb.org/'+platform+'/' + basename + opts.ext
+        url: 'http://fastdl.mongodb.org/'+opts.platform+'/' + basename + opts.ext
       };
 
     fn(null, pkg);
@@ -86,8 +98,6 @@ function mci(opts, fn){
   });
 }
 
-
-
 function search(query, fn){
   versions(function(err, res){
     if(err) return fn(err);

package.json

@@ -18,15 +18,13 @@
     "mocha": "~2.0.1"
   },
   "dependencies": {
+    "amp-defaults": "~1.0.1",
     "async": "~0.9.0",
     "cheerio": "~0.17.0",
     "debug": "~1.0.4",
     "docopt": "~0.4.0",
     "downcache": "0.0.5-a",
     "fs-extra": "~0.10.0",
-    "lodash.defaults": "~2.4.1",
-    "lodash.pluck": "~2.4.1",
-    "lodash.without": "~2.4.1",
     "progress": "~1.1.8",
     "request": "~2.40.0",
     "semver": "~3.0.1",