chef-zero-scheduled-task 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3483f32db095dc30108f0c7d332329300243841
-  data.tar.gz: 87a6c6564a8d51c13c88ca9d08fdfb7159b203a7
+  metadata.gz: 9856132650063f5768cf8d2ec0784db9e958854a
+  data.tar.gz: 5b8c13e93070018f9730405659f1dd044bcb7f53
 SHA512:
-  metadata.gz: 5d15db7fb0e10dec5f23c70cac9cd9369d4b8d0bff1883cf38b5fdf62fc22dd161893127bf2de6018447a4bbd482a85508ecdc148f980d8da3e2cc5f6ec73d66
-  data.tar.gz: 88d856b13222ac3374a836bf3c8e56cd58d7136029621d3d4042847da74efa5887e66958130149a2c24c8d12816b9f56e2327bfa37b35281c23b9e98cec3dee8
+  metadata.gz: 2c2c2658b28130e8706a51c0022ccfb832739cf112bc32ca9fa6047146d2fd98c448e0941707dbc0ed6d1ae1d8e2d69207828b60e789ba3f025a17e398d08c90
+  data.tar.gz: 637e521f09f4ebedce7e3d2da615c51f017b0c75342850cee9c152d0220c0bd1b82ead37294db79579f1298d51ed96a28aa557fc20c9f7989eb825d9c0c19903

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

@@ -2,7 +2,7 @@ module Chef
   module Zero
     module Scheduled
       module Task
-        VERSION = "0.0.10"
+        VERSION = "0.0.11"
       end
     end
   end

data/lib/kitchen/provisioner/chef_zero_scheduled_task.rb

@@ -30,18 +30,6 @@ module Kitchen
 
       default_config :task_password
 
-      def prepare_command
-        if windows_os?
-          debug("Serializing $env:temp")
-          wrap_shell_code(<<-EOH
-            "`$env:temp = '$env:temp'" |
-                out-file $env:temp/kitchen/env.ps1
-          EOH
-          )
-        end
-        super
-      end
-
       def init_command
         if windows_os?
           info("Creating the scheduled task.")
@@ -54,7 +42,7 @@ module Kitchen
       def run_command
         if windows_os?
           script = "$script = @'\n#{scheduled_task_command_script}\n'@\n" \
-          "\n$Script | out-file \"$env:temp/kitchen/chef-client-script.ps1\"" \
+          "\n$ExecutionContext.InvokeCommand.ExpandString($Script) | out-file \"$env:temp/kitchen/chef-client-script.ps1\"" \
           "\n#{run_scheduled_task_command}"
           wrap_shell_code(script)
         else
@@ -92,24 +80,25 @@ module Kitchen
 
       def run_scheduled_task_command
         <<-EOH
-        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"
-          $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)
-        }
+try {
+  Add-Type -AssemblyName System.Core
+  $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"
+  $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
 
@@ -138,20 +127,20 @@ module Kitchen
 
       def scheduled_task_command_script
         <<-EOH
-        . $psscriptroot/env.ps1;
-        start-sleep -seconds 5;
-        $npipeClient = new-object System.IO.Pipes.NamedPipeClientStream(
-        $env:ComputerName, 'task', [System.IO.Pipes.PipeDirection]::Out);
-        $npipeclient.connect();
-        $pipeWriter = new-object System.IO.StreamWriter($npipeClient);
-        $pipeWriter.AutoFlush = $true;
-        #{client_zero_command} |
-          foreach-object {} {$pipewriter.writeline($_)} {
-            $pipewriter.writeline("SCHEDULED_TASK_DONE: $LastExitCode");
-            $pipewriter.dispose();
-            $npipeclient.dispose()
-          }
-        EOH
+Add-Type -AssemblyName System.Core
+start-sleep -seconds 5;
+`$npipeClient = new-object System.IO.Pipes.NamedPipeClientStream(`$env:ComputerName,
+  `'task`', [System.IO.Pipes.PipeDirection]::Out);
+`$npipeclient.connect();
+`$pipeWriter = new-object System.IO.StreamWriter(`$npipeClient);
+`$pipeWriter.AutoFlush = `$true;
+#{client_zero_command} |
+  foreach-object {} {`$pipewriter.writeline(`$_)} {
+    `$pipewriter.writeline(`"SCHEDULED_TASK_DONE: `$LastExitCode`");
+    `$pipewriter.dispose();
+    `$npipeclient.dispose()
+  }
+EOH
       end
 
       def prepare_client_zero_script

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero-scheduled-task
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen