Fix SSH command with port.

CHANGELOG.md

@@ -1,5 +1,5 @@
 ### 0.1.2-pre
-*
+* Fix SSH command with port
 
 ### 0.1.1
 * Add build reports to readme

lib/breaker.js

@@ -44,18 +44,18 @@ Breaker.prototype.format = function (type, cb) {
 Breaker.prototype.ssh = function (command, cb) {
   var tasks = [];
   this._config().forEach(function (item) {
-    
+
     console.log('+ %s', item.host);
     if (!item.ssh) {
       item.ssh = [{}];
     }
     item.ssh.forEach(function (sshItem) {
       tasks.push(function (cb) {
-        var sshCommand = util.format('ssh %s %s%s%s %s',
+        var sshCommand = util.format('ssh %s %s %s%s %s',
           (sshItem.key) ? '-i ' + sshItem.key : '',
+          ((sshItem.port) ? '-p ' + sshItem.port : ''),
           (sshItem.user) ? sshItem.user + '@' : '',
           item.host,
-          ((sshItem.port) ? ':' + sshItem.port : ''),
           '\'' + command + '\''
           );
         console.log('> ' + sshCommand);

test/breaker.js

@@ -46,15 +46,15 @@ buster.testCase('breaker - ssh', {
     this.mockConsole = this.mock(console);
   },
   'should exec ssh command to hosts': function (done) {
-    this.mockBag.expects('exec').once().withArgs('ssh -i id_rsa1 user1@dev1.com:22 \'df -kh;\'', true).callsArgWith(2);
-    this.mockBag.expects('exec').once().withArgs('ssh -i id_rsa2 user2@dev2.com:22 \'df -kh;\'', true).callsArgWith(2);
-    this.mockBag.expects('exec').once().withArgs('ssh -i id_rsa3 user3@dev3.com:22 \'df -kh;\'', true).callsArgWith(2);
+    this.mockBag.expects('exec').once().withArgs('ssh -i id_rsa1 -p 22 user1@dev1.com \'df -kh;\'', true).callsArgWith(2);
+    this.mockBag.expects('exec').once().withArgs('ssh -i id_rsa2 -p 22 user2@dev2.com \'df -kh;\'', true).callsArgWith(2);
+    this.mockBag.expects('exec').once().withArgs('ssh -i id_rsa3 -p 22 user3@dev3.com \'df -kh;\'', true).callsArgWith(2);
     this.mockConsole.expects('log').once().withExactArgs('+ %s', 'dev1.com');
-    this.mockConsole.expects('log').once().withExactArgs('> ssh -i id_rsa1 user1@dev1.com:22 \'df -kh;\'');
+    this.mockConsole.expects('log').once().withExactArgs('> ssh -i id_rsa1 -p 22 user1@dev1.com \'df -kh;\'');
     this.mockConsole.expects('log').once().withExactArgs('+ %s', 'dev2.com');
-    this.mockConsole.expects('log').once().withExactArgs('> ssh -i id_rsa2 user2@dev2.com:22 \'df -kh;\'');
+    this.mockConsole.expects('log').once().withExactArgs('> ssh -i id_rsa2 -p 22 user2@dev2.com \'df -kh;\'');
     this.mockConsole.expects('log').once().withExactArgs('+ %s', 'dev3.com');
-    this.mockConsole.expects('log').once().withExactArgs('> ssh -i id_rsa3 user3@dev3.com:22 \'df -kh;\'');
+    this.mockConsole.expects('log').once().withExactArgs('> ssh -i id_rsa3 -p 22 user3@dev3.com \'df -kh;\'');
     var breaker = new Breaker();
     breaker._config = function () {
       return [
@@ -69,11 +69,11 @@ buster.testCase('breaker - ssh', {
     });
   },
   'should exec multiple ssh settings with same command on same host': function (done) {
-    this.mockBag.expects('exec').once().withArgs('ssh -i id_rsa1 user1@dev1.com:22 \'df -kh;\'', true).callsArgWith(2);
-    this.mockBag.expects('exec').once().withArgs('ssh -i id_rsa2 user2@dev1.com:2222 \'df -kh;\'', true).callsArgWith(2);
+    this.mockBag.expects('exec').once().withArgs('ssh -i id_rsa1 -p 22 user1@dev1.com \'df -kh;\'', true).callsArgWith(2);
+    this.mockBag.expects('exec').once().withArgs('ssh -i id_rsa2 -p 2222 user2@dev1.com \'df -kh;\'', true).callsArgWith(2);
     this.mockConsole.expects('log').once().withExactArgs('+ %s', 'dev1.com');
-    this.mockConsole.expects('log').once().withExactArgs('> ssh -i id_rsa1 user1@dev1.com:22 \'df -kh;\'');
-    this.mockConsole.expects('log').once().withExactArgs('> ssh -i id_rsa2 user2@dev1.com:2222 \'df -kh;\'');
+    this.mockConsole.expects('log').once().withExactArgs('> ssh -i id_rsa1 -p 22 user1@dev1.com \'df -kh;\'');
+    this.mockConsole.expects('log').once().withExactArgs('> ssh -i id_rsa2 -p 2222 user2@dev1.com \'df -kh;\'');
     var breaker = new Breaker();
     breaker._config = function () {
       return [
@@ -86,9 +86,9 @@ buster.testCase('breaker - ssh', {
     });
   },
   'should create ssh command without key, with default user, and no port': function (done) {
-    this.mockBag.expects('exec').once().withArgs('ssh  dev1.com \'df -kh;\'', true).callsArgWith(2);
+    this.mockBag.expects('exec').once().withArgs('ssh   dev1.com \'df -kh;\'', true).callsArgWith(2);
     this.mockConsole.expects('log').once().withExactArgs('+ %s', 'dev1.com');
-    this.mockConsole.expects('log').once().withExactArgs('> ssh  dev1.com \'df -kh;\'');
+    this.mockConsole.expects('log').once().withExactArgs('> ssh   dev1.com \'df -kh;\'');
     var breaker = new Breaker();
     breaker._config = function () {
       return [