lib/ridley/host_connector.rb in ridley-0.10.2 vs lib/ridley/host_connector.rb in ridley-0.11.0.rc1

@@ -11,26 +11,48 @@
 
     DEFAULT_SSH_PORT   = 22.freeze
     DEFAULT_WINRM_PORT = 5985.freeze
 
     class << self
+      # Create a new connection worker for the given host. An SSH or WinRM connection will be returned
+      # depending on which ports are open on the target host.
+      #
+      # @param [String] host
+      #   host to create a connector for
+      #
+      # @option options [Hash] ssh
+      #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
+      #   * :password (String) the password for the shell user that will perform the bootstrap
+      #   * :keys (Array, String) an array of keys (or a single key) to authenticate the ssh user with instead of a password
+      #   * :timeout (Float) [5.0] timeout value for SSH bootstrap
+      # @option options [Hash] :winrm
+      #   * :user (String) a user that will login to each node and perform the bootstrap command on
+      #   * :password (String) the password for the user that will perform the bootstrap
+      #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on
+      #
+      # @return [SSH::Worker, WinRM::Worker]
+      def new(host, options = {})
+        HostConnector.best_connector_for(host, options) do |host_connector|
+          host_connector::Worker.new(host, options)
+        end
+      end
+
       # Finds and returns the best HostConnector for a given host
       #
       # @param  host [String]
       #   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]
       #   an optional block that is yielded the best HostConnector
       #
       # @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, options[:ssh][:timeout])
+        if connector_port_open?(host, ssh_port)
           host_connector = Ridley::HostConnector::SSH
         elsif connector_port_open?(host, winrm_port)
           host_connector = Ridley::HostConnector::WinRM
         else
           raise Ridley::Errors::HostConnectionError, "No available connection method available on #{host}."
@@ -48,15 +70,13 @@
       #
       # @param  host [String]
       #   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=3)
-        Timeout::timeout(timeout) do
+      def connector_port_open?(host, port)
+        Timeout::timeout(3) do
           socket = TCPSocket.new(host, port)
           socket.close
         end
 
         true