lib/ridley/bootstrapper.rb in ridley-0.9.1 vs lib/ridley/bootstrapper.rb in ridley-0.10.0.rc1

@@ -1,26 +1,14 @@
 module Ridley
   # @author Jamie Winsor <[e-mail]>
   class Bootstrapper
     autoload :Context, 'ridley/bootstrapper/context'
 
-    class << self
-      # @return [Pathname]
-      def templates_path
-        Ridley.root.join('bootstrappers')
-      end
-
-      # @return [String]
-      def default_template
-        templates_path.join('omnibus.erb').to_s
-      end
-    end
-
     include Celluloid
     include Celluloid::Logger
-
-    # @return [Array<String>]
+    
+    # @return  [Array<String>]
     attr_reader :hosts
 
     # @return [Array<Bootstrapper::Context>]
     attr_reader :contexts
 
@@ -31,10 +19,14 @@
     # @option options [Hash] :ssh
     #   * :user (String) a shell user that will login to each node and perform the bootstrap command on (required)
     #   * :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 (required)
+    #   * :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 (5985)
     # @option options [String] :validator_client
     # @option options [String] :validator_path
     #   filepath to the validator used to bootstrap the node (required)
     # @option options [String] :bootstrap_proxy (nil)
     #   URL to a proxy server to bootstrap through
@@ -44,17 +36,17 @@
     #   a hash of Ohai hints to place on the bootstrapped node
     # @option options [Hash] :attributes (Hash.new)
     #   a hash of attributes to use in the first Chef run
     # @option options [Array] :run_list (Array.new)
     #   an initial run list to bootstrap with
-    # @option options [String] :chef_version (Ridley::CHEF_VERSION)
+    # @option options [String] :chef_version (nil)
     #   version of Chef to install on the node
     # @option options [String] :environment ('_default')
     #   environment to join the node to
     # @option options [Boolean] :sudo (true)
     #   bootstrap with sudo (default: true)
-    # @option options [String] :template ('omnibus')
+    # @option options [String] :template
     #   bootstrap template to use
     def initialize(hosts, options = {})
       @hosts         = Array(hosts).collect(&:to_s).uniq
       @options       = options.dup
       @options[:ssh] ||= Hash.new
@@ -62,26 +54,26 @@
         timeout: 5.0,
         sudo: true
       }.merge(@options[:ssh])
 
       @options[:sudo] = @options[:ssh][:sudo]
-
       @contexts = @hosts.collect do |host|
-        Context.new(host, options)
+        Context.create(host, options)
       end
     end
 
-    # @return [SSH::ResponseSet]
+    # @return [HostConnector::ResponseSet]
     def run
       workers = Array.new
       futures = contexts.collect do |context|
         info "Running bootstrap command on #{context.host}"
 
-        workers << worker = SSH::Worker.new_link(self.options[:ssh].freeze)
-        worker.future.run(context.host, context.boot_command)
+        workers << worker = context.host_connector::Worker.new(context.host, self.options.freeze)
+
+        worker.future.run(context.template_binding.boot_command)
       end
 
-      SSH::ResponseSet.new.tap do |response_set|
+      HostConnector::ResponseSet.new.tap do |response_set|
         futures.each do |future|
           status, response = future.value
           response_set.add_response(response)
         end
       end