mixlib-install 2.1.6 → 2.1.7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [2.1.7]
+- Add support for passing arguments to the MSI in install scripts
+- Add platform version compatibility support for Windows (including desktop versions)
+- Enable platform version compatibility option by default for the cli
+
 ## [2.1.6]
 - Add `User-Agent` headers to all download requests
 - CLI UX improvements

data/ci/before-script.sh

@@ -3,7 +3,7 @@
 set -evx
 
 # Don't run acceptance tests on forks. The decryption keys are not available.
-if [ "${TRAVIS_REPO_SLUG}" = "chef/mixlib-install" ]; then
+if [ "${CHEF_ACCEPTANCE}" = "true" ] && [[ $encrypted_e2edbb28e76c_key ]]; then
 
   # download terraform
   wget "https://releases.hashicorp.com/terraform/0.7.4/terraform_0.7.4_linux_amd64.zip"

data/ci/run-acceptance-tests.sh

@@ -3,7 +3,7 @@
 set -evx
 
 # Don't run acceptance tests on forks. The decryption keys are not available.
-if [ "${CHEF_ACCEPTANCE}" = "true" ] && [ "${TRAVIS_REPO_SLUG}" = "chef/mixlib-install" ]; then
+if [ "${CHEF_ACCEPTANCE}" = "true" ] && [[ $encrypted_e2edbb28e76c_key ]]; then
   # setup acceptance tests
   cd acceptance
   export BUNDLE_GEMFILE=$PWD/Gemfile

data/lib/mixlib/install/backend/base.rb

@@ -94,18 +94,19 @@ module Mixlib
           artifacts.each do |a|
             return a if a.platform_version == options.platform_version
 
-            # We skip the artifacts produced for windows since their platform
-            # version is always set to 2008r2 which breaks our `to_f` comparison.
-            next if a.platform == "windows"
-
             # Calculate the closest compatible version.
             # For an artifact to be compatible it needs to be smaller than the
             # platform_version specified in options.
             # To find the closest compatible one we keep a max of the compatible
             # artifacts.
+
+            # Remove "r2" from artifacts produced for windows since platform
+            # versions with that ending break `to_f` comparisons.
+            current_platform_version = a.platform_version.chomp("r2").to_f
+
             if closest_compatible_artifact.nil? ||
-                (a.platform_version.to_f > closest_compatible_artifact.platform_version.to_f &&
-                  a.platform_version.to_f < options.platform_version.to_f )
+                (current_platform_version > closest_compatible_artifact.platform_version.to_f &&
+                  current_platform_version < options.platform_version.to_f )
               closest_compatible_artifact = a
             end
           end

data/lib/mixlib/install/cli.rb

@@ -36,6 +36,12 @@ module Mixlib
         default: "x86_64",
         aliases: ["-a"],
         enum: Mixlib::Install::Options::SUPPORTED_ARCHITECTURES.map(&:to_s)
+      option :platform_version_compat,
+        desc: "Enable or disable platform version compatibility mode.
+This will match the closest earlier version if the passed version is unavailable.
+If no earlier version is found the earliest version available will be set.",
+        type: :boolean,
+        default: true
       option :url,
         desc: "Print download URL without downloading the file",
         type: :boolean
@@ -48,6 +54,7 @@ module Mixlib
           channel: options[:channel].to_sym,
           product_name: product_name,
           product_version: options[:version],
+          platform_version_compatibility_mode: options[:platform_version_compat],
         }
 
         # Set platform info or auto detect platform
@@ -59,6 +66,7 @@ module Mixlib
           mixlib_install_options[:platform_version] = options[:platform_version]
           mixlib_install_options[:architecture] = options[:architecture]
         else
+
           mixlib_install_options.merge!(Mixlib::Install.detect_platform)
         end
 

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

@@ -42,7 +42,10 @@ function Install-Project {
     $nightlies,
     [validateset('auto', 'i386', 'x86_64')]
     [string]
-    $architecture = 'auto'
+    $architecture = 'auto',
+    [validateset('auto', 'service', 'task')]
+    [string]
+    $daemon = 'auto'
   )
 
   $package_metadata = Get-ProjectMetadata -project $project -channel $channel -version $version -prerelease:$prerelease -nightlies:$nightlies -architecture $architecture
@@ -89,7 +92,7 @@ function Install-Project {
           $result = Install-ChefAppx $download_destination $project
         }
         else {
-          $result = Install-ChefMsi $download_destination
+          $result = Install-ChefMsi $download_destination $daemon
         }
         if(!$result) { continue }
         $installingProject = $False
@@ -102,8 +105,17 @@ function Install-Project {
 }
 set-alias install -value Install-Project
 
-Function Install-ChefMsi($msi) {
-  $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait
+Function Install-ChefMsi($msi, $addlocal) {
+  if ($addlocal -eq "service") {
+    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi ADDLOCAL=`"ChefServiceFeature`"" -Passthru -Wait
+  }
+  ElseIf ($addlocal -eq "task") {
+    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi ADDLOCAL=`"ChefSchTaskFeature`"" -Passthru -Wait
+  }
+  ElseIf ($addlocal -eq "auto") {
+    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait
+  }
+
   $p.WaitForExit()
   if ($p.ExitCode -eq 1618) {
     Write-Host "Another msi install is in progress (exit code 1618), retrying ($($installAttempts))..."

data/lib/mixlib/install/options.rb

@@ -61,6 +61,8 @@ module Mixlib
       def initialize(options)
         @options = options
 
+        map_windows_desktop_versions! if for_windows?
+
         validate!
       end
 
@@ -91,6 +93,7 @@ module Mixlib
       def for_ps1?
         platform == "windows" || shell_type == :ps1
       end
+      alias_method :for_windows?, :for_ps1?
 
       def latest_version?
         product_version.to_sym == :latest
@@ -174,6 +177,25 @@ Must be one of: #{SUPPORTED_SHELL_TYPES.join(", ")}
 
         error
       end
+
+      def map_windows_desktop_versions!
+        # This logic does not try to compare and determine proper versions based on conditions or ranges.
+        # These are here to improve UX for older desktop versions.
+        options[:platform_version] = case platform_version
+                                     when /^10/
+                                       "2016"
+                                     when /^6.3/, /^8.1/
+                                       "2012r2"
+                                     when /^6.2/, /^8/
+                                       "2012"
+                                     when /^6.1/, /^7/
+                                       "2008r2"
+                                     when /^6/
+                                       "2008"
+                                     else
+                                       platform_version
+                                     end
+      end
     end
   end
 end

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "2.1.6"
+    VERSION = "2.1.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -220,6 +220,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.html
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -309,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A mixin to help with omnitruck installs