omnibus 6.1.7 → 8.0.9

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/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
@@ -73,7 +73,7 @@ module Omnibus
 
       unless options.empty?
         raise ArgumentError,
-          "Unknown option(s): #{options.keys.map(&:inspect).join(', ')}"
+          "Unknown option(s): #{options.keys.map(&:inspect).join(", ")}"
       end
 
       # String value returned from #render_template_content

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
@@ -80,7 +80,7 @@ module Omnibus
     #   populated with results of the command.
     #
     def shellout(*args)
-      options = args.last.kind_of?(Hash) ? args.pop : {}
+      options = args.last.is_a?(Hash) ? args.pop : {}
       options = SHELLOUT_OPTIONS.merge(options)
 
       command_string = args.join(" ")
@@ -158,6 +158,7 @@ module Omnibus
       yield
     rescue Exception => e
       raise e unless retried_exceptions.any? { |eclass| e.is_a?(eclass) }
+
       if retries != 0
         log.info(log_key) { "Retrying failed #{logstr} due to #{e} (#{retries} retries left)..." }
         retries -= 1
@@ -196,7 +197,7 @@ module Omnibus
     #
     def compiler_safe_path(*pieces)
       path = File.join(*pieces)
-      path = path.sub(/^([A-Za-z]):\//, "/\\1/") if ENV["MSYSTEM"]
+      path = path.sub(%r{^([A-Za-z]):/}, "/\\1/") if ENV["MSYSTEM"]
       path
     end
 

data/lib/omnibus/version.rb

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

data/lib/omnibus/whitelist.rb

@@ -1,5 +1,5 @@
 
-# Copyright 2012-2018 Chef Software, Inc.
+# Copyright 2012-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.
@@ -16,6 +16,7 @@
 
 WHITELIST_LIBS = [
     /ld-linux/,
+    /libanl\.so/,
     /libc\.so/,
     /libcrypt\.so/,
     /libdl/,
@@ -33,6 +34,7 @@ WHITELIST_LIBS = [
   ].freeze
 
 ARCH_WHITELIST_LIBS = [
+  /libanl\.so/,
   /libc\.so/,
   /libcrypt\.so/,
   /libdb-5\.3\.so/,
@@ -56,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/,

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,22 +12,22 @@ 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"
   gem.executables = %w{omnibus}
-  gem.test_files = gem.files.grep(/^(test|spec|features)\//)
+  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.add_dependency "aws-sdk-s3",       "~> 1"
-  gem.add_dependency "chef-sugar-ng",    ">= 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", "< 16"
+  gem.add_dependency "ohai",             ">= 15"
   gem.add_dependency "ruby-progressbar", "~> 1.7"
-  gem.add_dependency "thor",             "~> 0.18"
+  gem.add_dependency "thor",             ">= 0.18", "< 2.0"
   gem.add_dependency "license_scout",    "~> 1.0"
 
   gem.add_dependency "mixlib-versioning"
@@ -36,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",   "= 0.12"
-  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/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/rpm/signing.erb

@@ -11,25 +11,22 @@ require 'pty'
 
 puts rpm_cmd
 PTY.spawn(rpm_cmd) do |r, w, pid|
+  # Older versions of rpmsign will prompt right away for the passphrase
   prompt = r.read(19)
 
-  # match the expected prompt exactly, since that's the only way we know if
-  # something went wrong.
-  unless prompt == 'Enter pass phrase: '
-    STDERR.puts "unexpected output from `#{rpm_cmd}`: '#{prompt}'"
-    Process.kill(:KILL, pid)
-    exit 1
+  if prompt == 'Enter pass phrase: '
+    STDOUT.puts prompt
+    w.write("#{password}\n")
   end
 
-  STDOUT.puts prompt
-  w.write("#{password}\n")
-
   # Keep printing output unti the command exits
   loop do
     begin
       line = r.gets
       puts line
-      if (line =~ /failed/) && !(line =~ /warning:/)
+      if line =~ /Please enter the passphrase to unlock the OpenPGP secret key:/
+        w.write("#{password}\n")
+      elsif (line =~ /failed/) && !(line =~ /warning:/)
         STDERR.puts 'RPM signing failure'
         exit 1
       end

data/spec/functional/builder_spec.rb

@@ -22,6 +22,7 @@ module Omnibus
         ext = name == "ruby" ? ".exe" : ".bat"
         source = Bundler.which(name + ext)
         raise "Could not find #{name} in bundler environment" unless source
+
         File.open(File.join(embedded_bin_dir, name + ".bat"), "w") do |f|
           f.write <<-EOH.gsub(/^ {12}/, "")
             @"#{source}" %*
@@ -221,7 +222,7 @@ module Omnibus
         output = capture_logging { subject.build }
 
         appbundler_path = File.join(embedded_bin_dir, "appbundler")
-        appbundler_path.gsub!(/\//, '\\') if windows?
+        appbundler_path.gsub!(%r{/}, '\\') if windows?
         expect(output).to include("#{appbundler_path} '#{project_dir}' '#{bin_dir}'")
       end
     end

data/spec/functional/fetchers/file_fetcher_spec.rb

@@ -13,10 +13,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(Omnibus::ManifestEntry,
-             name: "pathelogical",
-             locked_version: nil,
-             described_version: nil,
-             locked_source: source)
+        name: "pathelogical",
+        locked_version: nil,
+        described_version: nil,
+        locked_source: source)
     end
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/functional/fetchers/git_fetcher_spec.rb

@@ -110,10 +110,10 @@ module Omnibus
       let(:remote)   { remote_git_repo("zlib", annotated_tags: [version]) }
       let(:manifest_entry) do
         double(ManifestEntry,
-               name: "software",
-               locked_version: "efde208366abd0f91419d8a54b45e3f6e0540105",
-               described_version: version,
-               locked_source: source)
+          name: "software",
+          locked_version: "efde208366abd0f91419d8a54b45e3f6e0540105",
+          described_version: version,
+          locked_source: source)
       end
 
       subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/functional/fetchers/net_fetcher_spec.rb

@@ -4,8 +4,7 @@ module Omnibus
   module RSpec
     module OhaiHelpers
       # Turn off the mandatory Ohai helper.
-      def stub_ohai(options = {}, &block)
-      end
+      def stub_ohai(options = {}, &block); end
     end
   end
 
@@ -29,10 +28,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(ManifestEntry,
-             name: "software",
-             locked_version: "1.2.8",
-             described_version: "1.2.8",
-             locked_source: source)
+        name: "software",
+        locked_version: "1.2.8",
+        described_version: "1.2.8",
+        locked_source: source)
     end
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/functional/fetchers/path_fetcher_spec.rb

@@ -12,10 +12,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(Omnibus::ManifestEntry,
-             name: "pathelogical",
-             locked_version: nil,
-             described_version: nil,
-             locked_source: source)
+        name: "pathelogical",
+        locked_version: nil,
+        described_version: nil,
+        locked_source: source)
     end
 
     before do

data/spec/functional/licensing_spec.rb

@@ -37,14 +37,14 @@ module Omnibus
         expect(project_license).to match /This product bundles private_code 1.7.2,\nwhich is available under a "Unspecified"/
         expect(project_license).to match /This product bundles snoopy 1.0.0,\nwhich is available under a "GPL v2"/
         expect(project_license).not_to match /preparation/
-        expect(project_license).to match /LICENSES\/snoopy-artistic.html/
-        expect(project_license).to match /LICENSES\/snoopy-NOTICE/
+        expect(project_license).to match %r{LICENSES/snoopy-artistic.html}
+        expect(project_license).to match %r{LICENSES/snoopy-NOTICE}
         if zlib_version_override
           expect(project_license).to match /This product bundles zlib 1.8.0,\nwhich is available under a "Apache-2.0"/
-          expect(project_license).to match /LICENSES\/zlib-APACHE/
+          expect(project_license).to match %r{LICENSES/zlib-APACHE}
         else
           expect(project_license).to match /This product bundles zlib 1.7.2,\nwhich is available under a "Zlib"/
-          expect(project_license).to match /LICENSES\/zlib-LICENSE/
+          expect(project_license).to match %r{LICENSES/zlib-LICENSE}
         end
       end
 
@@ -263,7 +263,7 @@ module Omnibus
       it "should log a warning for the missing file" do
         output = capture_logging { create_licenses }
         expect(output).to match(/Retrying failed download/)
-        expect(output).to match(/Can not download license file 'https:\/\/downloads.chef.io\/LICENSE' for software 'problematic'./)
+        expect(output).to match(%r{Can not download license file 'https://downloads.chef.io/LICENSE' for software 'problematic'.})
       end
     end
 

data/spec/support/examples.rb

@@ -27,8 +27,7 @@ RSpec.shared_examples "a software" do |name = "chefdk"|
       install_dir: install_dir,
       project_dir: project_dir,
       source:      source,
-      overridden?: false
-    )
+      overridden?: false)
   end
 
   before do
@@ -56,12 +55,12 @@ RSpec.shared_examples "a software" do |name = "chefdk"|
     FileUtils.mkdir_p(embedded_bin_dir)
 
     allow(software).to receive(:with_embedded_path).and_return(
-      "PATH" => "#{bin_dir}:#{embedded_bin_dir}:#{ENV['PATH']}"
+      "PATH" => "#{bin_dir}:#{embedded_bin_dir}:#{ENV["PATH"]}"
     )
 
     allow(software).to receive(:embedded_bin) do |binary|
       p = File.join(embedded_bin_dir, binary)
-      p.gsub!(/\//, '\\') if windows?
+      p.gsub!(%r{/}, '\\') if windows?
       p
     end
   end

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/builder_spec.rb

@@ -6,8 +6,7 @@ module Omnibus
       double(Software,
         name: "chefdk",
         install_dir: project_dir,
-        project_dir: project_dir
-      )
+        project_dir: project_dir)
     end
 
     let(:project_dir) { on_windows ? "C:/opscode/chefdk" : "/opt/chefdk" }
@@ -238,7 +237,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)
-          subject.configure()
+          subject.configure
         end
       end
 
@@ -254,7 +253,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)
-          subject.configure()
+          subject.configure
         end
       end
 
@@ -305,7 +304,8 @@ module Omnibus
           .with("config/patches", "good_patch")
           .and_return(
             [ ["#{project_dir}/patch_location1/good_patch", "#{project_dir}/patch_location2/good_patch"],
-              "#{project_dir}/patch_location2/good_patch" ])
+              "#{project_dir}/patch_location2/good_patch" ]
+          )
       end
 
       it "is a DSL method" do
@@ -355,10 +355,10 @@ module Omnibus
 
       let(:software) do
         double(Software,
-               name: "chefdk",
-               install_dir: tmp_dir,
-               project_dir: tmp_dir,
-               overridden?: false)
+          name: "chefdk",
+          install_dir: tmp_dir,
+          project_dir: tmp_dir,
+          overridden?: false)
       end
 
       let(:before_build_shasum) do