chef 19.1.164 → 19.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e7fc478657545da0cad78e0200726a50534157cbee77bd4f130b5c5252e8b9d
-  data.tar.gz: 0c6a6791f5f5c13dd65f3ce6bd428f7447920408d6ca01f04860d1ca762a8839
+  metadata.gz: a348124039267c43844767273ea5e8727b35d92b641fc3e6690885947277b543
+  data.tar.gz: f85cdbe7468884cd9c80d2775a8e30ead5c2102b451bcd1d778e13b2090ceae0
 SHA512:
-  metadata.gz: 64d827469a38015f1db81fb765617836b1524c6c9c1e70a13f3062815989e25ca1ef6b651fc607a69b382c8b4c4cae9f4d2f9fec408b5433d69db49be3ce38fe
-  data.tar.gz: 61e13e48a1d7459635b076b346a5c37942da12e965ca4172679d0d7fee7da611c3c482c5b4d0414fef222cef79fc6eb4a21bb592fada320f8115b9c0311dfc44
+  metadata.gz: 523e235dfa63d0f7ba8de9aee74606e13e9795e04ce18893c11298a1b1c2d08d23c03f7e8f3c0c30e297330740abaab6a74fac58b1d0338dec1f8abacecebedd
+  data.tar.gz: f7eb3b68c618206e5ba488e7eeca347f316e2e5098338eeaebeb06e37b4a37291190a5b98170006daf000f48c21c17aa4ed3c961bd478c6910d9f2de3e73534f

data/Gemfile

@@ -35,7 +35,7 @@ end
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
-  gem "inspec-core-bin", "= 7.0.95" # need to provide the binaries for inspec
+  gem "inspec-core-bin", "= 7.0.107" # need to provide the binaries for inspec
   gem "chef-vault"
 end
 

data/Rakefile

@@ -114,3 +114,13 @@ task :style do
 rescue LoadError
   puts "Rubocop or Cookstyle gems are not installed. bundle install first to make sure all dependencies are installed."
 end
+
+# begin
+#   require "chefstyle"
+#   require "rubocop/rake_task"
+#   RuboCop::RakeTask.new(:style) do |task|
+#     task.options += ["--display-cop-names", "--no-color"]
+#   end
+# rescue LoadError
+#   puts "chefstyle/rubocop is not available. bundle install first to make sure all dependencies are installed."
+# end

data/chef.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-shellout", "~> 3.3.8"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 19.0"
-  s.add_dependency "inspec-core", "~> 7.0.95"
+  s.add_dependency "inspec-core", "~> 7.0.107"
 
   s.add_dependency "ffi", ">= 1.15.5", "< 1.18.0"
   s.add_dependency "ffi-yajl", "~> 2.2"

data/lib/chef/provider/package/chocolatey.rb

@@ -257,7 +257,8 @@ class Chef
           @choco_install_path ||= begin
             result = powershell_exec!(PATHFINDING_POWERSHELL_COMMAND).result
             result = "" if result.empty?
-            result
+            # Ensure consistent Windows path separators
+            result.empty? ? result : result.tr("/", "\\")
           end
         end
 
@@ -459,8 +460,10 @@ class Chef
         def get_local_pkg_dirs(base_dir)
           return [] unless Dir.exist?(base_dir)
 
-          Dir.entries(base_dir).select do |dir|
-            ::File.directory?(::File.join(base_dir, dir)) && !dir.start_with?(".")
+          with_file_lock_retry("reading chocolatey package directories") do
+            Dir.entries(base_dir).select do |dir|
+              ::File.directory?(::File.join(base_dir, dir)) && !dir.start_with?(".")
+            end
           end
         end
 
@@ -496,6 +499,60 @@ class Chef
           args
         end
 
+        # Wait for chocolatey to release file locks after package operations
+        # @param names [Array<String>] package names that were just installed/upgraded
+        def wait_for_chocolatey_lock_release(names)
+          return if names.empty?
+
+          Chef::Log.debug("Waiting for chocolatey to release file locks for packages: #{names.join(", ")}")
+
+          # Check for .chocolateyPending files and wait for them to be released
+          names.each do |name|
+            pending_file = ::File.join(choco_lib_path, name.downcase, ".chocolateyPending")
+            if ::File.exist?(pending_file)
+              with_file_lock_retry("waiting for .chocolateyPending file release: #{pending_file}") do
+                # Try to open the file exclusively - this will fail if it's locked
+                ::File.open(pending_file, "r") do |f|
+                  f.flock(::File::LOCK_EX | ::File::LOCK_NB) or raise Errno::EAGAIN
+                end
+              end
+            end
+          end
+        end
+
+        # Retry file operations that might encounter chocolatey process file locks
+        # @param operation_desc [String] description of the operation for logging
+        # @param max_retries [Integer] maximum number of retry attempts
+        # @param base_delay [Float] base delay between retries in seconds
+        def with_file_lock_retry(operation_desc, max_retries: 5, base_delay: 0.5)
+          retries = 0
+          begin
+            yield
+          rescue Errno::EACCES, Errno::EBUSY, Errno::EAGAIN, Errno::ENOENT => e
+            if retries < max_retries && file_lock_error?(e)
+              retries += 1
+              delay = base_delay * (2**(retries - 1)) # exponential backoff
+              Chef::Log.debug("Chocolatey file lock detected during #{operation_desc}, retrying in #{delay}s (attempt #{retries}/#{max_retries}): #{e.message}")
+              sleep(delay)
+              retry
+            else
+              Chef::Log.warn("Failed #{operation_desc} after #{retries} retries: #{e.message}")
+              raise e
+            end
+          end
+        end
+
+        # Check if the error is related to file locking by chocolatey processes
+        # @param error [Exception] the exception to check
+        # @return [Boolean] true if it's a chocolatey file lock related error
+        def file_lock_error?(error)
+          error.message&.include?("being used by another process") ||
+            error.message&.include?("chocolateyPending") ||
+            error.is_a?(Errno::EACCES) ||
+            error.is_a?(Errno::EBUSY) ||
+            error.is_a?(Errno::EAGAIN)
+        end
+
         # Fetch the local package versions from chocolatey
         def fetch_package_versions(base_dir, target_dirs, targets)
           pkg_versions = {}
@@ -511,25 +568,27 @@ class Chef
         # Grab the locally installed packages from the nupkg list
         # rather than shelling out to chocolatey
         def get_pkg_data(path)
-          t = ::File.join(path, "*.nupkg").gsub("\\", "/")
-          targets = Dir.glob(t)
-
-          # Extract package version from the first nuspec file in this nupkg
-          targets.each do |target|
-            Zip::File.open(target) do |zip_file|
-              zip_file.each do |entry|
-                next unless entry.name.end_with?(".nuspec")
-
-                f = entry.get_input_stream
-                doc = REXML::Document.new(f.read.to_s)
-                f.close
-                id = doc.elements["package/metadata/id"]
-                version = doc.elements["package/metadata/version"]
-                return { id.text.to_s.downcase => version.text } if id && version
+          with_file_lock_retry("get package data for #{path}") do
+            t = ::File.join(path, "*.nupkg")
+            targets = Dir.glob(t)
+
+            # Extract package version from the first nuspec file in this nupkg
+            targets.each do |target|
+              Zip::File.open(target) do |zip_file|
+                zip_file.each do |entry|
+                  next unless entry.name.end_with?(".nuspec")
+
+                  f = entry.get_input_stream
+                  doc = REXML::Document.new(f.read.to_s)
+                  f.close
+                  id = doc.elements["package/metadata/id"]
+                  version = doc.elements["package/metadata/version"]
+                  return { id.text.to_s.downcase => version.text } if id && version
+                end
               end
             end
+            {}
           end
-          {}
         rescue StandardError => e
           Chef::Log.warn("Failed to get package info for #{path}: #{e}")
           {}

data/lib/chef/provider/package/rubygems.rb

@@ -391,6 +391,8 @@ class Chef
             cmd = "#{@gem_binary_location} list #{gem_dependency.name} --remote --all #{source_args}"
             result = shell_out!(cmd)
 
+            target_platforms = nil
+
             versions = []
             result.stdout.each_line do |line|
               next unless line.start_with?("#{gem_dependency.name} (")
@@ -399,10 +401,31 @@ class Chef
               next unless version_string
 
               version_string.split(/,\s*/).each do |v|
-                version = Gem::Version.new(v.strip)
+                # `gem list --remote --all` emits entries like "1.6.0 x86_64-linux".
+                # Accept platform-specific tokens only when the platform is compatible
+                # with the target gem environment; pure-Ruby tokens have no suffix and
+                # are always accepted.
+                version_token, *platform_tokens = v.strip.split(/\s+/)
+
+                if platform_tokens.any?
+                  target_platforms ||= gem_platforms
+                  # Each comma-separated entry from `gem list --remote --all` can list
+                  # multiple platforms for one version: "1.5.9 ruby x86_64-linux aarch64-linux ...".
+                  # Accept if any listed platform is "ruby" (pure-Ruby) or matches the target env.
+                  compatible = platform_tokens.any? do |pt|
+                    pt == "ruby" || target_platforms.any? do |p|
+                      Gem::Platform.new(p) === Gem::Platform.new(pt)
+                    rescue ArgumentError
+                      false
+                    end
+                  end
+                  next unless compatible
+                end
+
+                version = Gem::Version.new(version_token)
                 versions << version if gem_dependency.requirement.satisfied_by?(version)
               rescue ArgumentError
-                # Skip invalid versions
+                # Skip tokens with invalid version strings.
               end
             end
 

data/lib/chef/resource/chef_client_hab_ca_cert.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "pathname"
+require "pathname" unless defined?(Pathname)
 require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef

data/lib/chef/resource/chocolatey_installer.rb

@@ -35,7 +35,7 @@ class Chef
           ```ruby
           chocolatey_installer 'latest' do
             action :install
-            download_url "c:\\foo\foo.nupkg"
+            download_url "c:\\foo\\foo.nupkg"
             chocolatey_version '2.12.24'
           end
           ```

data/lib/chef/resource/helpers/path_helpers.rb

@@ -23,9 +23,11 @@ class Chef
         bin = File.basename(path)
 
         # On Windows, temporarily use the c:\\hab\\bin\\*.bat binstubs
-        bat_path = "C:\\hab\\bin\\#{bin}.bat"
+        bat_path = "C:\\hab\\bin\\#{ChefUtils::Dist::Infra::CLIENT}.bat"
         return bat_path if File.exist?(bat_path) && ChefUtils.windows?
-        return path if bin == "#{ChefUtils::Dist::Infra::CLIENT}"
+
+        # return path for any bin/chef-* names
+        return path.sub(bin, ChefUtils::Dist::Infra::CLIENT) if bin =~ /^chef-[a-z-]+$/
 
         # Return empty string if no valid path is found
         ""
@@ -37,7 +39,7 @@ class Chef
         path = File.realpath($PROGRAM_NAME)
         bin = File.basename(path)
 
-        return path if bin == "#{ChefUtils::Dist::Infra::CLIENT}"
+        return path.sub(bin, ChefUtils::Dist::Infra::CLIENT) if bin =~ /^chef-[a-z-]+$/
 
         # Return empty string if no valid path is found
         ""

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("19.1.164")
+  VERSION = Chef::VersionString.new("19.2.12")
 end
 
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 19.1.164
+  version: 19.2.12
 platform: ruby
 authors:
 - Adam Jacob
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 19.1.164
+        version: 19.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 19.1.164
+        version: 19.2.12
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 19.1.164
+        version: 19.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 19.1.164
+        version: 19.2.12
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -219,14 +219,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.95
+        version: 7.0.107
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.95
+        version: 7.0.107
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement