From 33e112800899fa8e1f3e4ea23b2e6d16985ae1f8 Mon Sep 17 00:00:00 2001
From: manish <manish@alphonso.tv>
Date: Tue, 5 Aug 2014 15:36:03 +0530
Subject: [PATCH 1/2] support for ssh_options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

added support to pass ssh-options, the ones which are passed to scp
through ‘-o’ command line flag.
---
 README.md                 | 46 +++++++++++++++++++++++++++++++++
 package.json              |  3 ++-
 scp.js                    | 53 ++++++++++++++++++++++++++-------------
 test/get-with-options.js  | 20 +++++++++++++++
 test/send-with-options.js | 21 ++++++++++++++++
 5 files changed, 125 insertions(+), 18 deletions(-)
 create mode 100644 test/get-with-options.js
 create mode 100644 test/send-with-options.js

diff --git a/README.md b/README.md
index 135dfa1..e55b354 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,30 @@ scp.send({
 });
 ````
 
+You can also pass, `ssh options`, the ones which should be passed to scp through `-o` command line option 
+
+The code 
+
+````javascript
+scp.send({
+  file        : './file.txt',
+  user        : 'username',
+  host        : 'myServer',
+  port        : 22,
+  path        : '~',
+  ssh_options : {
+    ControlMaster         : 'no',
+    StrictHostKeyChecking : 'yes'
+  }
+````
+
+is equivalent to following command line
+
+````
+scp -o ControlMaster=no -o StrictHostKeyChecking=yes -P 22 username@myServer:~/file.txt ~
+````
+
+
 ###scp.get(options, cb)
 
 Transfer a file from a remote host (in your `~/.ssh/config`) to the current computer.
@@ -65,6 +89,28 @@ scp.get({
 });
 ````
 
+You can also pass, `ssh options`, the ones which should be passed to scp through `-o` command line option.
+
+The code 
+
+````javascript
+scp.get({
+  file        : '~/file.txt',
+  user        : 'username',
+  host        : 'myServer',
+  port        : 22,
+  path        : '~',
+  ssh_options : {
+    ControlMaster         : 'no',
+    StrictHostKeyChecking : 'yes'
+  }
+````
+is equivalent to following command line
+
+````
+scp -o ControlMaster=no -o StrictHostKeyChecking=yes -P 22 username@myServer:~/file.txt ~
+````
+
 ## license
 
 (The MIT License)
diff --git a/package.json b/package.json
index 40f5c2e..13c31f7 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
     "Gabriel Preston <gpreston@gmail.com>",
     "Joseph Silvestre <joseph.silvestre38@gmail.com>",
     "appr <appr@appr.me>",
-    "Daniel Phatthanan <daniel@phatthanan.com>"
+    "Daniel Phatthanan <daniel@phatthanan.com>",
+    "Manish Gupta <manish@alphonso.tv"
   ],
   "name": "scp",
   "description": "remote file copy wrapper",
diff --git a/scp.js b/scp.js
index 9c78819..9880a95 100644
--- a/scp.js
+++ b/scp.js
@@ -10,15 +10,24 @@ var scp = module.exports = {};
  * Transfer a file to a remote host
  */
 scp.send = function (options, cb) {
-  var command = [
-    'scp',
-    '-r',
-    '-P',
-    (options.port == undefined ? '22' : options.port),
-    '-o "ControlMaster no"', //callback is not fired if ssh sessions are shared
+  var command = ['scp'];
+
+  if (options.ssh_options) {
+    Object.keys(options.ssh_options).forEach(
+      function(opt_name) {
+        command.push("-o " + opt_name + "=" + options.ssh_options[opt_name]);
+      }
+    );
+  }
+
+  if ( !options.hasOwnProperty('recursive') || options.recursive )
+    command.push("-r");
+
+  command.push(
+    '-P', (options.port ? options.port : '22'),
     options.file,
-    (options.user == undefined ? '' : options.user+'@') + options.host + ':' + options.path,
-  ];
+    (options.user ? options.user + '@' : '') + options.host + ":" + options.path);
+
   exec(command.join(' '), function (err, stdout, stderr) {
     if (cb) {
       cb(err, stdout, stderr);
@@ -32,15 +41,25 @@ scp.send = function (options, cb) {
  * Grab a file from a remote host
  */
 scp.get = function (options, cb) {
-  var command = [
-    'scp',
-    '-r',
-    '-P',
-    (options.port == undefined ? '22' : options.port),
-    '-o "ControlMaster no"', //callback is not fired if ssh sessions are shared
-    (options.user == undefined ? '' : options.user+'@') + options.host + ':' + options.file,
-    options.path
-  ];
+
+  var command = ['scp'];
+   
+  if (options.ssh_options) {
+    Object.keys(options.ssh_options).forEach(
+      function(opt_name) {
+        command.push("-o " + opt_name + "=" + options.ssh_options[opt_name]);
+      }
+    );
+  }
+   
+  if ( !options.hasOwnProperty('recursive') || options.recursive )
+    command.push("-r");
+
+  command.push(
+    '-P', (options.port ? options.port : '22'),
+    (options.user ? options.user + '@' : '') + options.host + ":" + options.file,
+    options.path);
+
   exec(command.join(' '), function (err, stdout, stderr) {
     if (cb) {
       cb(err, stdout, stderr);
diff --git a/test/get-with-options.js b/test/get-with-options.js
new file mode 100644
index 0000000..d6a3485
--- /dev/null
+++ b/test/get-with-options.js
@@ -0,0 +1,20 @@
+var scp = require('../');
+
+scp.get(
+    {
+        file      : '~/what',
+        host      : 'uspro603.server4you.net', 
+        user      : 'alpha', 
+        recursive : false,
+        path      : '.',
+        ssh_options :
+        {
+            ControlMaster : 'no',
+            StrictHostKeyChecking : 'no'
+        }
+    },
+    function ()
+    {
+        console.log(arguments);
+    }
+);
diff --git a/test/send-with-options.js b/test/send-with-options.js
new file mode 100644
index 0000000..bc6ff2b
--- /dev/null
+++ b/test/send-with-options.js
@@ -0,0 +1,21 @@
+var scp = require('../');
+
+scp.send(
+    {
+        file      : './what',
+        host      : 'uspro603.server4you.net', 
+        user      : 'alpha', 
+        // host      : 'core', 
+        recursive : false,
+        path      : '~',
+        ssh_options :
+        {
+            ControlMaster : 'no',
+            StrictHostKeyChecking : 'no'
+        }
+    },
+    function ()
+    {
+        console.log(arguments);
+    }
+);

From bdd2111d3f2731bb080ed12f6c8f6b365b5249be Mon Sep 17 00:00:00 2001
From: manish <manish@alphonso.tv>
Date: Tue, 5 Aug 2014 15:38:33 +0530
Subject: [PATCH 2/2] bump version to 0.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 13c31f7..1d23c23 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   ],
   "name": "scp",
   "description": "remote file copy wrapper",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "repository": {
     "type": "git",
     "url": "git://github.com/ecto/node-scp.git"