promisify context.exec

lib/context.js

@@ -95,16 +95,6 @@ Context.prototype.end = function () {
   return Q.resolve();
 };
 
-Context.prototype.exec = function() {
-  var args = Array.prototype.slice.call(arguments, 0);
-  var last = args.pop();
-  if(typeof last !== 'function') {
-    args.push(last);
-    last = function () { }
-  }
-  this.send('EXEC ' + args.join(' ') + '\n', last);
-};
-
 Context.prototype.sendCommand = function (command) {
   var defer = new Q.defer();
   this.send(command + '\n', function (err, result){
@@ -123,10 +113,15 @@ Context.prototype.onEvent = function (event) {
     defer.resolve(data);
   });
   return defer.promise;
-}
+};
+
+Context.prototype.exec = function() {
+  var args = Array.prototype.slice.call(arguments, 0);
+  return this.sendCommand('EXEC ' + args.join(' '));
+};
 
-Context.prototype.dial = function (num, timeout, params, cb) {
-  this.exec('Dial', num + ',' + timeout + ',' + params, cb);
+Context.prototype.dial = function (num, timeout, params) {
+  return this.exec('Dial', num + ',' + timeout + ',' + params);
 };
 
 Context.prototype.databaseDel = function (family, key) {

test/index.js

@@ -96,9 +96,10 @@ describe('Context', function() {
           context.stream.write('\n');
         });
 
-        context.exec('test', 'boom', function(err, res) {
-          done(err);
+        context.exec('test', 'boom').then(function(){
+          done();
         });
+        
       });
     });
 
@@ -111,18 +112,20 @@ describe('Context', function() {
           context.stream.write('200 result=0\n');
         });
 
-        context.exec('test', function(err, res) {
-          expect(res.result).to.eql('0');
-
-          context.exec('test 2', function(err, res) {
+        context.exec('test')
+          .then(function (res) {
+            expect(res.result).to.eql('0');
+            return context.exec('test 2');
+          })
+          .then(function (res) {
             expect(res.result).to.eql('1');
             done();
           });
           
-          process.nextTick(function() {
-            context.stream.write('200 result=1\n');
-          });
+        process.nextTick(function() {
+          context.stream.write('200 result=1\n');
         });
+        
       });
     });
   });