Add port number support

lib/ssh/connection-pool.js

@@ -6,6 +6,7 @@ var isFunction = require('lodash').isFunction;
 var extend = require('lodash').extend;
 var async = require('async');
 var Connection = require('./connection');
+var extend = require('lodash').extend;
 
 /**
  * Expose ConnectionPool.
@@ -24,6 +25,16 @@ function ConnectionPool(connections, options) {
   // Create connection if necessary.
   connections = connections.map(function (connection) {
     if (connection instanceof Connection) return connection;
+
+    var splitURL = connection.split(':');
+    var port = 22;
+
+    if (splitURL[1]) {
+      connection = splitURL[0];
+      port = splitURL[1];
+    }
+
+    options = extend(options || {}, {port: port});
     return new Connection(extend({ remote: connection }, options));
   });
 

lib/ssh/connection.js

@@ -50,6 +50,7 @@ Connection.prototype.run = function (command, options, cb) {
 
   // In sudo mode, we use a TTY channel.
   var args = /^sudo/.exec(command) ? ['-tt'] : [];
+  args.push('-p ' + (this.options.port || 22));
   args.push(remote.format(this.remote));
 
   // Escape double quotes in command.
@@ -101,7 +102,7 @@ Connection.prototype.copy = function (src, dest, options, cb) {
   var args = ['rsync'].concat(excludes).concat([
     '-az',
     '-e',
-    'ssh',
+    '"ssh -p ' + (this.options.port || 22) + '"',
     src,
     dest
   ]);

test/unit/ssh/connection.js

@@ -57,7 +57,7 @@ describe('SSH Connection', function () {
       connection.run('my-command -x', { cwd: '/root' }, done);
 
       expect(childProcess.exec).to.be.calledWith(
-        'ssh user@host "my-command -x"',
+        'ssh -p 22 user@host "my-command -x"',
         { cwd: '/root', maxBuffer: 1000 * 1024 }
       );
     });
@@ -66,7 +66,7 @@ describe('SSH Connection', function () {
       connection.run('echo "ok"', {cwd: '/root'}, done);
 
       expect(childProcess.exec).to.be.calledWith(
-        'ssh user@host "echo \\"ok\\""',
+        'ssh -p 22 user@host "echo \\"ok\\""',
         { cwd: '/root', maxBuffer: 1000 * 1024 }
       );
     });
@@ -84,7 +84,7 @@ describe('SSH Connection', function () {
       connection.run('sudo my-command -x', { cwd: '/root' }, done);
 
       expect(childProcess.exec).to.be.calledWith(
-        'ssh -tt user@host "sudo my-command -x"',
+        'ssh -tt -p 22 user@host "sudo my-command -x"',
         { cwd: '/root', maxBuffer: 1000 * 1024 }
       );
     });
@@ -94,11 +94,11 @@ describe('SSH Connection', function () {
       connection.run('my-command2 -x', function () {});
 
       expect(childProcess.exec).to.be.calledWith(
-        'ssh user@host "my-command -x"'
+        'ssh -p 22 user@host "my-command -x"'
       );
 
       expect(childProcess.exec).to.be.calledWith(
-        'ssh user@host "my-command2 -x"'
+        'ssh -p 22 user@host "my-command2 -x"'
       );
     });
   });
@@ -116,14 +116,14 @@ describe('SSH Connection', function () {
     it('should call cmd.spawn', function (done) {
       connection.copy('/src/dir', '/dest/dir', done);
 
-      expect(childProcess.exec).to.be.calledWith('rsync -az -e ssh /src/dir user@host:/dest/dir');
+      expect(childProcess.exec).to.be.calledWith('rsync -az -e "ssh -p 22" /src/dir user@host:/dest/dir');
     });
 
     it('should accept "ignores" option', function (done) {
       connection.copy('/src/dir', '/dest/dir', { ignores: ['a', 'b'] }, done);
 
       expect(childProcess.exec).to.be.calledWith('rsync --exclude a --exclude b -az -e ' +
-        'ssh /src/dir user@host:/dest/dir');
+        '"ssh -p 22" /src/dir user@host:/dest/dir');
     });
   });
 });