mixlib-install 3.14.0 → 3.16.0

data/lib/mixlib/install.rb

@@ -103,6 +103,7 @@ module Mixlib
       uri = URI.parse(artifact.url)
       filename = nil
       final_body = nil
+      final_uri = uri
 
       Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
         # Build the request path including query string
@@ -112,23 +113,27 @@ module Mixlib
         # Get the response, following redirects
         response = http.request_get(request_path)
 
+        # Try to extract filename from Content-Disposition in initial response
+        if response["content-disposition"]
+          filename = response["content-disposition"][/filename="?([^"]+)"?/, 1]
+        end
+
         # Follow redirects
         redirect_limit = 5
         while response.is_a?(Net::HTTPRedirection) && redirect_limit > 0
           redirect_uri = URI.parse(response["location"])
           # Handle relative redirects
           redirect_uri = uri + redirect_uri if redirect_uri.relative?
+          final_uri = redirect_uri
 
           Net::HTTP.start(redirect_uri.host, redirect_uri.port, use_ssl: redirect_uri.scheme == "https") do |redirect_http|
             redirect_path = redirect_uri.path
             redirect_path += "?#{redirect_uri.query}" if redirect_uri.query
             response = redirect_http.request_get(redirect_path)
 
-            # Try to get filename from Content-Disposition or final URL
-            if response["content-disposition"]
+            # Try to get filename from Content-Disposition in redirect response
+            if response["content-disposition"] && filename.nil?
               filename = response["content-disposition"][/filename="?([^"]+)"?/, 1]
-            else
-              filename = File.basename(redirect_uri.path)
             end
           end
 
@@ -136,9 +141,23 @@ module Mixlib
         end
 
         final_body = response.body
+
+        # Try Content-Disposition from final successful response
+        if response["content-disposition"] && filename.nil?
+          filename = response["content-disposition"][/filename="?([^"]+)"?/, 1]
+        end
+      end
+
+      # Fallback: extract filename from final URL path (works for direct package URLs)
+      if filename.nil?
+        path_filename = File.basename(final_uri.path.split("?").first)
+        # Only use path filename if it looks like a package file
+        if /\.(rpm|deb|pkg|msi|dmg|bff|p5p|sh|tar|gz|appx)$/.match?(path_filename)
+          filename = path_filename
+        end
       end
 
-      # Use the extracted filename or fall back to basename of original URL
+      # Final fallback: use basename of original URL
       filename ||= File.basename(uri.path)
       file = File.join(directory, filename)
 
@@ -158,10 +177,19 @@ module Mixlib
     def root
       # This only works for chef and chefdk but they are the only projects
       # we are supporting as of now.
-      if options.for_ps1?
-        "$env:systemdrive\\#{Mixlib::Install::Dist::WINDOWS_INSTALL_DIR}\\#{options.product_name}"
+      # chef-ice uses Habitat install directories
+      if options.product_name.casecmp("chef-ice") == 0
+        if options.for_ps1?
+          "$env:systemdrive\\#{Mixlib::Install::Dist::HABITAT_WINDOWS_INSTALL_DIR}\\chef\\chef-infra-client\\*\\*"
+        else
+          "#{Mixlib::Install::Dist::HABITAT_LINUX_INSTALL_DIR}/chef/chef-infra-client/*/*"
+        end
       else
-        "/opt/#{options.product_name}"
+        if options.for_ps1?
+          "$env:systemdrive\\#{Mixlib::Install::Dist::OMNIBUS_WINDOWS_INSTALL_DIR}\\#{options.product_name}"
+        else
+          "#{Mixlib::Install::Dist::OMNIBUS_LINUX_INSTALL_DIR}/#{options.product_name}"
+        end
       end
     end
 
@@ -175,10 +203,19 @@ module Mixlib
       # install directory which can be different than the product name (e.g.
       # chef-server -> /opt/opscode). But this is OK for now since
       # chef & chefdk are the only supported products.
-      version_manifest_file = if options.for_ps1?
-                                "$env:systemdrive\\#{Mixlib::Install::Dist::WINDOWS_INSTALL_DIR}\\#{options.product_name}\\version-manifest.json"
+      # chef-ice uses Habitat install directories
+      version_manifest_file = if options.product_name.casecmp("chef-ice") == 0
+                                if options.for_ps1?
+                                  "$env:systemdrive\\#{Mixlib::Install::Dist::HABITAT_WINDOWS_INSTALL_DIR}\\chef\\chef-infra-client\\*\\*\\version-manifest.json"
+                                else
+                                  "#{Mixlib::Install::Dist::HABITAT_LINUX_INSTALL_DIR}/chef/chef-infra-client/*/*/version-manifest.json"
+                                end
                               else
-                                "/opt/#{options.product_name}/version-manifest.json"
+                                if options.for_ps1?
+                                  "$env:systemdrive\\#{Mixlib::Install::Dist::OMNIBUS_WINDOWS_INSTALL_DIR}\\#{options.product_name}\\version-manifest.json"
+                                else
+                                  "/opt/#{options.product_name}/version-manifest.json"
+                                end
                               end
 
       if File.exist? version_manifest_file
@@ -258,8 +295,25 @@ module Mixlib
     # ------------------
     # base_url [String]
     #   url pointing to the omnitruck to be queried by the script.
+    # license_id [String]
+    #   license ID for commercial or trial API access.
+    #   If license_id starts with 'free-' or 'trial-', trial API defaults are enforced.
     #
     def self.install_sh(context = {})
+      # Apply trial API defaults if license_id indicates trial
+      if context[:license_id] && Mixlib::Install::Dist.trial_license?(context[:license_id])
+        # Warn and override if non-compliant values provided
+        if context[:channel] && context[:channel].to_s != "stable"
+          warn "WARNING: Trial API only supports 'stable' channel. Changing from '#{context[:channel]}' to 'stable'."
+          context[:channel] = "stable"
+        end
+
+        if context[:version] && !["latest", nil].include?(context[:version].to_s)
+          warn "WARNING: Trial API only supports 'latest' version. Changing from '#{context[:version]}' to 'latest'."
+          context[:version] = "latest"
+        end
+      end
+
       Mixlib::Install::Generator::Bourne.install_sh(context)
     end
 
@@ -269,8 +323,25 @@ module Mixlib
     # ------------------
     # base_url [String]
     #   url pointing to the omnitruck to be queried by the script.
+    # license_id [String]
+    #   license ID for commercial or trial API access.
+    #   If license_id starts with 'free-' or 'trial-', trial API defaults are enforced.
     #
     def self.install_ps1(context = {})
+      # Apply trial API defaults if license_id indicates trial
+      if context[:license_id] && Mixlib::Install::Dist.trial_license?(context[:license_id])
+        # Warn and override if non-compliant values provided
+        if context[:channel] && context[:channel].to_s != "stable"
+          warn "WARNING: Trial API only supports 'stable' channel. Changing from '#{context[:channel]}' to 'stable'."
+          context[:channel] = "stable"
+        end
+
+        if context[:version] && !["latest", nil].include?(context[:version].to_s)
+          warn "WARNING: Trial API only supports 'latest' version. Changing from '#{context[:version]}' to 'latest'."
+          context[:version] = "latest"
+        end
+      end
+
       Mixlib::Install::Generator::PowerShell.install_ps1(context)
     end
   end

data/support/install_command.ps1

@@ -1,3 +1,6 @@
+# Set strict error handling to ensure errors cause script failures
+$ErrorActionPreference = 'Stop'
+
 Function Check-UpdateChef($root, $version) {
   if (-Not (Test-Path "$root\embedded")) { return $true }
   elseif ("$version" -eq "true") { return $false }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.16.0
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-01-14 00:00:00.000000000 Z
+date: 2026-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout