mixlib-install 2.1.10 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33aae15f046862d9ff419e37d41aaa29b81d6c6d
-  data.tar.gz: fdc1c8caca3ae66346623fd46021ddb6f42b3180
+  metadata.gz: 78100fdfcf4f2f4138a8c837ce334bfbb812f589
+  data.tar.gz: 4cc8e261d9e76e6fbacb66948b7c2013902c29cb
 SHA512:
-  metadata.gz: 83ce80b409838a649904703c165dc194e4749789df457172141fc39c089590f830fcf6b30c2e97d1d6c703a117209b0e7875ab1441950874b7c56b786baf29b6
-  data.tar.gz: 3c866560cf575ec0314a9495689194d913b775a341ec31ba4250358fd704894df0afd2d872f4e9917136156c7bd9af84615ecea1505a8c5c0d62ef4c1255e10a
+  metadata.gz: 1c49e9e1d76860d6f046f8802787afb24c5f43dfd68282790159af34fe7d97696cfacdbf93b5771e2f75c6564905b09c0f3046ef6fac57dc9f47d0de55b311c4
+  data.tar.gz: d3294be5f080deb190f45c2081e59feea6e8f5d2a6267278cc5fa8626e4addcd28e0b3979cc2f2823b8578829447d4faf74efea75b7d7db723fe256983e0c551

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [2.1.11]
+- Fix ScriptGenerator install script to use proper platform detection for Windows artifacts
+- Artifact metadata now includes supported Windows Desktop versions
+
 ## [2.1.10]
 - Backward and forward compatibility support for `automate` and `delivery` product versions.
 

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

@@ -16,12 +16,18 @@
 # limitations under the License.
 #
 
+require "mixlib/install/util"
+
 module Mixlib
   class Install
     class Backend
       class Base
+        class UnsupportedVersion < ArgumentError; end
+
         attr_reader :options
 
+        SUPPORTED_WINDOWS_DESKTOP_VERSIONS = %w{7 8 8.1 10}
+
         def initialize(options)
           @options = options
         end
@@ -124,6 +130,9 @@ module Mixlib
         # On windows, if we do not have a native 64-bit package available
         # in the discovered artifacts, we will make 32-bit artifacts available
         # for 64-bit architecture.
+        #
+        # We also create new artifacts for windows 7, 8, 8.1 and 10
+        #
         def windows_artifact_fixup!(artifacts)
           new_artifacts = [ ]
           native_artifacts = [ ]
@@ -143,6 +152,26 @@ module Mixlib
             end
           end
 
+          # Grab windows artifact for each architecture so we don't have to manipulate
+          # the architecture extension in the filename of the url which changes based on product.
+          # Don't want to deal with that!
+          artifact_64 = artifacts.find { |a| a.platform == "windows" && a.architecture == "x86_64" }
+          artifact_32 = artifacts.find { |a| a.platform == "windows" && a.architecture == "i386" }
+
+          # Attempt to clone windows artifacts only when a Windows 32 bit artifact exists
+          if artifact_32
+            new_artifacts.concat(clone_windows_desktop_artifacts(artifact_32))
+
+            # Clone an existing 64 bit artifact
+            if artifact_64
+              new_artifacts.concat(clone_windows_desktop_artifacts(artifact_64))
+
+            # Clone the 32 bit artifact when 64 bit doesn't exist
+            else
+              new_artifacts.concat(clone_windows_desktop_artifacts(artifact_32, architecture: "x86_64"))
+            end
+          end
+
           # Now discard the cloned artifacts if we find an equivalent native
           # artifact
           native_artifacts.each do |r|
@@ -195,6 +224,39 @@ module Mixlib
             architecture
           end
         end
+
+        private
+
+        #
+        # Custom map Chef's supported windows desktop versions to the server versions we currently build
+        # See https://docs.chef.io/platforms.html
+        #
+        def map_custom_windows_desktop_versions(desktop_version)
+          unless SUPPORTED_WINDOWS_DESKTOP_VERSIONS.include?(desktop_version)
+            raise UnsupportedVersion, "Unsupported Windows desktop version `#{desktop_version}`. Supported versions: #{SUPPORTED_WINDOWS_DESKTOP_VERSIONS.join(", ")}."
+          end
+
+          server_version = Util.map_windows_desktop_version(desktop_version)
+
+          # Windows desktop 10 officially maps to server 2016.
+          # However, we don't test on server 2016 at this time, so we default to 2012r2
+          server_version = "2012r2" if server_version == "2016"
+
+          server_version
+        end
+
+        #
+        # Clone all supported Windows desktop artifacts from a base artifact
+        # options hash allows overriding any valid attribute
+        #
+        def clone_windows_desktop_artifacts(base_artifact, options = {})
+          SUPPORTED_WINDOWS_DESKTOP_VERSIONS.collect do |dv|
+            options[:platform_version] = dv
+            options[:url] = base_artifact.url.gsub("\/#{base_artifact.platform_version}\/", "\/#{map_custom_windows_desktop_versions(dv)}\/")
+
+            base_artifact.clone_with(options)
+          end
+        end
       end
     end
   end

data/lib/mixlib/install/options.rb

@@ -17,6 +17,7 @@
 #
 
 require "mixlib/install/product"
+require "mixlib/install/util"
 require "mixlib/versioning"
 
 module Mixlib
@@ -179,22 +180,7 @@ Must be one of: #{SUPPORTED_SHELL_TYPES.join(", ")}
       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
+        options[:platform_version] = Util.map_windows_desktop_version(platform_version)
       end
     end
   end

data/lib/mixlib/install/script_generator.rb

@@ -18,6 +18,7 @@
 #
 
 require "mixlib/install/util"
+require "mixlib/install/generator/powershell"
 require "cgi"
 
 module Mixlib
@@ -171,8 +172,23 @@ module Mixlib
           %w{.. .. .. support},
           "install_command"
         )
-        Util.shell_code_from_file(vars, fn, powershell,
-                                  http_proxy: http_proxy, https_proxy: https_proxy)
+        code = Util.shell_code_from_file(
+          vars, fn, powershell,
+          http_proxy: http_proxy, https_proxy: https_proxy
+        )
+        powershell ? powershell_prefix.concat(code) : code
+      end
+
+      # Prefixes the PowerShell install script with helpers and shell vars
+      # to detect the platform version and architecture.
+      #
+      # @return [String] PowerShell helpers and shell vars for platform info
+      def powershell_prefix
+        [
+          Mixlib::Install::Generator::PowerShell.get_script("helpers.ps1"),
+          "$platform_architecture = Get-PlatformArchitecture",
+          "$platform_version = Get-PlatformVersion",
+        ].join("\n")
       end
 
       # Builds a shell variable assignment string for the required shell type.
@@ -200,7 +216,7 @@ module Mixlib
                end
 
         url = "#{base}#{endpoint}"
-        url << "?p=windows&m=x86_64&pv=2008r2" # same package for all versions
+        url << "?p=windows&m=$platform_architecture&pv=$platform_version"
         url << "&v=#{CGI.escape(version)}" unless %w{latest true nightlies}.include?(version)
         url << "&prerelease=true" if prerelease
         url << "&nightlies=true" if nightlies

data/lib/mixlib/install/util.rb

@@ -129,6 +129,25 @@ module Mixlib
           # Ensure that if the default user agent is aleady set it doesn't get duplicated
           user_agents.flatten.compact.uniq.join(" ")
         end
+
+        def map_windows_desktop_version(version)
+          # This logic does not try to compare and determine proper versions based on conditions or ranges.
+          # These are here to improve UX for desktop versions.
+          case version
+          when /^10/
+            "2016"
+          when /^6.3/, /^8.1/
+            "2012r2"
+          when /^6.2/, /^8/
+            "2012"
+          when /^6.1/, /^7/
+            "2008r2"
+          when /^6/
+            "2008"
+          else
+            version
+          end
+        end
       end
     end
   end

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "2.1.10"
+    VERSION = "2.1.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.1.11
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -220,7 +220,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- CHANGELOG.html
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -290,7 +289,6 @@ files:
 - mixlib-install.gemspec
 - support/install_command.ps1
 - support/install_command.sh
-- terraform_0.7.4_linux_amd64.zip
 homepage: https://chef.io
 licenses:
 - Apache-2.0