omnibus 8.2.2 → 9.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af0b9ab4b9d9903d007df7fe7ef6400f29c440f6de01c3c76f2fb18690f04001
-  data.tar.gz: aa35f665517e110e781329b7e97ea9ff154633fb25c80d274bae96d4f46a6bde
+  metadata.gz: f05719c1cecdc2defbb5641b5a61517b84f88a844932ca0568e3b435997e6fd9
+  data.tar.gz: 7593e4150d3222b368a722f84f92755a4f246e2a31fc8bdb72b8bc9495c42420
 SHA512:
-  metadata.gz: f8a052707df85029b1a29c3b55a24abd7f81d9b288707bc98512c1bc185c1f309c753d72e792dc68e814c67ccc06f059cddf1b16c593f913de68cfb356d8a903
-  data.tar.gz: 46626cb42cca8480b546bd4281b853bc2c5a51063350109cff57a2f51c766963be06737af5ff26f0610c9ac9b9d2cf53ba5ae6da5df5077901569baf2bd00bfb
+  metadata.gz: bb4cd2da9b1baab9d1b2555f498d0efdf71627a0a8686654ebdab0e1da8546004b48215ac907e768c964409f8f08caa0a91cd75d664de76d8b7607f509795c5c
+  data.tar.gz: e1a6e11eac83c8e192c2468fbd457b20eacecca8d0aa7c2e286f77cdc1357cba4a9cb1618c0c03014fb7fdb4d7f9bfd346036abe277abed169d1b26f74f833e7

data/lib/omnibus/config.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2018 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 #
 
 require "singleton" unless defined?(Singleton)
+require "omnibus/sugarable" unless defined?(Sugarable)
 
 module Omnibus
   class Config
@@ -22,6 +23,7 @@ module Omnibus
     include NullArgumentable
     include Singleton
     include Util
+    include Sugarable
 
     class << self
       #

data/lib/omnibus/fetchers/net_fetcher.rb

@@ -212,7 +212,7 @@ module Omnibus
     #   :seven_zip - use 7zip for all tar/compressed tar files on windows.
     #   :lax_tar - use tar.exe on windows but ignore errors.
     #
-    # Both 7z and bsdtar have issues on windows.
+    # 7z has issues on windows.
     #
     # 7z cannot extract and untar at the same time. You need to extract to a
     # temporary location and then extract again into project_dir.
@@ -221,15 +221,6 @@ module Omnibus
     # location simply results in a text file with the target path written in
     # it. It does this without throwing any errors.
     #
-    # bsdtar will exit(1) if it is encounters symlinks on windows. So we can't
-    # use shellout! directly.
-    #
-    # bsdtar will also exit(1) and fail to overwrite files at the destination
-    # during extraction if a file already exists at the destination and is
-    # marked read-only. This used to be a problem when we weren't properly
-    # cleaning an existing project_dir. It should be less of a problem now...
-    # but who knows.
-    #
     def extract
       # Only used by tar
       compression_switch = ""
@@ -243,7 +234,7 @@ module Omnibus
           returns = [0]
           returns << 1 if source[:extract] == :lax_tar
 
-          shellout!("tar #{compression_switch}xf #{safe_downloaded_file} -C#{safe_project_dir}", returns: returns)
+          shellout!("tar #{compression_switch}xf #{downloaded_file} --force-local -C#{project_dir}", returns: returns)
         elsif downloaded_file.end_with?(*COMPRESSED_TAR_EXTENSIONS)
           Dir.mktmpdir do |temp_dir|
             log.debug(log_key) { "Temporarily extracting `#{safe_downloaded_file}' to `#{temp_dir}'" }

data/lib/omnibus/health_check.rb

@@ -1,5 +1,5 @@
 
-# Copyright 2012-2018 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -66,20 +66,25 @@ module Omnibus
     def run!
       measure("Health check time") do
         log.info(log_key) { "Running health on #{project.name}" }
-        bad_libs =  case Ohai["platform"]
-                    when "mac_os_x"
-                      health_check_otool
-                    when "aix"
-                      health_check_aix
-                    when "windows"
-                      # TODO: objdump -p will provided a very limited check of
-                      # explicit dependencies on windows. Most dependencies are
-                      # implicit and hence not detected.
-                      log.warn(log_key) { "Skipping dependency health checks on Windows." }
-                      {}
-                    else
-                      health_check_ldd
-                    end
+        bad_libs, good_libs =
+          case Ohai["platform"]
+          when "mac_os_x"
+            health_check_otool
+          when "aix"
+            health_check_aix
+          when "windows"
+            # TODO: objdump -p will provided a very limited check of
+            # explicit dependencies on windows. Most dependencies are
+            # implicit and hence not detected.
+            log.warn(log_key) { "Skipping dependency health checks on Windows." }
+            [{}, {}]
+          when "solaris2"
+            health_check_solaris
+          when "freebsd", "openbsd", "netbsd"
+            health_check_freebsd
+          else
+            health_check_linux
+          end
 
         unresolved = []
         unreliable = []
@@ -167,6 +172,10 @@ module Omnibus
           raise HealthCheckFailed
         end
 
+        if good_libs.keys.length == 0 && !windows?
+          raise "Internal error: no good libraries were found"
+        end
+
         conflict_map = {}
 
         conflict_map = relocation_check if relocation_checkable?
@@ -280,19 +289,20 @@ module Omnibus
     def health_check_otool
       current_library = nil
       bad_libs = {}
+      good_libs = {}
 
-      read_shared_libs("find #{project.install_dir}/ -type f | egrep '\.(dylib|bundle)$' | xargs otool -L") do |line|
+      read_shared_libs("find #{project.install_dir}/ -type f | egrep '\.(dylib|bundle)$'", "xargs otool -L") do |line|
         case line
         when /^(.+):$/
           current_library = Regexp.last_match[1]
         when /^\s+(.+) \(.+\)$/
           linked = Regexp.last_match[1]
           name = File.basename(linked)
-          bad_libs = check_for_bad_library(bad_libs, current_library, name, linked)
+          bad_libs, good_libs = check_for_bad_library(bad_libs, good_libs, current_library, name, linked)
         end
       end
 
-      bad_libs
+      [bad_libs, good_libs]
     end
 
     #
@@ -304,8 +314,9 @@ module Omnibus
     def health_check_aix
       current_library = nil
       bad_libs = {}
+      good_libs = {}
 
-      read_shared_libs("find #{project.install_dir}/ -type f | xargs file | grep \"RISC System\" | awk -F: '{print $1}' | xargs -n 1 ldd") do |line|
+      read_shared_libs("find #{project.install_dir}/ -type f | xargs file | grep \"XCOFF\" | awk -F: '{print $1}'", "xargs -n 1 ldd") do |line|
         case line
         when /^(.+) needs:$/
           current_library = Regexp.last_match[1]
@@ -313,31 +324,68 @@ module Omnibus
         when /^\s+(.+)$/
           name = Regexp.last_match[1]
           linked = Regexp.last_match[1]
-          bad_libs = check_for_bad_library(bad_libs, current_library, name, linked)
+          ( bad_libs, good_libs ) = check_for_bad_library(bad_libs, good_libs, current_library, name, linked)
         when /File is not an executable XCOFF file/ # ignore non-executable files
         else
           log.warn(log_key) { "Line did not match for #{current_library}\n#{line}" }
         end
       end
 
-      bad_libs
+      [bad_libs, good_libs]
     end
 
     #
-    # Run healthchecks against ldd.
+    # Run healthchecks on Solaris.
     #
     # @return [Hash<String, Hash<String, Hash<String, Int>>>]
     #   the bad libraries (library_name -> dependency_name -> satisfied_lib_path -> count)
     #
-    def health_check_ldd
-      regexp_ends = ".*(" + IGNORED_ENDINGS.map { |e| e.gsub(/\./, '\.') }.join("|") + ")$"
-      regexp_patterns = IGNORED_PATTERNS.map { |e| ".*" + e.gsub(%r{/}, '\/') + ".*" }.join("|")
-      regexp = regexp_ends + "|" + regexp_patterns
+    def health_check_solaris
+      current_library = nil
+      bad_libs = {}
+      good_libs = {}
+
+      # The case/when below depends on the "current_library" being output with a : at the end
+      # and then the dependencies on subsequent lines in the form "library.so.1 => /lib/64/library.so.1"
+      # This output format only happens if ldd is passed multiple libraries (for Solaris, similar to Linux)
+      # FIXME if any of the `when` clauses in the `health_check_*` methods run before the `current_library`
+      # they probably should error out with an explicit callout of formatting with their environment's
+      # respective ldd parsing
+      read_shared_libs("find #{project.install_dir}/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'", "xargs ldd") do |line|
+        case line
+        when /^(.+):$/
+          current_library = Regexp.last_match[1]
+        when /^\s+(.+) \=\>\s+(.+)( \(.+\))?$/
+          name = Regexp.last_match[1]
+          linked = Regexp.last_match[2]
+          ( bad_libs, good_libs ) = check_for_bad_library(bad_libs, good_libs, current_library, name, linked)
+        when /^\s+(.+) \(.+\)$/
+          next
+        when /^\s+statically linked$/
+          next
+        when /^\s+not a dynamic executable$/ # ignore non-executable files
+        else
+          log.warn(log_key) do
+            "Line did not match for #{current_library}\n#{line}"
+          end
+        end
+      end
 
+      [bad_libs, good_libs]
+    end
+
+    #
+    # Run healthchecks on FreeBSD
+    #
+    # @return [Hash<String, Hash<String, Hash<String, Int>>>]
+    #   the bad libraries (library_name -> dependency_name -> satisfied_lib_path -> count)
+    #
+    def health_check_freebsd
       current_library = nil
       bad_libs = {}
+      good_libs = {}
 
-      read_shared_libs("find #{project.install_dir}/ -type f -regextype posix-extended ! -regex '#{regexp}' | xargs ldd") do |line|
+      read_shared_libs("find #{project.install_dir}/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'", "xargs ldd") do |line|
         case line
         when /^(.+):$/
           current_library = Regexp.last_match[1]
@@ -345,16 +393,51 @@ module Omnibus
         when /^\s+(.+) \=\>\s+(.+)( \(.+\))?$/
           name = Regexp.last_match[1]
           linked = Regexp.last_match[2]
-          bad_libs = check_for_bad_library(bad_libs, current_library, name, linked)
+          ( bad_libs, good_libs ) = check_for_bad_library(bad_libs, good_libs, current_library, name, linked)
         when /^\s+(.+) \(.+\)$/
           next
         when /^\s+statically linked$/
           next
-        when /^\s+libjvm.so/
+        when /^\s+not a dynamic executable$/ # ignore non-executable files
+        else
+          log.warn(log_key) do
+            "Line did not match for #{current_library}\n#{line}"
+          end
+        end
+      end
+
+      [bad_libs, good_libs]
+    end
+
+    #
+    # Run healthchecks against ldd.
+    #
+    # @return [Hash<String, Hash<String, Hash<String, Int>>>]
+    #   the bad libraries (library_name -> dependency_name -> satisfied_lib_path -> count)
+    #
+    def health_check_linux
+      current_library = nil
+      bad_libs = {}
+      good_libs = {}
+
+      read_shared_libs("find #{project.install_dir}/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'", "xargs ldd") do |line|
+        case line
+        when /^(.+):$/
+          current_library = Regexp.last_match[1]
+          log.debug(log_key) { "Analyzing dependencies for #{current_library}" }
+        when /^\s+(.+) \=\>\s+(.+)( \(.+\))?$/
+          name = Regexp.last_match[1]
+          linked = Regexp.last_match[2]
+          ( bad_libs, good_libs ) = check_for_bad_library(bad_libs, good_libs, current_library, name, linked)
+        when /^\s+(.+) \(.+\)$/
+          next
+        when /^\s+statically linked$/
           next
-        when /^\s+libjava.so/
+        when /^\s+libjvm.so/ # FIXME: should remove if it doesn't blow up server
           next
-        when /^\s+libmawt.so/
+        when /^\s+libjava.so/ # FIXME: should remove if it doesn't blow up server
+          next
+        when /^\s+libmawt.so/ # FIXME: should remove if it doesn't blow up server
           next
         when /^\s+not a dynamic executable$/ # ignore non-executable files
         else
@@ -364,7 +447,7 @@ module Omnibus
         end
       end
 
-      bad_libs
+      [bad_libs, good_libs]
     end
 
     private
@@ -399,10 +482,40 @@ module Omnibus
     # @yield [String]
     #   each line
     #
-    def read_shared_libs(command)
-      cmd = shellout(command)
-      cmd.stdout.each_line do |line|
-        yield line
+    def read_shared_libs(find_command, ldd_command, &output_proc)
+      #
+      # construct the list of files to check
+      #
+
+      find_output = shellout!(find_command).stdout.lines
+
+      find_output.reject! { |file| IGNORED_ENDINGS.any? { |ending| file.end_with?("#{ending}\n") } }
+
+      find_output.reject! { |file| IGNORED_SUBSTRINGS.any? { |substr| file.include?(substr) } }
+
+      if find_output.empty?
+        # probably the find_command is busted, it should never be empty or why are you using omnibus?
+        raise "Internal Error: Health Check found no lines"
+      end
+
+      if find_output.any? { |file| file !~ Regexp.new(project.install_dir) }
+        # every file in the find output should be within the install_dir
+        raise "Internal Error: Health Check lines not matching the install_dir"
+      end
+
+      #
+      # feed the list of files to the "ldd" command
+      #
+
+      # this command will typically fail if the last file isn't a valid lib/binary which happens often
+      ldd_output = shellout(ldd_command, input: find_output.join).stdout
+
+      #
+      # do the output process to determine if the files are good or bad
+      #
+
+      ldd_output.each_line do |line|
+        output_proc.call(line)
       end
     end
 
@@ -420,7 +533,7 @@ module Omnibus
     #
     # @return the modified bad_library hash
     #
-    def check_for_bad_library(bad_libs, current_library, name, linked)
+    def check_for_bad_library(bad_libs, good_libs, current_library, name, linked)
       safe = nil
 
       whitelist_libs = case Ohai["platform"]
@@ -463,10 +576,11 @@ module Omnibus
           bad_libs[current_library][name][linked] = 1
         end
       else
+        good_libs[current_library] = true
         log.debug(log_key) { "    -> PASSED: #{name} is either whitelisted or safely provided." }
       end
 
-      bad_libs
+      [bad_libs, good_libs]
     end
   end
 end

data/lib/omnibus/metadata.rb

@@ -218,7 +218,7 @@ module Omnibus
           # version is the same as Windows 2012R2. It's only here for completeness
           # and documentation.
           when /6\.3\.\d+/, "8.1" then "8.1"
-          when /^10\.0/ then "10"
+          when "10", /^10\.0/ then "10"
           else
             raise UnknownPlatformVersion.new(platform, platform_version)
           end

data/lib/omnibus/packagers/pkg.rb

@@ -431,23 +431,21 @@ module Omnibus
     end
 
     def is_binary?(bin)
-      is_binary = File.file?(bin) &&
-        File.executable?(bin) &&
-        !File.symlink?(bin)
-      log.debug(log_key) { "    removing non-binary file from signing: #{bin}" } unless is_binary
-      is_binary
+      return false unless File.file?(bin) && File.executable?(bin) && !File.symlink?(bin)
+
+      log.debug(log_key) { "    skipping non-binary file from signing: #{bin}" }
+      true
     end
 
     def is_macho?(lib)
-      is_macho = false
-      if is_binary?(lib)
-        command = "file #{lib}"
+      return false unless File.file?(lib) && File.executable?(lib) && !File.symlink?(lib)
 
-        stdout = shellout!(command).stdout
-        is_macho = stdout.match?(/Mach-O.*(library|bundle)/)
+      if shellout!("file #{lib}").stdout.match?(/Mach-O.*(library|bundle)/) # https://rubular.com/r/nRgaQlAbkM9wHL
+        log.debug(log_key) { "    skipping non-Mach-O library file from signing: #{lib}" }
+        return true
       end
-      log.debug(log_key) { "    removing non-Mach-O library file from signing: #{lib}" } unless is_macho
-      is_macho
+
+      false
     end
   end
 end

data/lib/omnibus/project.rb

@@ -179,7 +179,7 @@ module Omnibus
       if null?(val)
         @install_dir || raise(MissingRequiredAttribute.new(self, :install_dir, "/opt/chef"))
       else
-        @install_dir = val.tr('\\', "/").squeeze("/").chomp("/")
+        @install_dir = val.tr('\\', "/").squeeze("/").chomp("/") # rubocop:disable Style/StringLiterals
       end
     end
     expose :install_dir

data/lib/omnibus/software.rb

@@ -717,7 +717,7 @@ module Omnibus
           {
             "CC" => "clang",
             "CXX" => "clang++",
-            "LDFLAGS" => "-L#{install_dir}/embedded/lib",
+            "LDFLAGS" => "-L#{install_dir}/embedded/lib -Wl,-rpath,#{install_dir}/embedded/lib",
             "CFLAGS" => "-I#{install_dir}/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector",
           }
         when "windows"

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "8.2.2".freeze
+  VERSION = "9.0.8".freeze
 end

data/lib/omnibus/whitelist.rb

@@ -1,5 +1,5 @@
 
-# Copyright 2012-2020, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,12 +49,18 @@ ARCH_WHITELIST_LIBS = [
 ].freeze
 
 AIX_WHITELIST_LIBS = [
+  /libc\.a/,
+  /libcfg\.a/,
+  /libcorcfg\.a/,
+  /libcrypt\.a/,
+  /libdl\.a/,
+  /liblvm\.a/,
+  /libodm\.a/,
+  /libperfstat\.a/,
   /libpthread\.a/,
   /libpthreads\.a/,
-  /libdl.a/,
   /librtl\.a/,
-  /libc\.a/,
-  /libcrypt\.a/,
+  /libsrc\.a/,
   /unix$/,
 ].freeze
 
@@ -82,11 +88,13 @@ OMNIOS_WHITELIST_LIBS = [
 SOLARIS_WHITELIST_LIBS = [
   /libaio\.so/,
   /libavl\.so/,
+  /libbsm\.so/,
   /libcrypt_[di]\.so/,
   /libcrypto.so/,
   /libcurses\.so/,
   /libdoor\.so/,
   /libgen\.so/,
+  /libinetutil\.so/,
   /libmd5\.so/,
   /libmd\.so/,
   /libmp\.so/,
@@ -96,9 +104,11 @@ SOLARIS_WHITELIST_LIBS = [
   /libsocket\.so/,
   /libssl.so/,
   /libthread.so/,
+  /libtsol\.so/,
   /libuutil\.so/,
   /libkstat\.so/,
   # solaris 11 libraries:
+  /libstdc\+\+\.so/,
   /libc\.so\.1/,
   /libm\.so\.2/,
   /libdl\.so\.1/,
@@ -167,6 +177,8 @@ MAC_WHITELIST_LIBS = [
 
 FREEBSD_WHITELIST_LIBS = [
   /libc\.so/,
+  /libc\+\+\.so/,
+  /libcxxrt\.so/,
   /libgcc_s\.so/,
   /libcrypt\.so/,
   /libm\.so/,
@@ -177,28 +189,34 @@ FREEBSD_WHITELIST_LIBS = [
   /libkvm\.so/,
   /libprocstat\.so/,
   /libmd\.so/,
+  /libdl\.so/,
 ].freeze
 
 IGNORED_ENDINGS = %w{
   .TXT
-  .[ch]
-  .[ch]pp
-  .[eh]rl
   .app
   .appup
   .bat
   .beam
+  .c
   .cc
   .cmake
   .conf
+  .cpp
   .css
-  .e*rb
+  .erb
+  .erl
   .feature
   .gemspec
   .gif
   .gitignore
   .gitkeep
-  .h*h
+  .h
+  .h
+  .hh
+  .hpp
+  .hrl
+  .html
   .jar
   .java
   .jpg
@@ -210,6 +228,7 @@ IGNORED_ENDINGS = %w{
   .lua
   .md
   .mkd
+  .mo
   .npmignore
   .out
   .packlist
@@ -219,21 +238,28 @@ IGNORED_ENDINGS = %w{
   .png
   .pod
   .properties
-  .py[oc]*
-  .r*html
+  .py
+  .pyc
+  .pyo
   .rake
+  .rb
+  .rbs
   .rdoc
+  .rhtml
   .ri
+  .rpm
   .rst
   .scss
   .sh
   .sql
   .svg
   .toml
+  .tt
   .ttf
   .txt
   .xml
   .yml
+  COPYING
   Gemfile
   LICENSE
   Makefile
@@ -243,7 +269,7 @@ IGNORED_ENDINGS = %w{
   license
 }.freeze
 
-IGNORED_PATTERNS = %w{
+IGNORED_SUBSTRINGS = %w{
   /build_info/
   /licenses/
   /LICENSES/

data/omnibus.gemspec

@@ -25,18 +25,19 @@ Gem::Specification.new do |gem|
   gem.add_dependency "chef-cleanroom",   "~> 1.0"
   gem.add_dependency "ffi-yajl",         "~> 2.2"
   gem.add_dependency "mixlib-shellout",  ">= 2.0", "< 4.0"
-  gem.add_dependency "ohai",             ">= 15", "< 17"
+  gem.add_dependency "ohai",             ">= 15", "< 18"
   gem.add_dependency "ruby-progressbar", "~> 1.7"
   gem.add_dependency "thor",             ">= 0.18", "< 2.0"
   gem.add_dependency "license_scout",    "~> 1.0"
   gem.add_dependency "contracts",        ">= 0.16.0", "< 0.17.0"
+  gem.add_dependency "rexml",            "~> 3.2"
 
   gem.add_dependency "mixlib-versioning"
   gem.add_dependency "pedump"
 
   gem.add_development_dependency "artifactory", "~> 3.0"
   gem.add_development_dependency "aruba",       "~> 2.0"
-  gem.add_development_dependency "chefstyle",   "= 1.7.5"
+  gem.add_development_dependency "chefstyle",   "= 2.2.2"
   gem.add_development_dependency "fauxhai-ng",  ">= 7.5"
   gem.add_development_dependency "rspec",       "~> 3.0"
   gem.add_development_dependency "rspec-json_expectations"

data/resources/rpm/spec.erb

@@ -13,6 +13,9 @@
 
 %define _binary_payload <%= compression %>
 
+# Disable creation of build-id links
+%define _build_id_links none
+
 # Metadata
 Name: <%= name %>
 Version: <%= version %>

data/spec/functional/builder_spec.rb

@@ -222,7 +222,7 @@ module Omnibus
         output = capture_logging { subject.build }
 
         appbundler_path = File.join(embedded_bin_dir, "appbundler")
-        appbundler_path.gsub!(%r{/}, '\\') if windows?
+        appbundler_path.gsub!(%r{/}, '\\') if windows? # rubocop:disable Style/StringLiterals
         expect(output).to include("#{appbundler_path} '#{project_dir}' '#{bin_dir}'")
       end
     end

data/spec/support/examples.rb

@@ -60,7 +60,7 @@ RSpec.shared_examples "a software" do |name = "chefdk"|
 
     allow(software).to receive(:embedded_bin) do |binary|
       p = File.join(embedded_bin_dir, binary)
-      p.gsub!(%r{/}, '\\') if windows?
+      p.gsub!(%r{/}, '\\') if windows? # rubocop:disable Style/StringLiterals
       p
     end
   end

data/spec/support/ohai_helpers.rb

@@ -14,7 +14,7 @@ module Omnibus
         # If we asked for Windows, we should also specify that magical
         # +File::ALT_SEPARATOR+ variable
         if options[:platform] && options[:platform] == "windows"
-          stub_const("File::ALT_SEPARATOR", '\\')
+          stub_const("File::ALT_SEPARATOR", '\\') # rubocop:disable Style/StringLiterals
         end
       end
     end

data/spec/unit/builder_spec.rb

@@ -23,7 +23,7 @@ module Omnibus
       allow(subject).to receive(:windows?).and_return(on_windows)
       allow(subject).to receive(:windows_safe_path) do |*args|
         path = File.join(*args)
-        path.gsub!(File::SEPARATOR, '\\') if on_windows
+        path.gsub!(File::SEPARATOR, '\\') if on_windows # rubocop:disable Style/StringLiterals
       end
     end
 
@@ -171,7 +171,7 @@ module Omnibus
       context "when :bin is present" do
         it "uses the custom bin" do
           expect(subject).to receive(:command)
-            .with("/path/to/make", in_msys_bash: true)
+            .with("/path/to/make", { in_msys_bash: true })
           subject.make(bin: "/path/to/make")
         end
       end
@@ -185,7 +185,7 @@ module Omnibus
 
         it "uses gmake and sets MAKE=gmake" do
           expect(subject).to receive(:command)
-            .with("gmake", env: { "MAKE" => "gmake" }, in_msys_bash: true)
+            .with("gmake", { env: { "MAKE" => "gmake" }, in_msys_bash: true } )
           subject.make
         end
       end
@@ -198,26 +198,26 @@ module Omnibus
 
         it "uses make" do
           expect(subject).to receive(:command)
-            .with("make", in_msys_bash: true)
+            .with("make", { in_msys_bash: true } )
           subject.make
         end
       end
 
       it "accepts 0 options" do
         expect(subject).to receive(:command)
-          .with("make", in_msys_bash: true)
+          .with("make", { in_msys_bash: true } )
         expect { subject.make }.to_not raise_error
       end
 
       it "accepts an additional command string" do
         expect(subject).to receive(:command)
-          .with("make install", in_msys_bash: true)
+          .with("make install", { in_msys_bash: true } )
         expect { subject.make("install") }.to_not raise_error
       end
 
       it "persists given options" do
         expect(subject).to receive(:command)
-          .with("make", timeout: 3600, in_msys_bash: true)
+          .with("make", { timeout: 3600, in_msys_bash: true } )
         subject.make(timeout: 3600)
       end
     end
@@ -242,7 +242,7 @@ module Omnibus
 
         it "appends platform host to the options" do
           expect(subject).to receive(:command)
-            .with("./configure --build=x86_64-w64-mingw32 --prefix=#{project_dir}/embedded", in_msys_bash: true)
+            .with("./configure --build=x86_64-w64-mingw32 --prefix=#{project_dir}/embedded", { in_msys_bash: true } )
           subject.configure
         end
       end
@@ -258,7 +258,7 @@ module Omnibus
 
         it "appends platform host to the options" do
           expect(subject).to receive(:command)
-            .with("./configure --build=i686-w64-mingw32 --prefix=#{project_dir}/embedded", in_msys_bash: true)
+            .with("./configure --build=i686-w64-mingw32 --prefix=#{project_dir}/embedded", { in_msys_bash: true } )
           subject.configure
         end
       end
@@ -266,7 +266,7 @@ module Omnibus
       context "when :bin is present" do
         it "uses the custom bin" do
           expect(subject).to receive(:command)
-            .with("/path/to/configure --prefix=#{project_dir}/embedded", in_msys_bash: true)
+            .with("/path/to/configure --prefix=#{project_dir}/embedded", { in_msys_bash: true } )
           subject.configure(bin: "/path/to/configure")
         end
       end
@@ -274,32 +274,32 @@ module Omnibus
       context "when :prefix is present" do
         it "emits non-empty prefix" do
           expect(subject).to receive(:command)
-            .with("./configure --prefix=/some/prefix", in_msys_bash: true)
+            .with("./configure --prefix=/some/prefix", { in_msys_bash: true } )
           subject.configure(prefix: "/some/prefix")
         end
 
         it "omits prefix if empty" do
           expect(subject).to receive(:command)
-            .with("./configure", in_msys_bash: true)
+            .with("./configure", { in_msys_bash: true } )
           subject.configure(prefix: "")
         end
       end
 
       it "accepts 0 options" do
         expect(subject).to receive(:command)
-          .with("./configure --prefix=#{project_dir}/embedded", in_msys_bash: true)
+          .with("./configure --prefix=#{project_dir}/embedded", { in_msys_bash: true } )
         expect { subject.configure }.to_not raise_error
       end
 
       it "accepts an additional command string" do
         expect(subject).to receive(:command)
-          .with("./configure --prefix=#{project_dir}/embedded --myopt", in_msys_bash: true)
+          .with("./configure --prefix=#{project_dir}/embedded --myopt", { in_msys_bash: true } )
         expect { subject.configure("--myopt") }.to_not raise_error
       end
 
       it "persists given options" do
         expect(subject).to receive(:command)
-          .with("./configure --prefix=#{project_dir}/embedded", timeout: 3600, in_msys_bash: true)
+          .with("./configure --prefix=#{project_dir}/embedded", { timeout: 3600, in_msys_bash: true } )
         subject.configure(timeout: 3600)
       end
     end
@@ -321,28 +321,28 @@ module Omnibus
       it "invokes patch with patch level 1 unless specified" do
         expect { subject.patch(source: "good_patch") }.to_not raise_error
         expect(subject).to receive(:shellout!)
-          .with("patch -p1 -i #{project_dir}/patch_location2/good_patch", in_msys_bash: true)
+          .with("patch -p1 -i #{project_dir}/patch_location2/good_patch", { in_msys_bash: true } )
         run_build_command
       end
 
       it "invokes patch with patch level provided" do
         expect { subject.patch(source: "good_patch", plevel: 0) }.to_not raise_error
         expect(subject).to receive(:shellout!)
-          .with("patch -p0 -i #{project_dir}/patch_location2/good_patch", in_msys_bash: true)
+          .with("patch -p0 -i #{project_dir}/patch_location2/good_patch", { in_msys_bash: true } )
         run_build_command
       end
 
       it "invokes patch differently if target is provided" do
         expect { subject.patch(source: "good_patch", target: "target/path") }.to_not raise_error
         expect(subject).to receive(:shellout!)
-          .with("cat #{project_dir}/patch_location2/good_patch | patch -p1 target/path", in_msys_bash: true)
+          .with("cat #{project_dir}/patch_location2/good_patch | patch -p1 target/path", { in_msys_bash: true } )
         run_build_command
       end
 
       it "persists other options" do
         expect { subject.patch(source: "good_patch", timeout: 3600) }.to_not raise_error
         expect(subject).to receive(:shellout!)
-          .with("patch -p1 -i #{project_dir}/patch_location2/good_patch", timeout: 3600, in_msys_bash: true)
+          .with("patch -p1 -i #{project_dir}/patch_location2/good_patch", { timeout: 3600, in_msys_bash: true } )
         run_build_command
       end
     end

data/spec/unit/fetchers/net_fetcher_spec.rb

@@ -421,19 +421,19 @@ module Omnibus
           it_behaves_like "an extractor", "zip", {},
             ['7z.exe x C:\\file.zip -oC:\\tmp\\project -r -y']
           it_behaves_like "an extractor", "tar", {},
-            [['tar xf C:\\file.tar -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar xf C:/file.tar --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "tgz", {},
-            [['tar zxf C:\\file.tgz -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar zxf C:/file.tgz --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "tar.gz", {},
-            [['tar zxf C:\\file.tar.gz -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar zxf C:/file.tar.gz --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "tar.bz2", {},
-            [['tar jxf C:\\file.tar.bz2 -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar jxf C:/file.tar.bz2 --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "txz", {},
-            [['tar Jxf C:\\file.txz -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar Jxf C:/file.txz --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "tar.xz", {},
-            [['tar Jxf C:\\file.tar.xz -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar Jxf C:/file.tar.xz --force-local -CC:/tmp/project", { returns: [0] }]]
           it_behaves_like "an extractor", "tar.lzma", {},
-            [['tar --lzma -xf C:\\file.tar.lzma -CC:\\tmp\\project', { returns: [0] }]]
+            [["tar --lzma -xf C:/file.tar.lzma --force-local -CC:/tmp/project", { returns: [0] }]]
         end
 
         context "when seven_zip extract strategy is chosen" do
@@ -469,19 +469,19 @@ module Omnibus
           it_behaves_like "an extractor", "zip", { extract: :lax_tar },
             ['7z.exe x C:\\file.zip -oC:\\tmp\\project -r -y']
           it_behaves_like "an extractor", "tar", { extract: :lax_tar },
-            [['tar xf C:\\file.tar -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar xf C:/file.tar --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "tgz", { extract: :lax_tar },
-            [['tar zxf C:\\file.tgz -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar zxf C:/file.tgz --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "tar.gz", { extract: :lax_tar },
-            [['tar zxf C:\\file.tar.gz -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar zxf C:/file.tar.gz --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "tar.bz2", { extract: :lax_tar },
-            [['tar jxf C:\\file.tar.bz2 -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar jxf C:/file.tar.bz2 --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "txz", { extract: :lax_tar },
-            [['tar Jxf C:\\file.txz -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar Jxf C:/file.txz --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "tar.xz", { extract: :lax_tar },
-            [['tar Jxf C:\\file.tar.xz -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar Jxf C:/file.tar.xz --force-local -CC:/tmp/project", { returns: [0, 1] }]]
           it_behaves_like "an extractor", "tar.lzma", { extract: :lax_tar },
-            [['tar --lzma -xf C:\\file.tar.lzma -CC:\\tmp\\project', { returns: [0, 1] }]]
+            [["tar --lzma -xf C:/file.tar.lzma --force-local -CC:/tmp/project", { returns: [0, 1] }]]
         end
       end
 

data/spec/unit/health_check_spec.rb

@@ -99,9 +99,47 @@ module Omnibus
     context "on linux" do
       before { stub_ohai(platform: "ubuntu", version: "16.04") }
 
+      # file_list just needs to have one file which is inside of the install_dir
+      let(:file_list) do
+        double("Mixlib::Shellout",
+          error!: false,
+          stdout: <<~EOH
+            /opt/chefdk/shouldnt/matter
+          EOH
+        )
+      end
+
+      let(:empty_list) do
+        double("Mixlib::Shellout",
+          error!: false,
+          stdout: <<~EOH
+          EOH
+        )
+      end
+
+      let(:failed_list) do
+        failed_list = double("Mixlib::Shellout",
+          stdout: <<~EOH
+            /opt/chefdk/shouldnt/matter
+          EOH
+        )
+        allow(failed_list).to receive(:error!).and_raise("Mixlib::Shellout::ShellCommandFailed")
+        failed_list
+      end
+
+      let(:bad_list) do
+        double("Mixlib::Shellout",
+          error!: false,
+          stdout: <<~EOH
+            /somewhere/other/than/install/dir
+          EOH
+        )
+      end
+
       let(:bad_healthcheck) do
         double("Mixlib::Shellout",
-          stdout: <<-EOH.gsub(/^ {12}/, "")
+          error!: false,
+          stdout: <<~EOH
             /bin/ls:
               linux-vdso.so.1 =>  (0x00007fff583ff000)
               libselinux.so.1 => /lib/x86_64-linux-gnu/libselinux.so.1 (0x00007fad8592a000)
@@ -122,7 +160,8 @@ module Omnibus
 
       let(:good_healthcheck) do
         double("Mixlib::Shellout",
-          stdout: <<-EOH.gsub(/^ {12}/, "")
+          error!: false,
+          stdout: <<~EOH
             /bin/echo:
               linux-vdso.so.1 =>  (0x00007fff8a6ee000)
               libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f70f58c0000)
@@ -135,11 +174,13 @@ module Omnibus
         )
       end
 
-      let(:regexp) { ".*(\\.TXT|\\.[ch]|\\.[ch]pp|\\.[eh]rl|\\.app|\\.appup|\\.bat|\\.beam|\\.cc|\\.cmake|\\.conf|\\.css|\\.e*rb|\\.feature|\\.gemspec|\\.gif|\\.gitignore|\\.gitkeep|\\.h*h|\\.jar|\\.java|\\.jpg|\\.js|\\.jsm|\\.json|\\.lock|\\.log|\\.lua|\\.md|\\.mkd|\\.npmignore|\\.out|\\.packlist|\\.perl|\\.pl|\\.pm|\\.png|\\.pod|\\.properties|\\.py[oc]*|\\.r*html|\\.rake|\\.rdoc|\\.ri|\\.rst|\\.scss|\\.sh|\\.sql|\\.svg|\\.toml|\\.ttf|\\.txt|\\.xml|\\.yml|Gemfile|LICENSE|Makefile|README|Rakefile|VERSION|license)$|.*\\/build_info\\/.*|.*\\/licenses\\/.*|.*\\/LICENSES\\/.*|.*\\/man\\/.*|.*\\/share\\/doc\\/.*|.*\\/share\\/info\\/.*|.*\\/share\\/postgresql\\/.*|.*\\/share\\/terminfo\\/.*|.*\\/share\\/timezone\\/.*|.*\\/terminfo\\/.*" }
-
       it "raises an exception when there are external dependencies" do
         allow(subject).to receive(:shellout)
-          .with("find #{project.install_dir}/ -type f -regextype posix-extended ! -regex '#{regexp}' | xargs ldd")
+          .with("find /opt/chefdk/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'")
+          .and_return(file_list)
+
+        allow(subject).to receive(:shellout)
+          .with("xargs ldd", { input: "/opt/chefdk/shouldnt/matter\n" })
           .and_return(bad_healthcheck)
 
         expect { subject.run! }.to raise_error(HealthCheckFailed)
@@ -147,7 +188,11 @@ module Omnibus
 
       it "does not raise an exception when the healthcheck passes" do
         allow(subject).to receive(:shellout)
-          .with("find #{project.install_dir}/ -type f -regextype posix-extended ! -regex '#{regexp}' | xargs ldd")
+          .with("find /opt/chefdk/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'")
+          .and_return(file_list)
+
+        allow(subject).to receive(:shellout)
+          .with("xargs ldd", { input: "/opt/chefdk/shouldnt/matter\n" })
           .and_return(good_healthcheck)
 
         expect { subject.run! }.to_not raise_error
@@ -156,6 +201,30 @@ module Omnibus
       it "will not perform dll base relocation checks" do
         expect(subject.relocation_checkable?).to be false
       end
+
+      it "raises an exception if there's nothing in the file list" do
+        allow(subject).to receive(:shellout)
+          .with("find /opt/chefdk/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'")
+          .and_return(empty_list)
+
+        expect { subject.run! }.to raise_error(RuntimeError, "Internal Error: Health Check found no lines")
+      end
+
+      it "raises an exception if the file list command raises" do
+        allow(subject).to receive(:shellout)
+          .with("find /opt/chefdk/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'")
+          .and_return(failed_list)
+
+        expect { subject.run! }.to raise_error(RuntimeError, "Mixlib::Shellout::ShellCommandFailed")
+      end
+
+      it "raises an exception if the file list command has no entries in the install_dir" do
+        allow(subject).to receive(:shellout)
+          .with("find /opt/chefdk/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'")
+          .and_return(bad_list)
+
+        expect { subject.run! }.to raise_error(RuntimeError, "Internal Error: Health Check lines not matching the install_dir")
+      end
     end
   end
 end

data/spec/unit/packagers/pkg_spec.rb

@@ -557,7 +557,9 @@ module Omnibus
 
       context "when is a Mach-O library" do
         before do
-          allow(subject).to receive(:is_binary?).with("file").and_return(true)
+          allow(File).to receive(:file?).with("file").and_return(true)
+          allow(File).to receive(:executable?).with("file").and_return(true)
+          allow(File).to receive(:symlink?).with("file").and_return(false)
           expect(subject).to receive(:shellout!).with("file file").and_return(shellout)
           allow(shellout).to receive(:stdout)
             .and_return("file: Mach-O 64-bit dynamically linked shared library x86_64")
@@ -570,7 +572,9 @@ module Omnibus
 
       context "when is a Mach-O Bundle" do
         before do
-          allow(subject).to receive(:is_binary?).with("file").and_return(true)
+          allow(File).to receive(:file?).with("file").and_return(true)
+          allow(File).to receive(:executable?).with("file").and_return(true)
+          allow(File).to receive(:symlink?).with("file").and_return(false)
           expect(subject).to receive(:shellout!).with("file file").and_return(shellout)
           allow(shellout).to receive(:stdout)
             .and_return("file: Mach-O 64-bit bundle x86_64")
@@ -583,7 +587,9 @@ module Omnibus
 
       context "when is not a Mach-O Bundle or Mach-O library" do
         before do
-          allow(subject).to receive(:is_binary?).with("file").and_return(true)
+          allow(File).to receive(:file?).with("file").and_return(true)
+          allow(File).to receive(:executable?).with("file").and_return(true)
+          allow(File).to receive(:symlink?).with("file").and_return(false)
           expect(subject).to receive(:shellout!).with("file file").and_return(shellout)
           allow(shellout).to receive(:stdout)
             .and_return("file: ASCII text")

data/spec/unit/project_spec.rb

@@ -229,7 +229,7 @@ module Omnibus
 
       context "when on Windows" do
         before { stub_ohai(platform: "windows", version: "2019") }
-        before { stub_const("File::ALT_SEPARATOR", '\\') }
+        before { stub_const("File::ALT_SEPARATOR", '\\') } # rubocop:disable Style/StringLiterals
         it "returns a Windows iteration" do
           expect(subject.build_iteration).to eq(1)
         end

data/spec/unit/software_spec.rb

@@ -239,7 +239,7 @@ module Omnibus
             "CXXFLAGS"  => "-I/opt/project/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "CPPFLAGS"  => "-I/opt/project/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "CXX" => "clang++",
-            "LDFLAGS" => "-L/opt/project/embedded/lib",
+            "LDFLAGS" => "-L/opt/project/embedded/lib -Wl,-rpath,/opt/project/embedded/lib",
             "LD_RUN_PATH" => "/opt/project/embedded/lib",
             "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
@@ -543,7 +543,7 @@ module Omnibus
 
       it "fetches from a fully expanded git path" do
         expect(subject.source).to eq(git: "https://github.com/chef/ohai.git")
-        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://github.com/chef/ohai.git").and_return("1.2.8")
+        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", { git: "https://github.com/chef/ohai.git" } ).and_return("1.2.8")
         subject.send(:fetcher)
       end
 
@@ -552,7 +552,7 @@ module Omnibus
 
         it "fetches from the override path" do
           expect(subject.source).to eq(git: "https://blah.com/git.git")
-          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://blah.com/git.git").and_return("1.2.8")
+          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", { git: "https://blah.com/git.git" } ).and_return("1.2.8")
           subject.send(:fetcher)
         end
       end
@@ -562,7 +562,7 @@ module Omnibus
 
         it "fetches from the override path" do
           expect(subject.source).to eq(git: "https://github.com/a/b.git")
-          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://github.com/a/b.git").and_return("1.2.8")
+          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", { git: "https://github.com/a/b.git" } ).and_return("1.2.8")
           subject.send(:fetcher)
         end
       end
@@ -577,7 +577,7 @@ module Omnibus
 
       it "fetches from the git spec" do
         expect(subject.source).to eq(git: "https://blah.com/git.git")
-        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://blah.com/git.git").and_return("1.2.8")
+        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", { git: "https://blah.com/git.git" } ).and_return("1.2.8")
         subject.send(:fetcher)
       end
 
@@ -586,7 +586,7 @@ module Omnibus
 
         it "fetches from the override path" do
           expect(subject.source).to eq(git: "https://github.com/a/b.git")
-          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://github.com/a/b.git").and_return("1.2.8")
+          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", { git: "https://github.com/a/b.git" } ).and_return("1.2.8")
           subject.send(:fetcher)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 8.2.2
+  version: 9.0.8
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -95,7 +95,7 @@ dependencies:
         version: '15'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '17'
+        version: '18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ dependencies:
         version: '15'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '17'
+        version: '18'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: mixlib-versioning
   requirement: !ruby/object:Gem::Requirement
@@ -236,14 +250,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: fauxhai-ng
   requirement: !ruby/object:Gem::Requirement