mixlib-install 0.8.0.alpha.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe243313ad84e3ae88dc0708806eb15c43f76a11
-  data.tar.gz: 470d541528a8c2d1f7147632f43a1e932e7dd875
+  metadata.gz: 7c49c14b6182e48d0e62bdddc9677cc8c368eb30
+  data.tar.gz: 36429f8f5161f5ed5ea3a75aaeafc6ebdf43c3d1
 SHA512:
-  metadata.gz: f5a37cf8df4a56bb141995f514899895a61634fa2bd7a8d09373bfd17cd95709411c32017991867caccb61ab96e860cadbdfc5ae0accd59ce961e5209d933bc7
-  data.tar.gz: 94cf89573f423781f835a31ec99290b9fcefc71758c44ee7b18142c112b1ba18bd7852ac32390f56906ef968755aced6830486ed79569796eca47cfa006071f3
+  metadata.gz: 5560590bf8b7e98ac892073bb8f89ff18d31b0ad285c153d8257c5295d1926e6525e6bc40554886e8a5340c6e02a88be76b5323ecc4d963dce7021818a29bd28
+  data.tar.gz: 93358f525f3b45e3ef426b0312e61f2151886a6d6c80fff2ee8a37524769ed118ba68fd59b536c861be302154f4e6b4f8ddf1be023681406421b7ff1631d6a83

data/README.md

@@ -35,6 +35,20 @@ artifacts.first.url
 # => "http://opscode-omnibus-packages-current.s3.amazonaws.com/mac_os_x/10.9/x86_64/chef-12.5.1%2B20151009083009-1.dmg"
 ```
 
+### Detect platform information
+```ruby
+options = {
+  channel: :current,
+  product_name: 'chef',
+  product_version: :latest
+}
+
+artifact = Mixlib::Install.new(options).detect_platform
+
+artifact.platform # => "mac_os_x"
+artifact.platform_version # => "10.10"
+```
+
 ## Unstable channel
 The `:unstable` channel is currently only available when connected to Chef's internal network.
 Configure Artifactory access by setting the following environment variables:

data/lib/mixlib/install.rb

@@ -18,6 +18,7 @@
 #
 
 require "mixlib/versioning"
+require "mixlib/shellout"
 
 require "mixlib/install/backend"
 require "mixlib/install/options"
@@ -37,8 +38,10 @@ module Mixlib
     #
     # Fetch artifact metadata information
     #
-    # @return [ArtifactInfo] fetched artifact data
-    #
+    # @return [Array<ArtifactInfo>] list of fetched artifact data for the configured
+    # channel, product name, and product version.
+    # @return [ArtifactInfo] fetched artifact data for the configured
+    # channel, product name, product version and platform info
     def artifact_info
       Backend.info(options)
     end
@@ -94,7 +97,9 @@ module Mixlib
     def upgrade_available?
       return true if current_version.nil?
 
-      available_ver = Mixlib::Versioning.parse(artifact_info.first.version)
+      artifact = artifact_info
+      artifact = artifact.first if artifact.is_a? Array
+      available_ver = Mixlib::Versioning.parse(artifact.version)
       current_ver = Mixlib::Versioning.parse(current_version)
       (available_ver > current_ver)
     end
@@ -111,11 +116,14 @@ module Mixlib
     # Returns a Hash containing the platform info options
     #
     def self.detect_platform
-      platform_info = if RbConfig::CONFIG["host_os"] =~ /mswin|mingw/
-                        `#{self.detect_platform_ps1}`.split
-                      else
-                        `#{self.detect_platform_sh}`.split
-                      end
+      detect_command = if Gem.win_platform?
+                         Mixlib::ShellOut.new(self.detect_platform_ps1)
+                       else
+                         Mixlib::ShellOut.new(self.detect_platform_sh)
+                       end
+
+      detect_command.run_command
+      platform_info = detect_command.stdout.split
 
       {
         platform: platform_info[0],

data/lib/mixlib/install/backend.rb

@@ -27,7 +27,7 @@ module Mixlib
         backend = if options.for_artifactory?
                     Backend::Artifactory.new(options)
                   else
-                    Backend::Omnitruck.new(options)
+                    Backend::Bintray.new(options)
                   end
 
         backend.info

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

@@ -113,7 +113,7 @@ module Mixlib
         # @return [Array<ArtifactInfo>] Array of info about found artifacts
         #
         def bintray_artifacts
-          version = options.product_version == :latest ? latest_version : options.product_version
+          version = options.latest_version? ? latest_version : options.product_version
           results = bintray_get("#{options.channel}/#{options.product_name}/versions/#{version}/files")
 
           #

data/lib/mixlib/install/script_generator.rb

@@ -69,7 +69,7 @@ module Mixlib
                               sudo_command}
 
       def initialize(version, powershell = false, opts = {})
-        @version = version || "latest"
+        @version = (version || "latest").to_s.downcase
         @powershell = powershell
         @http_proxy = nil
         @https_proxy = nil
@@ -198,7 +198,7 @@ module Mixlib
 
         url = "#{base}#{endpoint}"
         url << "?p=windows&m=x86_64&pv=2008r2" # same package for all versions
-        url << "&v=#{CGI.escape(version.to_s.downcase)}"
+        url << "&v=#{CGI.escape(version)}" unless %w{latest true nightlies}.include?(version)
         url << "&prerelease=true" if prerelease
         url << "&nightlies=true" if nightlies
         url

data/lib/mixlib/install/version.rb

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

data/mixlib-install.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "artifactory", "~> 2.3.0"
-  spec.add_dependency "mixlib-versioning", "~> 1.1.0"
+  spec.add_dependency "artifactory", ">= 2.3.0"
+  spec.add_dependency "mixlib-versioning", ">= 1.1.0"
+  spec.add_dependency "mixlib-shellout", ">= 2.2.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 0.8.0.alpha.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Thom May
@@ -9,36 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: mixlib-versioning
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: mixlib-shellout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -188,9 +202,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2
@@ -198,3 +212,4 @@ signing_key:
 specification_version: 4
 summary: A mixin to help with omnitruck installs
 test_files: []
+has_rdoc: