omnibus 6.1.7 → 8.0.9

data/lib/omnibus/compressor.rb

@@ -49,10 +49,10 @@ module Omnibus
       end
 
       if compressors.include?(:tgz)
-        return TGZ
+        TGZ
       else
         log.info(log_key) { "No compressor defined for `#{family}'." }
-        return Null
+        Null
       end
     end
     module_function :for_current_system

data/lib/omnibus/compressors/base.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   class Compressor::Base < Packager::Base
@@ -30,7 +30,7 @@ module Omnibus
     # @param [Project] project
     #
     def initialize(project)
-      @project  = project
+      @project = project
 
       # There can now be multiple packagers per platform
       # but windows is the only platform that uses multiple

data/lib/omnibus/compressors/dmg.rb

@@ -234,8 +234,7 @@ module Omnibus
           pkg_name: packager.package_name,
           window_bounds: window_bounds,
           pkg_position: pkg_position,
-        }
-      )
+        })
 
       Dir.chdir(staging_dir) do
         shellout! <<-EOH.gsub(/^ {10}/, "")
@@ -260,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 \\
@@ -316,10 +318,10 @@ module Omnibus
       Dir.chdir(staging_dir) do
         shellout! <<-EOH.gsub(/^ {10}/, "")
           # Convert the png to an icon
-          sips -i "#{resource_path('icon.png')}"
+          sips -i "#{resource_path("icon.png")}"
 
           # Extract the icon into its own resource
-          DeRez -only icns "#{resource_path('icon.png')}" > tmp.rsrc
+          DeRez -only icns "#{resource_path("icon.png")}" > tmp.rsrc
 
           # Append the icon reosurce to the DMG
           Rez -append tmp.rsrc -o "#{package_path}"

data/lib/omnibus/compressors/tgz.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "rubygems/package"
-require "zlib"
+require "rubygems/package" unless defined?(Gem::Package)
+require "zlib" unless defined?(Zlib)
 
 module Omnibus
   class Compressor::TGZ < Compressor::Base

data/lib/omnibus/config.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "singleton"
+require "singleton" unless defined?(Singleton)
 
 module Omnibus
   class Config
@@ -285,7 +285,7 @@ module Omnibus
     #
     # @return [String, nil]
     default(:s3_access_key) do
-      if s3_profile
+      if s3_profile || s3_iam_role_arn
         nil
       else
         raise MissingRequiredAttribute.new(self, :s3_access_key, "'ABCD1234'")
@@ -296,7 +296,7 @@ module Omnibus
     #
     # @return [String, nil]
     default(:s3_secret_key) do
-      if s3_profile
+      if s3_profile || s3_iam_role_arn
         nil
       else
         raise MissingRequiredAttribute.new(self, :s3_secret_key, "'EFGH5678'")
@@ -308,6 +308,11 @@ module Omnibus
     # @return [String, nil]
     default(:s3_profile, nil)
 
+    # The AWS IAM role arn to use with S3 caching.
+    #
+    # @return [String, nil]
+    default(:s3_iam_role_arn, nil)
+
     # The region of the S3 bucket you want to cache software artifacts in.
     # Defaults to 'us-east-1'
     #
@@ -455,6 +460,11 @@ module Omnibus
     # @return [String, nil]
     default(:publish_s3_profile, nil)
 
+    # The AWS IAM role arn to use with S3 publisher.
+    #
+    # @return [String, nil]
+    default(:publish_s3_iam_role_arn, nil)
+
     # Directory pattern for the S3 publisher.
     # Interpolation of metadata keys is supported.
     #

data/lib/omnibus/core_extensions/open_uri.rb

@@ -1,4 +1,4 @@
-require "open-uri"
+require "open-uri" unless defined?(OpenURI)
 
 module OpenURI
   class << self

data/lib/omnibus/digestable.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "openssl"
-require "pathname"
+require "openssl" unless defined?(OpenSSL)
+require "pathname" unless defined?(Pathname)
 require "omnibus/logging"
 
 module Omnibus

data/lib/omnibus/download_helpers.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "open-uri"
+require "open-uri" unless defined?(OpenURI)
 require "ruby-progressbar"
 
 module Omnibus
@@ -77,7 +77,11 @@ module Omnibus
           end
         end
 
-        file = open(from_url, options)
+        if RUBY_VERSION.to_f < 2.7
+          file = open(from_url, options)
+        else
+          file = URI.open(from_url, options)
+        end
         # This is a temporary file. Close and flush it before attempting to copy
         # it over.
         file.close

data/lib/omnibus/fetchers/file_fetcher.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   class FileFetcher < Fetcher

data/lib/omnibus/fetchers/git_fetcher.rb

@@ -276,6 +276,7 @@ module Omnibus
       unless commit_ref
         raise UnresolvableGitReference.new(ref)
       end
+
       commit_ref
     end
 

data/lib/omnibus/fetchers/net_fetcher.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 require "omnibus/download_helpers"
 
 module Omnibus
@@ -31,7 +31,7 @@ module Omnibus
     ALL_EXTENSIONS = WIN_7Z_EXTENSIONS + TAR_EXTENSIONS
 
     # Digest types used for verifying file checksums
-    DIGESTS = [:sha512, :sha256, :sha1, :md5].freeze
+    DIGESTS = %i{sha512 sha256 sha1 md5}.freeze
 
     #
     # A fetch is required if the downloaded_file (such as a tarball) does not
@@ -314,8 +314,7 @@ module Omnibus
     #
     # @return [[String]]
     #
-    def extract_command
-    end
+    def extract_command; end
 
     #
     # Primitively determine whether we should use gtar or tar to untar a file.

data/lib/omnibus/fetchers/path_fetcher.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   class PathFetcher < Fetcher

data/lib/omnibus/file_syncer.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   module FileSyncer

data/lib/omnibus/generator.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "thor"
+require "thor" unless defined?(Thor)
 
 module Omnibus
   class Generator < Thor::Group
@@ -73,7 +73,7 @@ module Omnibus
     class << self
       # Set the source root for Thor
       def source_root
-        File.expand_path("../generator_files", __FILE__)
+        File.expand_path("generator_files", __dir__)
       end
     end
 

data/lib/omnibus/generator_files/README.md.erb

@@ -47,8 +47,8 @@ $ bin/omnibus clean <%= config[:name] %> --purge
 ### Publish
 
 Omnibus has a built-in mechanism for releasing to a variety of "backends", such
-as Amazon S3. You must set the proper credentials in your `omnibus.rb` config
-file or specify them via the command line.
+as Amazon S3. You must set the proper credentials in your
+[`omnibus.rb`](omnibus.rb) config file or specify them via the command line.
 
 ```shell
 $ bin/omnibus publish path/to/*.deb --backend s3
@@ -82,37 +82,41 @@ version of every software definition.
 
 Kitchen-based Build Environment
 -------------------------------
-Every Omnibus project ships will a project-specific
-[Berksfile](https://docs.chef.io/berkshelf.html) that will allow you to build your omnibus projects on all of the projects listed
-in the `.kitchen.yml`. You can add/remove additional platforms as needed by
-changing the list found in the `.kitchen.yml` `platforms` YAML stanza.
+Every Omnibus project ships with a project-specific
+[Berksfile](https://docs.chef.io/berkshelf.html) that will allow you to build
+your omnibus projects on all of the platforms listed in the
+[`.kitchen.yml`](.kitchen.yml). You can add/remove additional platforms as
+needed by changing the list found in the [`.kitchen.yml`](.kitchen.yml)
+`platforms` YAML stanza.
 
 This build environment is designed to get you up-and-running quickly. However,
-there is nothing that restricts you to building on other platforms. Simply use
-the [omnibus cookbook](https://github.com/chef-cookbooks/omnibus) to setup
-your desired platform and execute the build steps listed above.
+there is nothing that restricts you from building on other platforms. Simply use
+the [omnibus cookbook](https://github.com/chef-cookbooks/omnibus) to setup your
+desired platform and execute the build steps listed above.
 
 The default build environment requires Test Kitchen and VirtualBox for local
 development. Test Kitchen also exposes the ability to provision instances using
 various cloud providers like AWS, DigitalOcean, or OpenStack. For more
 information, please see the [Test Kitchen documentation](https://kitchen.ci/).
 
-Once you have tweaked your `.kitchen.yml` (or `.kitchen.local.yml`) to your
-liking, you can bring up an individual build environment using the `kitchen`
-command.
+Once you have tweaked your [`.kitchen.yml`](.kitchen.yml) (or
+[`.kitchen.local.yml`](.kitchen.local.yml)) to your liking, you can bring up an
+individual build environment using the `kitchen` command.
+
 
 ```shell
-$ bin/kitchen converge ubuntu-1204
+$ bin/kitchen converge ubuntu-1804
 ```
 
 Then login to the instance and build the project as described in the Usage
 section:
 
 ```shell
-$ bundle exec kitchen login ubuntu-1204
-[vagrant@ubuntu...] $ cd <%= config[:name] %>
+$ bin/kitchen login ubuntu-1804
+[vagrant@ubuntu...] $ .  load-omnibus-toolchain.sh
+[vagrant@ubuntu...] $ [ -e .bundle ] && sudo chown -R vagrant:vagrant .bundle
+[vagrant@ubuntu...] $ cd <%= config[:name] %>   # or 'cd <%= config[:name] %>/omnibus' if your omnibus project is embedded in your main project
 [vagrant@ubuntu...] $ bundle install
-[vagrant@ubuntu...] $ ...
 [vagrant@ubuntu...] $ bin/omnibus build <%= config[:name] %>
 ```
 

data/lib/omnibus/generator_files/config/software/preparation.rb.erb

@@ -15,7 +15,7 @@
 #
 
 name "preparation"
-description "the steps required to preprare the build"
+description "the steps required to prepare the build"
 default_version "1.0.0"
 
 license :project_license

data/lib/omnibus/generator_files/omnibus.rb.erb

@@ -31,10 +31,11 @@
 # Enable S3 asset caching
 # ------------------------------
 # use_s3_caching true
-# s3_access_key  ENV['AWS_ACCESS_KEY_ID']
-# s3_secret_key  ENV['AWS_SECRET_ACCESS_KEY']
-# s3_profile     ENV['AWS_S3_PROFILE']
-# s3_bucket      ENV['AWS_S3_BUCKET']
+# s3_access_key    ENV['AWS_ACCESS_KEY_ID']
+# s3_secret_key    ENV['AWS_SECRET_ACCESS_KEY']
+# s3_profile       ENV['AWS_S3_PROFILE']
+# s3_iam_role_arn  ENV['S3_IAM_ROLE_ARN']
+# s3_bucket        ENV['AWS_S3_BUCKET']
 
 # Customize compiler bits
 # ------------------------------

data/lib/omnibus/git_cache.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "digest"
-require "fileutils"
+require "digest" unless defined?(Digest)
+require "fileutils" unless defined?(FileUtils)
 
 module Omnibus
   class GitCache

data/lib/omnibus/health_check.rb

@@ -331,7 +331,7 @@ module Omnibus
     #
     def health_check_ldd
       regexp_ends = ".*(" + IGNORED_ENDINGS.map { |e| e.gsub(/\./, '\.') }.join("|") + ")$"
-      regexp_patterns = IGNORED_PATTERNS.map { |e| ".*" + e.gsub(/\//, '\/') + ".*" }.join("|")
+      regexp_patterns = IGNORED_PATTERNS.map { |e| ".*" + e.gsub(%r{/}, '\/') + ".*" }.join("|")
       regexp = regexp_ends + "|" + regexp_patterns
 
       current_library = nil
@@ -428,6 +428,8 @@ module Omnibus
                          ARCH_WHITELIST_LIBS
                        when "mac_os_x"
                          MAC_WHITELIST_LIBS
+                       when "omnios"
+                         OMNIOS_WHITELIST_LIBS
                        when "solaris2"
                          SOLARIS_WHITELIST_LIBS
                        when "smartos"

data/lib/omnibus/licensing.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "uri"
-require "fileutils"
+require "uri" unless defined?(URI)
+require "fileutils" unless defined?(FileUtils)
 require "omnibus/download_helpers"
 require "license_scout/collector"
 require "license_scout/reporter"
@@ -130,8 +130,7 @@ module Omnibus
     #
     # @return [void]
     #
-    def execute_pre_build(software)
-    end
+    def execute_pre_build(software); end
 
     # Callback that gets called by Software#build_me after the build is done.
     # Invokes license copying for the given software. This ensures that
@@ -246,7 +245,7 @@ module Omnibus
 
         out << "This product bundles #{name} #{version},\n"
         out << "which is available under a \"#{license}\" License.\n"
-        if !license_files.empty?
+        unless license_files.empty?
           out << "For details, see:\n"
           license_files.each do |license_file|
             out << "#{license_package_location(name, license_file)}\n"
@@ -440,7 +439,7 @@ module Omnibus
 
       if Config.fatal_transitive_dependency_licensing_warnings && !transitive_dependency_licensing_warnings.empty?
         warnings_to_raise << transitive_dependency_licensing_warnings
-        warnings_to_raise << "If you are encountering missing license or missing license file errors for **transitive** dependencies, you can provide overrides for the missing information at https://github.com/chef/license_scout/blob/master/lib/license_scout/overrides.rb#L93"
+        warnings_to_raise << "If you are encountering missing license or missing license file errors for **transitive** dependencies, you can provide overrides for the missing information at https://github.com/chef/license_scout/blob/1-stable/lib/license_scout/overrides.rb#L93. \n Promote license_scout to Rubygems with `/expeditor promote chef/license_scout:1-stable X.Y.Z` in slack."
       end
 
       warnings_to_raise.flatten!

data/lib/omnibus/logger.rb

@@ -17,7 +17,7 @@
 module Omnibus
   class Logger
 
-    require "time"
+    require "time" unless defined?(Time.zone_offset)
 
     #
     # The amount of padding on the left column.
@@ -102,6 +102,7 @@ module Omnibus
     #
     def add(severity, progname, &block)
       return true if io.nil? || severity < level
+
       message = format_message(severity, progname, yield)
       MUTEX.synchronize { io.write(message) }
       true
@@ -138,7 +139,7 @@ module Omnibus
       else
         left = "#{format_severity(severity)} | "
       end
-      "#{left.rjust(LEFT)}#{Time.now.iso8601()} | #{message}\n"
+      "#{left.rjust(LEFT)}#{Time.now.iso8601} | #{message}\n"
     end
 
     #

data/lib/omnibus/manifest.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Omnibus
   class Manifest
@@ -44,7 +44,7 @@ module Omnibus
     end
 
     def add(name, entry)
-      if ! entry.is_a? Omnibus::ManifestEntry
+      unless entry.is_a? Omnibus::ManifestEntry
         raise NotAManifestEntry, "#{entry} is not an Omnibus:ManifestEntry"
       end