chef-zero-scheduled-task 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf269b33ca5ac6f65be285cb971360b8e38baf3e
-  data.tar.gz: bbbb3f130e58edeac35ac4c86501b4bda5cce9a9
+  metadata.gz: e3a4cd8ee79e0008cbec419edba9ab0eca46e606
+  data.tar.gz: 2f7f988aba5c1835148fe0aa4a991b2131ed6d89
 SHA512:
-  metadata.gz: c5b70056f8fd890306c727dd430cf6fed9096127a9a474789750db2a59ad87cbe4216a79c3059207539ec9a7a2ab3b3f4c2e89775b6394bc8e83f81e2832502a
-  data.tar.gz: bd0de042167c6755af2d692f6d5e66d1f67f644f164868bcf9caf6cb90cccec948d2b2d33f9d0e51ec4c995356f428721df672a73fd80e8eb343e4b45f59eeb9
+  metadata.gz: e15314dd568e10e277df4fc2d29bcf8787f867414e96f1eaef481b0a9a4f1e2c935fb4d59aa334ce339b02d221c6a2c08009bc2dee592dd2569f389a4e7e3088
+  data.tar.gz: 90b9cc3af97d42cb5b6f8914c37ec5df39b42442291c4311ba02757337821387106c36c0208fd235b327d685bba2b1fe445f760a296f1acfa980104ad71916fa

data/.gitignore

@@ -1,14 +1,14 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in chef-zero-scheduled-task.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in chef-zero-scheduled-task.gemspec
+gemspec

data/README.md

@@ -1,36 +1,39 @@
-[![Gem Version](https://badge.fury.io/rb/chef-zero-scheduled-task.svg)](http://badge.fury.io/rb/chef-zero-scheduled-task)
-# Chef::Zero::Scheduled::Task
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'chef-zero-scheduled-task'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install chef-zero-scheduled-task
-
-## Usage
-
-In the .kitchen.yml
-```
-provisioner:
-  name: chef_zero_scheduled_task
-```
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/chef-zero-scheduled-task/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+[![Gem Version](https://badge.fury.io/rb/chef-zero-scheduled-task.svg)](http://badge.fury.io/rb/chef-zero-scheduled-task)
+# Chef::Zero::Scheduled::Task
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'chef-zero-scheduled-task'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install chef-zero-scheduled-task
+
+## Usage
+
+In the .kitchen.yml
+```
+provisioner:
+  name: chef_zero_scheduled_task
+```
+
+This provisioner uses all the same configuration options as the native chef-zero provisioner, as well as:
+
+* task_username - user account the scheduled task should run under.  (defaults to the username used for the transport)
+* task_password - password to use to create the scheduled task.  (defaults to the password used for the transport)
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/chef-zero-scheduled-task/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/Rakefile

@@ -1,52 +1,52 @@
-# -*- encoding: utf-8 -*-
-
-require "bundler/gem_tasks"
-
-require "rake/testtask"
-Rake::TestTask.new(:unit) do |t|
-  t.libs.push "lib"
-  t.test_files = FileList["spec/**/*_spec.rb"]
-  t.verbose = true
-end
-
-desc "Run all test suites"
-task :test => [:unit]
-
-desc "Display LOC stats"
-task :stats do
-  puts "\n## Production Code Stats"
-  sh "countloc -r lib"
-  puts "\n## Test Code Stats"
-  sh "countloc -r spec"
-end
-
-require "finstyle"
-require "rubocop/rake_task"
-RuboCop::RakeTask.new(:style) do |task|
-  task.options << "--display-cop-names"
-  task.options << "--lint"
-  task.options << '--config' << '.rubocop.yml'
-  task.patterns = ['lib/**/*.rb']
-end
-
-require "cane/rake_task"
-desc "Run cane to check quality metrics"
-Cane::RakeTask.new do |cane|
-  cane.canefile = "./.cane"
-end
-
-desc "Run all quality tasks"
-task :quality => [:cane, :style, :stats]
-
-require "yard"
-YARD::Rake::YardocTask.new
-
-desc "Generate gem dependency graph"
-task :viz do
-  Bundler.with_clean_env do
-    sh "bundle viz --without test development guard " \
-      "--requirements --version"
-  end
-end
-
-task :default => [:test, :quality]
+# -*- encoding: utf-8 -*-
+
+require "bundler/gem_tasks"
+
+require "rake/testtask"
+Rake::TestTask.new(:unit) do |t|
+  t.libs.push "lib"
+  t.test_files = FileList["spec/**/*_spec.rb"]
+  t.verbose = true
+end
+
+desc "Run all test suites"
+task :test => [:unit]
+
+desc "Display LOC stats"
+task :stats do
+  puts "\n## Production Code Stats"
+  sh "countloc -r lib"
+  puts "\n## Test Code Stats"
+  sh "countloc -r spec"
+end
+
+require "finstyle"
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:style) do |task|
+  task.options << "--display-cop-names"
+  task.options << "--lint"
+  task.options << '--config' << '.rubocop.yml'
+  task.patterns = ['lib/**/*.rb']
+end
+
+require "cane/rake_task"
+desc "Run cane to check quality metrics"
+Cane::RakeTask.new do |cane|
+  cane.canefile = "./.cane"
+end
+
+desc "Run all quality tasks"
+task :quality => [:cane, :style, :stats]
+
+require "yard"
+YARD::Rake::YardocTask.new
+
+desc "Generate gem dependency graph"
+task :viz do
+  Bundler.with_clean_env do
+    sh "bundle viz --without test development guard " \
+      "--requirements --version"
+  end
+end
+
+task :default => [:test, :quality]

data/chef-zero-scheduled-task.gemspec

@@ -1,26 +1,26 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'chef/zero/scheduled/task/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "chef-zero-scheduled-task"
-  spec.version       = Chef::Zero::Scheduled::Task::VERSION
-  spec.authors       = ["Steven Murawski"]
-  spec.email         = ["steven.murawski@gmail.com"]
-  spec.summary       = "Test-Kitchen Provisioner that runs Chef Zero in a Scheduled Task"
-  spec.description   = "Test-Kitchen Provisioner that runs Chef Zero in a Scheduled Task"
-  spec.homepage      = "https://github.com/smurawski/chef-zero-scheduled-task"
-  spec.license       = "Apache 2"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "pry", "~> 0.10"
-
-  spec.add_dependency "test-kitchen", "~> 1.4"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'chef/zero/scheduled/task/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "chef-zero-scheduled-task"
+  spec.version       = Chef::Zero::Scheduled::Task::VERSION
+  spec.authors       = ["Steven Murawski"]
+  spec.email         = ["steven.murawski@gmail.com"]
+  spec.summary       = "Test-Kitchen Provisioner that runs Chef Zero in a Scheduled Task"
+  spec.description   = "Test-Kitchen Provisioner that runs Chef Zero in a Scheduled Task"
+  spec.homepage      = "https://github.com/smurawski/chef-zero-scheduled-task"
+  spec.license       = "Apache 2"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry", "~> 0.10"
+
+  spec.add_dependency "test-kitchen", "~> 1.4"
+end

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

@@ -2,7 +2,7 @@ module Chef
   module Zero
     module Scheduled
       module Task
-        VERSION = "0.0.2"
+        VERSION = "0.0.3"
       end
     end
   end

data/lib/kitchen/provisioner/chef_zero_scheduled_task.rb

@@ -16,19 +16,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/provisioner/chef_zero"
+require 'kitchen/provisioner/chef_zero'
 
 module Kitchen
-
   module Provisioner
-
     # Chef Zero provisioner to run in scheduled task on Windows
     class ChefZeroScheduledTask < ChefZero
-
       kitchen_provisioner_api_version 2
 
       plugin_version Kitchen::VERSION
 
+      default_config :task_username
+
+      default_config :task_password
+
       def create_sandbox
         super
         return unless windows_os?
@@ -37,30 +38,37 @@ module Kitchen
 
       def init_command
         resolve_username_and_password
-        wrap_shell_code( <<-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 /create /tn "chef-tk" /ru #{@task_username} /rp #{@task_password} /sc daily /st 00:00 /f /tr "$cmd_line"
-        EOH
-        )
+        wrap_shell_code(setup_scheduled_task_command)
       end
 
-      #assuming a version of Chef with local mode.
+      # assuming a version of Chef with local mode.
       def prepare_command
         return unless windows_os?
         info('Creating a script to run chef client.')
-        cmd = <<-EOH
-          $pre_cmd = "`$env:temp = `"$env:temp`""
-          $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)
-          $pre_cmd, $cmd | out-file $cmd_path
-        EOH
-        wrap_shell_code(cmd)
+        wrap_shell_code(scheduled_task_command)
       end
 
       def run_command
-        wrap_shell_code( <<-EOH
+        wrap_shell_code(run_scheduled_task_command)
+      end
+
+      private
+
+      def resolve_username_and_password
+        unless config[:task_username] && config[:task_password]
+          local_state_file = @instance.diagnose[:state_file]
+          if local_state_file.key?(:password)
+            config[:task_username] = local_state_file[:username]
+            config[:task_password] = local_state_file[:password]
+          else
+            config[:task_username] = @instance.transport[:username]
+            config[:task_password] = @instance.transport[:password]
+          end
+        end
+      end
+
+      def run_scheduled_task_command
+        <<-EOH
           if (test-path 'c:/chef/tk.log') {
             remove-item c:/chef/tk.log -force
           }
@@ -74,25 +82,30 @@ module Kitchen
           $host.ui.WriteLine('')
           get-content c:/chef/tk.log -readcount 0
         EOH
-        )
       end
 
-      private
-
-      def resolve_username_and_password
-        local_state_file = @instance.diagnose[:state_file]
-        if local_state_file.key?(:password)
-          @task_username = local_state_file[:username]
-          @task_password = local_state_file[:password]
-        else
-          @task_username = @instance.transport[:username]
-          @task_password = @instance.transport[:password]
-        end
+      def setup_scheduled_task_command
+        <<-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 /create /tn "chef-tk" /ru #{config[:task_username]} /rp #{config[:task_password]} /sc daily /st 00:00 /f /tr "$cmd_line"
+        EOH
+      end
 
+      def scheduled_task_command
+        <<-EOH
+          $pre_cmd = '$env:temp = "' + $env:temp + '"'
+          $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)
+          $cmd_folder = split-path $cmd_path
+          if (-not (test-path $cmd_folder)) {$null = mkdir $cmd_folder}
+          $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, '--logfile c:\chef\tk.log'].join(' ')
         File.open(File.join(sandbox_path, 'chef-client-script.ps1'), 'w') do |file|
           file.write(cmd)
         end
@@ -101,10 +114,10 @@ module Kitchen
       def chef_client_args
         level = config[:log_level] == :info ? :info : config[:log_level]
         args = [
-          "--config #{remote_path_join(config[:root_path], "client.rb")}",
+          "--config #{remote_path_join(config[:root_path], 'client.rb')}",
           "--log_level #{level}",
-          "--force-formatter",
-          "--no-color"
+          '--force-formatter',
+          '--no-color'
         ]
         add_optional_chef_client_args!(args)
 
@@ -112,4 +125,4 @@ module Kitchen
       end
     end
   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.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler