mixlib-install 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da86da1678b6aef5defbe82060f7476caa1f62e7
-  data.tar.gz: fad6d57bd932742b690beaed6d1dba6f5f2061eb
+  metadata.gz: f4bbebe8c34d32ee85913bbc2909706b61eae0c1
+  data.tar.gz: 8bacb078f62eac0966167958adb11042aec45790
 SHA512:
-  metadata.gz: bdf236b22604381394f24df9d0182eb2881ffc6964e2879ab5c3d20c8b21a494ec8cc2b1eb38460fc762cd0bf449986ce6c68ed1fd847b75caa70326834ac983
-  data.tar.gz: 4d5d547af2ad2429a35a327cb3f8680277c43973ce0dded009767780c128dc5a47e8e0e8b32582be9dfe2aca98e2fdfa22110b78cda24a21d4c946f6cce51ac0
+  metadata.gz: 3b614b75aa5bafd8f8f75b472628f4a452a2c343d83df7738c1b5c02eceb615cf7fcc4bc50ccf01d7110551db7c84ea384c0571e9783195d309a01e5ea751177
+  data.tar.gz: 6921b10c9c5d86b4cecd87ac2ddd88c319d115684d7afa8d6fa76973bf01ef8d9dd009beae092511b27698a07ca6380df86a154fd65c6fe79d9617e046d599f6

data/CHANGELOG.md

@@ -1,13 +1,10 @@
 # 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.2]
+### Added
+- Use 32 bit windows artifacts for 64-bit, when there is no 64-bit native artifact.
 
-## [1.0.1] - 2016-03-31
+## [1.0.1]
 ### Fixed
 - detect_platform method for Windows
 
@@ -16,11 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - wait for msiexec to exit
 - Replace md5sum checks with sha256 checks in install_command.ps1
 
-## [1.0.0] - 2016-03-30
+## [1.0.0]
 ### 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/artifact_info.rb

@@ -74,6 +74,10 @@ module Mixlib
           architecture: architecture,
         }
       end
+
+      def clone_with(data)
+        ArtifactInfo.new(self.to_hash.merge(data))
+      end
     end
   end
 end

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

@@ -126,7 +126,43 @@ module Mixlib
           end
 
           # Convert results to build records
-          results.map { |a| create_artifact(a) }
+          results.map! { |a| create_artifact(a) }
+
+          windows_artifact_fixup!(results)
+        end
+
+        # 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.
+        def windows_artifact_fixup!(artifacts)
+          new_artifacts = [ ]
+          native_artifacts = [ ]
+
+          artifacts.each do |r|
+            next if r.platform != "windows"
+
+            # Store all native 64-bit artifacts and clone 32-bit artifacts to
+            # be used as 64-bit.
+            case r.architecture
+            when "i386"
+              new_artifacts << r.clone_with(architecture: "x86_64")
+            when "x86_64"
+              native_artifacts << r.clone
+            else
+              puts "Unknown architecture '#{r.architecture}' for windows."
+            end
+          end
+
+          # Now discard the cloned artifacts if we find an equivalent native
+          # artifact
+          native_artifacts.each do |r|
+            new_artifacts.delete_if do |x|
+              x.platform_version == r.platform_version
+            end
+          end
+
+          # add the remaining cloned artifacts to the original set
+          artifacts += new_artifacts
         end
 
         #

data/lib/mixlib/install/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Thom May