omnibus 8.2.2 → 8.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af0b9ab4b9d9903d007df7fe7ef6400f29c440f6de01c3c76f2fb18690f04001
-  data.tar.gz: aa35f665517e110e781329b7e97ea9ff154633fb25c80d274bae96d4f46a6bde
+  metadata.gz: 0ead593d30d6adc565642ff443cce0b239294752253a6811d94f830160af190c
+  data.tar.gz: b75f1260a3b3acfb23bc31f9f376edb1be0799567d5623a2c33a3d350041468f
 SHA512:
-  metadata.gz: f8a052707df85029b1a29c3b55a24abd7f81d9b288707bc98512c1bc185c1f309c753d72e792dc68e814c67ccc06f059cddf1b16c593f913de68cfb356d8a903
-  data.tar.gz: 46626cb42cca8480b546bd4281b853bc2c5a51063350109cff57a2f51c766963be06737af5ff26f0610c9ac9b9d2cf53ba5ae6da5df5077901569baf2bd00bfb
+  metadata.gz: c403ea34e2b0352ed171abc7d329a797f36f1b8bd9d79c4bd2f4da1c3d5c187a9caa7bcad4fca8d7ab4577b9d3c079b05927fe872d145ccd0e2ffa1b9c302820
+  data.tar.gz: 3230fb144ca86a372f6de1e3e5fd21f1e9e0c72c95c2a8ef0194bca0b0f8437a7881d1de882666c9980d2a9c2ccaba371646ae69648eb6191d55266875d3258e

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/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,63 @@ 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 = {}
 
+      read_shared_libs("find #{project.install_dir}/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'", "xargs -n 1 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+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 +388,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+libjava.so/
+        when /^\s+statically linked$/
           next
-        when /^\s+libmawt.so/
+        when /^\s+libjvm.so/ # FIXME: should remove if it doesn't blow up server
+          next
+        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 +442,7 @@ module Omnibus
         end
       end
 
-      bad_libs
+      [bad_libs, good_libs]
     end
 
     private
@@ -399,10 +477,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 +528,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 +571,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/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/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "8.2.2".freeze
+  VERSION = "8.3.2".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
 
@@ -177,28 +183,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 +222,7 @@ IGNORED_ENDINGS = %w{
   .lua
   .md
   .mkd
+  .mo
   .npmignore
   .out
   .packlist
@@ -219,21 +232,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 +263,7 @@ IGNORED_ENDINGS = %w{
   license
 }.freeze
 
-IGNORED_PATTERNS = %w{
+IGNORED_SUBSTRINGS = %w{
   /build_info/
   /licenses/
   /LICENSES/

data/omnibus.gemspec

@@ -25,7 +25,7 @@ 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"

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/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")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 8.2.2
+  version: 8.3.2
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2022-02-15 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