sshkit 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 324909062c6ba178db01c1b415cb44632aded0e4
-  data.tar.gz: d5cf7ed31688bc73f277bfca22f7709479f616e9
+  metadata.gz: e8a80737dc30278cecf0c75d8317073b49d1a9ef
+  data.tar.gz: 6cb80d26c524ec7482254a7f1e9ac6bf54cf69b5
 SHA512:
-  metadata.gz: a30e0cf010601387eb7918fe6c730703a74848440085f437c36cf18669cb9884e303b08b8cd7f71ff0d028fa8f74d78b717c554689be24edeed6cceb11056906
-  data.tar.gz: dbbe5738efe368b0089e8226018832cb343583a970a3db0148c1f083c21b911582bb96eb74011bd92a2d42c23483218846fc760e473200919792a5493228f9eb
+  metadata.gz: 8f169d46717d900f9af2ebccff96665b306613946cf68bc74902a7bbba2ffd961a43fe356294066ffeaaa7754782870710a2e32dc6b9dd93f43ccfcc7e038580
+  data.tar.gz: 48fa41ad79624b95467bcd8b1f7f0699f0cf80c5cf0d1e9c5dc738d6f136e4ad2b509dba9221e27c50185db1ac021703f75e225d332a90aa2c47f378ec7df85f

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 This file is written in reverse chronological order, newer releases will
 appear at the top.
 
+## 0.0.34
+
+  * Allow the setting of global SSH options on the `backend.ssh` as a hash,
+    these options are the same as Net::SSH configure expects. Thanks to Rafał
+    @lisukorin Lisowski
+
 ## 0.0.32
 
   * Lots of small changes since 0.0.27.

data/EXAMPLES.md

@@ -105,6 +105,20 @@ etc, this will be improved as the library matures, but we're not there yet.
 In this case the `recursive: true` option mirrors the same options which are
 available to `Net::{SCP,SFTP}`.
 
+## Setting global SSH options
+
+Setting global SSH options, these will be overwritten by options set on the
+individual hosts:
+
+    Netssh.configure do |ssh|
+      ssh.connection_timeout = 30
+      ssh.ssh_options = {
+        keys: %w(/home/user/.ssh/id_rsa),
+        forward_agent: false,
+        auth_methods: %w(publickey password)
+      }
+    end
+
 ## Run a command with a different effective group ID
 
     on hosts do |host|

data/lib/sshkit/backends/netssh.rb

@@ -29,6 +29,11 @@ module SSHKit
 
       class Configuration
         attr_accessor :connection_timeout, :pty
+        attr_writer :ssh_options
+
+        def ssh_options
+          @ssh_options || {}
+        end
       end
 
       include SSHKit::CommandHelper
@@ -64,9 +69,9 @@ module SSHKit
           percentage = (sent.to_f * 100 / total.to_f)
           unless percentage.nan?
             if percentage > 0 && percentage % 10 == 0
-              info "Uploading #{name} #{percentage}%"
+              info "Uploading #{name} #{percentage.round(2)}%"
             else
-              debug "Uploading #{name} #{percentage}%"
+              debug "Uploading #{name} #{percentage.round(2)}%"
             end
           else
             warn "Error calculating percentage #{percentage} is NaN"
@@ -147,6 +152,7 @@ module SSHKit
 
       def ssh
         @ssh ||= begin
+          host.ssh_options ||= Netssh.config.ssh_options
           Net::SSH.start(
             String(host.hostname),
             host.username,

data/lib/sshkit/host.rb

@@ -6,7 +6,7 @@ module SSHKit
 
   class Host
 
-    attr_accessor :password, :hostname, :port, :user
+    attr_accessor :password, :hostname, :port, :user, :ssh_options
 
     def key=(new_key)
       @keys = [new_key]
@@ -78,6 +78,7 @@ module SSHKit
         sho[:password]      = password if password
         sho[:forward_agent] = true
       end
+      .merge(ssh_options || {})
     end
 
     def properties

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "0.0.33"
+  VERSION = "0.0.34"
 end

data/test/unit/backends/test_netssh.rb

@@ -12,10 +12,20 @@ module SSHKit
         backend.configure do |ssh|
           ssh.pty = true
           ssh.connection_timeout = 30
+          ssh.connection_timeout = 30
+          ssh.ssh_options = {
+            keys: %w(/home/user/.ssh/id_rsa),
+            forward_agent: false,
+            auth_methods: %w(publickey password)
+          }
         end
 
         assert_equal 30, backend.config.connection_timeout
         assert_equal true, backend.config.pty
+
+        assert_equal %w(/home/user/.ssh/id_rsa),  backend.config.ssh_options[:keys]
+        assert_equal false,                       backend.config.ssh_options[:forward_agent]
+        assert_equal %w(publickey password),      backend.config.ssh_options[:auth_methods]
       end
     end
   end

data/test/unit/test_host.rb

@@ -104,6 +104,27 @@ module SSHKit
       end
     end
 
+    def test_turning_a_host_into_ssh_options_when_extra_options_are_set
+      ssh_options = {
+        port: 3232,
+        keys: %w(/home/user/.ssh/id_rsa),
+        forward_agent: false,
+        auth_methods: %w(publickey password)
+      }
+      Host.new('someuser@example.com:2222').tap do |host|
+        host.password = "andthisdoesntevenmakeanysense"
+        host.keys     = ["~/.ssh/some_key_here"]
+        host.ssh_options = ssh_options
+        host.netssh_options.tap do |sho|
+          assert_equal 3232,                             sho.fetch(:port)
+          assert_equal 'andthisdoesntevenmakeanysense',  sho.fetch(:password)
+          assert_equal %w(/home/user/.ssh/id_rsa),       sho.fetch(:keys)
+          assert_equal false,                            sho.fetch(:forward_agent)
+          assert_equal %w(publickey password),           sho.fetch(:auth_methods)
+        end
+      end
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - Lee Hambley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh