omnibus 7.0.34 → 8.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c40c81af2fa93ca8c9e87d9e49a37cef3ea8145355700490d0ad5ce1a71cd169
-  data.tar.gz: c31ffa9da067d89db43aaff9963408ed4f56150abeb295f4e0733787f001df13
+  metadata.gz: 2d82119c178b28f06df2bcd81c54b97ffbbe8b16b072021e3c86297e7ba76b9c
+  data.tar.gz: 0fd1477fe37432ec09256c115243b1a06eaa62911b741ba8a2dec730b9b8e42b
 SHA512:
-  metadata.gz: 8d309f0c4d0cb1e0ecc57dcd5aac4c21e5be7b4b71781e5a0c134a723721963e248c673b969398c5b6dd733cc0eabf18bcbb965d122f3b4f5b788634f98d522a
-  data.tar.gz: 5db4091ae7e877d04705089c14e8401816ca1ac8828c99e160b8161109892956c2f348dbf9cbca95f03414cd051e3240d58402867592892b2b20fcef464f20ab
+  metadata.gz: 534731ae9d91c9b9108cb63e6bacf731817ae8e01a80d22615e93787e50ba148c4e7919934879c2b7bdf1bda51586cbe488648dc3c6c31b9d3684f489602fd02
+  data.tar.gz: 37bbc008548ed0ab0a1d20f958a81a19de17c47da4176ca263587cf11bfb6bffc31c50691d76ea9304e2c22223becfa1afa79de6682e32f8fe9f07d63e8ddd6e

data/lib/omnibus/compressors/dmg.rb

@@ -259,8 +259,11 @@ module Omnibus
           sync
           hdiutil unmount "#{@device}"
           # Give some time to the system so unmount dmg
-          sleep 5
-          hdiutil detach "#{@device}" &&  \
+          ATTEMPTS=0
+          until [ $ATTEMPTS -eq 5 ] || hdiutil detach "#{@device}"; do
+            sleep 10
+            echo Attempt number $(( ATTEMPTS++ ))
+          done
           hdiutil convert \\
             "#{writable_dmg}" \\
             -format UDZO \\

data/lib/omnibus/packager.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2018 Chef Software, Inc.
+# Copyright 2014-2020, 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,25 +66,16 @@ module Omnibus
       family = Ohai["platform_family"]
       version = Ohai["platform_version"]
 
-      if family == "solaris2" && Chef::Sugar::Constraints::Version.new(version).satisfies?(">= 5.11")
+      if family == "solaris2" && ChefUtils::VersionString.new(version).satisfies?(">= 5.11")
         family = "ips"
-      elsif family == "solaris2" && Chef::Sugar::Constraints::Version.new(version).satisfies?(">= 5.10")
+      elsif family == "solaris2" && ChefUtils::VersionString.new(version).satisfies?(">= 5.10")
         family = "solaris"
       end
       if klass = PLATFORM_PACKAGER_MAP[family]
-        package_types = klass.is_a?(Array) ? klass : [ klass ]
-
-        if package_types.include?(APPX) &&
-            !Chef::Sugar::Constraints::Version.new(version).satisfies?(">= 6.2")
-          log.warn(log_key) { "APPX generation is only supported on Windows versions 2012 and above" }
-          package_types -= [APPX]
-        end
-
-        package_types
+        klass.is_a?(Array) ? klass : [ klass ]
       else
         log.warn(log_key) do
-          "Could not determine packager for `#{family}', defaulting " \
-          "to `makeself'!"
+          "Could not determine packager for `#{family}`, defaulting to `makeself`!"
         end
         [Makeself]
       end

data/lib/omnibus/packagers/pkg.rb

@@ -424,7 +424,7 @@ module Omnibus
       is_binary = File.file?(bin) &&
         File.executable?(bin) &&
         !File.symlink?(bin)
-      log.debug(log_key) { "    removing from signing: #{bin}" } unless is_binary
+      log.debug(log_key) { "    removing non-binary file from signing: #{bin}" } unless is_binary
       is_binary
     end
 
@@ -434,9 +434,9 @@ module Omnibus
         command = "file #{lib}"
 
         stdout = shellout!(command).stdout
-        is_macho = stdout.match?(/Mach-O.*library/) || stdout.match?(/Mach-O.*bundle/)
+        is_macho = stdout.match?(/Mach-O.*(library|bundle)/)
       end
-      log.debug(log_key) { "    removing from signing: #{lib}" } unless is_macho
+      log.debug(log_key) { "    removing non-Mach-O library file from signing: #{lib}" } unless is_macho
       is_macho
     end
   end

data/lib/omnibus/software.rb

@@ -525,7 +525,7 @@ module Omnibus
       return if final_version.nil?
 
       begin
-        Chef::Sugar::Constraints::Version.new(final_version)
+        ChefUtils::VersionString.new(final_version)
       rescue ArgumentError
         log.warn(log_key) do
           "Version #{final_version} for software #{name} was not parseable. " \
@@ -720,17 +720,6 @@ module Omnibus
             "LDFLAGS" => "-L#{install_dir}/embedded/lib",
             "CFLAGS" => "-I#{install_dir}/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
           }
-        when "suse"
-          suse_flags = {
-            "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib",
-            "CFLAGS" => "-I#{install_dir}/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-          }
-          # Enable gcc version 4.8 if it is available
-          if which("gcc-4.8") && platform_version.satisfies?("< 12")
-            suse_flags["CC"] = "gcc-4.8"
-            suse_flags["CXX"] = "g++-4.8"
-          end
-          suse_flags
         when "windows"
           arch_flag = windows_arch_i386? ? "-m32" : "-m64"
           opt_flag = windows_arch_i386? ? "-march=i686" : "-march=x86-64"

data/lib/omnibus/sugarable.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2018 Chef Software, Inc.
+# Copyright 2014-2020, 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.
@@ -14,31 +14,22 @@
 # limitations under the License.
 #
 
-require "chef/sugar/architecture"
-require "chef/sugar/cloud"
-require "chef/sugar/constraints"
-require "chef/sugar/ip"
-require "chef/sugar/init"
-require "chef/sugar/platform"
-require "chef/sugar/platform_family"
-require "chef/sugar/ruby"
-require "chef/sugar/shell"
-require "chef/sugar/vagrant"
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 module Omnibus
   module Sugarable
     def self.extended(base)
-      base.send(:extend, Chef::Sugar::DSL)
+      base.send(:extend, ChefUtils)
       base.send(:extend, Omnibus::Sugar)
     end
 
     def self.included(base)
-      base.send(:include, Chef::Sugar::DSL)
+      base.send(:include, ChefUtils)
       base.send(:include, Omnibus::Sugar)
 
       if base < Cleanroom
         # Make all the "sugars" available in the cleanroom (DSL)
-        Chef::Sugar::DSL.instance_methods.each do |instance_method|
+        ChefUtils.instance_methods.each do |instance_method|
           base.send(:expose, instance_method)
         end
 

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "7.0.34".freeze
+  VERSION = "8.0.9".freeze
 end

data/omnibus.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "aws-sdk-s3",       "~> 1"
-  gem.add_dependency "chef-sugar",       ">= 3.3"
+  gem.add_dependency "chef-utils",       ">= 15.4"
   gem.add_dependency "chef-cleanroom",   "~> 1.0"
   gem.add_dependency "ffi-yajl",         "~> 2.2"
   gem.add_dependency "mixlib-shellout",  ">= 2.0", "< 4.0"
@@ -35,8 +35,8 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "artifactory", "~> 3.0"
   gem.add_development_dependency "aruba",       "~> 0.5"
-  gem.add_development_dependency "chefstyle",   "= 1.5.0"
-  gem.add_development_dependency "fauxhai",     ">= 5.2"
+  gem.add_development_dependency "chefstyle",   "= 1.5.2"
+  gem.add_development_dependency "fauxhai-ng",  ">= 7.5"
   gem.add_development_dependency "rspec",       "~> 3.0"
   gem.add_development_dependency "rspec-json_expectations"
   gem.add_development_dependency "rspec-its"

data/resources/msi/source.wxs.erb

@@ -21,20 +21,12 @@
     <Media Id="1" Cabinet="Project.cab" EmbedCab="yes" CompressionLevel="high" />
 
     <!--
-      Take advantage of Windows Installer 5.0 feature (if available) to disable 
-      checkpointing and other costings that take significant amounts of time 
+      Take advantage of Windows Installer 5.0 feature (if available) to disable
+      checkpointing and other costings that take significant amounts of time
       ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd408005(v=vs.85).aspx
     -->
     <Property Id="MSIFASTINSTALL" Value="7" />
 
-    <!--
-      Uncomment launch condition below to check for minimum OS
-      601 = Windows 7/Server 2008R2.
-    -->
-    <!-- Condition Message="!(loc.MinimumOSVersionMessage)">
-      <![CDATA[Installed OR VersionNT >= 601]]>
-    </Condition -->
-
     <!-- We always do Major upgrades -->
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeErrorMessage)" />
 

data/spec/unit/compressor_spec.rb

@@ -4,7 +4,7 @@ module Omnibus
   describe Compressor do
     describe ".for_current_system" do
       context "on Mac OS X" do
-        before { stub_ohai(platform: "mac_os_x", version: "10.12") }
+        before { stub_ohai(platform: "mac_os_x", version: "10.15") }
 
         context "when :dmg is activated" do
           it "prefers dmg" do

data/spec/unit/compressors/dmg_spec.rb

@@ -219,8 +219,11 @@ module Omnibus
             sync
             hdiutil unmount "#{device}"
             # Give some time to the system so unmount dmg
-            sleep 5
-            hdiutil detach "#{device}" &&\
+            ATTEMPTS=0
+            until [ $ATTEMPTS -eq 5 ] || hdiutil detach "/dev/sda1"; do
+              sleep 10
+              echo Attempt number $(( ATTEMPTS++ ))
+            done
             hdiutil convert \\
               "#{staging_dir}/project-writable.dmg" \\
               -format UDZO \\

data/spec/unit/metadata_spec.rb

@@ -177,17 +177,17 @@ module Omnibus
 
     describe ".platform_shortname" do
       it "returns el on rhel" do
-        stub_ohai(platform: "redhat", version: "6.9")
+        stub_ohai(platform: "redhat", version: "6")
         expect(described_class.platform_shortname).to eq("el")
       end
 
       it "returns sles on suse" do
-        stub_ohai(platform: "suse", version: "12.2")
+        stub_ohai(platform: "suse", version: "12")
         expect(described_class.platform_shortname).to eq("sles")
       end
 
       it "returns .platform on all other systems" do
-        stub_ohai(platform: "ubuntu", version: "16.04")
+        stub_ohai(platform: "ubuntu", version: "20.04")
         expect(described_class.platform_shortname).to eq("ubuntu")
       end
     end
@@ -196,7 +196,7 @@ module Omnibus
       shared_examples "a version manipulator" do |platform_shortname, version, expected|
         context "on #{platform_shortname}-#{version}" do
           it "returns the correct value" do
-            stub_ohai(platform: "ubuntu", version: "16.04") do |data|
+            stub_ohai(platform: "ubuntu", version: "20.04") do |data|
               data["platform"] = platform_shortname
               data["platform_version"] = version
             end
@@ -245,7 +245,7 @@ module Omnibus
 
       context "given an unknown platform" do
         before do
-          stub_ohai(platform: "ubuntu", version: "16.04") do |data|
+          stub_ohai(platform: "ubuntu", version: "20.04") do |data|
             data["platform"] = "bacon"
             data["platform_version"] = "1.crispy"
           end
@@ -259,7 +259,7 @@ module Omnibus
 
       context "given an unknown windows platform version" do
         before do
-          stub_ohai(platform: "ubuntu", version: "16.04") do |data|
+          stub_ohai(platform: "ubuntu", version: "20.04") do |data|
             data["platform"] = "windows"
             data["platform_version"] = "1.2.3"
           end

data/spec/unit/packager_spec.rb

@@ -4,26 +4,19 @@ module Omnibus
   describe Packager do
     describe ".for_current_system" do
       context "on Mac OS X" do
-        before { stub_ohai(platform: "mac_os_x", version: "10.13") }
+        before { stub_ohai(platform: "mac_os_x", version: "10.15") }
         it "prefers PKG" do
           expect(described_class.for_current_system).to eq([Packager::PKG])
         end
       end
 
-      context "on Windows 2012 R2" do
+      context "on Windows" do
         before { stub_ohai(platform: "windows", version: "2012R2") }
         it "prefers MSI and APPX" do
           expect(described_class.for_current_system).to eq([Packager::MSI, Packager::APPX])
         end
       end
 
-      context "on Windows 2008 R2" do
-        before { stub_ohai(platform: "windows", version: "2008R2") }
-        it "prefers MSI only" do
-          expect(described_class.for_current_system).to eq([Packager::MSI])
-        end
-      end
-
       context "on Solaris 11" do
         before { stub_ohai(platform: "solaris2", version: "5.11") }
         it "prefers IPS" do
@@ -32,14 +25,14 @@ module Omnibus
       end
 
       context "on AIX" do
-        before { stub_ohai(platform: "aix", version: "7.1") }
+        before { stub_ohai(platform: "aix", version: "7") }
         it "prefers BFF" do
           expect(described_class.for_current_system).to eq([Packager::BFF])
         end
       end
 
       context "on Fedora" do
-        before { stub_ohai(platform: "fedora", version: "28") }
+        before { stub_ohai(platform: "fedora", version: "31") }
         it "prefers RPM" do
           expect(described_class.for_current_system).to eq([Packager::RPM])
         end
@@ -53,14 +46,14 @@ module Omnibus
       end
 
       context "on Debian" do
-        before { stub_ohai(platform: "debian", version: "8.11") }
+        before { stub_ohai(platform: "debian", version: "10") }
         it "prefers RPM" do
           expect(described_class.for_current_system).to eq([Packager::DEB])
         end
       end
 
       context "on SLES" do
-        before { stub_ohai(platform: "suse", version: "12.3") }
+        before { stub_ohai(platform: "suse", version: "15") }
         it "prefers RPM" do
           expect(described_class.for_current_system).to eq([Packager::RPM])
         end

data/spec/unit/packagers/rpm_spec.rb

@@ -35,7 +35,7 @@ module Omnibus
       create_directory("#{staging_dir}/SOURCES")
       create_directory("#{staging_dir}/SPECS")
 
-      stub_ohai(platform: "redhat", version: "6.9") do |data|
+      stub_ohai(platform: "redhat", version: "6") do |data|
         data["kernel"]["machine"] = architecture
       end
     end
@@ -488,7 +488,7 @@ module Omnibus
 
     describe "#safe_architecture" do
       before do
-        stub_ohai(platform: "redhat", version: "6.9") do |data|
+        stub_ohai(platform: "redhat", version: "6") do |data|
           data["kernel"]["machine"] = "i386"
         end
       end
@@ -499,7 +499,7 @@ module Omnibus
 
       context "when i686" do
         before do
-          stub_ohai(platform: "redhat", version: "6.9") do |data|
+          stub_ohai(platform: "redhat", version: "6") do |data|
             data["kernel"]["machine"] = "i686"
           end
         end
@@ -512,9 +512,9 @@ module Omnibus
       context "on Pidora" do
         before do
           # There's no Pidora in Fauxhai :(
-          stub_ohai(platform: "fedora", version: "27") do |data|
+          stub_ohai(platform: "fedora", version: "32") do |data|
             data["platform"] = "pidora"
-            data["platform_version"] = "27"
+            data["platform_version"] = "32"
             data["kernel"]["machine"] = "armv6l"
           end
         end

data/spec/unit/project_spec.rb

@@ -207,28 +207,28 @@ module Omnibus
       before { stub_ohai(fauxhai_options) }
 
       context "when on RHEL" do
-        let(:fauxhai_options) { { platform: "redhat", version: "6.9" } }
+        let(:fauxhai_options) { { platform: "redhat", version: "8" } }
         it "returns a RHEL iteration" do
           expect(subject.build_iteration).to eq(1)
         end
       end
 
       context "when on Debian" do
-        let(:fauxhai_options) { { platform: "debian", version: "8.11" } }
+        let(:fauxhai_options) { { platform: "debian", version: "10" } }
         it "returns a Debian iteration" do
           expect(subject.build_iteration).to eq(1)
         end
       end
 
       context "when on FreeBSD" do
-        let(:fauxhai_options) { { platform: "freebsd", version: "10.4" } }
+        let(:fauxhai_options) { { platform: "freebsd", version: "12" } }
         it "returns a FreeBSD iteration" do
           expect(subject.build_iteration).to eq(1)
         end
       end
 
       context "when on Windows" do
-        before { stub_ohai(platform: "windows", version: "2008R2") }
+        before { stub_ohai(platform: "windows", version: "2019") }
         before { stub_const("File::ALT_SEPARATOR", '\\') }
         it "returns a Windows iteration" do
           expect(subject.build_iteration).to eq(1)
@@ -236,7 +236,7 @@ module Omnibus
       end
 
       context "when on OS X" do
-        let(:fauxhai_options) { { platform: "mac_os_x", version: "10.13" } }
+        let(:fauxhai_options) { { platform: "mac_os_x", version: "10.15" } }
         it "returns a generic iteration" do
           expect(subject.build_iteration).to eq(1)
         end

data/spec/unit/software_spec.rb

@@ -207,12 +207,7 @@ module Omnibus
       end
 
       context "on aix" do
-        before do
-          # There's no AIX in Fauxhai :(
-          stub_ohai(platform: "solaris2", version: "5.11") do |data|
-            data["platform"] = "aix"
-          end
-        end
+        before { stub_ohai(platform: "aix") }
 
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
@@ -232,9 +227,9 @@ module Omnibus
         end
       end
 
-      context "on freebsd 10" do
+      context "on freebsd" do
         before do
-          stub_ohai(platform: "freebsd", version: "10.4")
+          stub_ohai(platform: "freebsd", version: "12.1")
         end
 
         it "sets the defaults" do
@@ -250,95 +245,9 @@ module Omnibus
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
-
-        context "with gcc 4.9 installed" do
-          before do
-            allow(subject).to receive(:which).and_return("/usr/local/bin/gcc49")
-          end
-        end
-      end
-
-      context "on freebsd 10" do
-        before do
-          stub_ohai(platform: "freebsd", version: "10.4")
-        end
-
-        it "Clang as the default compiler" do
-          expect(subject.with_standard_compiler_flags).to eq(
-            "CC"              => "clang",
-            "CXX"             => "clang++",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-            "LDFLAGS"         => "-L/opt/project/embedded/lib",
-            "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
-            "OMNIBUS_INSTALL_DIR" => "/opt/project"
-          )
-        end
-      end
-
-      context "on sles 11" do
-        before do
-          # sles identifies as suse
-          stub_ohai(platform: "suse", version: "11.4")
-          allow(subject).to receive(:which).with("gcc-4.8").and_return(false)
-        end
-        it "sets the defaults" do
-          expect(subject.with_standard_compiler_flags).to eq(
-            "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-            "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
-            "OMNIBUS_INSTALL_DIR" => "/opt/project"
-          )
-        end
-
-        context "with gcc 4.8 installed" do
-
-          before do
-            allow(subject).to receive(:which).and_return("/usr/bin/gcc-4.8")
-          end
-
-          it "sets the compiler args" do
-            expect(subject.with_standard_compiler_flags).to eq(
-              "CC"              => "gcc-4.8",
-              "CXX"             => "g++-4.8",
-              "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-              "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-              "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-              "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-              "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
-              "OMNIBUS_INSTALL_DIR" => "/opt/project"
-            )
-          end
-        end
       end
 
-      context "on sles 12" do
-        before do
-          # sles identifies as suse
-          stub_ohai(platform: "suse", version: "12.2")
-          allow(subject).to receive(:which).with("gcc-4.8").and_return(true)
-        end
-
-        it "sets the defaults" do
-          expect(subject.with_standard_compiler_flags).to eq(
-            "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
-            "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
-            "OMNIBUS_INSTALL_DIR" => "/opt/project"
-          )
-        end
-      end
-
-      context "on Windows" do
+      context "on windows" do
         let(:win_arch_i386) { true }
 
         before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 7.0.34
+  version: 8.0.9
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: chef-sugar
+  name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '15.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '15.4'
 - !ruby/object:Gem::Dependency
   name: chef-cleanroom
   requirement: !ruby/object:Gem::Requirement
@@ -210,28 +210,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
-  name: fauxhai
+  name: fauxhai-ng
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement