mixlib-install 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4764a817f6f781c4fad2b870666b1bdf96c057f0
-  data.tar.gz: 36350ca6f4849c9468d0af8492373eac5e8a6147
+  metadata.gz: 4893a11fa816d4a5f41a23ba5fc240581814e01c
+  data.tar.gz: b63a27ed56a22506d8d239e94fdaa5996a86d316
 SHA512:
-  metadata.gz: e3fc2ba02d777c4dc5011d65a48643291373b4982b95b2160b551ff20b3cb929d7c2bf20635e3cafd9c92386b05c7229ccd646e265fbcf5c647ca864006e82ac
-  data.tar.gz: c8b48e71d606e9b45058ba4b9b16f1d247b2ae272c4b3879a5c4dea2e043342162653e85078059658b1df392e5b0d5f46397627f9b7111ed1afb27db8bcde137
+  metadata.gz: 4e4fa265d321456e0eb32c805680965ba28b1022794863bdf4a8d2e82cb2bb86e2ebd567b1a909925255ad94b070623db658c49bb498b63d4d6c4ec2049b4eab
+  data.tar.gz: aff7a8bdfa4fd774209e0cca484304eddcae3e3af35ca55e41f50b1826a64781470486b73cdf2c312148f49a0246f4ccbc51e0a99e34d735e490caad11fc3fa7

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [2.1.5]
+- Add `install_path` properties to the products inside PRODUCT_MATRIX.
+
 ## [2.1.4]
 - Fix Cumulus Linux and Cumulus Networks platform detection
 

data/README.md

@@ -103,11 +103,22 @@ Mixlib::Install.available_versions("chef", "stable")
 # => ["12.13.3", "12.13.7"]
 ```
 
+### User-Agent Request Headers
+By default, all requests made by `mixlib-install` will include a `User-Agent` request header as `mixlib-install/<version>`.
+Additional `User-Agent` request headers can be added by setting the `user_agent_headers` option.
+When you want to identify a product using mixlib-install as a dependency we recommend the format `product/version`.
+```ruby
+options = {
+  channel: :stable,
+  product_name: 'chef',
+  user_agent_headers: ["my_product/1.2.3", "somethingelse"],
+}
+```
+
 ### Collecting Software Dependencies and License Content
 Collecting software dependencies and license content for ArtifactInfo instances
 requires additional requests to the repository server. By default, collection is disabled.
 To return data for instance methods `software_dependencies` and `license_content`, the `include_metadata` option must be enabled.
-
 ```
 options = {
   channel: :current,

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

@@ -147,16 +147,32 @@ Can not find any builds for #{options.product_name} in #{endpoint}.
           uri = URI.parse(endpoint)
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = (uri.scheme == "https")
-
           full_path = File.join(uri.path, url)
-          request = Net::HTTP::Get.new(full_path)
 
-          res = http.request(request)
+          res = http.request(create_http_request(full_path))
 
           res.value
           JSON.parse(res.body)
         end
 
+        def create_http_request(full_path)
+          require "mixlib/install/version"
+
+          request = Net::HTTP::Get.new(full_path)
+
+          user_agents = ["mixlib-install/#{Mixlib::Install::VERSION}"]
+
+          if options.user_agent_headers
+            options.user_agent_headers.each do |header|
+              user_agents << header
+            end
+          end
+
+          request.add_field("User-Agent", user_agents.join(" "))
+
+          request
+        end
+
         def create_artifact(artifact_map)
           # set normalized platform and platform version
           platform, platform_version = normalize_platform(

data/lib/mixlib/install/options.rb

@@ -39,6 +39,7 @@ module Mixlib
         :shell_type,
         :platform_version_compatibility_mode,
         :include_metadata,
+        :user_agent_headers,
       ]
 
       def initialize(options)
@@ -57,6 +58,7 @@ module Mixlib
         errors << validate_product_names
         errors << validate_channels
         errors << validate_shell_type
+        errors << validate_user_agent_headers
 
         unless errors.compact.empty?
           raise InvalidOptions, errors.join("\n")
@@ -132,6 +134,20 @@ Must be one of: #{SUPPORTED_SHELL_TYPES.join(", ")}
         end
       end
 
+      def validate_user_agent_headers
+        error = nil
+        if user_agent_headers
+          if user_agent_headers.is_a? Array
+            user_agent_headers.each do |header|
+              error = "user agent headers can not have spaces." if header.include?(" ")
+            end
+          else
+            error = "user_agent_headers must be an Array."
+          end
+        end
+
+        error
+      end
     end
   end
 end

data/lib/mixlib/install/product.rb

@@ -29,6 +29,8 @@ module Mixlib
         :ctl_command,
         :package_name,
         :product_name,
+        :install_path,
+        :omnibus_project,
       ]
 
       #
@@ -49,7 +51,7 @@ module Mixlib
           if block.nil?
             if prop_string.nil?
               value = instance_variable_get("@#{prop}".to_sym)
-              return nil if value.nil?
+              return default_value_for(prop) if value.nil?
 
               if value.is_a? String
                 value
@@ -67,14 +69,16 @@ module Mixlib
       end
 
       #
-      # Set omnibus_project when configured, otherwise fall back to
-      # package_name
+      # Return the default values for DSL properties
       #
-      def omnibus_project(value = nil)
-        if value.nil?
-          @omnibus_project || package_name
+      def default_value_for(prop)
+        case prop
+        when :install_path
+          "/opt/#{package_name}"
+        when :omnibus_project
+          package_name
         else
-          @omnibus_project = value
+          nil
         end
       end
 
@@ -217,7 +221,20 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     end
     omnibus_project "chef-server"
     ctl_command "chef-server-ctl"
-    config_file "/etc/opscode/chef-server.rb"
+    config_file do |v|
+      if (v < version_for("12.0.0")) && (v > version_for("11.0.0"))
+        "/etc/chef-server/chef-server.rb"
+      else
+        "/etc/opscode/chef-server.rb"
+      end
+    end
+    install_path do |v|
+      if (v < version_for("12.0.0")) && (v > version_for("11.0.0"))
+        "/opt/chef-server"
+      else
+        "/opt/opscode"
+      end
+    end
   end
 
   product "chef-server-ha-provisioning" do
@@ -294,6 +311,7 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     package_name "private-chef"
     ctl_command "private-chef-ctl"
     config_file "/etc/opscode/private-chef.rb"
+    install_path "/opt/opscode"
   end
 
   product "push-jobs-client" do

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "2.1.4"
+    VERSION = "2.1.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory