chef-zero-scheduled-task 0.0.7.dev → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8117747c819d4f31c7f77aae4963ce74c8725f8f
-  data.tar.gz: f5720d725bf9275e5c15d1e7b788f278b7d60c57
+  metadata.gz: 17ecbdf7cc8a7a59ae9454dc63226bc799d8b1e6
+  data.tar.gz: de917b0ac0899172edb3f4ef04ceceb467f39574
 SHA512:
-  metadata.gz: 206da575b7737e8cb185748a06b19f87fcdc909ce9f41b5d5bf066058792af20788f863c0c62182b2372b0fcab78b8d353fb0d3c6f214539005b4dd8f6e97210
-  data.tar.gz: c1b6fff9b97504421e484cffc1e92995f66aab0e5f0846f299fdd24ed6e8e0170399e0d4ed25b1508a7241ab57f6a0ddae868bfe9fc94b9e137a21160439a7ae
+  metadata.gz: feab4427f9e635d6462a85793379e59119d1993b9970a6479f12f369412e98ab0ac1a4c1c5d7ae112269d89152852495c76e60ce58c217ae8f78a414626fb162
+  data.tar.gz: 1b6da04813e2b102727e78ba07dcf612029edfbfbd404aa418aa15056a2dea4a189c97906aa86f74611de988978ca70c3678dd2b4f8daf2ac72cef5444050633

data/Rakefile

@@ -16,7 +16,7 @@ Cucumber::Rake::Task.new(:features) do |t|
 end
 
 desc "Run all test suites"
-task :test => [:unit] #[:unit, :features]
+task :test => [:unit] # [:unit, :features]
 
 desc "Display LOC stats"
 task :stats do

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

@@ -2,7 +2,7 @@ module Chef
   module Zero
     module Scheduled
       module Task
-        VERSION = "0.0.7.dev"
+        VERSION = "0.0.7"
       end
     end
   end

data/lib/kitchen/provisioner/chef_zero_scheduled_task.rb

@@ -33,31 +33,30 @@ module Kitchen
       def create_sandbox
         super
         return unless windows_os?
+        info("Creating a script to run chef client.")
         prepare_client_zero_script
       end
 
-      def init_command
-        resolve_username_and_password
-        wrap_shell_code(setup_scheduled_task_command)
+      def prepare_command
+        wrap_shell_code('$env:temp = "$env:temp"')
       end
 
-      # assuming a version of Chef with local mode.
-      def prepare_command
-        return unless windows_os?
-        info("Creating a script to run chef client.")
-        wrap_shell_code(scheduled_task_command)
+      def init_command
+        info("Creating the scheduled task.")
+        wrap_shell_code(setup_scheduled_task_command)
       end
 
       def run_command
         wrap_shell_code(run_scheduled_task_command)
       end
 
-      #private
+      # private
 
-      def local_state_file 
+      def local_state_file
         @local_state_file ||= @instance.diagnose[:state_file]
       end
-      def resolve_username
+
+      def task_username
         if config[:task_username]
           config[:task_username]
         else
@@ -68,22 +67,17 @@ module Kitchen
           end
         end
       end
-      
-      def resolve_password
+
+      def task_password
         unless config[:task_password]
           if local_state_file.key?(:password)
-             local_state_file[:password]
+            local_state_file[:password]
           else
             @instance.transport[:password]
           end
         end
       end
 
-      def resolve_username_and_password
-        @task_username = resolve_username
-        @task_password = resolve_password
-      end
-
       def run_scheduled_task_command
         <<-EOH
         try {
@@ -107,45 +101,56 @@ module Kitchen
         EOH
       end
 
+      def new_scheduled_task_command
+        "schtasks /create /tn 'chef-tk' " \
+        "/ru '#{task_username}' /rp '#{task_password}' " \
+        "/sc daily /st 00:00 /f "
+      end
+
+      def new_scheduled_task_command_line_ps
+        "/tr $executioncontext.invokecommand.expandstring(" \
+        '"powershell -executionpolicy unrestricted -File '
+      end
+
       def setup_scheduled_task_command
-        schtasks_cmd = 'schtasks /create /tn "chef-tk"'
-        schtasks_user = "/ru '#{@task_username}'" /
-          " /rp '#{@task_password}'"
-        schtasks_timing = "/sc daily /st 00:00 /f"
-        <<-EOH
-          $cmd_path = "#{remote_path_join(config[:root_path], "chef-client-script.ps1")}"
-          $cmd_line = $executioncontext.invokecommand.expandstring(
-            "powershell -executionpolicy unrestricted -File $cmd_path")
-          #{schtasks_cmd} #{schtasks_user} #{schtasks_timing} /tr "$cmd_line"
-        EOH
+        new_scheduled_task_command +
+          new_scheduled_task_command_line_ps +
+          remote_chef_client_script +
+          '")'
+      end
+
+      def remote_chef_client_script
+        @remote_script_path ||= remote_path_join(
+          config[:root_path], "chef-client-script.ps1")
       end
 
-      def scheduled_task_command
+      def scheduled_task_command_script
         <<-EOH
-          $pre_cmd = '$env:temp = "' + $env:temp + '"' + ";"
-          $pre_cmd += 'start-sleep -seconds 5;'
-          $pre_cmd += '$npipeClient = new-object System.IO.Pipes.NamedPipeClientStream('
-          $pre_cmd += '$env:ComputerName,"task", [System.IO.Pipes.PipeDirection]::Out);'
-          $pre_cmd += '$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 -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
+        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
-        cmd = [local_mode_command, *chef_client_args].join(" ")
         File.open(File.join(sandbox_path, "chef-client-script.ps1"), "w") do |file|
-          file.write(cmd)
+          file.write(Util.outdent!(scheduled_task_command_script))
         end
       end
 
+      def client_zero_command
+        [local_mode_command, *chef_client_args].join(" ")
+      end
+
       def chef_client_args
         level = config[:log_level] == :info ? :info : config[:log_level]
         args = [

data/spec/kitchen/provisioner/chef_zero_scheduled_task_spec.rb

@@ -1,21 +1,27 @@
 require_relative "../../spec_helper"
 
-require 'pry'
+require "pry"
 require "kitchen"
 require "kitchen/provisioner/chef_zero_scheduled_task"
 
 describe Kitchen::Provisioner::ChefZeroScheduledTask do
 
-  let(:logged_output)   { StringIO.new }
-  let(:logger)          { Logger.new(logged_output) }
-  let(:platform)        { stub(:os_type => "windows",
-                               :shell_type => "powershell") }
-  let(:suite)           { stub(:name => "fries") }
-  let(:transport)       { { :username => "Administrator",
-                            :password => "P@ssw0rd" } }
+  let(:logged_output) { StringIO.new }
+  let(:logger) { Logger.new(logged_output) }
+  let(:platform) do
+    stub(:os_type => "windows", :shell_type => "powershell")
+  end
+  let(:suite) { stub(:name => "fries") }
+  let(:transport) do
+    { :username => "Administrator", :password => "P@ssw0rd" }
+  end
+  let(:diagnose) { { :state_file => { :hostname => "Blah" } } }
 
   let(:config) do
-    { :test_base_path => "/b", :kitchen_root => "/r", :log_level => :info }
+    { :test_base_path => "/b",
+      :kitchen_root => "/r",
+      :log_level => :info,
+      :root_path => "c:\\" }
   end
 
   let(:instance) do
@@ -25,11 +31,10 @@ describe Kitchen::Provisioner::ChefZeroScheduledTask do
       :suite => suite,
       :platform => platform,
       :transport => transport,
-      :diagnose => { :state_file => {:hostname => "Blah"} }
+      :diagnose => diagnose
     )
   end
 
-
   let(:provisioner) do
     Kitchen::Provisioner::ChefZeroScheduledTask.new(config).finalize_config!(instance)
   end
@@ -42,17 +47,42 @@ describe Kitchen::Provisioner::ChefZeroScheduledTask do
     provisioner.diagnose_plugin[:version].must_equal Kitchen::VERSION
   end
 
-  describe 'when username is not provided by the driver or task_username' do
+  describe "when username is not provided by the driver or task_username" do
+    it "is resolved from the transport" do
+      provisioner.task_username.must_match "Administrator"
+    end
+  end
+
+  describe "when password is not provided by the driver or task_password" do
+    it "is resolved from the transport" do
+      provisioner.task_password.must_match "P@ssw0rd"
+    end
+  end
+
+  describe "new_scheduled_task_command" do
+    it "returns a valid command line" do
+      provisioner.
+        new_scheduled_task_command.
+        must_match("schtasks /create /tn 'chef-tk' /ru " \
+        "'Administrator' /rp 'P@ssw0rd' /sc daily /st 00:00 /f ")
+    end
+  end
 
-    it 'is resolved from the transport' do
-      provisioner.resolve_username.must_match "Administrator"
+  describe "new_scheduled_task_command_line_ps" do
+    it "returns a valid task to execute" do
+      provisioner.
+        new_scheduled_task_command_line_ps.
+        must_match("/tr $executioncontext.invokecommand.expandstring(" \
+        '"powershell -executionpolicy unrestricted -File ')
     end
+  end
 
+  describe "remote_chef_client_script" do
+    it "returns a valid path to the script to execute" do
+      provisioner.
+        remote_chef_client_script.
+        must_match("c:\\chef-client-script.ps1")
+    end
   end
-  describe 'when password is not provided by the driver or task_password' do
-#    before { transport
-    it 'is resolved from the transport' do 
-     provisioner.resolve_password.must_match "P@ssw0rd"
-    end 
-  end 
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero-scheduled-task
 version: !ruby/object:Gem::Version
-  version: 0.0.7.dev
+  version: 0.0.7
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -254,12 +254,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Test-Kitchen Provisioner that runs Chef Zero in a Scheduled Task