mixlib-install 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caaea44ad0a1ced94e4b9844d6feaeebad9ae93c
-  data.tar.gz: 283249640b7928ee0af4db38d20b61f759202f25
+  metadata.gz: 7592663e9dc88898464abf226ad8b1e905331e23
+  data.tar.gz: 689ed39a2569a84473a9fe542cd44340c2d82359
 SHA512:
-  metadata.gz: 30277b99b8ebf0f878d79f084cb4fb1ead1fd235da9d6667a15ca151b28801ff524f8d40946f105127254aa424a8cb2c0dd68ee85b950fac94d5c03512cb3376
-  data.tar.gz: 144dc4e82927af4fb8a56ec3f8125fc081d34bc016821aab9dd247d6036c581f4bbb553a651f4fd6e050a0e685124f518ecd9206fb59dcf29244a060affc5bcb
+  metadata.gz: bc3f0cc2bc318043963135505b1a3a8c9bd34daec489d8cd6b642f35f5274825d545128a0b9744571f7e0bfc3ad2cb4572aa3c90670959bdd01b09f47cc366de
+  data.tar.gz: 75411cd38ab03f9518d3b98f74f058d4ac9356da97356b11e79b42e759b4bdee787c46842fb2ba9549f89b61423b85f71035ef6ad3e121088f0bca14c34cf556

data/lib/mixlib/install.rb

@@ -17,6 +17,7 @@
 #
 
 require "mixlib/install/util"
+require "cgi"
 
 module Mixlib
   class Install
@@ -41,6 +42,7 @@ module Mixlib
     attr_accessor :https_proxy
 
     attr_accessor :base_url
+    attr_accessor :install_msi_url
 
     def initialize(version, powershell = false, opts = {})
       @version = version
@@ -64,7 +66,7 @@ module Mixlib
       parse_opts(opts)
     end
 
-    def install
+    def install_command
       vars = if powershell
         install_command_vars_for_powershell
       else
@@ -81,7 +83,7 @@ module Mixlib
     # @return [String] shell variable lines
     # @api private
     def install_command_vars_for_bourne
-      flags = %w[latest true].include?(version) ? "" : "-v #{version}"
+      flags = %w[latest true].include?(version) ? "" : "-v #{CGI.escape(version)}"
       flags << " " << "-n" if nightlies
       flags << " " << "-p" if prerelease
       flags << " " << install_flags if install_flags
@@ -105,12 +107,17 @@ module Mixlib
     # @api private
     def install_command_vars_for_powershell
       [
-        shell_var("chef_metadata_url", windows_metadata_url),
         shell_var("chef_omnibus_root", root),
         shell_var("msi", "$env:TEMP\\chef-#{version}.msi"),
-        shell_var("pretty_version", Util.pretty_version(version)),
-        shell_var("version", version)
-      ].join("\n")
+      ].tap { |vars|
+        if install_msi_url
+          vars << shell_var("chef_msi_url", install_msi_url)
+        else
+          vars << shell_var("chef_metadata_url", windows_metadata_url)
+          vars << shell_var("pretty_version", Util.pretty_version(version))
+          vars << shell_var("version", version)
+        end
+      }.join("\n")
     end
 
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
@@ -136,6 +143,8 @@ module Mixlib
         when "sudo_command"
           self.use_sudo = true
           self.sudo_command = setting
+        when "install_msi_url"
+          self.install_msi_url = setting
         end
       end
     end
@@ -176,7 +185,7 @@ module Mixlib
 
       url = "#{base}#{endpoint}"
       url << "?p=windows&m=x86_64&pv=2008r2" # same package for all versions
-      url << "&v=#{version.to_s.downcase}"
+      url << "&v=#{CGI.escape(version.to_s.downcase)}"
       url << "&prerelease=true" if prerelease
       url << "&nightlies=true" if nightlies
       url

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/support/install_command.ps1

@@ -3,8 +3,11 @@ Function Check-UpdateChef($root, $version) {
   elseif ("$version" -eq "true") { return $false }
   elseif ("$version" -eq "latest") { return $true }
 
-  Try { $chef_version = (& $root\bin\chef-solo.bat -v).split(" ", 2)[1] }
-  Catch { $chef_version = "" }
+  Try { $chef_version = Get-Content $root\version-manifest.txt | select-object -1}
+  Catch {
+    Try { $chef_version = (& $root\bin\chef-solo.bat -v).split(" ", 2)[1] }
+    Catch { $chef_version = "" }
+  }
 
   if ($chef_version.StartsWith($version)) { return $false }
   else { return $true }
@@ -26,16 +29,15 @@ Function Get-MD5Sum($src) {
   } Finally { if (($c -ne $null) -and ($c.GetType().GetMethod("Dispose") -ne $null)) { $c.Dispose() }; if ($in -ne $null) { $in.Dispose() } }
 }
 
-Function Download-Chef($md_url, $dst) {
-  $url, $md5 = Get-ChefMetadata $md_url
-
+Function Download-Chef($url, $md5, $dst) {
   Try {
     Log "Downloading package from $url"
     ($c = Make-WebClient).DownloadFile($url, $dst)
     Log "Download complete."
   } Finally { if ($c -ne $null) { $c.Dispose() } }
 
-  if (($dmd5 = Get-MD5Sum $dst) -eq $md5) { Log "Successfully verified $dst" }
+  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" }
 }
 
@@ -69,7 +71,13 @@ $msi = Unresolve-Path $msi
 
 if (Check-UpdateChef $chef_omnibus_root $version) {
   Write-Host "-----> Installing Chef Omnibus ($pretty_version)`n"
-  Download-Chef "$chef_metadata_url" $msi
+  if ($chef_metadata_url -ne $null) {
+    $url, $md5 = Get-ChefMetadata "$chef_metadata_url"
+  } else {
+    $url = $chef_msi_url
+    $md5 = $null
+  }
+  Download-Chef "$url" $md5 $msi
   Install-Chef $msi
 } else {
   Write-Host "-----> Chef Omnibus installation detected ($pretty_version)`n"

data/support/install_command.sh

@@ -172,13 +172,22 @@ should_update_chef() {
     return 0;
   fi
 
-  chef_version="`${1}/bin/chef-solo -v | cut -d \" \" -f 2`";
+  if test -f "${1}/version-manifest.txt"; then
+    chef_version="`head -n 1 ${1}/version-manifest.txt | cut -d \" \" -f 2`";
+  else
+    chef_version="`${1}/bin/chef-solo -v | cut -d \" \" -f 2`";
+  fi
 
   echo "$chef_version" | grep "^${2}" 2>&1 >/dev/null;
   if test $? -eq 0; then
     return 1;
   else
-    return 0;
+    echo "${2}" | grep "^$chef_version" 2>&1 >/dev/null;
+    if test $? -eq 0; then
+      return 1;
+    else
+      return 0;
+    fi
   fi
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Thom May
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,3 +98,4 @@ signing_key:
 specification_version: 4
 summary: A mixin to help with omnitruck installs
 test_files: []
+has_rdoc: