windows_chef_zero 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4666dd1d2ea774b19ba452bed9f93a19fa80179a
-  data.tar.gz: f0296afe4f2dbfa51b53c574cd5f2841ace837fe
+  metadata.gz: 8852b072697c45ec2929629cb4a7f3adc124f08b
+  data.tar.gz: e567b02c0754c5cba762946252f9099f7e973946
 SHA512:
-  metadata.gz: 4477b598fcd9b7348f7f100bdafe1a5a2197d39d2cd22bbf876abe04a77449108b99f45bc14e254b29fdf3fa60059b650de236c845c392511d5d65889c5322c8
-  data.tar.gz: 9eb12329f03af3ea4c488af4c615249e830dbe7e0c260f13a70f4903770e2e46c4e43e3f8bee6474f01d48860842fbf47b15d29a6687c7cabd90f0960897fee3
+  metadata.gz: adbd7e1609fe6dc6a673d19062bf3c665a5ba8c5d93b77c0969be0e3f48cc532786539ee4e89cd5f1807a81191e3702905a4e93918a683c63000d3fee0713eac
+  data.tar.gz: 65280e4fd8619bdc914b47763390ad21614e11276b3f21d4b697da868ce59b030187eb6a5e20dcc542d2ecc52b7ab02afa4bed4d9386427d4fa1413058077e41

data/lib/kitchen/provisioner/windows_chef_zero.rb

@@ -10,7 +10,7 @@ module Kitchen
     class WindowsChefZero < ChefZero
 
       default_config :sudo, false
-      default_config :require_chef_omnibus, false
+      default_config :chef_omnibus_url, "http://www.getchef.com/chef/install.msi"
       default_config :windows_root_path, 'C:\Windows\Temp\kitchen'
       default_config :windows_chef_bindir, 'C:\opscode\chef\bin'
       default_config :disabled_ohai_plugins, %w[
@@ -20,16 +20,30 @@ module Kitchen
         windows::virtualization windows::kernel_devices
       ]
 
+      # It would be difficult to make the existing
+      # `Kitchen::Provisioner::ChefBase#install_command`
+      # Windows-friendly so we'll just make it no-op.
+      def install_command; end
+
       def create_sandbox
         super
+        prepare_install_ps1 if config[:require_chef_omnibus]
         prepare_chef_client_zero_rb
         prepare_validation_pem
         prepare_client_rb
         prepare_run_script
       end
 
+      # We're hacking Test Kitchen's life-cycle a little here, but YOLO.
       def run_command
-        File.join(config[:root_path], "run_client.bat")
+        cmds = []
+        cmds << install_chef_command if config[:require_chef_omnibus]
+        cmds << File.join(config[:windows_root_path], "run_client.bat")
+        # Since these commands most likely run under cygwin's `/bin/sh`
+        # let's make sure all paths have forward slashes.
+        cmds.map { |cmd|
+          cmd.gsub("\\", "/")
+        }.join("; ")
       end
 
       private
@@ -83,6 +97,44 @@ module Kitchen
           file.write(windows_run_command)
         end
       end
+
+      def prepare_install_ps1
+        url = config[:chef_omnibus_url]
+        flag = config[:require_chef_omnibus]
+        version = if flag.is_a?(String) && flag != "latest"
+          "v=#{flag.downcase}"
+        else
+          ""
+        end
+
+        File.open(File.join(sandbox_path, "install.ps1"), "wb") do |file|
+          file.write <<-INSTALL.gsub(/^ {12}/, "")
+            $env:Path = "C:\\opscode\\chef\\bin"
+
+            # Retrieve current Chef version
+            try {
+              $installed_chef_version = [string](chef-solo -v)
+            } catch [Exception] {
+              $installed_chef_version = ''
+            }
+
+            # If the current and desired versions don't match
+            # install Chef.
+            if (-Not ($installed_chef_version -match '#{flag}')) {
+              Write-Host "-----> Installing Chef Omnibus (#{flag})"
+              $downloader = New-Object System.Net.WebClient
+              $download_path = Join-Path '#{config[:windows_root_path]}' 'chef-client-#{flag}.windows.msi'
+              $downloader.DownloadFile('#{url}?#{version}', $download_path)
+              $install_process = Start-Process -FilePath 'msiexec.exe' -ArgumentList "/q /i $download_path" -Wait -Passthru
+            }
+          INSTALL
+        end
+      end
+
+      def install_chef_command
+        install_script_path = File.join(config[:windows_root_path], "install.ps1")
+        "powershell.exe -InputFormat None -ExecutionPolicy bypass -File #{install_script_path}"
+      end
     end
   end
 end

data/windows_chef_zero.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "windows_chef_zero"
-  spec.version       = "1.0.0"
+  spec.version       = "2.0.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "A Test-Kitchen Chef Zero provisioner for Windows"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: windows_chef_zero
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen