mixlib-install 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b2ddb2bee9fa02b5c0835109b73ee0234a5b69f
-  data.tar.gz: 7b699b07eea1499dff69661e9321ed147eb55312
+  metadata.gz: 0472a91eb0523c4a4d71757705485fcc536da342
+  data.tar.gz: a93463411cf239b06f9c2cd87cc1bc9a4ff9c98a
 SHA512:
-  metadata.gz: 5e659140f51abfdb1c348cb15adacb514bf2aafcfad2d80de79b701fb026fa41a8206b63b48f28c038b51a7f59edcb7f551ea741b00de1cf7a6e38dfee534624
-  data.tar.gz: f10c4a2d8ae90e47a41c3ccafbd48b727ffe6e8fee49b4c92f90e3500fa8f21136750c2b018803e6a5f0a115d52fcc0bc93b26a8c194dd90ae66e5da3c4797de
+  metadata.gz: e2fc4c89038e426cc11f7458f0f508f686ce6e6c55303218ea9435f27b51885cc4e7b8f87c602c331a3d8a980debb51350108fb7b787ba1b19891329639fd2b8
+  data.tar.gz: b148002234e2123801d8bd14b878977f49291aed34b557e3a880cab48f2818229dcebfb87ab6839f3fea5fe2e1b31d9e8e47456b7b9e34105906491b2f33fe9f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [1.0.12]
+- Normalize the architecture detection to return either x86_64, i386 or sparc.
+- Remove the powershell product_name validation to support delivery-cli and push-jobs-client in install.ps1.
+- Retry MSI installation when it fails with 1618 (another installation in progress).
+
 ## [1.0.11]
 - Add `platform_version_compatibility_mode` option which makes mixlib-install select an artifact built for an earlier version of a platform when set.
 

data/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh

@@ -150,6 +150,19 @@ case $platform in
     ;;
 esac
 
+# normalize the architecture we detected
+case $machine in
+  "x86_64"|"amd64"|"x64")
+    machine="x86_64"
+    ;;
+  "i386"|"i86pc"|"x86"|"i686")
+    machine="i386"
+    ;;
+  "sparc"|"sun4u"|"sun4v")
+    machine="sparc"
+    ;;
+esac
+
 if test "x$platform_version" = "x"; then
   echo "Unable to determine platform version!"
   report_bug

data/lib/mixlib/install/generator/powershell/scripts/get_project_metadata.ps1.erb

@@ -19,11 +19,6 @@ function Get-ProjectMetadata {
     [uri]$base_server_uri = '<%= base_url %>',
     [string]
     # Project to install
-    # chef - Chef Client
-    # chefdk - Chef Development Kit
-    # angrychef - AngryChef
-    # server and container are not valid windows targets
-    [validateset('chef', 'chefdk', 'angrychef')]
     [string]
     $project = 'chef',
     # Version of the application to install

data/lib/mixlib/install/generator/powershell/scripts/get_project_metadata_for_artifactory.ps1.erb

@@ -19,11 +19,6 @@ function Get-ProjectMetadata {
     [uri]$base_server_uri = '<%= base_url %>',
     [string]
     # Project to install
-    # chef - Chef Client
-    # chefdk - Chef Development Kit
-    # angrychef - AngryChef
-    # server and container are not valid windows targets
-    [validateset('chef', 'chefdk', 'angrychef')]
     [string]
     $project = 'chef',
     # Version of the application to install

data/lib/mixlib/install/generator/powershell/scripts/install_project.ps1

@@ -16,11 +16,6 @@ function Install-Project {
   [cmdletbinding(SupportsShouldProcess=$true)]
   param (
     # Project to install
-    # chef - Chef Client
-    # chefdk - Chef Development Kit
-    # angrychef - AngryChef
-    # server and container are not valid windows targets
-    [validateset('chef', 'chefdk', 'angrychef')]
     [string]
     $project = 'chef',
     # Release channel to install from

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "1.0.11"
+    VERSION = "1.0.12"
   end
 end

data/support/install_command.ps1

@@ -43,11 +43,20 @@ Function Download-Chef($url, $sha256, $dst) {
 
 Function Install-Chef($msi) {
   Log "Installing Chef Omnibus package $msi"
-  $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait
-  $p.WaitForExit()
-
-  if ($p.ExitCode -ne 0) { throw "msiexec was not successful. Received exit code $($p.ExitCode)" }
-
+  $installingChef = $True
+  $installAttempts = 0
+  while ($installingChef) {
+    $installAttempts++
+    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait
+    $p.WaitForExit()
+    if ($p.ExitCode -eq 1618) {
+      Log "Another msi install is in progress (exit code 1618), retrying ($($installAttempts))..."
+      continue
+    } elseif ($p.ExitCode -ne 0) {
+      throw "msiexec was not successful. Received exit code $($p.ExitCode)"
+    }
+    $installingChef = $False
+  }
   Remove-Item $msi -Force
   Log "Installation complete"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A mixin to help with omnitruck installs