ridley 1.0.0 → 1.0.1

data/lib/ridley/host_commander.rb

@@ -161,7 +161,7 @@ module Ridley
       def execute(method, host, *args)
         options = args.last.is_a?(Hash) ? args.pop : Hash.new
 
-        defer { connector_for(host, options).send(method, host, *args, options) }
+        connector_for(host, options).send(method, host, *args, options)
       rescue Errors::HostConnectionError => ex
         abort(ex)
       end
@@ -207,7 +207,9 @@ module Ridley
       #
       # @return [Boolean]
       def connector_port_open?(host, port, wait_time = nil)
-        timeout(wait_time || PORT_CHECK_TIMEOUT) { Celluloid::IO::TCPSocket.new(host, port).close; true }
+        defer {
+          timeout(wait_time || PORT_CHECK_TIMEOUT) { Celluloid::IO::TCPSocket.new(host, port).close; true }
+        }
       rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL => ex
         false
       end

data/lib/ridley/host_connector/ssh.rb

@@ -30,26 +30,27 @@ module Ridley
           begin
             log.info "Running SSH command: '#{command}' on: '#{host}' as: '#{options[:ssh][:user]}'"
 
-            Net::SSH.start(host, options[:ssh][:user], options[:ssh].slice(*Net::SSH::VALID_OPTIONS)) do |ssh|
-              ssh.open_channel do |channel|
-                if options[:sudo]
-                  channel.request_pty do |channel, success|
-                    unless success
-                      raise "Could not aquire pty: A pty is required for running sudo commands."
+            defer {
+              Net::SSH.start(host, options[:ssh][:user], options[:ssh].slice(*Net::SSH::VALID_OPTIONS)) do |ssh|
+                ssh.open_channel do |channel|
+                  if options[:sudo]
+                    channel.request_pty do |channel, success|
+                      unless success
+                        raise "Could not aquire pty: A pty is required for running sudo commands."
+                      end
+
+                      channel_exec(channel, command, host, response)
                     end
-
+                  else
                     channel_exec(channel, command, host, response)
                   end
-                else
-                  channel_exec(channel, command, host, response)
                 end
+                ssh.loop
               end
-              ssh.loop
-            end
+            }
           rescue Net::SSH::Exception => ex
             response.exit_code = -1
             response.stderr    = ex.message
-            return response
           end
 
           case response.exit_code

data/lib/ridley/host_connector/winrm.rb

@@ -54,23 +54,23 @@ module Ridley
           begin
             log.info "Running WinRM Command: '#{command}' on: '#{host}' as: '#{user}'"
 
-            output = connection.send(command_method, command) do |stdout, stderr|
-              if stdout && stdout.present?
-                response.stdout += stdout
-                log.info "[#{host}](WinRM) #{stdout}"
+            defer {
+              output = connection.send(command_method, command) do |stdout, stderr|
+                if stdout && stdout.present?
+                  response.stdout += stdout
+                  log.info "[#{host}](WinRM) #{stdout}"
+                end
+
+                if stderr && stderr.present?
+                  response.stderr += stderr
+                  log.info "[#{host}](WinRM) #{stderr}"
+                end
               end
-
-              if stderr && stderr.present?
-                response.stderr += stderr
-                log.info "[#{host}](WinRM) #{stderr}"
-              end
-            end
-
-            response.exit_code = output[:exitcode]
+              response.exit_code = output[:exitcode]
+            }
           rescue ::WinRM::WinRMHTTPTransportError => ex
             response.exit_code = -1
             response.stderr    = ex.message
-            return response
           end
 
           case response.exit_code

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -390,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 422593322150565092
+      hash: -3032546146925818617
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23