mixlib-install 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c49c14b6182e48d0e62bdddc9677cc8c368eb30
-  data.tar.gz: 36429f8f5161f5ed5ea3a75aaeafc6ebdf43c3d1
+  metadata.gz: da86da1678b6aef5defbe82060f7476caa1f62e7
+  data.tar.gz: fad6d57bd932742b690beaed6d1dba6f5f2061eb
 SHA512:
-  metadata.gz: 5560590bf8b7e98ac892073bb8f89ff18d31b0ad285c153d8257c5295d1926e6525e6bc40554886e8a5340c6e02a88be76b5323ecc4d963dce7021818a29bd28
-  data.tar.gz: 93358f525f3b45e3ef426b0312e61f2151886a6d6c80fff2ee8a37524769ed118ba68fd59b536c861be302154f4e6b4f8ddf1be023681406421b7ff1631d6a83
+  metadata.gz: bdf236b22604381394f24df9d0182eb2881ffc6964e2879ab5c3d20c8b21a494ec8cc2b1eb38460fc762cd0bf449986ce6c68ed1fd847b75caa70326834ac983
+  data.tar.gz: 4d5d547af2ad2429a35a327cb3f8680277c43973ce0dded009767780c128dc5a47e8e0e8b32582be9dfe2aca98e2fdfa22110b78cda24a21d4c946f6cce51ac0

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Change Log
+This change log follows the principles
+outlined from [Keep a CHANGELOG](http://keepachangelog.com/).
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+## [1.0.1] - 2016-03-31
+### Fixed
+- detect_platform method for Windows
+
+### Changed
+- added stopaction to kick in the catch statement if manifest is missing
+- wait for msiexec to exit
+- Replace md5sum checks with sha256 checks in install_command.ps1
+
+## [1.0.0] - 2016-03-30
+### Added
+- Ability to query product artifacts from multiple channels
+- Ability to generate installation scripts for `sh` and `ps1`
+
+[Unreleased]: https://github.com/chef/mixlib-install/compare/v1.0.1...HEAD
+[1.0.1]: https://github.com/chef/mixlib-install/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/chef/mixlib-install/compare/v0.7.1...v1.0.0

data/lib/mixlib/install.rb

@@ -116,14 +116,21 @@ module Mixlib
     # Returns a Hash containing the platform info options
     #
     def self.detect_platform
-      detect_command = if Gem.win_platform?
-                         Mixlib::ShellOut.new(self.detect_platform_ps1)
-                       else
-                         Mixlib::ShellOut.new(self.detect_platform_sh)
-                       end
-
-      detect_command.run_command
-      platform_info = detect_command.stdout.split
+      output = if Gem.win_platform?
+                 # For Windows we write the detect platform script and execute the
+                 # powershell.exe program with Mixlib::ShellOut
+                 Dir.mktmpdir do |d|
+                   File.open(File.join(d, "detect_platform.ps1"), "w+") do |f|
+                     f.puts self.detect_platform_ps1
+                   end
+
+                   Mixlib::ShellOut.new("powershell.exe -file #{File.join(d, "detect_platform.ps1")}").run_command
+                 end
+               else
+                 Mixlib::ShellOut.new(self.detect_platform_sh).run_command
+               end
+
+      platform_info = output.stdout.split
 
       {
         platform: platform_info[0],

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

@@ -60,18 +60,9 @@ function Test-ProjectPackage {
     function Get-FileHash ($Path, $Algorithm) {
       $Path = (resolve-path $path).providerpath
       $hash = @{Algorithm = $Algorithm; Path = $Path}
-      if ($Algorithm -like 'MD5') {
-        use ($c = New-Object -TypeName Security.Cryptography.MD5CryptoServiceProvider) {
-          use ($in = (gi $path).OpenRead()) {
-            $hash.Hash = ([BitConverter]::ToString($c.ComputeHash($in))).Replace("-", "").ToUpper()
-          }
-        }
-      }
-      elseif ($Algorithm -like 'SHA256') {
-        use ($c = New-Object -TypeName Security.Cryptography.SHA256CryptoServiceProvider) {
-          use ($in = (gi $path).OpenRead()) {
-            $hash.Hash = ([BitConverter]::ToString($c.ComputeHash($in))).Replace("-", "").ToUpper()
-          }
+      use ($c = New-Object -TypeName Security.Cryptography.SHA256CryptoServiceProvider) {
+        use ($in = (gi $path).OpenRead()) {
+          $hash.Hash = ([BitConverter]::ToString($c.ComputeHash($in))).Replace("-", "").ToUpper()
         }
       }
       new-object PSObject -Property $hash

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

@@ -86,6 +86,7 @@ function Install-Project {
     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)"
       }

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/support/install_command.ps1

@@ -3,7 +3,7 @@ Function Check-UpdateChef($root, $version) {
   elseif ("$version" -eq "true") { return $false }
   elseif ("$version" -eq "latest") { return $true }
 
-  Try { $chef_version = (Get-Content $root\version-manifest.txt | select-object -first 1) }
+  Try { $chef_version = (Get-Content $root\version-manifest.txt  -ErrorAction stop | select-object -first 1) }
   Catch {
     Try { $chef_version = (& $root\bin\chef-solo.bat -v) }
     Catch { $chef_version = " " }
@@ -18,32 +18,33 @@ Function Get-ChefMetadata($url) {
   Finally { if ($c -ne $null) { $c.Dispose() } }
 
   $md = ConvertFrom-StringData $response.Replace("`t", "=")
-  return @($md.url, $md.md5)
+  return @($md.url, $md.sha256)
 }
 
-Function Get-MD5Sum($src) {
+Function Get-SHA256($src) {
   Try {
-    $c = New-Object -TypeName System.Security.Cryptography.MD5CryptoServiceProvider
+    $c = New-Object -TypeName System.Security.Cryptography.SHA256CryptoServiceProvider
     $bytes = $c.ComputeHash(($in = (Get-Item $src).OpenRead()))
     return ([System.BitConverter]::ToString($bytes)).Replace("-", "").ToLower()
   } Finally { if (($c -ne $null) -and ($c.GetType().GetMethod("Dispose") -ne $null)) { $c.Dispose() }; if ($in -ne $null) { $in.Dispose() } }
 }
 
-Function Download-Chef($url, $md5, $dst) {
+Function Download-Chef($url, $sha256, $dst) {
   Try {
     Log "Downloading package from $url"
     ($c = Make-WebClient).DownloadFile($url, $dst)
     Log "Download complete."
   } Finally { if ($c -ne $null) { $c.Dispose() } }
 
-  if ($md5 -eq $null) { Log "Skipping md5 verification" }
-  elseif (($dmd5 = Get-MD5Sum $dst) -eq $md5) { Log "Successfully verified $dst" }
-  else { throw "MD5 for $dst $dmd5 does not match $md5" }
+  if ($sha256 -eq $null) { Log "Skipping sha256 verification" }
+  elseif (($dsha256 = Get-SHA256 $dst) -eq $sha256) { Log "Successfully verified $dst" }
+  else { throw "SHA256 for $dst $dsha256 does not match $sha256" }
 }
 
 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)" }
 
@@ -72,12 +73,12 @@ $msi = Unresolve-Path $msi
 if (Check-UpdateChef $chef_omnibus_root $version) {
   Write-Host "-----> Installing Chef Omnibus ($pretty_version)`n"
   if ($chef_metadata_url -ne $null) {
-    $url, $md5 = Get-ChefMetadata "$chef_metadata_url"
+    $url, $sha256 = Get-ChefMetadata "$chef_metadata_url"
   } else {
     $url = $chef_msi_url
-    $md5 = $null
+    $sha256 = $null
   }
-  Download-Chef "$url" $md5 $msi
+  Download-Chef "$url" $sha256 $msi
   Install-Chef $msi
 } else {
   Write-Host "-----> Chef Omnibus installation detected ($pretty_version)`n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -135,6 +135,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE