fix uploads and use one shell for the entire provision

lib/chef/provisioning/convergence_strategy/install_msi.rb

@@ -41,8 +41,7 @@ def setup_convergence(action_handler, machine)
 
         action_handler.open_stream(machine.node['name']) do |stdout|
           action_handler.open_stream(machine.node['name']) do |stderr|
-            machine.execute(action_handler, "powershell.exe -ExecutionPolicy Unrestricted -NoProfile \"& \"\"#{convergence_options[:install_script_path]}\"\"\"",
-              :raw => true,
+            machine.execute(action_handler, "& \"#{convergence_options[:install_script_path]}\"",
               :stream_stdout => stdout,
               :stream_stderr => stderr)
           end
@@ -54,10 +53,10 @@ def converge(action_handler, machine)
 
         action_handler.open_stream(machine.node['name']) do |stdout|
           action_handler.open_stream(machine.node['name']) do |stderr|
-            command_line = "chef-client"
+            command_line = "$env:path = [System.Environment]::GetEnvironmentVariable('PATH', 'MACHINE');"
+            command_line << "chef-client"
             command_line << " -l #{config[:log_level].to_s}" if config[:log_level]
             machine.execute(action_handler, command_line,
-              :raw => true,
               :stream_stdout => stdout,
               :stream_stderr => stderr,
               :timeout => @chef_client_timeout)

lib/chef/provisioning/transport/winrm.rb

@@ -25,6 +25,7 @@ def initialize(endpoint, type, options, global_config)
         @options = options
         @options[:endpoint] = endpoint
         @options[:transport] = type
+        @options[:password] = @options[:password] || @options[:pass]
         @config = global_config
       end
 
@@ -33,10 +34,8 @@ def initialize(endpoint, type, options, global_config)
 
       def execute(command, execute_options = {})
         output = with_execute_timeout(execute_options) do
-          shell_type = execute_options[:raw] ? :cmd : :powershell
-          shell = session.shell(shell_type)
           block = Proc.new { |stdout, stderr| stream_chunk(execute_options, stdout, stderr) }
-          shell.run(command, &block)
+          session.run(command, &block)
         end
         WinRMResult.new(command, execute_options, config, output)
       end
@@ -54,9 +53,9 @@ def write_file(path, content)
         file = Tempfile.new('provisioning-upload')
         begin
            file.write(content)
-           file_transporter.upload(file, path)
-        ensure
            file.close
+           file_transporter.upload(file.path, path)
+        ensure
            file.unlink   # deletes the temp file
         end
       end
@@ -97,7 +96,7 @@ def make_url_available_to_remote(local_url)
       def session
         @session ||= begin
           require 'winrm'
-          ::WinRM::Connection.new(options)
+          ::WinRM::Connection.new(options).shell(:powershell)
         end
       end