mixlib-install 0.8.0.alpha.7 → 0.8.0.alpha.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09578e7ebe6313ee2b4319317af109fed364e46e
-  data.tar.gz: 0a3a8c4bf55672a723c1576a5ebadbc883cde6de
+  metadata.gz: fe243313ad84e3ae88dc0708806eb15c43f76a11
+  data.tar.gz: 470d541528a8c2d1f7147632f43a1e932e7dd875
 SHA512:
-  metadata.gz: 5e87fb189a92b2dbd3d03ee680cadf47385c2ded328242e524fb620ac6e3c62cf17741a62f4b6ff3c3794ad89e5768e081318057421d6ad7bcab794a0c0996a4
-  data.tar.gz: 8342b80c4decd0db0640e4899e41d22ecb5fbe39aa4e90bd0caa58a366100c5386feabf4d3a628645b4a7945324e100a5a68b49d2bcc706cd3c3bbc1e98e92d8
+  metadata.gz: f5a37cf8df4a56bb141995f514899895a61634fa2bd7a8d09373bfd17cd95709411c32017991867caccb61ab96e860cadbdfc5ae0accd59ce961e5209d933bc7
+  data.tar.gz: 94cf89573f423781f835a31ec99290b9fcefc71758c44ee7b18142c112b1ba18bd7852ac32390f56906ef968755aced6830486ed79569796eca47cfa006071f3

data/PRODUCT_MATRIX.md

@@ -5,21 +5,21 @@
 | Angry Chef Client | angrychef |
 | Chef Client | chef |
 | Chef Backend | chef-backend |
-| Chef Server High Availability addon | chef-ha |
-| Chef Cloud Marketplace addon | chef-marketplace |
 | Chef Server | chef-server |
 | Chef Server HA Provisioning for AWS | chef-server-ha-provisioning |
-| Chef Server Replication addon | chef-sync |
 | Chef Development Kit | chefdk |
 | Chef Compliance | compliance |
 | Delivery | delivery |
 | Delivery CLI | delivery-cli |
+| Chef Server High Availability addon | ha |
 | Management Console | manage |
+| Chef Cloud Marketplace addon | marketplace |
 | Omnibus Toolchain | omnibus-toolchain |
 | Enterprise Chef (legacy) | private-chef |
-| Chef Push Server | push-client |
-| Chef Push Server | push-server |
+| Chef Push Server | push-jobs-client |
+| Chef Push Server | push-jobs-server |
 | Chef Server Reporting addon | reporting |
 | Supermarket | supermarket |
+| Chef Server Replication addon | sync |
 
 Do not modify this file manually. It is automatically rendered via a rake task.

data/config.ru

@@ -0,0 +1,7 @@
+require "rubygems"
+require "bundler"
+
+Bundler.require
+
+require_relative "spec/support/bintray_server"
+run BintrayServer

data/lib/mixlib/install/artifact_info.rb

@@ -19,19 +19,21 @@
 module Mixlib
   class Install
     class ArtifactInfo
-      attr_accessor :url
-      attr_accessor :md5
-      attr_accessor :sha256
-      attr_accessor :version
+      attr_reader :url
+      attr_reader :md5
+      attr_reader :sha256
+      attr_reader :sha1
+      attr_reader :version
 
-      attr_accessor :platform
-      attr_accessor :platform_version
-      attr_accessor :architecture
+      attr_reader :platform
+      attr_reader :platform_version
+      attr_reader :architecture
 
       def initialize(data)
         @url = data[:url]
         @md5 = data[:md5]
         @sha256 = data[:sha256]
+        @sha1 = data[:sha1]
         @version = data[:version]
         @platform = data[:platform]
         @platform_version = data[:platform_version]
@@ -65,6 +67,7 @@ module Mixlib
           url: url,
           md5: md5,
           sha256: sha256,
+          sha1: sha1,
           version: version,
           platform: platform,
           platform_version: platform_version,

data/lib/mixlib/install/backend.rb

@@ -18,15 +18,16 @@
 
 require "mixlib/install/backend/omnitruck"
 require "mixlib/install/backend/artifactory"
+require "mixlib/install/backend/bintray"
 
 module Mixlib
   class Install
     class Backend
       def self.info(options)
-        backend = if options.for_omnitruck?
-                    Backend::Omnitruck.new(options)
-                  elsif options.for_artifactory?
+        backend = if options.for_artifactory?
                     Backend::Artifactory.new(options)
+                  else
+                    Backend::Omnitruck.new(options)
                   end
 
         backend.info

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

@@ -20,23 +20,18 @@ require "net/http"
 require "json"
 require "mixlib/install/artifact_info"
 require "artifactory"
+require "mixlib/install/backend/base"
 
 module Mixlib
   class Install
     class Backend
-      class Artifactory
+      class Artifactory < Base
         class ConnectionError < StandardError; end
         class AuthenticationError < StandardError; end
         class NoArtifactsError < StandardError; end
 
         ENDPOINT = "http://artifactory.chef.co".freeze
 
-        attr_accessor :options
-
-        def initialize(options)
-          @options = options
-        end
-
         # Create filtered list of artifacts
         #
         # @return [Array<ArtifactInfo>] list of artifacts for the configured
@@ -109,13 +104,14 @@ Can not find any builds for #{options.product_name} in #{::Artifactory.endpoint}
         #
         # @return [Array<ArtifactInfo>] Array of info about found artifacts
         def artifactory_artifacts(version)
-          results = artifactory_query(<<-QUERY)
+          results = artifactory_query(<<-QUERY
 items.find(
   {"repo": "omnibus-#{options.channel}-local"},
   {"@omnibus.project": "#{options.product_name}"},
   {"@omnibus.version": "#{version}"}
 ).include("repo", "path", "name", "property")
           QUERY
+          )
 
           # Merge artifactory properties and downloadUri to a flat Hash
           results.collect! do |result|
@@ -191,16 +187,16 @@ items.find(
           begin
             results = yield
           rescue Errno::ETIMEDOUT, ::Artifactory::Error::ConnectionError
-            raise ConnectionError, <<-EOS
-Artifactory endpoint '#{::Artifactory.endpoint}' is unreachable. Check that
+            raise ConnectionError, <<-MSG
+Artifactory endpoint '#{endpoint}' is unreachable. Check that
 the endpoint is correct and there is an open connection to Chef's private network.
-            EOS
+            MSG
           rescue ::Artifactory::Error::HTTPError => e
             if e.code == 401 && e.message =~ /Bad credentials/
-              raise AuthenticationError, <<-EOS
+              raise AuthenticationError, <<-MSG
 Artifactory server denied credentials. Verify ARTIFACTORY_USERNAME and
 ARTIFACTORY_PASSWORD environment variables are configured properly.
-              EOS
+              MSG
             else
               raise e
             end

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

@@ -0,0 +1,39 @@
+#
+# Author:: Patrick Wright (<patrick@chef.io>)
+# Copyright:: Copyright (c) 2016 Chef, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Mixlib
+  class Install
+    class Backend
+      class Base
+        attr_reader :options
+
+        def initialize(options)
+          @options = options
+        end
+
+        def info
+          raise "Must implement info method that returns ArtifactInfo or Array<ArtifactInfo>"
+        end
+
+        def endpoint
+          raise "Must implement endpoint method that returns endpoint String"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,266 @@
+#
+# Author:: Patrick Wright (<patrick@chef.io>)
+# Copyright:: Copyright (c) 2016 Chef, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "json"
+require "mixlib/install/backend/base"
+require "mixlib/install/artifact_info"
+
+#
+# Add method to Array class to support
+# searching for substrings that match against
+# the items in the Array
+#
+class Array
+  def fuzzy_include?(search_value, regex_format = "%s")
+    inject(false) do |is_found, array_value|
+      is_found || !!(search_value =~ /#{regex_format % array_value}/)
+    end
+  end
+end
+
+module Mixlib
+  class Install
+    class Backend
+      class Bintray < Base
+        class UnknownArchitecture < StandardError; end
+
+        ENDPOINT = "https://bintray.com/api/v1/".freeze
+
+        # Bintray credentials for api read access. These are here intentionally.
+        BINTRAY_USERNAME = "mixlib-install@chef".freeze
+
+        BINTRAY_PASSWORD = "a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d".freeze
+
+        DOWNLOAD_URL_ENDPOINT = "https://packages.chef.io".freeze
+
+        def endpoint
+          @endpoint ||= ENV.fetch("BINTRAY_ENDPOINT", ENDPOINT)
+        end
+
+        # Create filtered list of artifacts
+        #
+        # @return [Array<ArtifactInfo>] list of artifacts for the configured
+        # channel, product name, and product version.
+        # @return [ArtifactInfo] arifact info for the configured
+        # channel, product name, product version and platform info
+        #
+        def info
+          artifacts = bintray_artifacts
+
+          if options.platform
+            artifacts.select! do |a|
+              a.platform == options.platform &&
+                a.platform_version == options.platform_version &&
+                a.architecture == options.architecture
+            end
+          end
+
+          artifacts.length == 1 ? artifacts.first : artifacts
+        end
+
+        #
+        # Makes a GET request to bintray for the given path.
+        #
+        # @param [String] path
+        #   "/api/v1/packages/chef" is prepended to the given path.
+        #
+        # @return [String] JSON parsed string of the bintray response
+        #
+        def bintray_get(path)
+          uri = URI.parse(endpoint)
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = (uri.scheme == "https")
+
+          full_path = File.join(uri.path, "packages/chef", path)
+          request = Net::HTTP::Get.new(full_path)
+          request.basic_auth(BINTRAY_USERNAME, BINTRAY_PASSWORD)
+
+          res = http.request(request)
+
+          # Raise if response is not 2XX
+          res.value
+          JSON.parse(res.body)
+        end
+
+        #
+        # Get latest version for product/channel
+        #
+        # @return [String] latest version value
+        #
+        def latest_version
+          result = bintray_get("#{options.channel}/#{options.product_name}/versions/_latest")
+          result["name"]
+        end
+
+        #
+        # Get artifacts for a given version, channel and product_name
+        #
+        # @return [Array<ArtifactInfo>] Array of info about found artifacts
+        #
+        def bintray_artifacts
+          version = options.product_version == :latest ? latest_version : options.product_version
+          results = bintray_get("#{options.channel}/#{options.product_name}/versions/#{version}/files")
+
+          #
+          # Delete .asc files
+          # Also delete .pkg files which are uploaded along with dmg files for
+          # some chef versions.
+          #
+          results.reject! do |r|
+            r["name"].end_with?(".asc") || r["name"].end_with?(".pkg")
+          end
+
+          # Convert results to build records
+          results.map { |a| create_artifact(a) }
+        end
+
+        #
+        # Creates an instance of ArtifactInfo
+        #
+        # @param artifact_map
+        # {
+        #   "name" => "chef-12.8.1-1.powerpc.bff",
+        #   "path" => "aix/6.1/chef-12.8.1-1.powerpc.bff",
+        #   "version" => "12.8.1",
+        #   "sha1" => "1206f7be7be8bbece1e9943dcdc0d22fe538718b",
+        #   "sha256" => "e49321095a04f51385a59b3f3d7223cd1bddefc2e2f4280edfb0934d00a4fa3f"
+        # }
+        #
+        # @return [ArtifactInfo] ArtifactInfo instance
+        #
+        def create_artifact(artifact_map)
+          platform_info = parse_platform_info(artifact_map)
+
+          url = "#{DOWNLOAD_URL_ENDPOINT}/#{options.channel}/#{artifact_map["path"]}"
+
+          ArtifactInfo.new(
+            sha1:             artifact_map["sha1"],
+            sha256:           artifact_map["sha256"],
+            version:          artifact_map["version"],
+            platform:         platform_info[:platform],
+            platform_version: platform_info[:platform_version],
+            architecture:     platform_info[:architecture],
+            url:              url
+          )
+        end
+
+        #
+        # Parses platform info
+        #
+        # @param artifact_map
+        # {
+        #   "name" => "chef-12.8.1-1.powerpc.bff",
+        #   "path" => "aix/6.1/chef-12.8.1-1.powerpc.bff",
+        #   "version" => "12.8.1",
+        #   "sha1" => "1206f7be7be8bbece1e9943dcdc0d22fe538718b",
+        #   "sha256" => "e49321095a04f51385a59b3f3d7223cd1bddefc2e2f4280edfb0934d00a4fa3f"
+        # }
+        #
+        # @return [Hash] platform, platform_version, architecture
+        #
+        def parse_platform_info(artifact_map)
+          # platform/platform_version/filename
+          path = artifact_map["path"].split("/")
+          platform = path[0]
+          platform_version = path[1]
+
+          filename = artifact_map["name"]
+          architecture = parse_architecture_from_file_name(filename)
+
+          {
+            platform: platform,
+            platform_version: platform_version,
+            architecture: architecture,
+          }
+        end
+
+        #
+        # Determines the architecture for which a file is published from from
+        # filename.
+        #
+        # We determine the architecture  based on the filename of the artifact
+        # since architecture the artifact is published for is not available
+        # in bintray.
+        #
+        # IMPORTANT: This function is heavily used by omnitruck poller. Make
+        #   sure you test with `./poller` if you change this function.
+        #
+        # @param [String] filename
+        #
+        # @return [String]
+        #   one of the standardized architectures for Chef packages:
+        #   x86_64, i386, powerpc, sparc, ppc64, ppc64le
+        def parse_architecture_from_file_name(filename)
+          #
+          # We first map the different variations of architectures that we have
+          # used historically to our final set.
+          #
+          if %w{ x86_64 amd64 x64 }.fuzzy_include?(filename)
+            "x86_64"
+          elsif %w{ i386 x86 i86pc i686 }.fuzzy_include?(filename)
+            "i386"
+          elsif %w{ powerpc }.fuzzy_include?(filename)
+            "powerpc"
+          elsif %w{ sparc sun4u sun4v }.fuzzy_include?(filename)
+            "sparc"
+          # Note that ppc64le should come before ppc64 otherwise our search
+          # will think ppc64le matches ppc64.
+          elsif %w{ ppc64le }.fuzzy_include?(filename)
+            "ppc64le"
+          elsif %w{ ppc64 }.fuzzy_include?(filename)
+            "ppc64"
+          #
+          # From here on we need to deal with historical versions
+          # that we have published without any architecture in their
+          # names.
+          #
+          #
+          # All dmg files are published for x86_64
+          elsif filename.end_with?(".dmg")
+            "x86_64"
+          #
+          # The msi files we catch here are versions that are older than the
+          # ones which we introduced 64 builds. Therefore they should map to
+          # i386
+          elsif filename.end_with?(".msi")
+            "i386"
+          #
+          # sh files are the packaging format we were using before dmg on Mac.
+          # They map to x86_64
+          elsif filename.end_with?(".sh")
+            "x86_64"
+          #
+          # We have two common file names for solaris packages. E.g:
+          #   chef-11.12.8-2.solaris2.5.10.solaris
+          #   chef-11.12.8-2.solaris2.5.9.solaris
+          # These were build on two boxes:
+          #   Solaris 9 => sparc
+          #   Solaris 10 => i386
+          elsif filename.end_with?(".solaris2.5.10.solaris")
+            "i386"
+          elsif filename.end_with?(".solaris2.5.9.solaris")
+            "sparc"
+          else
+            raise UnknownArchitecture,
+              "architecture can not be determined for '#{filename}'"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -19,17 +19,16 @@
 require "net/http"
 require "json"
 require "mixlib/install/artifact_info"
+require "mixlib/install/backend/base"
 
 module Mixlib
   class Install
     class Backend
-      class Omnitruck
+      class Omnitruck < Base
         ENDPOINT = "https://omnitruck.chef.io/".freeze
 
-        attr_accessor :options
-
-        def initialize(options)
-          @options = options
+        def endpoint
+          @endpoint ||= ENV.fetch("OMNITRUCK_ENDPOINT", ENDPOINT)
         end
 
         def info
@@ -55,7 +54,7 @@ module Mixlib
         private
 
         def omnitruck_get(resource, parameters)
-          uri = URI.parse(ENDPOINT)
+          uri = URI.parse(endpoint)
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = (uri.scheme == "https")
 

data/lib/mixlib/install/generator/bourne/scripts/artifactory_urls.sh.erb

@@ -12,7 +12,6 @@
 # Outputs:
 # $download_url:
 # $sha256:
-# $md5:
 ############
 
 <% artifacts.each do |artifact| %>
@@ -20,7 +19,6 @@
   mkdir -p $artifact_info_dir
   touch "$artifact_info_dir/artifact_info"
   echo "url <%= artifact.url%>" >> "$artifact_info_dir/artifact_info"
-  echo "md5 <%= artifact.md5%>" >> "$artifact_info_dir/artifact_info"
   echo "sha256 <%= artifact.sha256%>" >> "$artifact_info_dir/artifact_info"
 <% end %>
 
@@ -28,4 +26,3 @@ artifact_info_for_platform="$tmp_dir/artifact_info/$platform/$platform_version/$
 
 download_url=`awk '$1 == "url" { print $2 }' "$artifact_info_for_platform"`
 sha256=`awk '$1 == "sha256" { print $2 }' "$artifact_info_for_platform"`
-md5=`awk '$1 == "md5" { print $2 }' "$artifact_info_for_platform"`

data/lib/mixlib/install/generator/bourne/scripts/fetch_metadata.sh.erb

@@ -15,7 +15,6 @@
 # Outputs:
 # $download_url:
 # $sha256:
-# $md5:
 ############
 
 echo "Getting information for $project $channel $version for $platform..."
@@ -29,7 +28,7 @@ cat "$metadata_filename"
 
 echo ""
 # check that all the mandatory fields in the downloaded metadata are there
-if grep '^url' $metadata_filename > /dev/null && grep '^sha256' $metadata_filename > /dev/null && grep '^md5' $metadata_filename > /dev/null; then
+if grep '^url' $metadata_filename > /dev/null && grep '^sha256' $metadata_filename > /dev/null; then
   echo "downloaded metadata file looks valid..."
 else
   echo "downloaded metadata file is corrupted or an uncaught error was encountered in downloading the file..."
@@ -41,7 +40,6 @@ fi
 
 download_url=`awk '$1 == "url" { print $2 }' "$metadata_filename"`
 sha256=`awk '$1 == "sha256" { print $2 }' "$metadata_filename"`
-md5=`awk '$1 == "md5" { print $2 }' "$metadata_filename"`
 
 ############
 # end of fetch_metadata.sh

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

@@ -34,7 +34,7 @@ download_dir=`dirname $download_filename`
 cached_file_available="false"
 if test -f $download_filename; then
   echo "$download_filename already exists, verifiying checksum..."
-  if do_checksum "$download_filename" "$sha256" "$md5"; then
+  if do_checksum "$download_filename" "$sha256"; then
     echo "checksum compare succeeded, using existing file!"
     cached_file_available="true"
   else
@@ -45,7 +45,7 @@ fi
 # download if no local version of the file available
 if test "x$cached_file_available" != "xtrue"; then
   do_download "$download_url"  "$download_filename"
-  do_checksum "$download_filename" "$sha256" "$md5" || checksum_mismatch
+  do_checksum "$download_filename" "$sha256" || checksum_mismatch
 fi
 
 ############

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

@@ -214,17 +214,8 @@ do_checksum() {
     echo "Comparing checksum with shasum..."
     checksum=`shasum -a 256 $1 | awk '{ print $1 }'`
     return `test "x$checksum" = "x$2"`
-  elif exists md5sum; then
-    echo "Comparing checksum with md5sum..."
-    checksum=`md5sum $1 | awk '{ print $1 }'`
-    return `test "x$checksum" = "x$3"`
-  elif exists md5; then
-    echo "Comparing checksum with md5..."
-    # this is for md5 utility on MacOSX (OSX 10.6-10.10) and $4 is the correct field
-    checksum=`md5 $1 | awk '{ print $4 }'`
-    return `test "x$checksum" = "x$3"`
   else
-    echo "WARNING: could not find a valid checksum program, pre-install shasum, md5sum or md5 in your O/S image to get valdation..."
+    echo "WARNING: could not find a valid checksum program, pre-install shasum or sha256sum in your O/S image to get valdation..."
     return 0
   fi
 }

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

@@ -89,11 +89,11 @@ module Mixlib
         end
 
         def render_command
-          <<EOS
-install -project #{options.product_name} \
--version #{product_version} \
--channel #{options.channel}
-EOS
+          cmd = "install -project #{options.product_name}"
+          cmd << " -version #{product_version}"
+          cmd << " -channel #{options.channel}"
+          cmd << " -architecture #{options.architecture}" if options.architecture
+          cmd << "\n"
         end
       end
     end

data/lib/mixlib/install/generator/powershell/scripts/get_project_metadata.ps1.erb

@@ -7,11 +7,11 @@ function Get-ProjectMetadata {
     .EXAMPLE
     iex (new-object net.webclient).downloadstring('https://omnitruck.chef.io/install.ps1'); Get-ProjectMetadata -project chef -channel stable
 
-    Gets the download url, MD5 checksum, and SHA256 checksum for the latest stable release of Chef.
+    Gets the download url and SHA256 checksum for the latest stable release of Chef.
     .EXAMPLE
     iex (irm 'https://omnitruck.chef.io/install.ps1'); Get-ProjectMetadata -project chefdk -channel stable -version 0.8.0
 
-    Gets the download url, MD5 checksum, and SHA256 checksum for ChefDK 0.8.0.
+    Gets the download url and SHA256 checksum for ChefDK 0.8.0.
   #>
   [cmdletbinding()]
   param (

data/lib/mixlib/install/generator/powershell/scripts/get_project_metadata_for_artifactory.ps1.erb

@@ -7,11 +7,11 @@ function Get-ProjectMetadata {
     .EXAMPLE
     iex (new-object net.webclient).downloadstring('https://omnitruck.chef.io/install.ps1'); Get-ProjectMetadata -project chef -channel stable
 
-    Gets the download url, MD5 checksum, and SHA256 checksum for the latest stable release of Chef.
+    Gets the download url and SHA256 checksum for the latest stable release of Chef.
     .EXAMPLE
     iex (irm 'https://omnitruck.chef.io/install.ps1'); Get-ProjectMetadata -project chefdk -channel stable -version 0.8.0
 
-    Gets the download url, MD5 checksum, and SHA256 checksum for ChefDK 0.8.0.
+    Gets the download url, and SHA256 checksum for ChefDK 0.8.0.
   #>
   [cmdletbinding()]
   param (
@@ -64,7 +64,6 @@ function Get-ProjectMetadata {
     New-Item -ItemType directory -Path $artifact_info_dir -force
     New-Item -ItemType file "$($artifact_info_dir)/artifact_info" -force
     "url <%= artifact.url%>" | out-file "$artifact_info_dir/artifact_info"
-    "md5 <%= artifact.md5%>" | out-file "$artifact_info_dir/artifact_info" -Append
     "sha256 <%= artifact.sha256%>" | out-file "$artifact_info_dir/artifact_info" -Append
   <% end %>
 

data/lib/mixlib/install/options.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require "mixlib/install/product"
 require "mixlib/versioning"
 
 module Mixlib
@@ -25,21 +26,11 @@ module Mixlib
       class ArtifactoryCredentialsNotFound < StandardError; end
 
       attr_reader :options
-      attr_reader :defaults
 
       OMNITRUCK_CHANNELS = [:stable, :current]
       ARTIFACTORY_CHANNELS = [:unstable]
       ALL_SUPPORTED_CHANNELS = OMNITRUCK_CHANNELS + ARTIFACTORY_CHANNELS
-      SUPPORTED_PRODUCT_NAMES = %w{
-        angry-omnibus-toolchain
-        angrychef
-        chef
-        chefdk
-        chef-server
-        delivery-cli
-        omnibus-toolchain
-        push-jobs-client
-      }
+      SUPPORTED_PRODUCT_NAMES = PRODUCT_MATRIX.products
       SUPPORTED_SHELL_TYPES = [:ps1, :sh]
       SUPPORTED_OPTIONS = [
         :architecture,
@@ -53,9 +44,6 @@ module Mixlib
 
       def initialize(options)
         @options = options
-        @defaults = {
-          shell_type: :sh,
-        }
 
         validate!
       end
@@ -70,7 +58,6 @@ module Mixlib
 
         errors << validate_product_names
         errors << validate_channels
-        errors << validate_platform_info
         errors << validate_shell_type
 
         unless errors.compact.empty?
@@ -80,7 +67,7 @@ module Mixlib
 
       SUPPORTED_OPTIONS.each do |option|
         define_method option do
-          options[option] || options[option.to_s] || defaults[option]
+          options[option] || options[option.to_s] || default_options[option]
         end
       end
 
@@ -88,6 +75,10 @@ module Mixlib
         ARTIFACTORY_CHANNELS.include?(channel)
       end
 
+      def for_bintray?
+        [:stable, :current].include?(channel)
+      end
+
       def for_omnitruck?
         OMNITRUCK_CHANNELS.include?(channel)
       end
@@ -115,6 +106,12 @@ module Mixlib
 
       private
 
+      def default_options
+        {
+          shell_type: :sh,
+        }
+      end
+
       def validate_product_names
         unless SUPPORTED_PRODUCT_NAMES.include? product_name
           <<-EOS
@@ -133,16 +130,6 @@ Must be one of: #{ALL_SUPPORTED_CHANNELS.join(", ")}
         end
       end
 
-      def validate_platform_info
-        platform_opts = [platform, platform_version, architecture]
-        if (platform_opts.any?(&:nil?)) &&
-            (platform_opts.any? { |opt| !opt.nil? })
-          <<-EOS
-platform, platform version, and architecture are all required when specifying Platform options.
-          EOS
-        end
-      end
-
       def validate_shell_type
         unless SUPPORTED_SHELL_TYPES.include? shell_type
           <<-EOS

data/lib/mixlib/install/product.rb

@@ -172,19 +172,6 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     config_file "/etc/chef-backend/chef-backend.rb"
   end
 
-  product "chef-ha" do
-    product_name "Chef Server High Availability addon"
-    package_name "chef-ha"
-    config_file "/etc/opscode/chef-server.rb"
-  end
-
-  product "chef-marketplace" do
-    product_name "Chef Cloud Marketplace addon"
-    package_name "chef-marketplace"
-    ctl_command "chef-marketplace-ctl"
-    config_file "/etc/chef-marketplace/marketplace.rb"
-  end
-
   product "chef-server" do
     product_name "Chef Server"
     package_name do |v|
@@ -203,13 +190,6 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     package_name "chef-server-ha-provisioning"
   end
 
-  product "chef-sync" do
-    product_name "Chef Server Replication addon"
-    package_name "chef-sync"
-    ctl_command "chef-sync-ctl"
-    config_file "/etc/chef-sync/chef-sync.rb"
-  end
-
   product "chefdk" do
     product_name "Chef Development Kit"
     package_name "chefdk"
@@ -234,6 +214,12 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     package_name "delivery-cli"
   end
 
+  product "ha" do
+    product_name "Chef Server High Availability addon"
+    package_name "chef-ha"
+    config_file "/etc/opscode/chef-server.rb"
+  end
+
   product "manage" do
     product_name "Management Console"
     package_name do |v|
@@ -251,6 +237,13 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     end
   end
 
+  product "marketplace" do
+    product_name "Chef Cloud Marketplace addon"
+    package_name "chef-marketplace"
+    ctl_command "chef-marketplace-ctl"
+    config_file "/etc/chef-marketplace/marketplace.rb"
+  end
+
   product "omnibus-toolchain" do
     product_name "Omnibus Toolchain"
     package_name "omnibus-toolchain"
@@ -263,14 +256,14 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     config_file "/etc/opscode/private-chef.rb"
   end
 
-  product "push-client" do
+  product "push-jobs-client" do
     product_name "Chef Push Server"
     package_name do |v|
       v < version_for("1.3.0") ? "opscode-push-jobs-client" : "push-jobs-client"
     end
   end
 
-  product "push-server" do
+  product "push-jobs-server" do
     product_name "Chef Push Server"
     package_name "opscode-push-jobs-server"
     ctl_command "opscode-push-jobs-server-ctl"
@@ -290,4 +283,11 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     ctl_command "supermarket-ctl"
     config_file "/etc/supermarket/supermarket.json"
   end
+
+  product "sync" do
+    product_name "Chef Server Replication addon"
+    package_name "chef-sync"
+    ctl_command "chef-sync-ctl"
+    config_file "/etc/chef-sync/chef-sync.rb"
+  end
 end

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "0.8.0.alpha.7"
+    VERSION = "0.8.0.alpha.8"
   end
 end

data/mixlib-install.gemspec

@@ -24,4 +24,5 @@ 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 "sinatra"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 0.8.0.alpha.7
+  version: 0.8.0.alpha.8
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  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'
 description: 
 email:
 - thom@chef.io
@@ -127,10 +141,13 @@ files:
 - acceptance/unstable/.acceptance/acceptance-cookbook/recipes/provision.rb
 - acceptance/unstable/.acceptance/acceptance-cookbook/recipes/verify.rb
 - acceptance/unstable/.kitchen.yml
+- config.ru
 - lib/mixlib/install.rb
 - lib/mixlib/install/artifact_info.rb
 - lib/mixlib/install/backend.rb
 - lib/mixlib/install/backend/artifactory.rb
+- lib/mixlib/install/backend/base.rb
+- lib/mixlib/install/backend/bintray.rb
 - lib/mixlib/install/backend/omnitruck.rb
 - lib/mixlib/install/generator.rb
 - lib/mixlib/install/generator/base.rb
@@ -181,4 +198,3 @@ signing_key:
 specification_version: 4
 summary: A mixin to help with omnitruck installs
 test_files: []
-has_rdoc: