mixlib-install 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0472a91eb0523c4a4d71757705485fcc536da342
-  data.tar.gz: a93463411cf239b06f9c2cd87cc1bc9a4ff9c98a
+  metadata.gz: e3f1b2f2f71b83d4fa8db7372c9c9f0fd21767c3
+  data.tar.gz: 2a5f4ac5b1d995f2906cf6d89caed7c3e833c090
 SHA512:
-  metadata.gz: e2fc4c89038e426cc11f7458f0f508f686ce6e6c55303218ea9435f27b51885cc4e7b8f87c602c331a3d8a980debb51350108fb7b787ba1b19891329639fd2b8
-  data.tar.gz: b148002234e2123801d8bd14b878977f49291aed34b557e3a880cab48f2818229dcebfb87ab6839f3fea5fe2e1b31d9e8e47456b7b9e34105906491b2f33fe9f
+  metadata.gz: 23aea8c3a868d8e2c0a4cf2f93461063c02bdaf9ff280a507d17a4c971c86926adef12d4aa443261bf47f4caa43faa87da50583c23fb488b778e594e45f76cd6
+  data.tar.gz: 90f960a001300ede6e90604c19106b38a7d53d559beba6eac44e104c084614566ab2c7a78cfbc76b86553804a4e4089873a32cfae8b7d45813b63076d7090778

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [1.0.13]
+- Fix Windows architecture detection for stable channel
+- Added support for retrying project msi installation for exit code 1618 (another installation is in progress)
+
 ## [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.

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

@@ -53,13 +53,8 @@ function Get-ProjectMetadata {
   $platform_version = Get-PlatformVersion
   Write-Verbose "Platform Version: $platform_version"
 
-  # Custom architecture detection based on channel
   if ($architecture -eq 'auto') {
-    if (((get-wmiobject win32_operatingsystem).osarchitecture -like '64-bit') -and ($channel -like 'current')) {
-      $architecture = 'x86_64'
-    } else {
-      $architecture = 'i386'
-    }
+    $architecture = Get-PlatformArchitecture
   }
 
   Write-Verbose "Architecture: $architecture"

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

@@ -21,7 +21,13 @@ function Get-PlatformArchitecture {
 function New-Uri {
   param ($baseuri, $newuri)
 
+  try {
   new-object System.Uri $baseuri, $newuri
+  }
+  catch [System.Management.Automation.MethodInvocationException]{
+    Write-Error "$($_.exception.message)"
+    throw $_.exception
+  }
 }
 
 function Get-WebContent {

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

@@ -80,10 +80,18 @@ function Install-Project {
   if ($pscmdlet.ShouldProcess("$download_destination", "Installing")){
     if (Test-ProjectPackage -Path $download_destination -Algorithm 'SHA256' -Hash $package_metadata.sha256) {
       Write-Host "Installing $project from $download_destination"
-      $p = Start-Process -FilePath "msiexec" -ArgumentList "/qn /i $download_destination" -Passthru -Wait
-      $p.WaitForExit()
-      if ($p.ExitCode -ne 0) {
-        throw "msiexec was not successful. Received exit code $($p.ExitCode)"
+      $installingProject = $True
+      $installAttempts = 0
+      while ($installingProject) {
+        $p = Start-Process -FilePath "msiexec" -ArgumentList "/qn /i $download_destination" -Passthru -Wait
+        $p.WaitForExit()
+        if ($p.ExitCode -eq 1618) {
+          Write-Host "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)"
+        }
+        $installingProject = $False
       }
     }
     else {

data/lib/mixlib/install/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-06-09 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.4
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A mixin to help with omnitruck installs