mixlib-install 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b9844b39b2a0f932cc0c28d8ea483257be98e66
-  data.tar.gz: 6a57e3f38c78962adbbb4a49fb9af22f33689dfc
+  metadata.gz: 71d5046b449ed3757363647374ffc39eeb05f07c
+  data.tar.gz: ae951ab2c716f58ffa374fcfb0602bf610dfaf29
 SHA512:
-  metadata.gz: 20883ba88a6dc6886422e4396fe4ef01340c905c7f1f81fd6d67800b83ede9856a0b975f93b24958c12c613831b0dbe326c7b0afd97d2d3483d5e3f1bcfa8092
-  data.tar.gz: 2da868dcb318fd3973833004dc09235cae1b948771aab3fceba9a2fbda51262c5ac4e869ec091f96527079e2e099341bcbcd3c81d4f0040eb02065f55fd87ec0
+  metadata.gz: ba5b829af49cc93b5d25ae17f617641bdf9a02cf0bb614dbb76dca789af977a5daa0603d994a414dea4639d93a8638e281af7d5d6431db686d64a2b97eef5d2b
+  data.tar.gz: 515fedd4a41787f1dbee8e6e697846f595e2e166d4664a82fcc27d248d0de6189ebaf2436cc2e0150c48d5252fd2f08b23c03bc9614f530ac322c9c4cb276203

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [2.1.0]
+- Added new attributes to ArtifactInfo
+ - product_name, product_description, license, license_content, software_dependencies
+- Added static `#available_versions` method to API
+- Architecture normalization cleanup
+- Fixed race condition in acceptance suites
+
 ## [2.0.4]
 - Normalize auto detect platform architectures
 

data/README.md

@@ -26,9 +26,9 @@ artifact.url
 ```ruby
 options = {
   channel: :current,
-  product_name: 'chef',
-  product_version: :latest
+  product_name: 'chef'
 }
+# product_version: :latest is the default
 
 artifacts = Mixlib::Install.new(options).artifact_info
 # => [#<Mixlib::Install::ArtifactInfo>, ...]
@@ -70,16 +70,23 @@ artifact.platform_version # => "14.04"
 ```
 
 ### List the available versions for a product and channel
+#### Instance method
 ```ruby
-# Note that this feature currently only works for :unstable channel
 options = {
-  channel: :unstable,
+  channel: :stable,
   product_name: 'chef',
 }
 
 Mixlib::Install.new(options).available_versions
 
-# => ["12.13.3", "12.13.7", "12.13.8+20160721014124", "12.13.11+20160721165202"]
+# => ["12.13.3", "12.13.7"]
+```
+
+#### Static method
+```ruby
+Mixlib::Install.available_versions("chef", "stable")
+
+# => ["12.13.3", "12.13.7"]
 ```
 
 ## Development

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

@@ -1,4 +1,4 @@
-execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.install_ps1, 'install'\" > ../.acceptance_data/install.ps1" do
+execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.install_ps1, 'install'\" > ../.acceptance_data/powershell_install.ps1" do
   cwd node['chef-acceptance']['suite-dir']
 end
 

data/acceptance/powershell_install_ps1/terraform/application.tf

@@ -77,7 +77,7 @@ EOF
   }
 
   provisioner "file" {
-    source      = "../../.acceptance_data/install.ps1"
+    source      = "../../.acceptance_data/powershell_install.ps1"
     destination = "/tmp/install.ps1"
   }
 

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

@@ -1,4 +1,4 @@
-execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.new(product_name: 'omnibus-toolchain', product_version: :latest, channel: :stable).install_command\" > ../.acceptance_data/install.sh" do
+execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.new(product_name: 'omnibus-toolchain', product_version: :latest, channel: :stable).install_command\" > ../.acceptance_data/ubuntu_install_command.sh" do
   cwd node['chef-acceptance']['suite-dir']
 end
 

data/acceptance/ubuntu_install_command/terraform/application.tf

@@ -65,7 +65,7 @@ resource "aws_instance" "mixlib_install_sh" {
   }
 
   provisioner "file" {
-    source      = "../../.acceptance_data/install.sh"
+    source      = "../../.acceptance_data/ubuntu_install_command.sh"
     destination = "/tmp/install.sh"
   }
 

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

@@ -1,4 +1,4 @@
-execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.install_sh\" > ../.acceptance_data/install.sh" do
+execute "bundle exec ruby -e \"require 'mixlib/install'; puts Mixlib::Install.install_sh\" > ../.acceptance_data/ubuntu_install.sh" do
   cwd node['chef-acceptance']['suite-dir']
 end
 

data/acceptance/ubuntu_install_sh/terraform/application.tf

@@ -65,7 +65,7 @@ resource "aws_instance" "mixlib_install_sh" {
   }
 
   provisioner "file" {
-    source      = "../../.acceptance_data/install.sh"
+    source      = "../../.acceptance_data/ubuntu_install.sh"
     destination = "/tmp/install.sh"
   }
 

data/ci/script.sh

@@ -11,8 +11,6 @@ if [ "${TRAVIS_REPO_SLUG}" = "chef/mixlib-install" ]; then
   cd acceptance && export BUNDLE_GEMFILE=$PWD/Gemfile && /opt/chefdk/embedded/bin/bundle install && export APPBUNDLER_ALLOW_RVM=true
   # run acceptances tests and force cleanup
   # only testing ubuntu until issues with powershell suite resovled:
-  # 1) inspec not finding chef package once connected (not reproducible locally)
-  # 2) currently no way to mask password (sensitive true) AND know what the error is if inspec fails
-  /opt/chefdk/embedded/bin/bundle exec chef-acceptance test ubuntu_install_command --force-destroy
-  /opt/chefdk/embedded/bin/bundle exec chef-acceptance test ubuntu_install_sh --force-destroy
+  # - currently no way to mask password (sensitive true) AND know what the error is if inspec fails
+  /opt/chefdk/embedded/bin/bundle exec chef-acceptance test ubuntu --force-destroy
 fi

data/lib/mixlib/install.rb

@@ -52,7 +52,25 @@ module Mixlib
     # @return [Array<String>] list of available versions for the given
     # product_name and channel.
     def available_versions
-      Backend.available_versions(options)
+      self.class.available_versions(options.product_name, options.channel)
+    end
+
+    #
+    # List available versions
+    #
+    # @param [String] product name
+    #
+    # @param [String, Symbol] channel
+    #
+    # @return [Array<String>] list of available versions for the given
+    # product_name and channel.
+    def self.available_versions(product_name, channel)
+      Backend.available_versions(
+        Mixlib::Install::Options.new(
+          product_name: product_name,
+          channel: channel.to_sym
+        )
+      )
     end
 
     #

data/lib/mixlib/install/artifact_info.rb

@@ -19,25 +19,31 @@
 module Mixlib
   class Install
     class ArtifactInfo
-      attr_reader :url
-      attr_reader :md5
-      attr_reader :sha256
-      attr_reader :sha1
-      attr_reader :version
 
-      attr_reader :platform
-      attr_reader :platform_version
-      attr_reader :architecture
+      ATTRIBUTES = %w{
+        architecture
+        license
+        license_content
+        md5
+        platform
+        platform_version
+        product_description
+        product_name
+        sha1
+        sha256
+        software_dependencies
+        url
+        version
+      }.freeze
+
+      # Dynamically create readers
+      ATTRIBUTES.each { |attribute| attr_reader attribute.to_sym }
 
       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]
-        @architecture = data[:architecture]
+        # Create an instance variable for each attribute
+        ATTRIBUTES.each do |attribute|
+          instance_variable_set("@#{attribute}", data[attribute.to_sym])
+        end
       end
 
       def self.from_json(json, platform_info)
@@ -63,16 +69,8 @@ module Mixlib
       end
 
       def to_hash
-        {
-          url: url,
-          md5: md5,
-          sha256: sha256,
-          sha1: sha1,
-          version: version,
-          platform: platform,
-          platform_version: platform_version,
-          architecture: architecture,
-        }
+        # Create a Hash of the instance data
+        Hash[ATTRIBUTES.map { |attribute| [attribute.to_sym, eval(attribute)] }]
       end
 
       def clone_with(data)

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

@@ -186,7 +186,7 @@ module Mixlib
           case architecture
           when "amd64"
             "x86_64"
-          when "x86", "i86pc", "i686"
+          when "i86pc", "i686"
             "i386"
           when "sun4u", "sun4v"
             "sparc"

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

@@ -158,10 +158,15 @@ Can not find any builds for #{options.product_name} in #{endpoint}.
         end
 
         def create_artifact(artifact_map)
-          platform, platform_version = normalize_platform(artifact_map["omnibus.platform"],
-            artifact_map["omnibus.platform_version"])
+          # set normalized platform and platform version
+          platform, platform_version = normalize_platform(
+            artifact_map["omnibus.platform"],
+            artifact_map["omnibus.platform_version"]
+          )
 
-          chef_standard_path = generate_chef_standard_path(options.channel,
+          # create the standardized file path
+          chef_standard_path = generate_chef_standard_path(
+            options.channel,
             artifact_map["omnibus.project"],
             artifact_map["omnibus.version"],
             platform,
@@ -169,18 +174,59 @@ Can not find any builds for #{options.product_name} in #{endpoint}.
             artifact_map["filename"]
           )
 
+          # retrieve the metadata using the standardized path
+          begin
+            metadata = get("#{chef_standard_path}.metadata.json")
+            license_content = metadata["license_content"]
+            software_dependencies = metadata["version_manifest"]["software"]
+          rescue Net::HTTPServerException => e
+            if e.message =~ /404/
+              license_content, software_dependencies = nil
+            else
+              raise e
+            end
+          end
+
+          # create the download path with the correct endpoint
+          base_url = if use_compat_download_url_endpoint?(platform, platform_version)
+                       COMPAT_DOWNLOAD_URL_ENDPOINT
+                     else
+                       endpoint
+                     end
+
           ArtifactInfo.new(
-            md5:              artifact_map["omnibus.md5"],
-            sha256:           artifact_map["omnibus.sha256"],
-            sha1:             artifact_map["omnibus.sha1"],
-            version:          artifact_map["omnibus.version"],
-            platform:         platform,
-            platform_version: platform_version,
-            architecture:     normalize_architecture(artifact_map["omnibus.architecture"]),
-            url:              chef_standard_path
+            architecture:          normalize_architecture(artifact_map["omnibus.architecture"]),
+            license:               artifact_map["omnibus.license"],
+            license_content:       license_content,
+            md5:                   artifact_map["omnibus.md5"],
+            platform:              platform,
+            platform_version:      platform_version,
+            product_description:   product_description,
+            product_name:          options.product_name,
+            sha1:                  artifact_map["omnibus.sha1"],
+            sha256:                artifact_map["omnibus.sha256"],
+            software_dependencies: software_dependencies,
+            url:                   "#{base_url}/#{chef_standard_path}",
+            version:               artifact_map["omnibus.version"]
           )
         end
 
+        #
+        # 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 ENDPOINT based urls
+        #
+        # @return [boolean] use compat download url endpoint
+        #
+        def use_compat_download_url_endpoint?(platform, platform_version)
+          case "#{platform}-#{platform_version}"
+          when "freebsd-9", "el-5", "solaris2-5.9", "solaris2-5.10"
+            true
+          else
+            false
+          end
+        end
+
         private
 
         # Converts Array<Hash> where the Hash is a key pair and
@@ -194,28 +240,17 @@ Can not find any builds for #{options.product_name} in #{endpoint}.
         end
 
         # Generates a chef standard download uri in the form of
-        # http://endpoint/files/:channel/:project/:version/:platform/:platform_version/:file
+        # /files/:channel/:project/:version/:platform/:platform_version/:file
         def generate_chef_standard_path(channel, project, version, platform, platform_version, filename)
-          # 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 ENDPOINT based urls
-          base_url = case "#{platform}-#{platform_version}"
-                     when "freebsd-9", "el-5", "solaris2-5.9", "solaris2-5.10"
-                       COMPAT_DOWNLOAD_URL_ENDPOINT
-                     else
-                       endpoint
-                     end
-
-          uri = []
-          uri << base_url.sub(/\/$/, "")
-          uri << "files"
-          uri << channel
-          uri << project
-          uri << version
-          uri << platform
-          uri << platform_version
-          uri << filename
-          uri.join("/")
+          path = []
+          path << "files"
+          path << channel
+          path << project
+          path << version
+          path << platform
+          path << platform_version
+          path << filename
+          path.join("/")
         end
 
         def endpoint
@@ -225,6 +260,10 @@ Can not find any builds for #{options.product_name} in #{endpoint}.
         def omnibus_project
           @omnibus_project ||= PRODUCT_MATRIX.lookup(options.product_name, options.product_version).omnibus_project
         end
+
+        def product_description
+          PRODUCT_MATRIX.lookup(options.product_name, options.product_version).product_name
+        end
       end
     end
   end

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "2.0.4"
+    VERSION = "2.1.0"
   end
 end

metadata

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