Merge branch 'command-abbreviations' of git://github.com/alFReD-NSH/bower

satazor · satazor · commit cd45a1976b67 · 2013-03-17T13:07:21.000Z
diff --git a/bin/bower b/bin/bower
@@ -30,7 +30,11 @@ options   = nopt(options, shorthand, process.argv);
 bower.version = pkg.version;
 
 if (options.version) return console.log(bower.version);
-if (~cmdList.indexOf(command = options.argv.remain && options.argv.remain.shift())) bower.command = command;
+
+command = options.argv.remain && options.argv.remain.shift();
+command = bower.abbreviations[command];
+
+if (command) bower.command = command;
 
 
 // Temporarory fix for #22 #320 #187
diff --git a/lib/index.js b/lib/index.js
@@ -6,7 +6,11 @@
 // http://opensource.org/licenses/MIT
 // ==========================================
 
+var abbrev = require('abbrev');
+var commands = require('./commands');
+
 module.exports = {
-  commands: require('./commands'),
+  commands: commands,
+  abbreviations: abbrev(Object.keys(commands)),
   config: require('./core/config')
 };
diff --git a/package.json b/package.json
@@ -33,7 +33,8 @@
     "rc": "~0.0.6",
     "unzip": "0.1.4",
     "tar": "~0.1.13",
-    "promptly": "~0.1.0"
+    "promptly": "~0.1.0",
+    "abbrev": "~1.0.4"
   },
   "scripts": {
     "test": "mocha --reporter spec --timeout 40000"
diff --git a/test/abbreviations.js b/test/abbreviations.js
@@ -0,0 +1,22 @@
+/*jshint plusplus:false*/
+
+var bower   = require('../lib');
+var assert  = require('assert');
+
+var commandsList = Object.keys(bower.commands);
+var abbreviations = bower.abbreviations;
+
+describe('abbreviations', function () {
+  it('Should contain all commands in full', function () {
+    commandsList.forEach(function (command) {
+      assert(abbreviations[command]);
+    });
+  });
+  it('Should contain abbreviations that are not ambiguous', function () {
+    assert.equal(abbreviations.s, 'search');
+    assert.equal(abbreviations.ins, 'install');
+    assert.equal(abbreviations.inst, 'install');
+    assert.equal(abbreviations.cache, 'cache-clean');
+    assert.equal(abbreviations.compl, 'completion');
+  });
+});
