mixlib-install 3.12.30 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b6b9d6f612f1a8e4eb431feb24cd888fdcefbca693bd239a7d1435fc23b045
-  data.tar.gz: 3e3804a6ad0bcf92caa7dbb5ac440c4366223be9a25096dde560010f1b4d96d3
+  metadata.gz: ff7a4f9c339e539a6ceb50655b22976fa5c5f41c9c4f74a721dc55028d7df84f
+  data.tar.gz: 30d398aefff7ada62fcf40368a0bd40a83031d11d765341a37d6572f9561fea9
 SHA512:
-  metadata.gz: 2e3b09b0a7fb065568d81922529eb01714bbc0bdea1a6ca30734b4c2a1884287ea8144234263d636371ce372b3db2db9815b701ce9537bfe2e2b917f29a12587
-  data.tar.gz: b74d672d7f632e4ccabcf05af695c6529e5571c8c155ce197e46c9d1104c5ccd821cbbe04b8c4f471ff74a466cdbc2b6053a3f026c9cd535ad9e95004a446176
+  metadata.gz: ca10f06e8f5a7fd3323f23c954988c57e31fef1ea093738a6aefdf3c77bafd2c9ad44ec54a42514cfab1c81c18cc8739f55718ef21f3e5850d68f36fbb6e82cd
+  data.tar.gz: 983a976ca909b8a0e56903b44f2ea38e62f79e49b502a81174383dc2946e96a8e6f30a2365801f5d5647f43df7a7b13c8faaba686230694df018a2e69f64d8b2

data/Gemfile

@@ -3,30 +3,86 @@ source "https://rubygems.org"
 gemspec
 
 gem "chef-utils", "= 16.6.14" if RUBY_VERSION < "2.6.0"
+# OpenSSL version constraints to fix CRL checking issues in OpenSSL 3.6+
+# Ruby 2.6-2.7 bundled openssl needs update to 3.1.2+
+# Ruby 3.0-3.2 bundled openssl needs update to 3.1.2+
+# Ruby 3.3 bundled openssl needs update to 3.2.2+
+# Ruby 3.4 bundled openssl needs update to 3.3.1+
+if RUBY_VERSION < "2.7.0"
+  gem "openssl", ">= 3.1.2", "< 3.2.0"
+elsif RUBY_VERSION < "3.3.0"
+  gem "openssl", ">= 3.1.2"
+elsif RUBY_VERSION < "3.4.0"
+  gem "openssl", ">= 3.2.2"
+elsif RUBY_VERSION < "4.0.0"
+  gem "openssl", ">= 3.3.1"
+end
 
 group :test do
+  gem "contracts", "~> 0.16.0" # this entry can go away when ruby < 3 support is gone
   gem "rake"
   gem "rspec"
   gem "webrick"
   gem "webmock", "~> 3.4"
-  gem "contracts", "~> 0.16.0" # this entry can go away when ruby < 3 support is gone
   if RUBY_VERSION < "2.6.0"
     gem "climate_control", "= 0.1.0"
-    gem "vcr", "= 6.0.0"
     gem "mixlib-shellout", "= 3.2.5"
+    gem "public_suffix", "<= 5.1.1" # Dep of addressable which is a dep of webmock
+    gem "vcr", "= 6.0.0"
+  elsif RUBY_VERSION < "2.7.0"
+    gem "climate_control", "~> 1.0"
+    gem "mixlib-shellout", "< 3.3.9"
+    gem "public_suffix", "<= 5.1.1" # Dep of addressable which is a dep of webmock
+    gem "vcr", ">= 6.0.0", "< 6.2.0"
+  elsif RUBY_VERSION < "3.0.0"
+    gem "climate_control", "~> 1.0"
+    gem "mixlib-shellout", "< 3.3.9"
+    gem "public_suffix", "<= 5.1.1" # Dep of addressable which is a dep of webmock
+    gem "vcr"
+  elsif RUBY_VERSION < "3.2.0"
+    gem "climate_control", "~> 1.0"
+    gem "public_suffix", "< 7.0.0" # Dep of addressable which is a dep of webmock
+    gem "vcr"
+  elsif RUBY_VERSION < "3.3.0"
+    gem "climate_control", "~> 1.0"
+    gem "public_suffix", "< 7.0.0" # Dep of addressable which is a dep of webmock
+    gem "vcr"
+  elsif RUBY_VERSION >= "4.0.0"
+    gem "base64"
+    gem "benchmark"
+    gem "climate_control", "~> 1.0"
+    gem "ostruct"
+    gem "racc"
+    gem "vcr"
+  elsif RUBY_VERSION >= "3.4.0"
+    gem "base64"
+    gem "climate_control", "~> 1.0"
+    gem "racc"
+    gem "vcr"
+  elsif RUBY_VERSION >= "3.3.0"
+    gem "climate_control", "~> 1.0"
+    gem "racc"
+    gem "vcr"
   else
     gem "climate_control", "~> 1.0"
     gem "vcr"
   end
 end
 
-# use old chefstyle to support TargetRubyVersion of 1.9
 group :chefstyle do
-  gem "chefstyle", "~> 0.4.0"
+  gem "chefstyle", "~> 0.12.0" # Minimum version that will run without errors on Ruby 3.4
 end
 
 group :debug do
   gem "pry"
-  gem "pry-byebug"
+  if RUBY_VERSION < "2.7.0"
+    gem "byebug", "< 12.0" # Dep of pry-bybug
+    gem "pry-byebug", "< 3.10.0"
+  elsif RUBY_VERSION < "3.1.0"
+    gem "byebug", "< 12.0" # Dep of pry-bybug
+    gem "pry-byebug"
+  else
+    gem "pry-byebug"
+  end
   gem "rb-readline"
 end

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

@@ -19,6 +19,7 @@ require "erb" unless defined?(Erb)
 require "ostruct" unless defined?(OpenStruct)
 require_relative "../util"
 require_relative "../dist"
+require "net/http" unless defined?(Net::HTTP)
 
 module Mixlib
   class Install
@@ -68,6 +69,17 @@ module Mixlib
         def get_script(name, context = {})
           self.class.get_script(name, context)
         end
+
+        def install_sh_from_upstream
+          uri = URI.parse(options.options[:new_omnibus_download_url])
+          response = Net::HTTP.get_response(uri)
+
+          if response.code == "200"
+            response.body
+          else
+            raise StandardError, "unable to fetch the install.sh"
+          end
+        end
       end
     end
   end

data/lib/mixlib/install/generator/bourne/scripts/check_product.sh

@@ -1,6 +1,9 @@
-if test -d "/opt/$project" && test "x$install_strategy" = "xonce"; then
-  echo "$project installation detected"
-  echo "install_strategy set to 'once'"
-  echo "Nothing to install"
-  exit
-fi
+# Check for chef-client command in various locations
+for path in /hab/pkgs/chef/chef-infra-client/*/*/bin/chef-client "/usr/bin/${project}-client" "/opt/$project/bin/${project}-client"; do
+  if test -x "$path" 2>/dev/null && test "x$install_strategy" = "xonce"; then
+    echo "$project installation detected at $path"
+    echo "install_strategy set to 'once'"
+    echo "Nothing to install"
+    exit
+  fi
+done

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

@@ -59,11 +59,19 @@ function Install-Project {
     $install_strategy
   )
 
-  if ((Test-Path "$env:systemdrive\<%= windows_dir %>\$project\embedded") -and ($install_strategy -eq 'once')) {
-    Write-Host "$project installation detected"
-    Write-Host "install_strategy set to 'once'"
-    Write-Host "Nothing to install"
-    exit
+  # Check for chef-client command in various locations
+  $chef_locations = @(
+    "$env:systemdrive\hab\pkgs\chef\chef-infra-client\*\*\bin\chef-client.bat",
+    "$env:systemdrive\<%= windows_dir %>\$project\bin\$project-client.bat"
+  )
+  foreach ($path in $chef_locations) {
+    $resolved = Get-Item $path -ErrorAction SilentlyContinue | Select-Object -First 1
+    if ($resolved -and (Test-Path $resolved.FullName) -and ($install_strategy -eq 'once')) {
+      Write-Host "$project installation detected at $($resolved.FullName)"
+      Write-Host "install_strategy set to 'once'"
+      Write-Host "Nothing to install"
+      exit
+    }
   }
 
   # Set http_proxy as env var
@@ -93,8 +101,8 @@ function Install-Project {
   else {
     $filename = (([System.Uri]$download_url).AbsolutePath -split '/')[-1]
   }
-  Write-Verbose "Download directory: $download_directory"
-  Write-Verbose "Filename: $filename"
+  Write-Host "Download directory: $download_directory"
+  Write-Host "Filename: $filename"
 
   if (-not (test-path $download_directory)) {
     mkdir $download_directory
@@ -104,23 +112,23 @@ function Install-Project {
   $download_destination = join-path $download_directory $filename
 
   if ((test-path $download_destination)) {
-    Write-Verbose "Found existing installer at $download_destination."
+    Write-Host "Found existing installer at $download_destination."
     if (-not [string]::IsNullOrEmpty($sha256)) {
-      Write-Verbose "Checksum specified"
+      Write-Host "Checksum specified"
       $valid_checksum = Test-ProjectPackage -Path $download_destination -Algorithm 'SHA256' -Hash $sha256
       if ($valid_checksum -eq $true) {
-        Write-Verbose "Checksum verified, using existing installer."
+        Write-Host "Checksum verified, using existing installer."
         $cached_installer_available=$true # local file OK
         $verify_checksum = $false # no need to re-verify checksums
       }
       else {
-        Write-Verbose "Checksum mismatch, ignoring existing installer."
+        Write-Host "Checksum mismatch, ignoring existing installer."
         $cached_installer_available=$false # bad local file
         $verify_checksum = $false # re-verify checksums
       }
     }
     else {
-      Write-Verbose "Checksum not specified, existing installer ignored."
+      Write-Host "Checksum not specified, existing installer ignored."
       $cached_installer_available=$false # ignore local file
       $verify_checksum = $false # no checksum to compare
     }
@@ -128,7 +136,7 @@ function Install-Project {
 
   if (-not ($cached_installer_available)) {
     if ($pscmdlet.ShouldProcess("$($download_url)", "Download $project")) {
-      Write-Verbose "Downloading $project from $($download_url) to $download_destination."
+      Write-Host "Downloading $project from $($download_url) to $download_destination."
       Get-WebContent $download_url -filepath $download_destination
     }
   }

data/lib/mixlib/install/generator.rb

@@ -22,11 +22,10 @@ module Mixlib
   class Install
     class Generator
       def self.install_command(options)
-        if options.for_ps1?
-          PowerShell.new(options).install_command
-        else
-          Bourne.new(options).install_command
-        end
+        klass = options.for_ps1? ? PowerShell : Bourne
+        meth = options.options[:new_omnibus_download_url] ? :install_sh_from_upstream : :install_command
+
+        klass.new(options).send(meth)
       end
     end
   end

data/lib/mixlib/install/script_generator.rb

@@ -21,6 +21,7 @@ require_relative "util"
 require_relative "generator/powershell"
 require_relative "dist"
 require "cgi"
+require "net/http" unless defined?(Net::HTTP)
 
 module Mixlib
   class Install
@@ -101,6 +102,17 @@ module Mixlib
         shell_code_from_file(vars)
       end
 
+      def install_command_from_omnitruck(url)
+        uri = URI.parse(url)
+        response = Net::HTTP.get_response(uri)
+
+        if response.code == "200"
+          response.body
+        else
+          raise StandardError, "unable to fetch the install.sh"
+        end
+      end
+
       private
 
       # Generates the install command variables for Bourne shell-based

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.12.30"
+    VERSION = "3.13.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.12.30
+  version: 3.13.0
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2026-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: A library for interacting with Chef Software Inc's software distribution