mixlib-install 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e92952408c7ab6f65b6613a45e2debc1cecc561
-  data.tar.gz: da6e6ae0fff21cf77a0823883f72788a95dc7434
+  metadata.gz: e766479dca9a2bb0dbdfc558b76d0e291580ed9e
+  data.tar.gz: bf3a9b004e84d76307c1bcfb7826b9166eecab47
 SHA512:
-  metadata.gz: 210497a42f51a085c00170ad28d77bff5861fbc0c12588ac091fcd7b5268e494b97b792c08f17c1f3bd4f21784420b12e452c9e0a0861b578c13730867364a79
-  data.tar.gz: 8a7b5fe062d3d3f842bbc5e3e031fcb293ca27df61f961d5671ec66bbc56304c6e024128cd62e4f2b398e811974d0009999c251930ba42b2b6f6ac1dc1f3e46d
+  metadata.gz: 6d97cf66c06b5f551ce3ea799a49544ff311b9f2aac37914926dc79761dc0aa9f9a0bdb9ec6b76a18ddabcd9b8f6ba743a17c4e04958486f2f668e9077204b09
+  data.tar.gz: a34a4378b3083182b156b1489abd5964cad41b5566f56219fa151136ea34385c9aa12e9200ea24181f7de63e681dcc4bb91a9aeb171ad0d993ec51f8dee0b79c

data/.travis.yml

@@ -19,8 +19,8 @@ matrix:
     env: SUITE=ubuntu
   - rvm: 2.3
     env: SUITE=windows-server-2012r2
-  - rvm: 2.3
-    env: SUITE=windows-nano
+  # - rvm: 2.3
+  #   env: SUITE=windows-nano
 
 before_script:
   - ci/before-script.sh

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [3.2.0]
+- Add support for partial product versioning support ("11", 12", "12.1", etc.)
+- Refactor and expose `#normalize_architecture`
+
 ## [3.1.0]
 - Add support for Windows Nano 2016 (returns appx packages)
 

data/README.md

@@ -16,10 +16,13 @@ Run `$ mixlib-install help` for additional commands and options.
 
 ## API Usage
 
-### Get URL for specific platform and package version
+### Load mixlib-install
 ```ruby
 require 'mixlib/install'
+```
 
+### Get URL for specific platform and package version
+```ruby
 options = {
   channel: :current,
   product_name: 'chef',
@@ -51,6 +54,39 @@ artifacts.first.url
 # => => "https://packages.chef.io/files/current/chef/12.14.90/mac_os_x/10.11/chef-12.14.90-1.dmg"
 ```
 
+### Get latest artifacts for a partial version
+```ruby
+options = {
+  channel: :current,
+  product_name: 'chef',
+  product_version: '12.14'
+}
+
+artifacts = Mixlib::Install.new(options).artifact_info
+# => [#<Mixlib::Install::ArtifactInfo>]
+
+artifacts.first.version
+# => "12.14.89"
+```
+
+### Get latest artifact for a partial version
+```ruby
+options = {
+  channel: :current,
+  product_name: 'chef',
+  product_version: '12',
+  platform: 'mac_os_x',
+  platform_version: '10.9',
+  architecture: 'x86_64'
+}
+
+artifact = Mixlib::Install.new(options).artifact_info
+# => #<Mixlib::Install::ArtifactInfo>
+
+artifact.version
+# => "12.19.36"
+```
+
 ### Detect platform information
 ```ruby
 options = {

data/acceptance/windows-server-2012r2/inspec/verify.rb

@@ -1,3 +1,3 @@
-describe package("Chef Client v12*") do
+describe package("Chef Client v13*") do
   it { should be_installed }
 end

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

@@ -222,25 +222,6 @@ EOF
           [platform, platform_version]
         end
 
-        #
-        # Normalizes architecture information that we receive from omnibus.architecture
-        #
-        # @param [String] architecture
-        #
-        # @return String [architecture]
-        def normalize_architecture(architecture)
-          case architecture
-          when "amd64"
-            "x86_64"
-          when "i86pc", "i686"
-            "i386"
-          when "sun4u", "sun4v"
-            "sparc"
-          else
-            architecture
-          end
-        end
-
         private
 
         #

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

@@ -21,6 +21,7 @@ require "mixlib/install/artifact_info"
 require "mixlib/install/backend/base"
 require "mixlib/install/product"
 require "mixlib/install/util"
+require "mixlib/versioning"
 require "net/http"
 
 module Mixlib
@@ -36,7 +37,7 @@ module Mixlib
         # @return [Array<ArtifactInfo>] list of artifacts for the configured
         # channel, product name, and product version.
         def available_artifacts
-          artifacts = if options.latest_version?
+          artifacts = if options.latest_version? || options.partial_version?
                         latest_version
                       else
                         artifacts_for_version(options.product_version)
@@ -89,12 +90,25 @@ EOF
 
         #
         # Get artifacts for the latest version, channel and product_name
+        # When a partial version is set the results will be filtered
+        # before return latest version.
         #
         # @return [Array<ArtifactInfo>] Array of info about found artifacts
         def latest_version
-          # Sort by created data
-          sorted_versions = versions.sort_by! { |b| b["created"] }.reverse!
-          version = extract_version_from_response(sorted_versions.first)
+          product_versions = if options.partial_version?
+                               v = options.product_version
+                               partial_version = v.end_with?(".") ? v : v + "."
+                               versions.find_all { |ver| extract_version_from_response(ver).start_with?(partial_version) }
+                             else
+                               versions
+                             end
+
+          # Use mixlib versioning to parse and sort versions
+          ordered_versions = product_versions.sort_by do |v|
+            Mixlib::Versioning.parse(extract_version_from_response(v))
+          end.reverse
+
+          version = extract_version_from_response(ordered_versions.first)
           artifacts_for_version(version)
         end
 
@@ -193,7 +207,7 @@ EOF
                      end
 
           ArtifactInfo.new(
-            architecture:          normalize_architecture(artifact_map["omnibus.architecture"]),
+            architecture:          Util.normalize_architecture(artifact_map["omnibus.architecture"]),
             license:               artifact_map["omnibus.license"],
             license_content:       license_content,
             md5:                   artifact_map["omnibus.md5"],

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

@@ -57,8 +57,14 @@ module Mixlib
 project=#{options.product_name}
 version=#{options.product_version}
 channel=#{options.channel}
+#{install_command_vars}
 EOS
         end
+
+        def install_command_vars
+          return if options.install_command_options.nil?
+          options.install_command_options.map { |key, value| "#{key}='#{value}'" }.join("\n")
+        end
       end
     end
   end

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

@@ -71,8 +71,13 @@ module Mixlib
           cmd << " -version #{options.product_version}"
           cmd << " -channel #{options.channel}"
           cmd << " -architecture #{options.architecture}" if options.architecture
+          cmd << install_command_params if options.install_command_options
           cmd << "\n"
         end
+
+        def install_command_params
+          options.install_command_options.map { |key, value| " -#{key} '#{value}'" }.join
+        end
       end
     end
   end

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

@@ -45,9 +45,14 @@ function Install-Project {
     $architecture = 'auto',
     [validateset('auto', 'service', 'task')]
     [string]
-    $daemon = 'auto'
+    $daemon = 'auto',
+    [string]
+    $http_proxy
   )
 
+  # Set http_proxy as env var
+  $env:http_proxy = $http_proxy
+
   $package_metadata = Get-ProjectMetadata -project $project -channel $channel -version $version -prerelease:$prerelease -nightlies:$nightlies -architecture $architecture
 
   if (-not [string]::IsNullOrEmpty($filename)) {

data/lib/mixlib/install/options.rb

@@ -60,6 +60,7 @@ module Mixlib
         :platform_version_compatibility_mode,
         :include_metadata,
         :user_agent_headers,
+        :install_command_options,
       ]
 
       SUPPORTED_WINDOWS_DESKTOP_VERSIONS = %w{7 8 8.1 10}
@@ -70,7 +71,7 @@ module Mixlib
         @options = options
         @errors = []
 
-        # Store original platform version in cases where we must remap it
+        # Store original options in cases where we must remap
         @original_platform_version = options[:platform_version]
 
         resolve_platform_version_compatibility_mode!
@@ -110,6 +111,10 @@ module Mixlib
         product_version.to_sym == :latest
       end
 
+      def partial_version?
+        !latest_version? && !Mixlib::Versioning.parse(product_version)
+      end
+
       def include_metadata?
         include_metadata.to_s == "true"
       end

data/lib/mixlib/install/util.rb

@@ -148,6 +148,25 @@ module Mixlib
             version
           end
         end
+
+        #
+        # Normalizes architecture information
+        #
+        # @param [String] architecture
+        #
+        # @return String [architecture]
+        def normalize_architecture(architecture)
+          case architecture
+          when "amd64"
+            "x86_64"
+          when "i86pc", "i686"
+            "i386"
+          when "sun4u", "sun4v"
+            "sparc"
+          else
+            architecture
+          end
+        end
       end
     end
   end

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.1.0"
+    VERSION = "3.2.0"
   end
 end

data/mixlib-install.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -183,16 +183,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: 
 email:
 - thom@chef.io
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library for interacting with Chef Software Inc's software distribution