net-ssh-simple 1.3.0 → 1.3.1

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

@@ -524,7 +524,7 @@ module Net
 
       def initialize(opts={})
         @opts     = opts
-        @sessions = {}
+        Thread.current[:ssh_simple_sessions] = {}
         @result   = Result.new
       end
 
@@ -560,7 +560,7 @@ module Net
       # @return [Net::SSH::Simple::Result] Result
       # 
       def close
-        @sessions.values.each do |session|
+        Thread.current[:ssh_simple_sessions].values.each do |session|
           session.close
         end
         @result
@@ -570,8 +570,9 @@ module Net
       def with_session(host, opts={:timeout => 60}, &block)
         begin
           Timeout.timeout(opts[:timeout]) do
-            session = @sessions[host.hash] = @sessions[host.hash] ||\
-              Net::SSH.start(*[host, opts[:user], opts])
+            session = Thread.current[:ssh_simple_sessions][host.hash] \
+                    = Thread.current[:ssh_simple_sessions][host.hash] \
+                   || Net::SSH.start(*[host, opts[:user], opts])
             block.call(session)
           end
         rescue => e

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

@@ -1,7 +1,7 @@
 module Net
   module SSH
     class Simple
-      VERSION = "1.3.0"
+      VERSION = "1.3.1"
     end
   end
 end

data/spec/net-ssh-simple.rb

@@ -253,18 +253,24 @@ describe Net::SSH::Simple do
         t[i] = Net::SSH::Simple.async do
           mockback = mock(:progress_callback)
           mockback.should_receive(:ping).at_least(:once)
-          r = nil
-          if 0 == i % 2 
-            r = scp_dl('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
-              mockback.ping
-            end
-          else
-            r = scp_ul('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
-              mockback.ping
+          mockback.should_not_receive(:exception)
+          begin
+            r = nil
+            if 0 == i % 2 
+              r = scp_dl('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
+                mockback.ping
+              end
+            else
+              r = scp_ul('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
+                mockback.ping
+              end
             end
+            r.success.should == true
+            ssh('localhost', "echo hello #{i}")
+          rescue => e
+            p e
+            mockback.exception()
           end
-          r.success.should == true
-          ssh('localhost', "echo hello #{i}")
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-simple
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &10094940 !ruby/object:Gem::Requirement
+  requirement: &17944420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *10094940
+  version_requirements: *17944420
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &10094180 !ruby/object:Gem::Requirement
+  requirement: &17940960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *10094180
+  version_requirements: *17940960
 - !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &10093180 !ruby/object:Gem::Requirement
+  requirement: &17940320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *10093180
+  version_requirements: *17940320
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &10090120 !ruby/object:Gem::Requirement
+  requirement: &17939620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *10090120
+  version_requirements: *17939620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10089500 !ruby/object:Gem::Requirement
+  requirement: &17939000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *10089500
+  version_requirements: *17939000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10088820 !ruby/object:Gem::Requirement
+  requirement: &17938520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10088820
+  version_requirements: *17938520
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &10088120 !ruby/object:Gem::Requirement
+  requirement: &17937760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10088120
+  version_requirements: *17937760
 description: Net::SSH::Simple is a simple wrapper around Net::SSH and Net::SCP.
 email:
 - moe@busyloop.net
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2613341470762730453
+      hash: -2990715889701617495
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10