omnibus 7.0.13 → 8.1.15

data/lib/omnibus/templating.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require "erb"
+require "erb" unless defined?(Erb)
 
 module Omnibus
   module Templating

data/lib/omnibus/thread_pool.rb

@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-require "thread"
-
 module Omnibus
   class ThreadPool
 

data/lib/omnibus/util.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "mixlib/shellout"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module Omnibus
   module Util

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "7.0.13".freeze
+  VERSION = "8.1.15".freeze
 end

data/lib/omnibus/whitelist.rb

@@ -58,6 +58,27 @@ AIX_WHITELIST_LIBS = [
   /unix$/,
 ].freeze
 
+OMNIOS_WHITELIST_LIBS = [
+  /libc\.so\.1/,
+  /libcrypt\./,
+  /libcrypt\.so\.1/,
+  /libdl\.so\.1/,
+  /libgcc_s\.so\.1/,
+  /libgen\.so\.1/,
+  /libm\.so\.2/,
+  /libmd\.so\.1/,
+  /libmp\.so/,
+  /libmp\.so\.2/,
+  /libnsl\.so\.1/,
+  /libpthread\.so\.1/,
+  /librt\.so\.1/,
+  /libsocket\.so\.1/,
+  /libssp\.s/,
+  /libssp\.so./,
+  /libssp\.so\.0/,
+  /libgcc_s\.so\.1/,
+].freeze
+
 SOLARIS_WHITELIST_LIBS = [
   /libaio\.so/,
   /libavl\.so/,
@@ -141,6 +162,7 @@ MAC_WHITELIST_LIBS = [
   /libc\+\+\.1\.dylib/,
   /libzstd\.1\.dylib/,
   /Security/,
+  /SystemConfiguration/,
 ].freeze
 
 FREEBSD_WHITELIST_LIBS = [

data/omnibus.gemspec

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "omnibus/version"
 
@@ -13,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.description    = gem.summary
   gem.homepage       = "https://github.com/chef/omnibus"
 
-  gem.required_ruby_version = ">= 2.4"
+  gem.required_ruby_version = ">= 2.6"
 
   gem.files = %w{ LICENSE README.md Rakefile Gemfile } + Dir.glob("*.gemspec") + Dir.glob("{bin,lib,resources,spec}/**/{*,.kitchen*}")
   gem.bindir = "bin"
@@ -22,22 +21,23 @@ 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"
-  gem.add_dependency "ohai",             ">= 13", "< 17"
+  gem.add_dependency "ohai",             ">= 15", "< 17"
   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 "mixlib-versioning"
   gem.add_dependency "pedump"
 
   gem.add_development_dependency "artifactory", "~> 3.0"
-  gem.add_development_dependency "aruba",       "~> 0.5"
-  gem.add_development_dependency "chefstyle",   "= 1.1.0"
-  gem.add_development_dependency "fauxhai",     ">= 5.2"
+  gem.add_development_dependency "aruba",       "~> 1.1"
+  gem.add_development_dependency "chefstyle",   "= 1.7.5"
+  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/ips/doc-transform.erb

@@ -2,3 +2,4 @@
 <transform file depend -> edit pkg.debug.depend.file ruby env>
 <transform file depend -> edit pkg.debug.depend.file make env>
 <transform file depend -> edit pkg.debug.depend.file perl env>
+<transform file depend -> edit pkg.debug.depend.path usr/local/bin usr/bin>

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/resources/pkg/distribution.xml.erb

@@ -7,7 +7,7 @@
 
   <!-- Generated by productbuild - - synthesize -->
   <pkg-ref id="<%= identifier %>"/>
-  <options customize="never" require-scripts="false"/>
+  <options customize="never" require-scripts="false" hostArchitectures="<%= host_architecture %>" />
   <choices-outline>
     <line choice="default">
       <line choice="<%= identifier %>"/>

data/resources/rpm/spec.erb

@@ -8,8 +8,8 @@
 %define __spec_clean_post true
 %define __spec_clean_pre true
 
-# Use md5
-%define _binary_filedigest_algorithm 1
+# Use SHA256 checksums for all files
+%define _binary_filedigest_algorithm 8
 
 %define _binary_payload <%= compression %>
 

data/spec/functional/fetchers/net_fetcher_spec.rb

@@ -127,17 +127,8 @@ module Omnibus
         end
       end
 
-      context "when the source has read-only files" do
-        let(:source_url) { "http://dl.bintray.com/oneclick/OpenKnapsack/x86/openssl-1.0.0q-x86-windows.tar.lzma" }
-        let(:source_md5) { "577dbe528415c6f178a9431fd0554df4" }
-
-        it "extracts the asset without crashing" do
-          subject.clean
-          expect(extracted).to_not be_a_file
-          subject.clean
-          expect(extracted).to_not be_a_file
-        end
-      end
+      # we need to find a new test fixture because this one no longer exists
+      # context "when the source has read-only files"
 
       context "when the source has broken symlinks" do
         let(:source_url) { "http://www.openssl.org/source/openssl-1.0.1q.tar.gz" }

data/spec/support/path_helpers.rb

@@ -6,13 +6,13 @@ module Omnibus
       end
 
       def tmp_path
-        File.expand_path("../../tmp", __FILE__)
+        File.expand_path("../tmp", __dir__)
       end
 
       private
 
       def fixtures_path
-        File.expand_path("../../fixtures", __FILE__)
+        File.expand_path("../fixtures", __dir__)
       end
     end
   end

data/spec/unit/compressor_spec.rb

@@ -3,8 +3,8 @@ require "spec_helper"
 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") }
+      context "on macOS" do
+        before { stub_ohai(platform: "mac_os_x") }
 
         context "when :dmg is activated" do
           it "prefers dmg" do

data/spec/unit/compressors/dmg_spec.rb

@@ -190,7 +190,7 @@ module Omnibus
 
         expect(contents).to include('set found_disk to do shell script "ls /Volumes/ | grep \'Project One*\'"')
         expect(contents).to include("	set the bounds of Finder window 1 to {100, 100, 750, 600}")
-        expect(contents).to include('  	set position of item "project-1.2.3-2.pkg" of container window to {535, 50}')
+        expect(contents).to include('  	set position of item "project-1.2.3-2.x86_64.pkg" of container window to {535, 50}')
       end
 
       it "runs the apple script" do
@@ -219,14 +219,17 @@ module Omnibus
             sync
             hdiutil unmount "#{device}"
             # Give some time to the system so unmount dmg
-            sleep 5
-            hdiutil detach "#{device}" &&\
+            ATTEMPTS=1
+            until [ $ATTEMPTS -eq 6 ] || hdiutil detach "/dev/sda1"; do
+              sleep 10
+              echo Attempt number $(( ATTEMPTS++ ))
+            done
             hdiutil convert \\
               "#{staging_dir}/project-writable.dmg" \\
               -format UDZO \\
               -imagekey \\
               zlib-level=9 \\
-              -o "#{package_dir}/project-1.2.3-2.dmg" \\
+              -o "#{package_dir}/project-1.2.3-2.x86_64.dmg" \\
               -puppetstrings
           EOH
 
@@ -244,7 +247,7 @@ module Omnibus
         expect(subject).to receive(:shellout!)
           .with <<-EOH.gsub(/^ {12}/, "")
             hdiutil verify \\
-              "#{package_dir}/project-1.2.3-2.dmg" \\
+              "#{package_dir}/project-1.2.3-2.x86_64.dmg" \\
               -puppetstrings
           EOH
 
@@ -286,10 +289,10 @@ module Omnibus
             DeRez -only icns "#{icon}" > tmp.rsrc
 
             # Append the icon reosurce to the DMG
-            Rez -append tmp.rsrc -o "#{package_dir}/project-1.2.3-2.dmg"
+            Rez -append tmp.rsrc -o "#{package_dir}/project-1.2.3-2.x86_64.dmg"
 
             # Source the icon
-            SetFile -a C "#{package_dir}/project-1.2.3-2.dmg"
+            SetFile -a C "#{package_dir}/project-1.2.3-2.x86_64.dmg"
           EOH
 
         subject.set_dmg_icon
@@ -298,11 +301,11 @@ module Omnibus
 
     describe "#package_name" do
       it "reflects the packager's unmodified package_name" do
-        expect(subject.package_name).to eq("project-1.2.3-2.dmg")
+        expect(subject.package_name).to eq("project-1.2.3-2.x86_64.dmg")
       end
 
       it "reflects the packager's modified package_name" do
-        package_basename = "projectsub-1.2.3-3"
+        package_basename = "projectsub-1.2.3-3.x86_64"
         allow(project.packagers_for_system[0]).to receive(:package_name)
           .and_return("#{package_basename}.pkg")
 

data/spec/unit/compressors/tgz_spec.rb

@@ -38,25 +38,25 @@ module Omnibus
 
     describe "#package_name" do
       it "returns the name of the packager" do
-        expect(subject.package_name).to eq("project-1.2.3-2.pkg.tar.gz")
+        expect(subject.package_name).to eq("project-1.2.3-2.x86_64.pkg.tar.gz")
       end
     end
 
     describe "#write_tgz" do
       before do
-        File.open("#{staging_dir}/project-1.2.3-2.pkg", "wb") do |f|
+        File.open("#{staging_dir}/project-1.2.3-2.x86_64.pkg", "wb") do |f|
           f.write " " * 1_000_000
         end
       end
 
       it "generates the file" do
         subject.write_tgz
-        expect("#{staging_dir}/project-1.2.3-2.pkg.tar.gz").to be_a_file
+        expect("#{staging_dir}/project-1.2.3-2.x86_64.pkg.tar.gz").to be_a_file
       end
 
       it "has the correct content" do
         subject.write_tgz
-        file = File.open("#{staging_dir}/project-1.2.3-2.pkg.tar.gz", "rb")
+        file = File.open("#{staging_dir}/project-1.2.3-2.x86_64.pkg.tar.gz", "rb")
         contents = file.read
         file.close
 

data/spec/unit/fetchers/net_fetcher_spec.rb

@@ -278,6 +278,10 @@ module Omnibus
 
       let(:cumulative_downloaded_length) { 100 }
 
+      let(:uri_open_target) do
+        RUBY_VERSION.to_f < 2.7 ? subject : URI
+      end
+
       def capturing_stdout
         old_stdout, $stdout = $stdout, progress_bar_output
         yield
@@ -286,7 +290,7 @@ module Omnibus
       end
 
       before do
-        expect(subject).to receive(:open).with(source[:url], expected_open_opts) do |_url, open_uri_opts|
+        expect(uri_open_target).to receive(:open).with(source[:url], expected_open_opts) do |_url, open_uri_opts|
           open_uri_opts[:content_length_proc].call(reported_content_length)
           open_uri_opts[:progress_proc].call(cumulative_downloaded_length)
 

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
@@ -218,6 +218,8 @@ module Omnibus
       it_behaves_like "a version manipulator", "gentoo", "4.9.95-gentoo", "rolling"
       it_behaves_like "a version manipulator", "kali", "rolling", "rolling"
       it_behaves_like "a version manipulator", "mac_os_x", "10.9.1", "10.9"
+      it_behaves_like "a version manipulator", "mac_os_x", "10.15.7", "10.15"
+      it_behaves_like "a version manipulator", "mac_os_x", "11.2.1", "11"
       it_behaves_like "a version manipulator", "omnios", "r151010", "r151010"
       it_behaves_like "a version manipulator", "openbsd", "5.4.4", "5.4"
       it_behaves_like "a version manipulator", "opensuseleap", "42.3", "42.3"
@@ -245,7 +247,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 +261,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

@@ -3,27 +3,20 @@ require "spec_helper"
 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") }
+      context "on macOS" do
+        before { stub_ohai(platform: "mac_os_x") }
         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