net-ssh-simple 1.5.1 → 1.5.2

data/README.rdoc

@@ -2,9 +2,9 @@
 
 Net::SSH::Simple is a simple wrapper around Net::SSH and Net::SCP.
 
-It greatly reduces the amount of boilerplate code that you need
-to write for handling SSH-connections and thereby prevents many common
-mistakes related to error-handling, threading, timeouts and keep-alive.
+It reduces the amount of boilerplate code that you need to write for
+handling SSH-connections, thereby preventing many common mistakes related
+to error-handling, threading, timeouts and keep-alive.
 
 It also makes it very easy to talk to many hosts in parallel
 synchronously or asynchronously.

data/lib/net/ssh/simple.rb

@@ -560,6 +560,7 @@ module Net
       # @return [Thread] Thread executing the SSH-Block.
       #
       def async(opts={}, &block)
+        opts = @opts.merge(opts)
         self.class.async(opts, &block)
       end
 

data/lib/net/ssh/simple/version.rb

@@ -1,7 +1,7 @@
 module Net
   module SSH
     class Simple
-      VERSION = "1.5.1"
+      VERSION = "1.5.2"
     end
   end
 end

data/net-ssh-simple.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
   
-  s.add_dependency "net-ssh", "~> 2.1.4"
+  s.add_dependency "net-ssh", "~> 2.2.1"
   s.add_dependency "net-scp", "~> 1.0.4"
   s.add_dependency "blockenspiel", "~> 0.4.3"
   s.add_dependency "hashie", "~> 1.1.0"

data/spec/net-ssh-simple.rb

@@ -440,6 +440,30 @@ describe Net::SSH::Simple do
       s.close
     end
 
+    it "works with instance syntax + async" do
+      s = Net::SSH::Simple.new({:timeout => 7})
+      t = s.async({:operation_timeout => 11}) do
+        r = ssh('localhost', 'date', {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+        r.opts[:operation_timeout].should == 11
+
+        r = scp_ul('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
+                   {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+        r.opts[:operation_timeout].should == 11
+
+        r = scp_dl('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
+                   {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+        r.opts[:operation_timeout].should == 11
+        :happy
+      end
+      t.value.should == :happy
+    end
+
     it "works with synchronous block syntax" do
       r = Net::SSH::Simple.sync({:timeout => 7}) do
         r = ssh('localhost', 'date', {:rekey_packet_limit => 42})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-simple
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2011-12-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &20268640 !ruby/object:Gem::Requirement
+  requirement: &14729360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *20268640
+  version_requirements: *14729360
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &20909120 !ruby/object:Gem::Requirement
+  requirement: &14728760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *20909120
+  version_requirements: *14728760
 - !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &21271860 !ruby/object:Gem::Requirement
+  requirement: &14728100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *21271860
+  version_requirements: *14728100
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &21280120 !ruby/object:Gem::Requirement
+  requirement: &14727600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *21280120
+  version_requirements: *14727600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22924860 !ruby/object:Gem::Requirement
+  requirement: &14727040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *22924860
+  version_requirements: *14727040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23604040 !ruby/object:Gem::Requirement
+  requirement: &14726560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23604040
+  version_requirements: *14726560
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &23831720 !ruby/object:Gem::Requirement
+  requirement: &14725840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23831720
+  version_requirements: *14725840
 description: Net::SSH::Simple is a simple wrapper around Net::SSH and Net::SCP.
 email:
 - moe@busyloop.net
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 173875200728558481
+      hash: 3678619616093971020
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10