mixlib-install 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa42309e20d7a5b06a3874e1cb4d471892a2cb8
-  data.tar.gz: 70ff1f55118f8f2c6094315b03657b826af4fcbc
+  metadata.gz: 40fa6c0a0b63502b8c38218361ecff0c041ebbd7
+  data.tar.gz: e151caa4b979c2e561c5520d860bfc4e0f544e9a
 SHA512:
-  metadata.gz: dd1a93974bb5129e86251a25c720a6e9b76229fb5bf77c7d609ace656287884c6783fb2389a474d1d0c0ff72be6cde03fe6b3c178f00128953630a0b207830f3
-  data.tar.gz: f924da9ad408db2f7f90c0dd8fa9fa23b31556acfd2bd07453a431361ee4792d2717e722a2c071ad4eb86681be1a173856dd694ce829ca0aac10d2b698deb70e
+  metadata.gz: 4441ee64cfed4d6cc63ccf209def59e4f3866393b389d9cbd70c3211a7332e1d4b664a1e21ed972b6062d3bf423ec16686c18efb92dee48803d8f3c05726efcb
+  data.tar.gz: 8f7c097bd4c36ab4474dec1007d82da49b02d015be101575348cca832ed503e6063b5123ed3536c78cc9ac9779234859dd8283678d88841a8bfc67926649c7a3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [2.1.8]
+- Query performance optimizations
+- Add ChefClientFeature support to the MSI install script
+
 ## [2.1.7]
 - Add support for passing arguments to the MSI in install scripts
 - Add platform version compatibility support for Windows (including desktop versions)

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

@@ -47,10 +47,23 @@ module Mixlib
         end
 
         #
-        # Gets available versions from Artifactory via AQL.
+        # Gets available versions from Artifactory via AQL. Returning
+        # simply the list of versions.
         #
         # @return [Array<String>] Array of available versions
         def available_versions
+          # We are only including a single property, version and that exists
+          # under the properties in the following structure:
+          # "properties" => [ {"key"=>"omnibus.version", "value"=>"12.13.3"} ]
+          ver_list = versions.map { |i| extract_version_from_response(i) }
+          ver_list.uniq
+        end
+
+        #
+        # Get available versions from Artifactory via AQL. Returning the full API response
+        #
+        # @return [Array<Array<Hash>] Build records for available versions
+        def versions
           items = get("/api/v1/#{options.channel}/#{omnibus_project}/versions")["results"]
 
           # Filter out the partial builds if we are in :unstable channel
@@ -63,12 +76,7 @@ module Mixlib
             # populated with the build record if "artifact.module.build" exists.
             items.reject! { |i| i["artifacts"].nil? }
           end
-
-          # We are only including a single property, version and that exists
-          # under the properties in the following structure:
-          # "properties" => [ {"key"=>"omnibus.version", "value"=>"12.13.3"} ]
-          items.map! { |i| i["properties"].first["value"] }
-          items.uniq
+          items
         end
 
         #
@@ -79,7 +87,7 @@ module Mixlib
           # Get the list of builds from the REST api.
           # We do this because a user in the readers group does not have
           # permissions to run aql against builds.
-          builds = get("/api/v1/build/#{omnibus_project}")
+          builds = versions
 
           if builds.nil?
             raise NoArtifactsError, <<-MSG
@@ -87,30 +95,15 @@ Can not find any builds for #{options.product_name} in #{endpoint}.
             MSG
           end
 
-          # Output we get is something like:
-          # {
-          #   "buildsNumbers": [
-          #     {"uri"=>"/12.5.1+20151213083009", "started"=>"2015-12-13T08:40:19.238+0000"},
-          #     {"uri"=>"/12.6.0+20160111212038", "started"=>"2016-01-12T00:25:35.762+0000"},
-          #     ...
-          #   ]
-          # }
-          # First we sort based on started
-          builds["buildsNumbers"].sort_by! { |b| b["started"] }.reverse!
-
-          # Now check if the build is in the requested channel or not
-          # Note that if you do this for any channel other than :unstable
-          # it will run a high number of queries but it is fine because we
-          # are using artifactory only for :unstable channel
-          builds["buildsNumbers"].each do |build|
-            version = build["uri"].delete("/")
-            artifacts = artifacts_for_version(version)
-
-            return artifacts unless artifacts.empty?
-          end
+          # Sort by created data
+          # TODO: Shouldn't we sort by version?
+          builds.sort_by! { |b| b["created"] }.reverse!
+          version = extract_version_from_response(builds.first)
+          artifacts_for_version(version)
+        end
 
-          # we could not find any matching artifacts
-          []
+        def extract_version_from_response(response)
+          response["properties"].find { |item| item["key"] == "omnibus.version" }["value"]
         end
 
         #
@@ -149,9 +142,7 @@ Can not find any builds for #{options.product_name} in #{endpoint}.
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = (uri.scheme == "https")
           full_path = File.join(uri.path, url)
-
           res = http.request(create_http_request(full_path))
-
           res.value
           JSON.parse(res.body)
         end

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

@@ -107,10 +107,10 @@ set-alias install -value Install-Project
 
 Function Install-ChefMsi($msi, $addlocal) {
   if ($addlocal -eq "service") {
-    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi ADDLOCAL=`"ChefServiceFeature`"" -Passthru -Wait
+    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi ADDLOCAL=`"ChefClientFeature,ChefServiceFeature`"" -Passthru -Wait
   }
   ElseIf ($addlocal -eq "task") {
-    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi ADDLOCAL=`"ChefSchTaskFeature`"" -Passthru -Wait
+    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi ADDLOCAL=`"ChefClientFeature,ChefSchTaskFeature`"" -Passthru -Wait
   }
   ElseIf ($addlocal -eq "auto") {
     $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait

data/lib/mixlib/install/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory