mixlib-install 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c63e09a7ebe4166626811ca0456ea1eff7af1828
-  data.tar.gz: e5721c290d6d34796f86c9ad6303432265ff6128
+  metadata.gz: 03929d3bab7753839718857039be870546202ee5
+  data.tar.gz: cc933994d3a8c50a20cf6fcaa328ddf97475e68d
 SHA512:
-  metadata.gz: 988bd0f5658f65b6f52a2dcbf7147385a6556cb288ad992b9f8b35fa04d45e7da645a43ba860bbfa6ee0a4a185586bd26d2bf32543d128cb6e4f7d4ec3fcfa9a
-  data.tar.gz: 6a929fef500e497365835f01aaf4f15b1acd1a300c454604c186d26a3b9868f56e21e5d989054c6d5ecddcc9ae2ba9fbda074a1261741d979ad21173e6f97565
+  metadata.gz: d83a3f88f72136251caf55268d7729f02e03ec135963794b29183c5d4d72c1439a8d7e06939a9447a41cea18dffb39da42f8ffbeca3ed85945edcefd06fd7690
+  data.tar.gz: 1a1af862a6b4f89e22c58102abc504f3ce2852b41203edee62e35a8f0d729d8ea11eeda662e4e59c2842327f02825e5d1988ba0b57a76482836433376d5c2c5f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [1.0.10]
+- Correctly parse architecture for ppc64el.
+- Return chef.bintray.com based urls for solaris9 and solaris10.
+- Handle historical artifacts published for solaris.
+
 ## [1.0.9]
 - Update platform detection scripts to recognize debian 8 correctly.
 

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

@@ -219,7 +219,7 @@ module Mixlib
           platform_info = parse_platform_info(artifact_map)
 
           base_url = case "#{platform_info[:platform]}-#{platform_info[:platform_version]}"
-                     when "freebsd-9", "el-5"
+                     when "freebsd-9", "el-5", "solaris2-5.9", "solaris2-5.10"
                        COMPAT_DOWNLOAD_URL_ENDPOINT
                      else
                        DOWNLOAD_URL_ENDPOINT
@@ -247,6 +247,7 @@ module Mixlib
           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)
@@ -258,6 +259,29 @@ 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.
@@ -288,8 +312,8 @@ module Mixlib
           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)
+          # 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"

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "1.0.9"
+    VERSION = "1.0.10"
   end
 end

data/mixlib-install.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "webmock", "~> 1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -127,16 +127,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: 
 email:
 - thom@chef.io