symphony-ssh 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecf234436b7966c1062b9d13dbfe4c71015c29fe
-  data.tar.gz: 89636ab1155f42de42d0bc9f74e45f6b51299e18
+  metadata.gz: 2c93e395b96d34101bb5c100733522814ae85ade
+  data.tar.gz: f1c0f325add294be5bfce9eb02144d9cf424946d
 SHA512:
-  metadata.gz: a6b1681a726bbb2a554f2429c5dd11f3695e149c1341991088ad4deac99f0edd7728fcaca02480362cce98218dbe7b1e13dbfc1bcc01ef468df8199f3d9746df
-  data.tar.gz: bcc024b3faed110b348714ee2925d13544448da998f5a9d145ff1d017ed69c8b244047fe18019c6234aa8143c05aa3db1d5803e9430da9724cbd3808bf6d1df6
+  metadata.gz: 3a97df10467dff6f1d03b8266c63171f48880d1a1be9647eb537c6e9f640251024a4cc0650b86af6de2f13cc89b977b988ddfc7f0e4adf0f26e54207eddef7a2
+  data.tar.gz: 19f949f31461e467d6020b349783dd7d06c5ce1085b5f503e1b34fd6f0ac9a1346ec22e2078561432661a42b9b9b026b938ae6e1dc73d45c964a6f9b0d9616f1

data/lib/symphony/tasks/ssh.rb

@@ -88,7 +88,7 @@ class Symphony::Task::SSH < Symphony::Task
 	### Configurability API.
 	###
 	def self::configure( config=nil )
-		config = self.defaults.merge( config || {} )
+		config = Symphony::Task::SSH.defaults.merge( config || {} )
 		@path  = config.delete( :path )
 		@opts  = config.delete( :opts )
 		@user  = config.delete( :user )
@@ -137,7 +137,7 @@ class Symphony::Task::SSH < Symphony::Task
 
 		cmd = []
 		cmd << Symphony::Task::SSH.path
-		cmd += Symphony::Task::SSH.opts
+		cmd += opts
 
 		cmd << '-p' << port.to_s
 		cmd << '-i' << key if key
@@ -149,7 +149,7 @@ class Symphony::Task::SSH < Symphony::Task
 		parent_reader, child_writer = IO.pipe
 		child_reader, parent_writer = IO.pipe
 
-		pid = spawn( *cmd, :out => child_writer, :in => child_reader, :close_others => true )
+		pid = Process.spawn( *cmd, :out => child_writer, :in => child_reader, :close_others => true )
 		child_writer.close
 		child_reader.close
 
@@ -158,7 +158,14 @@ class Symphony::Task::SSH < Symphony::Task
 		@output = @output.split("\n").reject{|l| l =~ SSH_CLEANUP }.join
 		self.log.debug "  run block done."
 
-		pid, status = Process.waitpid2( pid )
+		status = nil
+
+	ensure
+		if pid
+			active = Process.kill( 0, pid ) rescue false
+			Process.kill( :TERM, pid ) if active
+			pid, status = Process.waitpid2( pid )
+		end
 		return status
 	end
 

data/lib/symphony/tasks/sshscript.rb

@@ -90,7 +90,7 @@ class Symphony::Task::SSHScript < Symphony::Task
 	### Configurability API.
 	###
 	def self::configure( config=nil )
-		config = self.defaults.merge( config || {} )
+		config = Symphony::Task::SSHScript.defaults.merge( config || {} )
 		@user = config.delete( :user )
 		@key  = config.delete( :key )
 		super
@@ -108,7 +108,7 @@ class Symphony::Task::SSHScript < Symphony::Task
 		key        = payload[ 'key'  ]    || Symphony::Task::SSHScript.key
 		nocleanup  = payload[ 'nocleanup' ]
 
-		raise ArgumentError, "Missing required option 'command'" unless template
+		raise ArgumentError, "Missing required option 'template'" unless template
 		raise ArgumentError, "Missing required option 'host'"    unless payload[ 'host' ]
 
 		remote_filename = self.make_remote_filename( template )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symphony-ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mahlon E. Smith <mahlon@martini.nu>
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: symphony