drbssh 0.5.1 → 0.5.2

data/drbssh.gemspec

@@ -4,7 +4,7 @@ require 'rake'
 
 Gem::Specification.new do |s|
 	s.name        = "drbssh"
-	s.version     = "0.5.1"
+	s.version     = "0.5.2"
 	s.platform    = Gem::Platform::RUBY
 	s.authors     = %w(kvs)
 	s.email       = %w(kvs@binarysolutions.dk)

data/lib/drbssh.rb

@@ -2,6 +2,7 @@
 
 require 'drb'
 require 'socket'
+require 'timeout'
 
 # DRb protocol handler for using a persistent SSH connection to a remote server. Creates a duplex
 # connection so DRbUndumped objects can contact the initiating machine back through the same link.
@@ -70,7 +71,13 @@ module DRb
 		end
 
 		def recv_reply
-			@receiveq.pop
+			reply = @receiveq.pop
+			if reply.is_a? Exception
+				self.close
+				raise reply
+			else
+				reply
+			end
 		end
 
 		def alive?
@@ -134,8 +141,8 @@ module DRb
 		def close
 			# Closing the filedescriptors should trigger an IOError in the server-thread
 			# waiting, which makes it close the client attached.
-			self.read_fd.close
-			self.write_fd.close
+			self.read_fd.close unless self.read_fd.closed?
+			self.write_fd.close unless self.write_fd.closed?
 		end
 	end
 
@@ -218,7 +225,8 @@ module DRb
 						end
 					end
 				rescue
-					client.close
+					client.receiveq.push($!)
+					@srv_requestq.push($!)
 				end
 			end
 
@@ -239,19 +247,32 @@ module DRb
 						end
 					end
 				rescue
-					client.close
+					client.receiveq.push($!)
+					@srv_requestq.push($!)
 				end
 			end
 		end
 
 		# Delegate shutdown to client.
 		def close
+			return unless @client.alive?
+
+			Timeout::timeout(15) do
+				sleep 0.1 until @client.sendq.empty?
+			end rescue nil
+
 			@client.close
 		end
 
 		# Wait for a request to appear on the request-queue
 		def recv_request
-			@srv_requestq.pop
+			reply = @srv_requestq.pop
+			if reply.is_a? Exception
+				self.close
+				raise reply
+			else
+				reply
+			end
 		end
 
 		# Queue client-reply

data/spec/drbssh_spec.rb

@@ -71,8 +71,21 @@ describe DRb::DRbSSHProtocol do
 		drb.eval("`hostname`").should eq "vagrant-ubuntu-oneiric\n"
 		pid = drb.eval('$$')
 
-		expect { drb.eval('Kernel.exit! 0') }.to raise_exception IOError
+		expect { drb.eval('Kernel.exit! 0') }.to raise_exception(DRb::DRbConnError)
 
 		drb.eval('$$').should_not eq pid # should create new connection
+
+		DRb.stop_service
+	end
+
+	it "handles eval-errors correctly" do
+		DRb.start_service("drbssh://")
+
+		drb = DRbObject.new_with_uri("drbssh://vagrant-drbssh/")
+		expect { drb.eval("raise 'test'") }.to raise_exception "test"
+
+		expect { drb.eval('Invalid') }.to raise_exception NameError
+
+		DRb.stop_service
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drbssh
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70111189214280 !ruby/object:Gem::Requirement
+  requirement: &70174137095020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70111189214280
+  version_requirements: *70174137095020
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70111189213240 !ruby/object:Gem::Requirement
+  requirement: &70174137094240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70111189213240
+  version_requirements: *70174137094240
 description: Allows DRb to create and use an SSH-connection.
 email:
 - kvs@binarysolutions.dk