omnibus 6.0.1 → 6.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b284dd534123f25d29564a4e30f2d4c2aad7681c866e498a27dcd5bdd31ac98b
-  data.tar.gz: ba218cd4ed48cf4e1c7697b8aeee068c167bbaa5c776d09e7cd4e80fe67765c7
+  metadata.gz: 62046c09cd3865088ef63927b5ce3bd565c0ad8d7553358a8537f459f1163356
+  data.tar.gz: 472d2ba5eeffd0e997c9d787d4b507a18483ceebdc8061043b3e2da38fbf6204
 SHA512:
-  metadata.gz: cf7dffcc3674c570065db2183937da6d10ed75167ac065c91800fdc4e7d7487c8dd959d9cc42109cb38b1e7a764115657137599d076cadb80c9c609f7fe6ead8
-  data.tar.gz: a195cbdeb15ab989bc5b0da999b828eda914dbaf28dbfd9833cba683073f4acba7217f559c82c8988360340625aa83a274ce2a7b03d8a1452e955cf849b83ef8
+  metadata.gz: bb009f95b399d7514d80cda4db6032dca69b9eec31715e3d15fa4a7396c20e72b9387eec06b817356b91d56ec2eaead7fca67185a98f88cf069e1177e15e6c00
+  data.tar.gz: 7333413a6c610a29d8f1d6a0ebd787010f8b58c65e086aad9c8710e0062eb4d0cbcd98f9ee449cb4ea502537c325387043393f4799f2bb2297e6fc7c0c30083d

data/Gemfile

@@ -13,3 +13,6 @@ group :debug do
   gem "pry-byebug"
   gem "pry-stack_explorer"
 end
+
+# this brings in several fixes to rspec-json_expectations that are causing test failures
+gem "rspec-json_expectations", git: "https://github.com/tas50/rspec-json_expectations.git"

data/lib/omnibus/build_version.rb

@@ -34,7 +34,7 @@ module Omnibus
     #
     # @see Omnibus::BuildVersion#semver
     # @see Time#strftime
-    TIMESTAMP_FORMAT = "%Y%m%d%H%M%S"
+    TIMESTAMP_FORMAT = "%Y%m%d%H%M%S".freeze
 
     class << self
       # @see (BuildVersion#git_describe)

data/lib/omnibus/builder.rb

@@ -765,7 +765,7 @@ module Omnibus
       log.internal(log_key) { "Cached builder checksum before build: #{shasum}" }
       if software.overridden?
         log.info(log_key) do
-          "Version overridden from #{software.default_version} to "\
+          "Version overridden from #{software.default_version || "n/a"} to "\
           "#{software.version}"
         end
       end

data/lib/omnibus/changelog.rb

@@ -2,7 +2,7 @@ require "omnibus/git_repository"
 
 module Omnibus
   class ChangeLog
-    CHANGELOG_TAG = "ChangeLog-Entry"
+    CHANGELOG_TAG = "ChangeLog-Entry".freeze
 
     attr_reader :end_ref
     def initialize(start_ref = nil, end_ref = "HEAD", git_repo = GitRepository.new("./"))

data/lib/omnibus/compressors/dmg.rb

@@ -36,6 +36,7 @@ module Omnibus
     build do
       create_writable_dmg
       attach_dmg
+      copy_assets_to_dmg
       # Give some time to the system so attached dmg shows up in Finder
       sleep 5
       set_volume_icon
@@ -138,11 +139,9 @@ module Omnibus
 
       shellout! <<-EOH.gsub(/^ {8}/, "")
         hdiutil create \\
-          -srcfolder "#{resources_dir}" \\
           -volname "#{volume_name}" \\
           -fs HFS+ \\
           -fsargs "-c c=64,a=16,e=16" \\
-          -format UDRW \\
           -size 512000k \\
           "#{writable_dmg}"
       EOH
@@ -170,6 +169,17 @@ module Omnibus
       end
     end
 
+    #
+    # Copy assets to dmg
+    #
+    def copy_assets_to_dmg
+      log.info(log_key) { "Copying assets into dmg" }
+
+      FileSyncer.glob("#{resources_dir}/*").each do |file|
+        FileUtils.cp_r(file, "/Volumes/#{volume_name}")
+      end
+    end
+
     #
     # Create the icon for the volume using sips.
     #
@@ -216,10 +226,10 @@ module Omnibus
       render_template(resource_path("create_dmg.osascript.erb"),
         destination: "#{staging_dir}/create_dmg.osascript",
         variables: {
-          volume_name:   volume_name,
-          pkg_name:      packager.package_name,
+          volume_name: volume_name,
+          pkg_name: packager.package_name,
           window_bounds: window_bounds,
-          pkg_position:  pkg_position,
+          pkg_position: pkg_position,
         }
       )
 
@@ -231,7 +241,9 @@ module Omnibus
     end
 
     #
-    # Compress the dmg using hdiutil and zlib.
+    # Compress the dmg using hdiutil and zlib. zlib offers better compression
+    # levels than bzip2 (10.4+) or LZFSE (10.11+), but takes longer to compress.
+    # We're willing to trade slightly longer build times for smaller package sizes.
     #
     # @return [void]
     #

data/lib/omnibus/core_extensions/open_uri.rb

@@ -64,7 +64,7 @@ module OpenURI
   #
   # @see http://winstonyw.com/2013/10/02/openuris_open_tempfile_and_stringio/
   #
-  # rubocop:disable Style/ConstantName
+  # rubocop:disable Naming/ConstantName
   class Buffer
     remove_const :StringMax
     StringMax = 0

data/lib/omnibus/exceptions.rb

@@ -23,11 +23,11 @@ module Omnibus
     end
 
     def to_s
-      <<-EOH
-Could not locate or access the package at the given path:
+      <<~EOH
+        Could not locate or access the package at the given path:
 
-    #{@path}
-EOH
+            #{@path}
+      EOH
     end
   end
 
@@ -37,11 +37,11 @@ EOH
     end
 
     def to_s
-      <<-EOH
-Could not locate or access the package metadata file at the given path:
+      <<~EOH
+        Could not locate or access the package metadata file at the given path:
 
-    #{@path}
-EOH
+            #{@path}
+      EOH
     end
   end
 
@@ -52,16 +52,16 @@ EOH
     end
 
     def to_s
-      <<-EOH
-Missing required attribute `#{@name}' for #{@class}. You must
-specify a value for `#{@name}' in your DSL file:
+      <<~EOH
+        Missing required attribute `#{@name}' for #{@class}. You must
+        specify a value for `#{@name}' in your DSL file:
 
-    #{@name} #{@sample.inspect}
+            #{@name} #{@sample.inspect}
 
-Or set the value on the object:
+        Or set the value on the object:
 
-    #{@class.downcase}.#{@name}(#{@sample.inspect})
-EOH
+            #{@class.downcase}.#{@name}(#{@sample.inspect})
+      EOH
     end
   end
 
@@ -71,12 +71,12 @@ EOH
     end
 
     def to_s
-      <<-EOH
-Attempting to apply the patch `#{@name}', but it was not found at any of the
-following locations:
+      <<~EOH
+        Attempting to apply the patch `#{@name}', but it was not found at any of the
+        following locations:
 
-#{@search_paths.map { |path| "    #{path}" }.join("\n")}
-EOH
+        #{@search_paths.map { |path| "    #{path}" }.join("\n")}
+      EOH
     end
   end
 
@@ -86,12 +86,12 @@ EOH
     end
 
     def to_s
-      <<-EOH
-Attempting to evaluate the template `#{@template}', but it was not found at any of
-the following locations:
+      <<~EOH
+        Attempting to evaluate the template `#{@template}', but it was not found at any of
+        the following locations:
 
-#{@search_paths.map { |path| "    #{path}" }.join("\n")}
-EOH
+        #{@search_paths.map { |path| "    #{path}" }.join("\n")}
+      EOH
     end
   end
 
@@ -102,11 +102,11 @@ EOH
     end
 
     def to_s
-      <<-EOH
-I could not find a project named `#{@name}' in any of the project locations:"
+      <<~EOH
+        I could not find a project named `#{@name}' in any of the project locations:"
 
-#{@possible_paths.map { |path| "    #{path}" }.join("\n")}
-EOH
+        #{@possible_paths.map { |path| "    #{path}" }.join("\n")}
+      EOH
     end
   end
 
@@ -117,11 +117,11 @@ EOH
     end
 
     def to_s
-      <<-EOH
-I could not find a software named `#{@name}' in any of the software locations:"
+      <<~EOH
+        I could not find a software named `#{@name}' in any of the software locations:"
 
-#{@possible_paths.map { |path| "    #{path}" }.join("\n")}
-EOH
+        #{@possible_paths.map { |path| "    #{path}" }.join("\n")}
+      EOH
     end
   end
 
@@ -131,13 +131,13 @@ EOH
     end
 
     def to_s
-      <<-EOH
-I could not load the `#{@name}' gem. Please make sure the gem is installed on
-your local system by running `gem install #{@name}`, or by adding the following
-to your Gemfile:
+      <<~EOH
+        I could not load the `#{@name}' gem. Please make sure the gem is installed on
+        your local system by running `gem install #{@name}`, or by adding the following
+        to your Gemfile:
 
-    gem '#{@name}'
-EOH
+            gem '#{@name}'
+      EOH
     end
   end
 
@@ -147,9 +147,9 @@ EOH
     end
 
     def to_s
-      <<-EOH
-Software must specify a `#{@key}; to cache it in S3 (#{@package})!
-EOH
+      <<~EOH
+        Software must specify a `#{@key}; to cache it in S3 (#{@package})!
+      EOH
     end
   end
 
@@ -166,9 +166,9 @@ EOH
     end
 
     def to_s
-      <<-EOH
-Invalid value for `#{@source}'. Expected #{@source} to #{@message}!
-EOH
+      <<~EOH
+        Invalid value for `#{@source}'. Expected #{@source} to #{@message}!
+      EOH
     end
   end
 
@@ -182,10 +182,10 @@ EOH
     end
 
     def to_s
-      <<-EOH
-Unknown platform `#{@platform}'!
-I do not know how to proceed!"
-EOH
+      <<~EOH
+        Unknown platform `#{@platform}'!
+        I do not know how to proceed!"
+      EOH
     end
   end
 
@@ -199,46 +199,46 @@ EOH
     end
 
     def to_s
-      <<-EOH
-Unknown platform version `#{@version}' for #{@platform}!
-I do not know how to proceed!"
-EOH
+      <<~EOH
+        Unknown platform version `#{@version}' for #{@platform}!
+        I do not know how to proceed!"
+      EOH
     end
   end
 
   class HealthCheckFailed < Error
     def to_s
-      <<-EOH
-The health check failed! Please see above for important information.
-EOH
+      <<~EOH
+        The health check failed! Please see above for important information.
+      EOH
     end
   end
 
   class ChecksumMissing < Error
     def initialize(software)
-      super <<-EOH
-Verification for #{software.name} failed due to a missing checksum.
+      super <<~EOH
+        Verification for #{software.name} failed due to a missing checksum.
 
-This added security check is used to prevent MITM attacks when downloading the
-remote file. You must specify a checksum for each version of software downloaded
-from a remote location.
-EOH
+        This added security check is used to prevent MITM attacks when downloading the
+        remote file. You must specify a checksum for each version of software downloaded
+        from a remote location.
+      EOH
     end
   end
 
   class ChecksumMismatch < Error
     def initialize(software, expected, actual)
-      super <<-EOH
-Verification for #{software.name} failed due to a checksum mismatch:
+      super <<~EOH
+        Verification for #{software.name} failed due to a checksum mismatch:
 
-    expected: #{expected}
-    actual:   #{actual}
+            expected: #{expected}
+            actual:   #{actual}
 
-This added security check is used to prevent MITM attacks when downloading the
-remote file. If you have updated the version or URL for the download, you will
-also need to update the checksum value. You can find the checksum value on the
-software publisher's website.
-EOH
+        This added security check is used to prevent MITM attacks when downloading the
+        remote file. If you have updated the version or URL for the download, you will
+        also need to update the checksum value. You can find the checksum value on the
+        software publisher's website.
+      EOH
     end
   end
 
@@ -258,19 +258,19 @@ EOH
       stdout = cmd.stdout.empty? ? "(nothing)" : cmd.stdout.strip
       stderr = cmd.stderr.empty? ? "(nothing)" : cmd.stderr.strip
 
-      super <<-EOH
-The following shell command exited with status #{status}:
+      super <<~EOH
+        The following shell command exited with status #{status}:
 
-    $ #{command_with_env}
+            $ #{command_with_env}
 
-Output:
+        Output:
 
-    #{stdout}
+            #{stdout}
 
-Error:
+        Error:
 
-    #{stderr}
-EOH
+            #{stderr}
+      EOH
     end
   end
 
@@ -289,15 +289,15 @@ EOH
 
       timeout = cmd.timeout.to_s.reverse.gsub(/...(?=.)/, '\&,').reverse
 
-      super <<-EOH
-The following shell command timed out at #{timeout} seconds:
+      super <<~EOH
+        The following shell command timed out at #{timeout} seconds:
 
-    $ #{command_with_env}
+            $ #{command_with_env}
 
-Please increase the `:timeout' value or run the command manually to make sure it
-is completing successfully. Sometimes it is common for a command to wait for
-user input.
-EOH
+        Please increase the `:timeout' value or run the command manually to make sure it
+        is completing successfully. Sometimes it is common for a command to wait for
+        user input.
+      EOH
     end
   end
 
@@ -306,27 +306,27 @@ EOH
       name = project.name
       culprit = project.culprit.name
 
-      super <<-EOH
-The project `#{name}' was already marked as dirty by `#{culprit}'. You cannot
-mark a project as dirty twice. This is probably a bug in Omnibus and should be
-reported.
-EOH
+      super <<~EOH
+        The project `#{name}' was already marked as dirty by `#{culprit}'. You cannot
+        mark a project as dirty twice. This is probably a bug in Omnibus and should be
+        reported.
+      EOH
     end
   end
 
   class UnresolvableGitReference < Error
     def initialize(ref)
-      super <<-EOH
-Could not resolve `#{ref}' to a valid git SHA-1.
-EOH
+      super <<~EOH
+        Could not resolve `#{ref}' to a valid git SHA-1.
+      EOH
     end
   end
 
   class InvalidVersion < Error
     def initialize(version)
-      super <<-EOF
-'#{version}' could not be parsed as a valid version.
-EOF
+      super <<~EOF
+        '#{version}' could not be parsed as a valid version.
+      EOF
     end
   end
 
@@ -342,13 +342,13 @@ EOF
     end
 
     def to_s
-      <<-EOH
-Encountered error(s) with project's licensing information.
-Failing the build because :fatal_licensing_warnings is set in the configuration.
-Error(s):
+      <<~EOH
+        Encountered error(s) with project's licensing information.
+        Failing the build because :fatal_licensing_warnings is set in the configuration.
+        Error(s):
 
-    #{@errors.join("\n    ")}
-EOH
+            #{@errors.join("\n    ")}
+      EOH
     end
   end
 end