mixlib-install 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0af20fe8cef0f2c9e3b55eaff4c7c36add075d5
-  data.tar.gz: 81fbbba78d8ac828c86c2e41adc61db3d0f9475f
+  metadata.gz: af96827b91f93939e6376192d760548132394e7e
+  data.tar.gz: 39e849c94aebecb08b7f0f5e4328aeb8a45cb038
 SHA512:
-  metadata.gz: d6ed09120e13ddd6bb012b9ba981c9e4e134ce281b4cffff2d1d665b0421775c5c9f2ee150ebe2ffc700411406d7e4cff9d1d1cea0d3f9c2fd4df0e5ef8584b1
-  data.tar.gz: cbb47489c619ad045f36c518003ff886d7889054896a69f1abf92792b47c2ae798aac9d87ceef09cb3c86d2bdf787fe33707924a453bfea91c2d5f3d0e4b5fd4
+  metadata.gz: 0cb34501343fb8891d181076ef8c213d034cdcbad866fc758754fdf24830883660bbca4c77282b0006118d48f1c22748a74ec6aba3935482349ed0fe446ed8af
+  data.tar.gz: 7320f109233968d75a508f959fc3a5c71964c40eb7921563dd21a5c1cf353ed5a2a8103e04b2770755d1e05981c356f7504a5948c4eb9229453250cffceb656c

data/.travis.yml

@@ -3,6 +3,5 @@ sudo: false
 rvm:
   - 2.2
   - 2.1
-  - 1.9.3
 
 script: bundle exec rake ci

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [1.2.0]
+- Fix omnibus project mappings
+- Add `available_versions` method to API
+- Add `chef-automate` product
+- Add install support for Arista EOS
+- Add p5p package support
+- Add s390x architecture support
+- Add Nano support
+
 ## [1.1.0]
 - Remove delivery-cli from Product Matrix since we are now shipping it within ChefDK
 

data/Gemfile

@@ -1,5 +1,3 @@
 source "https://rubygems.org"
 
-gem "chefstyle", github: "chef/chefstyle"
-
 gemspec

data/PRODUCT_MATRIX.md

@@ -3,6 +3,7 @@
 | Analytics Platform | analytics |
 | Angry Omnibus Toolchain | angry-omnibus-toolchain |
 | Angry Chef Client | angrychef |
+| Chef Automate | automate |
 | Chef Client | chef |
 | Chef Backend | chef-backend |
 | Chef Server | chef-server |
@@ -15,7 +16,7 @@
 | Chef Cloud Marketplace addon | marketplace |
 | Omnibus Toolchain | omnibus-toolchain |
 | Enterprise Chef (legacy) | private-chef |
-| Chef Push Server | push-jobs-client |
+| Chef Push Client | push-jobs-client |
 | Chef Push Server | push-jobs-server |
 | Chef Server Reporting addon | reporting |
 | Supermarket | supermarket |

data/README.md

@@ -67,9 +67,28 @@ artifact.platform # => "ubuntu"
 artifact.platform_version # => "14.04"
 ```
 
+### List the available versions for a product and channel
+```ruby
+# Note that this feature currently only works for :unstable channel
+options = {
+  channel: :unstable,
+  product_name: 'chef',
+}
+
+Mixlib::Install.new(options).available_versions
+
+# => ["12.13.3", "12.13.7", "12.13.8+20160721014124", "12.13.11+20160721165202"]
+```
+
 ## Unstable channel
 The `:unstable` channel is currently only available when connected to Chef's internal network.
 
+## Feature Flags
+
+Below are the environment variables you can set to tune certain aspects of mixlib-install. They enable some features that are currently under development. You should use these features with care.
+
+`MIXLIB_INSTALL_UNIFIED_BACKEND` => Enables unified backend feature which uses Artifactory backend for all available channels.
+
 ## Development
 Since mixlib-install needs to interact with Bintray and Artifactory and since Artifactory instances are only available in Chef's network, this project uses [vcr](https://github.com/vcr/vcr).
 

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-task default: :test
+task default: :ci
 
 desc "Run specs"
 RSpec::Core::RakeTask.new(:spec) do |spec|
@@ -18,11 +18,21 @@ rescue LoadError
   puts "chefstyle/rubocop is not available.  gem install chefstyle to do style checking."
 end
 
+desc "Run specs for unified_backend (artifactory)"
+task :unified_backend do
+  ENV["MIXLIB_INSTALL_UNIFIED_BACKEND"] = "true"
+  ENV["ARTIFACTORY_ENDPOINT"] = "https://packages-acceptance.chef.io"
+  Rake::Task["spec"].reenable
+  Rake::Task["spec"].invoke
+  ENV.delete "MIXLIB_INSTALL_UNIFIED_BACKEND"
+  ENV.delete "ARTIFACTORY_ENDPOINT"
+end
+
 desc "Run all tests"
-task test: [:style, :spec]
+task test: [:style, :spec, :unified_backend]
 
 desc "Run tests for Travis CI"
-task ci: [:style, :spec]
+task ci: [:style, :spec, :unified_backend]
 
 desc "Render product matrix documentation"
 task "matrix" do
@@ -42,3 +52,11 @@ task "matrix" do
     f.puts("Do not modify this file manually. It is automatically rendered via a rake task.")
   end
 end
+
+task :console do
+  require "irb"
+  require "irb/completion"
+  require "mixlib/install"
+  ARGV.clear
+  IRB.start
+end

data/lib/mixlib/install.rb

@@ -46,6 +46,15 @@ module Mixlib
       Backend.info(options)
     end
 
+    #
+    # List available versions
+    #
+    # @return [Array<String>] list of available versions for the given
+    # product_name and channel.
+    def available_versions
+      Backend.available_versions(options)
+    end
+
     #
     # Returns an install script for the given options
     #
@@ -174,5 +183,13 @@ module Mixlib
     def self.install_ps1(context = {})
       Mixlib::Install::Generator::PowerShell.install_ps1(context)
     end
+
+    #
+    # Returns if unified_backend feature flag for mixlib-install is enabled
+    #
+    # @return [Boolean] true if feature is enabled, false otherwise.
+    def self.unified_backend?
+      !ENV["MIXLIB_INSTALL_UNIFIED_BACKEND"].nil?
+    end
   end
 end

data/lib/mixlib/install/backend.rb

@@ -22,14 +22,20 @@ require "mixlib/install/backend/bintray"
 module Mixlib
   class Install
     class Backend
+      def self.available_versions(options)
+        backend(options).available_versions
+      end
+
       def self.info(options)
-        backend = if options.for_artifactory?
-                    Backend::Artifactory.new(options)
-                  else
-                    Backend::Bintray.new(options)
-                  end
+        backend(options).info
+      end
 
-        backend.info
+      def self.backend(options)
+        if options.for_artifactory?
+          Backend::Artifactory.new(options)
+        else
+          Backend::Bintray.new(options)
+        end
       end
     end
   end

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

@@ -43,11 +43,45 @@ module Mixlib
         # @return [Array<ArtifactInfo>] list of artifacts for the configured
         # channel, product name, and product version.
         def available_artifacts
-          if options.latest_version?
-            artifactory_latest
-          else
-            artifactory_artifacts(options.product_version)
+          artifacts = if options.latest_version?
+                        artifactory_latest
+                      else
+                        artifactory_artifacts(options.product_version)
+                      end
+
+          windows_artifact_fixup!(artifacts)
+        end
+
+        #
+        # Gets available versions from Artifactory via AQL.
+        #
+        # @return [Array<String>] Array of available versions
+        def available_versions
+          query = <<-QUERY
+items.find(
+  {"repo": "omnibus-#{options.channel}-local"},
+  {"@omnibus.project": "#{omnibus_project}"},
+  {"name": {"$nmatch": "*.metadata.json" }}
+).include("@omnibus.version", "artifact.module.build")
+QUERY
+          items = artifactory_query(query)
+
+          # Filter out the partial builds if we are in :unstable channel
+          # In other channels we do not need to do this since all builds are
+          # always complete. Infact we should not do this since for some arcane
+          # builds like Chef Client 10.X we do not have build record created in
+          # artifactory.
+          if options.channel == :unstable
+            # We check if "artifacts" field contains something since it is only
+            # 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
         end
 
         #
@@ -58,7 +92,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 = client.get("/api/build/#{package_name}")
+          builds = client.get("/api/build/#{omnibus_project}")
 
           if builds.nil?
             raise NoArtifactsError, <<-MSG
@@ -100,16 +134,19 @@ Can not find any builds for #{options.product_name} in #{::Artifactory.endpoint}
           results = artifactory_query(<<-QUERY
 items.find(
   {"repo": "omnibus-#{options.channel}-local"},
-  {"@omnibus.project": "#{package_name}"},
+  {"@omnibus.project": "#{omnibus_project}"},
   {"@omnibus.version": "#{version}"},
   {"name": {"$nmatch": "*.metadata.json" }}
 ).include("repo", "path", "name", "property")
           QUERY
           )
 
-          # Merge artifactory properties and downloadUri to a flat Hash
+          # Merge artifactory properties to a flat Hash
           results.collect! do |result|
-            { "downloadUri" => generate_download_uri(result) }.merge(
+            {
+              "artifactory_standard_path" => generate_artifactory_standard_path(result),
+              "filename" => result["name"],
+            }.merge(
               map_properties(result["properties"])
             )
           end
@@ -130,15 +167,42 @@ items.find(
           results["results"]
         end
 
+        #
+        # Artifactory GET request
+        #
+        def get(url)
+          results = artifactory_request do
+            client.get(url)
+          end
+
+          results["results"]
+        end
+
         def create_artifact(artifact_map)
+          platform, platform_version = normalize_platform(artifact_map["omnibus.platform"],
+            artifact_map["omnibus.platform_version"])
+
+          chef_standard_path = generate_chef_standard_path(options.channel,
+            platform,
+            platform_version,
+            artifact_map["filename"]
+          )
+
           ArtifactInfo.new(
             md5:              artifact_map["omnibus.md5"],
             sha256:           artifact_map["omnibus.sha256"],
+            sha1:             artifact_map["omnibus.sha1"],
             version:          artifact_map["omnibus.version"],
-            platform:         artifact_map["omnibus.platform"],
-            platform_version: artifact_map["omnibus.platform_version"],
-            architecture:     artifact_map["omnibus.architecture"],
-            url:              artifact_map["downloadUri"]
+            platform:         platform,
+            platform_version: platform_version,
+            architecture:     normalize_architecture(artifact_map["omnibus.architecture"]),
+            # Select what type of url we are going to display based on the enabled
+            # feature flags.
+            url:              if Mixlib::Install.unified_backend?
+                                chef_standard_path
+                              else
+                                artifact_map["artifactory_standard_path"]
+                              end
           )
         end
 
@@ -154,9 +218,20 @@ items.find(
           end
         end
 
-        # Construct the downloadUri from raw artifactory data
-        #
-        def generate_download_uri(result)
+        # Generates a chef standard download uri in the form of
+        # http://endpoint/channel/platform/platform_version/filename
+        def generate_chef_standard_path(channel, platform, platform_version, filename)
+          uri = []
+          uri << endpoint.sub(/\/$/, "")
+          uri << channel
+          uri << platform
+          uri << platform_version
+          uri << filename
+          uri.join("/")
+        end
+
+        # Generates an artifactory standard download uri
+        def generate_artifactory_standard_path(result)
           uri = []
           uri << endpoint.sub(/\/$/, "")
           uri << result["repo"]
@@ -196,8 +271,22 @@ the endpoint is correct and there is an open connection to Chef's private networ
           results
         end
 
-        def package_name
-          @package_name ||= PRODUCT_MATRIX.lookup(options.product_name, options.product_version).package_name
+        def omnibus_project
+          @omnibus_project ||= PRODUCT_MATRIX.lookup(options.product_name, options.product_version).omnibus_project
+        end
+
+        #
+        # Normalizes architecture information that we receive.
+        #
+        # @param [String] architecture
+        #
+        # @return String [architecture]
+        def normalize_architecture(architecture)
+          if %w{ sun4u sun4v }.include?(architecture)
+            architecture = "sparc"
+          end
+
+          architecture
         end
       end
     end

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

@@ -38,6 +38,20 @@ module Mixlib
           raise "Must implement available_artifacts method that returns Array<ArtifactInfo>"
         end
 
+        #
+        # Returns the list of available versions for a given product_name
+        # and channel.
+        #
+        # @abstract Subclasses should define this method.
+        #           Currently this method is only available in the Artifactory
+        #           subclass.
+        #
+        # @return Array<String>
+        #   List of available versions as strings.
+        def available_versions
+          raise "available_versions API is only available for Artifactory backend."
+        end
+
         #
         # See #filter_artifacts
         def info
@@ -106,6 +120,61 @@ module Mixlib
           return []
         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
+
+        #
+        # Normalizes platform and platform_version information that we receive.
+        # There are a few entries that we historically published
+        # that we need to normalize. They are:
+        #   * solaris -> solaris2 & 10 -> 5.10 for solaris.
+        #
+        # @param [String] platform
+        # @param [String] platform_version
+        #
+        # @return Array<String> [platform, platform_version]
+        def normalize_platform(platform, platform_version)
+          if platform == "solaris"
+            platform = "solaris2"
+
+            # Here platform_version is set to either 10 or 11 and we would like
+            # to normalize that to 5.10 and 5.11.
+            platform_version = "5.#{platform_version}"
+          end
+
+          [platform, platform_version]
+        end
       end
     end
   end

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

@@ -81,7 +81,7 @@ module Mixlib
         # @return [String] latest version value
         #
         def latest_version
-          result = bintray_get("#{options.channel}/#{options.product_name}/versions/_latest")
+          result = bintray_get("#{options.channel}/#{bintray_product_name}/versions/_latest")
           result["name"]
         end
 
@@ -93,11 +93,11 @@ module Mixlib
         def available_artifacts
           version = options.latest_version? ? latest_version : options.product_version
           begin
-            results = bintray_get("#{options.channel}/#{options.product_name}/versions/#{version}/files")
+            results = bintray_get("#{options.channel}/#{bintray_product_name}/versions/#{version}/files")
           rescue Net::HTTPServerException => e
             if e.message =~ /404 "Not Found"/
               raise VersionNotFound,
-                "Specified version (#{version}) not found for #{options.product_name} in #{options.channel} channel."
+                "Specified version (#{version}) not found for #{bintray_product_name} in #{options.channel} channel."
             else
               raise
             end
@@ -119,40 +119,6 @@ module Mixlib
           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
-
         #
         # Creates an instance of ArtifactInfo
         #
@@ -238,29 +204,6 @@ module Mixlib
           }
         end
 
-        #
-        # Normalizes platform and platform_version information that we receive
-        # from bintray. There are a few entries that we historically published
-        # that we need to normalize. They are:
-        #   * solaris -> solaris2 & 10 -> 5.10 for solaris.
-        #
-        # @param [String] platform
-        # @param [String] platform_version
-        #
-        # @return Array<String> [platform, platform_version]
-        def normalize_platform(platform, platform_version)
-          if platform == "solaris"
-            platform = "solaris2"
-
-            # Here platform_version is set to either 10 or 11 and we would like
-            # to normalize that to 5.10 and 5.11.
-
-            platform_version = "5.#{platform_version}"
-          end
-
-          [platform, platform_version]
-        end
-
         #
         # Determines the architecture for which a file is published from from
         # filename.
@@ -290,6 +233,8 @@ module Mixlib
             "powerpc"
           elsif %w{ sparc sun4u sun4v }.fuzzy_include?(filename)
             "sparc"
+          elsif %w{ s390x }.fuzzy_include?(filename)
+            "s390x"
           # Note that ppc64le should come before ppc64 otherwise our search
           # will think ppc64le matches ppc64. Ubuntu also calls it ppc64el.
           elsif %w{ ppc64le ppc64el }.fuzzy_include?(filename)
@@ -332,6 +277,21 @@ module Mixlib
               "architecture can not be determined for '#{filename}'"
           end
         end
+
+        private
+
+        #
+        # This is a temporary workaround until we move to the unified backend
+        # for all channels. Some products are published to Bintray using their
+        # Omnibus project name as opposed to their mixlib-install product key.
+        #
+        def bintray_product_name
+          if %w{automate}.include?(options.product_name)
+            PRODUCT_MATRIX.lookup(options.product_name).omnibus_project
+          else
+            options.product_name
+          end
+        end
       end
     end
   end

data/lib/mixlib/install/generator/bourne.rb

@@ -46,7 +46,9 @@ module Mixlib
           install_command << get_script("helpers.sh")
           install_command << render_variables
           install_command << get_script("platform_detection.sh")
-          if options.for_artifactory?
+          # Since omnitruck can not resolve unstable we need to inject direct
+          # urls for the packages here.
+          if options.for_unstable?
             install_command << artifactory_urls
           else
             install_command << get_script("fetch_metadata.sh")

data/lib/mixlib/install/generator/bourne/scripts/helpers.sh

@@ -304,6 +304,10 @@ install_file() {
       echo "installing with sh..."
       sh "$2"
       ;;
+    "p5p" )
+      echo "installing p5p package..."
+      pkg install -g "$2" $project
+      ;;
     *)
       echo "Unknown filetype: $1"
       report_bug

data/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh

@@ -96,6 +96,10 @@ elif test "x$os" = "xAIX"; then
   platform="aix"
   platform_version="`uname -v`.`uname -r`"
   machine="powerpc"
+elif test -f "/etc/Eos-release"; then
+  platform=arista_eos
+  platform_version=`awk '{print $4}' /etc/Eos-release`
+  machine="i386"
 elif test -f "/etc/os-release"; then
   . /etc/os-release
   if test "x$CISCO_RELEASE_INFO" != "x"; then

data/lib/mixlib/install/generator/powershell.rb

@@ -46,7 +46,9 @@ module Mixlib
         def install_command
           install_project_module = []
           install_project_module << get_script("helpers.ps1")
-          install_project_module << if options.for_artifactory?
+          # Since omnitruck can not resolve unstable we need to inject direct
+          # urls for the packages here.
+          install_project_module << if options.for_unstable?
                                       artifactory_urls
                                     else
                                       get_script("get_project_metadata.ps1")
@@ -73,7 +75,7 @@ module Mixlib
 
         def artifactory_urls
           get_script("get_project_metadata_for_artifactory.ps1",
-                     artifacts: artifacts)
+                     artifacts: Array(artifacts))
         end
 
         def artifacts
@@ -81,7 +83,7 @@ module Mixlib
         end
 
         def product_version
-          if options.for_artifactory?
+          if options.for_unstable?
             artifacts.first.version
           else
             options.product_version

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

@@ -1,16 +1,22 @@
 function Get-PlatformVersion {
-  switch -regex ((get-wmiobject win32_operatingsystem).version) {
-    '10\.0\.\d+' {$platform_version = '2012r2'}
+  switch -regex ((Get-WMIQuery win32_operatingsystem).version) {
+    '10\.0\.\d+' {$platform_version = '2016'}
     '6\.3\.\d+'  {$platform_version = '2012r2'}
     '6\.2\.\d+'  {$platform_version = '2012'}
     '6\.1\.\d+'  {$platform_version = '2008r2'}
     '6\.0\.\d+'  {$platform_version = '2008'}
   }
+
+  if(Test-Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Server\ServerLevels') {
+    $levels = Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Server\ServerLevels'
+    if($levels.NanoServer -eq 1) { $platform_version += 'nano' }
+  }
+
   return $platform_version
 }
 
 function Get-PlatformArchitecture {
-  if ((get-wmiobject win32_operatingsystem).osarchitecture -like '64-bit') {
+  if ((Get-WMIQuery win32_operatingsystem).osarchitecture -like '64-bit') {
     $architecture = 'x86_64'
   } else {
     $architecture = 'i386'
@@ -22,7 +28,8 @@ function New-Uri {
   param ($baseuri, $newuri)
 
   try {
-  new-object System.Uri $baseuri, $newuri
+    $base = new-object System.Uri $baseuri
+    new-object System.Uri $base, $newuri
   }
   catch [System.Management.Automation.MethodInvocationException]{
     Write-Error "$($_.exception.message)"
@@ -32,17 +39,13 @@ function New-Uri {
 
 function Get-WebContent {
   param ($uri, $filepath)
-  $proxy = New-Object -TypeName System.Net.WebProxy
-  $wc = new-object System.Net.WebClient
-  $proxy.Address = $env:http_proxy
-  $wc.Proxy = $proxy
 
   try {
-    if ([string]::IsNullOrEmpty($filepath)) {
-      $wc.downloadstring($uri)
+    if($PSVersionTable.PSEdition -eq 'Core') {
+      Get-WebContentOnCore $uri $filepath
     }
     else {
-      $wc.downloadfile($uri, $filepath)
+      Get-WebContentOnFullNet $uri $filepath
     }
   }
   catch {
@@ -56,17 +59,61 @@ function Get-WebContent {
   }
 }
 
+function Get-WebContentOnFullNet {
+  param ($uri, $filepath)
+
+  $proxy = New-Object -TypeName System.Net.WebProxy
+  $wc = new-object System.Net.WebClient
+  $proxy.Address = $env:http_proxy
+  $wc.Proxy = $proxy
+
+  if ([string]::IsNullOrEmpty($filepath)) {
+    $wc.downloadstring($uri)
+  }
+  else {
+    $wc.downloadfile($uri, $filepath)
+  }
+}
+
+function Get-WebContentOnCore {
+  param ($uri, $filepath)
+
+  $handler = New-Object System.Net.Http.HttpClientHandler
+  $client = New-Object System.Net.Http.HttpClient($handler)
+  $client.Timeout = New-Object System.TimeSpan(0, 30, 0)
+  $cancelTokenSource = [System.Threading.CancellationTokenSource]::new()
+  $responseMsg = $client.GetAsync([System.Uri]::new($uri), $cancelTokenSource.Token)
+  $responseMsg.Wait()
+  if (!$responseMsg.IsCanceled) {
+    $response = $responseMsg.Result
+    if ($response.IsSuccessStatusCode) {
+      if ([string]::IsNullOrEmpty($filepath)) {
+        $response.Content.ReadAsStringAsync().Result
+      }
+      else {
+        $downloadedFileStream = [System.IO.FileStream]::new($filepath, [System.IO.FileMode]::Create, [System.IO.FileAccess]::Write)
+        $copyStreamOp = $response.Content.CopyToAsync($downloadedFileStream)
+        $copyStreamOp.Wait()
+        $downloadedFileStream.Close()
+        if ($copyStreamOp.Exception -ne $null) {
+          throw $copyStreamOp.Exception
+        }
+      }
+    }
+  }
+}
+
 function Test-ProjectPackage {
   [cmdletbinding()]
   param ($Path, $Algorithm = 'SHA256', $Hash)
 
-  if (-not (get-command get-filehash))   {
+  if (-not (get-command get-filehash -ErrorAction 'SilentlyContinue')) {
     function disposable($o){($o -is [IDisposable]) -and (($o | get-member | foreach-object {$_.name}) -contains 'Dispose')}
     function use($obj, [scriptblock]$sb){try {& $sb} catch [exception]{throw $_} finally {if (disposable $obj) {$obj.Dispose()}} }
     function Get-FileHash ($Path, $Algorithm) {
       $Path = (resolve-path $path).providerpath
       $hash = @{Algorithm = $Algorithm; Path = $Path}
-      use ($c = New-Object -TypeName Security.Cryptography.SHA256Managed) {
+      use ($c = Get-SHA256Converter) {
         use ($in = (gi $path).OpenRead()) {
           $hash.Hash = ([BitConverter]::ToString($c.ComputeHash($in))).Replace("-", "").ToUpper()
         }
@@ -84,3 +131,23 @@ function Test-ProjectPackage {
   }
   return $Valid
 }
+
+function Get-SHA256Converter {
+  if($PSVersionTable.PSEdition -eq 'Core') {
+    [System.Security.Cryptography.SHA256]::Create()
+  }
+  else {
+    New-Object -TypeName Security.Cryptography.SHA256Managed
+  }
+}
+
+function Get-WMIQuery {
+  param ($class)
+
+  if(Get-Command -Name Get-CimInstance -ErrorAction SilentlyContinue) {
+    Get-CimInstance $class
+  }
+  else {
+    Get-WmiObject $class
+  }
+}

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

@@ -83,14 +83,15 @@ function Install-Project {
       $installingProject = $True
       $installAttempts = 0
       while ($installingProject) {
-        $p = Start-Process -FilePath "msiexec" -ArgumentList "/qn /i $download_destination" -Passthru -Wait
-        $p.WaitForExit()
-        if ($p.ExitCode -eq 1618) {
-          Write-Host "Another msi install is in progress (exit code 1618), retrying ($($installAttempts))..."
-          continue
-        } elseif ($p.ExitCode -ne 0) {
-          throw "msiexec was not successful. Received exit code $($p.ExitCode)"
+        $installAttempts++
+        $result = $false
+        if($download_destination.EndsWith(".appx")) {
+          $result = Install-ChefAppx $download_destination $project
         }
+        else {
+          $result = Install-ChefMsi $download_destination
+        }
+        if(!$result) { continue }
         $installingProject = $False
       }
     }
@@ -100,4 +101,39 @@ 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
+  $p.WaitForExit()
+  if ($p.ExitCode -eq 1618) {
+    Write-Host "Another msi install is in progress (exit code 1618), retrying ($($installAttempts))..."
+    return $false
+  } elseif ($p.ExitCode -ne 0) {
+    throw "msiexec was not successful. Received exit code $($p.ExitCode)"
+  }
+  return $true
+}
+
+Function Install-ChefAppx($appx, $project) {
+  Add-AppxPackage -Path $appx -ErrorAction Stop
+  $package = (Get-AppxPackage -Name $project).InstallLocation
+  $installRoot = "$env:SystemDrive/opscode"
+  $link = Join-Path $installRoot $project
+
+  # Remove link from a previous install
+  # There is currently a bug in removing symbolic links from Powershell
+  # so we use the fisher-price cmd shell to do it
+  if(Test-Path $link) {
+    cmd /c rmdir $link
+  }
+
+  if(!(Test-Path $installRoot)) {
+    New-Item -ItemType Directory -Path $installRoot
+  }
+  push-Location $installRoot
+  New-Item -ItemType SymbolicLink -Name $project -Target $package
+  Pop-Location
+  return $true
+}
+
 export-modulemember -function 'Install-Project','Get-ProjectMetadata' -alias 'install'

data/lib/mixlib/install/options.rb

@@ -71,11 +71,11 @@ module Mixlib
       end
 
       def for_artifactory?
-        ARTIFACTORY_CHANNELS.include?(channel)
+        Mixlib::Install.unified_backend? || ARTIFACTORY_CHANNELS.include?(channel)
       end
 
-      def for_bintray?
-        [:stable, :current].include?(channel)
+      def for_unstable?
+        channel == :unstable
       end
 
       def for_omnitruck?
@@ -109,6 +109,7 @@ module Mixlib
         {
           shell_type: :sh,
           platform_version_compatibility_mode: false,
+          product_version: :latest,
         }
       end
 

data/lib/mixlib/install/product.rb

@@ -66,6 +66,33 @@ module Mixlib
         end
       end
 
+      #
+      # Set omnibus_project when configured, otherwise fall back to
+      # package_name
+      #
+      def omnibus_project(value = nil)
+        if value.nil?
+          @omnibus_project || package_name
+        else
+          @omnibus_project = value
+        end
+      end
+
+      #
+      # Return all known omnibus project names for a product
+      #
+      def known_omnibus_projects
+        # iterate through min/max versions for all product names
+        # and collect the name for both versions
+        projects = %w{ 0.0.0 1000.1000.1000 }.collect do |v|
+          @version = v
+          omnibus_project
+        end
+        # remove duplicates and return multiple known names or return the single
+        # project name
+        projects.uniq || projects
+      end
+
       #
       # Sets or retrieves the version for the product. This is used later
       # when we are reading the value of a property if a Proc is specified
@@ -160,6 +187,13 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     package_name "angrychef"
   end
 
+  product "automate" do
+    product_name "Chef Automate"
+    package_name "delivery"
+    ctl_command "delivery-ctl"
+    config_file "/etc/delivery/delivery.rb"
+  end
+
   product "chef" do
     product_name "Chef Client"
     package_name "chef"
@@ -181,6 +215,7 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
         "chef-server-core"
       end
     end
+    omnibus_project "chef-server"
     ctl_command "chef-server-ctl"
     config_file "/etc/opscode/chef-server.rb"
   end
@@ -252,7 +287,7 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
   end
 
   product "push-jobs-client" do
-    product_name "Chef Push Server"
+    product_name "Chef Push Client"
     package_name do |v|
       v < version_for("1.3.0") ? "opscode-push-jobs-client" : "push-jobs-client"
     end

data/lib/mixlib/install/script_generator.rb

@@ -132,8 +132,7 @@ module Mixlib
       def install_command_vars_for_powershell
         [
           shell_var("chef_omnibus_root", root),
-          shell_var("msi", "$env:TEMP\\chef-#{version}.msi"),
-        ].tap { |vars|
+        ].tap do |vars|
           if install_msi_url
             vars << shell_var("chef_msi_url", install_msi_url)
           else
@@ -141,7 +140,7 @@ module Mixlib
             vars << shell_var("pretty_version", Util.pretty_version(version))
             vars << shell_var("version", version)
           end
-        }.join("\n")
+        end.join("\n")
       end
 
       def validate_opts!(opt)

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/mixlib-install.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rb-readline"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock", "~> 1.0"
+  spec.add_development_dependency "chefstyle", "~> 0.3"
 end

data/support/install_command.ps1

@@ -1,5 +1,5 @@
 Function Check-UpdateChef($root, $version) {
-  if (-Not (Test-Path $root)) { return $true }
+  if (-Not (Test-Path "$root\embedded")) { return $true }
   elseif ("$version" -eq "true") { return $false }
   elseif ("$version" -eq "latest") { return $true }
 
@@ -14,8 +14,7 @@ Function Check-UpdateChef($root, $version) {
 }
 
 Function Get-ChefMetadata($url) {
-  Try { $response = ($c = Make-WebClient).DownloadString($url) }
-  Finally { if ($c -ne $null) { $c.Dispose() } }
+  $response = Get-WebContent $url
 
   $md = ConvertFrom-StringData $response.Replace("`t", "=")
   return @($md.url, $md.sha256)
@@ -23,52 +22,154 @@ Function Get-ChefMetadata($url) {
 
 Function Get-SHA256($src) {
   Try {
-    $c = New-Object -TypeName System.Security.Cryptography.SHA256Managed
+    $c = Get-SHA256Converter
     $bytes = $c.ComputeHash(($in = (Get-Item $src).OpenRead()))
     return ([System.BitConverter]::ToString($bytes)).Replace("-", "").ToLower()
   } Finally { if (($c -ne $null) -and ($c.GetType().GetMethod("Dispose") -ne $null)) { $c.Dispose() }; if ($in -ne $null) { $in.Dispose() } }
 }
 
+function Get-SHA256Converter {
+  if($PSVersionTable.PSEdition -eq 'Core') {
+    [System.Security.Cryptography.SHA256]::Create()
+  }
+  else {
+    New-Object -TypeName Security.Cryptography.SHA256Managed
+  }
+}
+
 Function Download-Chef($url, $sha256, $dst) {
-  Try {
-    Log "Downloading package from $url"
-    ($c = Make-WebClient).DownloadFile($url, $dst)
-    Log "Download complete."
-  } Finally { if ($c -ne $null) { $c.Dispose() } }
+  Log "Downloading package from $url"
+  Get-WebContent $url $dst
+  Log "Download complete."
 
   if ($sha256 -eq $null) { Log "Skipping sha256 verification" }
   elseif (($dsha256 = Get-SHA256 $dst) -eq $sha256) { Log "Successfully verified $dst" }
   else { throw "SHA256 for $dst $dsha256 does not match $sha256" }
 }
 
-Function Install-Chef($msi) {
+Function Install-Chef($msi, $chef_omnibus_root) {
   Log "Installing Chef Omnibus package $msi"
   $installingChef = $True
   $installAttempts = 0
   while ($installingChef) {
     $installAttempts++
-    $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait
-    $p.WaitForExit()
-    if ($p.ExitCode -eq 1618) {
-      Log "Another msi install is in progress (exit code 1618), retrying ($($installAttempts))..."
-      continue
-    } elseif ($p.ExitCode -ne 0) {
-      throw "msiexec was not successful. Received exit code $($p.ExitCode)"
+    $result = $false
+    if($msi.EndsWith(".appx")) {
+      $result = Install-ChefAppx $msi $chef_omnibus_root
     }
+    else {
+      $result = Install-ChefMsi $msi
+    }
+    if(!$result) { continue }
     $installingChef = $False
   }
   Remove-Item $msi -Force
   Log "Installation complete"
 }
 
+Function Install-ChefMsi($msi) {
+  $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait
+  $p.WaitForExit()
+  if ($p.ExitCode -eq 1618) {
+    Log "Another msi install is in progress (exit code 1618), retrying ($($installAttempts))..."
+    return $false
+  } elseif ($p.ExitCode -ne 0) {
+    throw "msiexec was not successful. Received exit code $($p.ExitCode)"
+  }
+  return $true
+}
+
+Function Install-ChefAppx($appx, $chef_omnibus_root) {
+  Add-AppxPackage -Path $appx -ErrorAction Stop
+
+  $rootParent = Split-Path $chef_omnibus_root -Parent
+  $rootFolder = Split-Path $chef_omnibus_root -Leaf
+  $link = Join-Path $rootParent $rootFolder
+
+  # Remove link from a previous install
+  # There is currently a bug in removing symbolic links from Powershell
+  # so we use the fisher-price cmd shell to do it
+  if(Test-Path $link) {
+    cmd /c rmdir $link
+  }
+
+  $package = (Get-AppxPackage -Name chef).InstallLocation
+  if(!(Test-Path $rootParent)) {
+    New-Item -ItemType Directory -Path $rootParent
+  }
+  push-Location $rootParent
+  New-Item -ItemType SymbolicLink -Name $rootFolder -Target $package
+  Pop-Location
+
+  return $true
+}
+
 Function Log($m) { Write-Host "       $m`n" }
 
-Function Make-WebClient {
+function Get-WebContent {
+  param ($uri, $filepath)
+
+  try {
+    if($PSVersionTable.PSEdition -eq 'Core') {
+      Get-WebContentOnCore $uri $filepath
+    }
+    else {
+      Get-WebContentOnFullNet $uri $filepath
+    }
+  }
+  catch {
+    $exception = $_.Exception
+    Write-Host "There was an error: "
+    do {
+      Write-Host "`t$($exception.message)"
+      $exception = $exception.innerexception
+    } while ($exception)
+    throw "Failed to download from $uri."
+  }
+}
+
+function Get-WebContentOnFullNet {
+  param ($uri, $filepath)
+
   $proxy = New-Object -TypeName System.Net.WebProxy
+  $wc = new-object System.Net.WebClient
   $proxy.Address = $env:http_proxy
-  $client = New-Object -TypeName System.Net.WebClient
-  $client.Proxy = $proxy
-  return $client
+  $wc.Proxy = $proxy
+
+  if ([string]::IsNullOrEmpty($filepath)) {
+    $wc.downloadstring($uri)
+  }
+  else {
+    $wc.downloadfile($uri, $filepath)
+  }
+}
+
+function Get-WebContentOnCore {
+  param ($uri, $filepath)
+
+  $handler = New-Object System.Net.Http.HttpClientHandler
+  $client = New-Object System.Net.Http.HttpClient($handler)
+  $client.Timeout = New-Object System.TimeSpan(0, 30, 0)
+  $cancelTokenSource = [System.Threading.CancellationTokenSource]::new()
+  $responseMsg = $client.GetAsync([System.Uri]::new($uri), $cancelTokenSource.Token)
+  $responseMsg.Wait()
+  if (!$responseMsg.IsCanceled) {
+    $response = $responseMsg.Result
+    if ($response.IsSuccessStatusCode) {
+      if ([string]::IsNullOrEmpty($filepath)) {
+        $response.Content.ReadAsStringAsync().Result
+      }
+      else {
+        $downloadedFileStream = [System.IO.FileStream]::new($filepath, [System.IO.FileMode]::Create, [System.IO.FileAccess]::Write)
+        $copyStreamOp = $response.Content.CopyToAsync($downloadedFileStream)
+        $copyStreamOp.Wait()
+        $downloadedFileStream.Close()
+        if ($copyStreamOp.Exception -ne $null) {
+          throw $copyStreamOp.Exception
+        }
+      }
+    }
+  }
 }
 
 Function Unresolve-Path($p) {
@@ -77,7 +178,6 @@ Function Unresolve-Path($p) {
 }
 
 $chef_omnibus_root = Unresolve-Path $chef_omnibus_root
-$msi = Unresolve-Path $msi
 
 if (Check-UpdateChef $chef_omnibus_root $version) {
   Write-Host "-----> Installing Chef Omnibus ($pretty_version)`n"
@@ -87,8 +187,10 @@ if (Check-UpdateChef $chef_omnibus_root $version) {
     $url = $chef_msi_url
     $sha256 = $null
   }
+  $msi = Join-Path $env:temp "$url".Split("/")[-1]
+  $msi = Unresolve-Path $msi
   Download-Chef "$url" $sha256 $msi
-  Install-Chef $msi
+  Install-Chef $msi $chef_omnibus_root
 } else {
   Write-Host "-----> Chef Omnibus installation detected ($pretty_version)`n"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +151,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: chefstyle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: 
 email:
 - thom@chef.io
@@ -147,7 +175,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -222,7 +249,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

data/.rubocop.yml

@@ -1,10 +0,0 @@
-AllCops:
-  Exclude:
-    - mixlib-install.gemspec
-Style/AlignParameters:
-  EnforcedStyle: with_first_parameter
-Style/HashSyntax:
-  EnforcedStyle: ruby19
-Metrics/LineLength:
-  Exclude:
-    - spec/**/*.rb