node_resource.rb in ridley-0.10.0.rc1

- old
+ new

@@ -8,10 +8,14 @@
       #   @param [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
       #     URL to a proxy server to bootstrap through (default: nil)
@@ -22,11 +26,11 @@
       #   @option options [Hash] :attributes
       #     a hash of attributes to use in the first Chef run (default: Hash.new)
       #   @option options [Array] :run_list
       #     an initial run list to bootstrap with (default: Array.new)
       #   @option options [String] :chef_version
-      #     version of Chef to install on the node (default: {Ridley::CHEF_VERSION})
+      #     version of Chef to install on the node (default: nil)
       #   @option options [String] :environment
       #     environment to join the node to (default: '_default')
       #   @option options [Boolean] :sudo
       #     bootstrap with sudo (default: true)
       #   @option options [String] :template
@@ -39,15 +43,16 @@
         default_options = {
           server_url: client.server_url,
           validator_path: client.validator_path,
           validator_client: client.validator_client,
           encrypted_data_bag_secret_path: client.encrypted_data_bag_secret_path,
-          ssh: client.ssh
+          ssh: client.ssh,
+          winrm: client.winrm,
+          chef_version: client.chef_version
         }
 
         options = default_options.merge(options)
-
-        Bootstrapper.new(*args, options).run
+        Bootstrapper.new(args, options).run
       end
 
       # Merges the given data with the the data of the target node on the remote
       #
       # @param [Ridley::Client] client