chef-zero-scheduled-task 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93c85c79fb07b95c44580437d30c3b455caf6a46
-  data.tar.gz: aa1fea084946933ad28210ac8e70d7c14b799864
+  metadata.gz: ba0ff7403a98e72130aab8075f648e671aa0071d
+  data.tar.gz: b1ec792ba273e5f7774bcc0c5932c5c3fae06da4
 SHA512:
-  metadata.gz: 48b83ae84bd2b3a56b114a6e2cb238730a38e4cc48b4a175b66501f657b33f4d780151d2a04bf00245f8b6e06f4e04cbb4faac15454f41a5b2e6211eb4c4fb24
-  data.tar.gz: 6651285c082f1ff736139efce7be4bcec26d6d10ca03748c63bac72b740a2f3a667e73aefc8915e523e2c3f3a5aada63233abab16d1de1c84d0fda2136c4eded
+  metadata.gz: d6ba2c795558b572f51e33b2dcde005894f300c2db4e1d26ace3aadf8615c9d2d5a83201576764423ed18854b9d7d05e3547a88081e52e654b899fe1d7e10232
+  data.tar.gz: 0ee7b9a8500655f381832dfa7ec072eb56d59f13e95aaaf311c83ea0dd35a3a1165c0e466b3553e4e84016e46b4fe11bb7b5e69eedafab0862b8170f7f71001c

data/lib/chef/zero/scheduled/task/version.rb

@@ -2,7 +2,7 @@ module Chef
   module Zero
     module Scheduled
       module Task
-        VERSION = "0.0.4"
+        VERSION = "0.0.5"
       end
     end
   end

data/lib/kitchen/provisioner/chef_zero_scheduled_task.rb

@@ -69,19 +69,27 @@ module Kitchen
 
       def run_scheduled_task_command
         <<-EOH
-          if (test-path 'c:/chef/tk.log') {
-            remove-item c:/chef/tk.log -force
-          }
+        try {
+          $npipeServer = new-object System.IO.Pipes.NamedPipeServerStream( 'task', [System.IO.Pipes.PipeDirection]::In)
+          $pipeReader = new-object System.IO.StreamReader($npipeServer)
           schtasks /run /tn "chef-tk"
-          $host.ui.WriteLine('Running scheduled task chef-tk.')
-          do {
-            $host.ui.WriteLine('  The task is still running.')
-            start-sleep -seconds 5
-            $state = schtasks /query /tn chef-tk /fo csv /v | convertfrom-csv
-          } while ($state.status -like 'Running')
-          $host.ui.WriteLine('')
-          get-content c:/chef/tk.log -readcount 0
-          $host.setshouldexit((gc c:/chef/exit_code.txt -readcount 0).trim())
+          $npipeserver.waitforconnection()
+          $host.ui.writeline('Connected to the scheduled task.')
+          while ($npipeserver.IsConnected) { 
+            $output = $pipereader.ReadLine()
+            if ($output -like 'SCHEDULED_TASK_DONE:*') {
+              $exit_code = ($output -replace 'SCHEDULED_TASK_DONE:').trim()
+            }
+            else {
+              $host.ui.WriteLine($output)
+            }
+          }
+        }
+        finally {
+          $pipereader.dispose()
+          $npipeserver.dispose()
+          $host.setshouldexit($exit_code)
+        }
         EOH
       end
 
@@ -95,19 +103,22 @@ module Kitchen
 
       def scheduled_task_command
         <<-EOH
-          $pre_cmd = '$env:temp = "' + $env:temp + '"'
+          $pre_cmd = '$env:temp = "' + $env:temp + '"' + ";"
+          $pre_cmd += 'start-sleep -seconds 5;'
+          $pre_cmd += '$npipeClient = new-object System.IO.Pipes.NamedPipeClientStream( $env:ComputerName,'
+          $pre_cmd += '"task", [System.IO.Pipes.PipeDirection]::Out); $npipeclient.connect();'
+          $pre_cmd += '$pipeWriter = new-object System.IO.StreamWriter($npipeClient);'
+          $pre_cmd += '$pipeWriter.AutoFlush = $true'
           $cmd_path = "#{remote_path_join(config[:root_path], 'chef-client-script.ps1')}"
-          $cmd_to_eval = gc $cmd_path | out-string
-          $cmd = $executioncontext.invokecommand.expandstring($cmd_to_eval)
-          $post_cmd = '$LastExitCode | out-file c:/chef/exit_code.txt'
-          $cmd_folder = split-path $cmd_path
-          if (-not (test-path $cmd_folder)) {$null = mkdir $cmd_folder}
-          $pre_cmd, $cmd, $post_cmd | out-file $cmd_path
+          $cmd_to_eval = gc $cmd_path -readcount 0 | out-string
+          $cmd = $executioncontext.invokecommand.expandstring($cmd_to_eval) -replace '\r\n'
+          $cmd = "$cmd | " + '% {} {$pipewriter.writeline($_)} {$pipewriter.writeline("SCHEDULED_TASK_DONE: $LastExitCode");$pipewriter.dispose();$npipeclient.dispose()}'
+          $pre_cmd, $cmd | out-file $cmd_path
         EOH
       end
 
       def prepare_client_zero_script
-        cmd = [local_mode_command, *chef_client_args, '--logfile c:\chef\tk.log'].join(' ')
+        cmd = [local_mode_command, *chef_client_args].join(' ')
         File.open(File.join(sandbox_path, 'chef-client-script.ps1'), 'w') do |file|
           file.write(cmd)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero-scheduled-task
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler