ridley 0.10.0 → 0.10.1

data/lib/ridley/host_connector.rb

@@ -19,6 +19,7 @@ module Ridley
       #   the host to attempt to connect to
       # @option options [Hash] :ssh
       #   * :port (Fixnum) the ssh port to connect on the node the bootstrap will be performed on (22)
+      #   * :timeout (Float) [5.0] timeout value for testing SSH connection
       # @option options [Hash] :winrm
       #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
       # @param block [Proc]
@@ -27,7 +28,7 @@ module Ridley
       # @return [Ridley::HostConnector] a class under Ridley::HostConnector
       def best_connector_for(host, options = {}, &block)
         ssh_port, winrm_port = parse_port_options(options)
-        if connector_port_open?(host, ssh_port)
+        if connector_port_open?(host, ssh_port, options[:ssh][:timeout])
           host_connector = Ridley::HostConnector::SSH
         elsif connector_port_open?(host, winrm_port)
           host_connector = Ridley::HostConnector::WinRM
@@ -49,10 +50,12 @@ module Ridley
       #   the host to attempt to connect to
       # @param  port [Fixnum]
       #   the port to attempt to connect on
+      # @param  timeout [Float]
+      #   the number of seconds to wait (default: 3)
       #
       # @return [Boolean]
-      def connector_port_open?(host, port)
-        Timeout::timeout(3) do
+      def connector_port_open?(host, port, timeout=3)
+        Timeout::timeout(timeout) do
           socket = TCPSocket.new(host, port)
           socket.close
         end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -433,7 +433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1599994919085656023
+      hash: -1173467066893192737
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23