mixlib-install 1.2.4 → 2.0.0

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

@@ -29,7 +29,7 @@ function Get-ProjectMetadata {
     [string]
     $version,
     # Release channel to install from
-    [validateset('current', 'stable')]
+    [validateset('current', 'stable', 'unstable')]
     [string]
     $channel = 'stable',
     # The following legacy switches are just aliases for the current channel

data/lib/mixlib/install/options.rb

@@ -26,9 +26,7 @@ module Mixlib
 
       attr_reader :options
 
-      OMNITRUCK_CHANNELS = [:stable, :current]
-      ARTIFACTORY_CHANNELS = [:unstable]
-      ALL_SUPPORTED_CHANNELS = OMNITRUCK_CHANNELS + ARTIFACTORY_CHANNELS
+      SUPPORTED_CHANNELS = [:stable, :current, :unstable]
       SUPPORTED_PRODUCT_NAMES = PRODUCT_MATRIX.products
       SUPPORTED_SHELL_TYPES = [:ps1, :sh]
       SUPPORTED_OPTIONS = [
@@ -70,18 +68,6 @@ module Mixlib
         end
       end
 
-      def for_artifactory?
-        Mixlib::Install.unified_backend? || ARTIFACTORY_CHANNELS.include?(channel)
-      end
-
-      def for_unstable?
-        channel == :unstable
-      end
-
-      def for_omnitruck?
-        OMNITRUCK_CHANNELS.include?(channel)
-      end
-
       def for_ps1?
         platform == "windows" || shell_type == :ps1
       end
@@ -123,10 +109,10 @@ Must be one of: #{SUPPORTED_PRODUCT_NAMES.join(", ")}
       end
 
       def validate_channels
-        unless ALL_SUPPORTED_CHANNELS.include? channel
+        unless SUPPORTED_CHANNELS.include? channel
           <<-EOS
 Unknown channel #{channel}.
-Must be one of: #{ALL_SUPPORTED_CHANNELS.join(", ")}
+Must be one of: #{SUPPORTED_CHANNELS.join(", ")}
           EOS
         end
       end

data/lib/mixlib/install/script_generator.rb

@@ -132,6 +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 do |vars|
           if install_msi_url
             vars << shell_var("chef_msi_url", install_msi_url)

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "1.2.4"
+    VERSION = "2.0.0"
   end
 end

data/mixlib-install.gemspec

@@ -22,11 +22,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mixlib-shellout"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   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"
+  spec.add_development_dependency "chefstyle"
+  spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -71,30 +71,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -155,16 +155,30 @@ dependencies:
   name: chefstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - thom@chef.io
@@ -176,6 +190,7 @@ files:
 - ".gitattributes"
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -185,30 +200,35 @@ files:
 - Rakefile
 - acceptance/.gitignore
 - acceptance/Gemfile
-- acceptance/current/.acceptance/acceptance-cookbook/.gitignore
-- acceptance/current/.acceptance/acceptance-cookbook/metadata.rb
-- acceptance/current/.acceptance/acceptance-cookbook/recipes/destroy.rb
-- acceptance/current/.acceptance/acceptance-cookbook/recipes/provision.rb
-- acceptance/current/.acceptance/acceptance-cookbook/recipes/verify.rb
-- acceptance/current/.kitchen.yml
-- acceptance/unstable/.acceptance/acceptance-cookbook/.gitignore
-- acceptance/unstable/.acceptance/acceptance-cookbook/metadata.rb
-- acceptance/unstable/.acceptance/acceptance-cookbook/recipes/destroy.rb
-- acceptance/unstable/.acceptance/acceptance-cookbook/recipes/provision.rb
-- acceptance/unstable/.acceptance/acceptance-cookbook/recipes/verify.rb
-- acceptance/unstable/.kitchen.yml
-- config.ru
+- acceptance/README.md
+- acceptance/bourne/.acceptance/acceptance-cookbook/.gitignore
+- acceptance/bourne/.acceptance/acceptance-cookbook/metadata.rb
+- acceptance/bourne/.acceptance/acceptance-cookbook/recipes/destroy.rb
+- acceptance/bourne/.acceptance/acceptance-cookbook/recipes/provision.rb
+- acceptance/bourne/.acceptance/acceptance-cookbook/recipes/verify.rb
+- acceptance/bourne/inspec/verify.rb
+- acceptance/bourne/terraform/application.tf
+- acceptance/bourne/terraform/aws.tf
+- acceptance/bourne/terraform/variables.tf
+- acceptance/powershell/.acceptance/acceptance-cookbook/.gitignore
+- acceptance/powershell/.acceptance/acceptance-cookbook/metadata.rb
+- acceptance/powershell/.acceptance/acceptance-cookbook/recipes/destroy.rb
+- acceptance/powershell/.acceptance/acceptance-cookbook/recipes/provision.rb
+- acceptance/powershell/.acceptance/acceptance-cookbook/recipes/verify.rb
+- acceptance/powershell/inspec/verify.rb
+- acceptance/powershell/terraform/application.tf
+- acceptance/powershell/terraform/aws.tf
+- acceptance/powershell/terraform/variables.tf
+- ci/before-script.sh
+- ci/es-infrastructure.pem.enc
 - 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/backend/package_router.rb
 - lib/mixlib/install/generator.rb
 - lib/mixlib/install/generator/base.rb
 - lib/mixlib/install/generator/bourne.rb
-- lib/mixlib/install/generator/bourne/scripts/artifactory_urls.sh.erb
 - lib/mixlib/install/generator/bourne/scripts/fetch_metadata.sh.erb
 - lib/mixlib/install/generator/bourne/scripts/fetch_package.sh
 - lib/mixlib/install/generator/bourne/scripts/helpers.sh
@@ -217,7 +237,6 @@ files:
 - lib/mixlib/install/generator/bourne/scripts/script_cli_parameters.sh
 - lib/mixlib/install/generator/powershell.rb
 - lib/mixlib/install/generator/powershell/scripts/get_project_metadata.ps1.erb
-- lib/mixlib/install/generator/powershell/scripts/get_project_metadata_for_artifactory.ps1.erb
 - lib/mixlib/install/generator/powershell/scripts/helpers.ps1
 - lib/mixlib/install/generator/powershell/scripts/install_project.ps1
 - lib/mixlib/install/generator/powershell/scripts/platform_detection.ps1

data/acceptance/current/.acceptance/acceptance-cookbook/recipes/destroy.rb

@@ -1,3 +0,0 @@
-execute "bundle exec kitchen destroy #{ENV["KITCHEN_INSTANCES"]}" do
-  cwd node['chef-acceptance']['suite-dir']
-end

data/acceptance/current/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -1,3 +0,0 @@
-execute "bundle exec kitchen converge #{ENV["KITCHEN_INSTANCES"]}" do
-  cwd node['chef-acceptance']['suite-dir']
-end

data/acceptance/current/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -1,3 +0,0 @@
-execute "bundle exec kitchen verify #{ENV["KITCHEN_INSTANCES"]}" do
-  cwd node['chef-acceptance']['suite-dir']
-end

data/acceptance/current/.kitchen.yml

@@ -1,41 +0,0 @@
-driver:
-  name: vagrant
-  provider: vmware_fusion
-  forward_agent: yes
-  customize:
-    numvcpus: 2
-    memsize: 1048
-
-provisioner:
-  name: chef_zero
-
-platforms:
-  - name: centos-6.5
-    run_list:
-  - name: debian-7.4
-    run_list:
-  - name: freebsd-10.0
-    run_list:
-  - name: ubuntu-14.04
-    run_list:
-  - name: macosx-10.10
-    driver:
-      box: chef/macosx-10.10 # private
-  - name: windows-server-2012r2-standard
-    driver:
-      box: chef/windows-server-2012r2-standard # private
-
-suites:
-  - name: chef-current-install
-    provisioner:
-      product_name: chef
-      product_version: latest
-      channel: current
-    run_list:
-  - name: chefdk-current-install
-    excludes: [ 'freebsd-10.0' ]
-    provisioner:
-      product_name: chefdk
-      product_version: latest
-      channel: current
-    run_list:

data/acceptance/unstable/.acceptance/acceptance-cookbook/.gitignore

@@ -1,2 +0,0 @@
-tmp/
-nodes/

data/acceptance/unstable/.acceptance/acceptance-cookbook/recipes/destroy.rb

@@ -1,3 +0,0 @@
-execute "bundle exec kitchen destroy #{ENV["KITCHEN_INSTANCES"]}" do
-  cwd node['chef-acceptance']['suite-dir']
-end

data/acceptance/unstable/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -1,3 +0,0 @@
-execute "bundle exec kitchen converge #{ENV["KITCHEN_INSTANCES"]}" do
-  cwd node['chef-acceptance']['suite-dir']
-end

data/acceptance/unstable/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -1,3 +0,0 @@
-execute "bundle exec kitchen verify #{ENV["KITCHEN_INSTANCES"]}" do
-  cwd node['chef-acceptance']['suite-dir']
-end

data/acceptance/unstable/.kitchen.yml

@@ -1,41 +0,0 @@
-driver:
-  name: vagrant
-  provider: vmware_fusion
-  forward_agent: yes
-  customize:
-    numvcpus: 2
-    memsize: 1048
-
-provisioner:
-  name: chef_zero
-
-platforms:
-  - name: centos-6.5
-    run_list:
-  - name: debian-7.4
-    run_list:
-  - name: freebsd-10.0
-    run_list:
-  - name: ubuntu-14.04
-    run_list:
-  - name: macosx-10.10
-    driver:
-      box: chef/macosx-10.10 # private
-  - name: windows-server-2012r2-standard
-    driver:
-      box: chef/windows-server-2012r2-standard # private
-
-suites:
-  - name: chef-unstable-install
-    provisioner:
-      product_name: chef
-      product_version: latest
-      channel: unstable
-    run_list:
-  - name: chefdk-unstable-install
-    excludes: [ 'freebsd-10.0' ]
-    provisioner:
-      product_name: chefdk
-      product_version: latest
-      channel: unstable
-    run_list:

data/config.ru

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

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

@@ -1,298 +0,0 @@
-#
-# 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
-        class VersionNotFound < StandardError; end
-        # Bintray credentials for api read access. These are here intentionally.
-        BINTRAY_USERNAME = "mixlib-install@chef".freeze
-        BINTRAY_PASSWORD = "a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d".freeze
-
-        ENDPOINT = "https://bintray.com/api/v1/".freeze
-        DOWNLOAD_URL_ENDPOINT = "https://packages.chef.io".freeze
-        COMPAT_DOWNLOAD_URL_ENDPOINT = "http://chef.bintray.com".freeze
-
-        def endpoint
-          @endpoint ||= ENV.fetch("BINTRAY_ENDPOINT", ENDPOINT)
-        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}/#{bintray_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 available_artifacts
-          version = options.latest_version? ? latest_version : options.product_version
-          begin
-            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 #{bintray_product_name} in #{options.channel} channel."
-            else
-              raise
-            end
-          end
-
-          #
-          # Delete files that we don't want as part of the artifact info array
-          # Windows: .asc files
-          # MAC OS _X: .pkg files which are uploaded along with dmg files for
-          # some chef versions.
-          #
-          %w{ asc pkg }.each do |ext|
-            results.reject! { |r| r["name"].end_with?(".#{ext}") }
-          end
-
-          # Convert results to build records
-          results.map! { |a| create_artifact(a) }
-
-          windows_artifact_fixup!(results)
-        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)
-
-          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(artifact_map)
-          )
-        end
-
-        #
-        # Creates the URL for the artifact.
-        #
-        # For some older platform & platform_version combinations we need to
-        # use COMPAT_DOWNLOAD_URL_ENDPOINT since these versions have an
-        # OpenSSL version that can not verify the DOWNLOAD_URL_ENDPOINT
-        # based urls
-        #
-        # @param artifact_map
-        #   see #create_artifact for details.
-        #
-        # @return [String] url for the artifact
-        #
-        def url(artifact_map)
-          platform_info = parse_platform_info(artifact_map)
-
-          base_url = case "#{platform_info[:platform]}-#{platform_info[:platform_version]}"
-                     when "freebsd-9", "el-5", "solaris2-5.9", "solaris2-5.10"
-                       COMPAT_DOWNLOAD_URL_ENDPOINT
-                     else
-                       DOWNLOAD_URL_ENDPOINT
-                     end
-
-          "#{base_url}/#{options.channel}/#{artifact_map["path"]}"
-        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]
-          platform, platform_version = normalize_platform(platform, platform_version)
-
-          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"
-          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)
-            "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
-
-        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
-end