omnibus 9.0.17 → 9.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e18818ba6b01864ca40a7847beb9b9cc281db69a99ad478265beb9792411fc
-  data.tar.gz: b25c8dca7eb871e4d1014fa61b270aa81db0653bc1a5061816e5ed8a0076c0f4
+  metadata.gz: 425eba24bbd4c8de03b075dea1255fa5bedd3a8ae2299e277e7353d4b172553a
+  data.tar.gz: 61c80839060c2418ee56e831bbfa2c4e712d4c5d5287a005b5af51ada7e81002
 SHA512:
-  metadata.gz: 311583baefc33f9b9ac500ff1b96c5f3b0f03897e08de2135c7dedff9e0d8abc35ed1c8b414d8f291331546063e47095f4f04386db794f0895f3154105fa7fbb
-  data.tar.gz: e1ed149a6899e29bdce5e26d2762ed984e74305dd4fcdf72d849f479a4dc1abf34a78fb448760df12ddc8d6b80e388ef9a396752bfe0e714e4d46d6cd076c1c1
+  metadata.gz: cb33e1a53677ea828fd163285dd40429792896cb9e1e06f3724225c6eeb99b82a40aacb9b4357ee80022a9fa827093061218dfb620cf3651b7445c74205a9c00
+  data.tar.gz: 1ca8cc40f6e4de6158384dda0c22fa43c528bc8c89778118716e4e4876de313636f5216a2a180a930c4f07c90dd49489b40c5bce1f839f92eec037bb17c72696

data/lib/omnibus/builder.rb

@@ -637,7 +637,7 @@ module Omnibus
     #
     def strip(path)
       regexp_ends = ".*(" + IGNORED_ENDINGS.map { |e| e.gsub(/\./, '\.') }.join("|") + ")$"
-      regexp_patterns = IGNORED_PATTERNS.map { |e| ".*" + e.gsub(%r{/}, '\/') + ".*" }.join("|")
+      regexp_patterns = IGNORED_SUBSTRINGS.map { |e| ".*" + e.gsub(%r{/}, '\/') + ".*" }.join("|")
       regexp = regexp_ends + "|" + regexp_patterns
 
       # Do not actually care if strip runs on non-strippable file, as its a no-op.  Hence the `|| true` appended.

data/lib/omnibus/cli/base.rb

@@ -32,6 +32,10 @@ module Omnibus
 
         super
       end
+
+      def exit_on_failure?
+        true
+      end
     end
 
     include Logging

data/lib/omnibus/metadata.rb

@@ -145,7 +145,11 @@ module Omnibus
       #
       def platform_shortname
         if rhel?
-          "el"
+          if "rocky" == Ohai["platform"]
+            "rocky"
+          else
+            "el"
+          end
         elsif suse?
           "sles"
         else
@@ -170,7 +174,7 @@ module Omnibus
       # rubocop:disable Lint/DuplicateCaseCondition
       def truncate_platform_version(platform_version, platform)
         case platform
-        when "centos", "cumulus", "debian", "el", "fedora", "freebsd", "omnios", "pidora", "raspbian", "rhel", "sles", "suse", "smartos"
+        when "centos", "cumulus", "debian", "el", "fedora", "freebsd", "omnios", "pidora", "raspbian", "rhel", "rocky", "sles", "suse", "smartos"
           # Only want MAJOR (e.g. Debian 7, OmniOS r151006, SmartOS 20120809T221258Z)
           platform_version.split(".").first
         when "aix", "alpine", "openbsd", "slackware", "solaris2", "opensuse", "opensuseleap", "ubuntu", "amazon"

data/lib/omnibus/packager.rb

@@ -44,6 +44,7 @@ module Omnibus
       "rhel" => RPM,
       "wrlinux" => RPM,
       "amazon" => RPM,
+      "rocky"  => RPM,
       "aix" => BFF,
       "solaris" => Solaris,
       "omnios" => IPS,

data/lib/omnibus/packagers/rpm.rb

@@ -437,7 +437,7 @@ module Omnibus
           render_template(resource_path("rpmmacros.erb"),
             destination: "#{home}/.rpmmacros",
             variables: {
-              gpg_name: project.maintainer,
+              gpg_name: "Opscode Packages",
               gpg_path: "#{ENV["HOME"]}/.gnupg", # TODO: Make this configurable
             })
         end
@@ -448,7 +448,7 @@ module Omnibus
 
           # RHEL 8 has gpg-agent running so we can skip the expect script since the agent
           # takes care of the passphrase entering on the signing
-          if dist_tag != ".el8"
+          if dist_tag != ".el8" && dist_tag != ".el9"
             sign_cmd.prepend("#{signing_script} \"").concat("\"")
           end
 

data/lib/omnibus/templating.rb

@@ -36,8 +36,7 @@ module Omnibus
     #   the list of variables to pass to the template
     #
     def render_template_content(source, variables = {})
-      template = ERB.new(File.read(source), nil, "-")
-
+      template = ERB.new(File.read(source), trim_mode: "-")
       struct =
         if variables.empty?
           Struct.new("Empty")

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "9.0.17".freeze
+  VERSION = "9.0.22".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 9.0.17
+  version: 9.0.22
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3