ohai 17.7.8 → 17.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9624a58f805a1092cf71a19d5cc1501104c297df8b5f5cb9dafc8f288a77a62b
-  data.tar.gz: fa2839c8ca0d39f53629fc186b77addb1ef02e8783dba59a10f94d94406388ce
+  metadata.gz: 152ee2a1456b0508eeb740837c37169e101f860d4398ed71dc2be86207aa9e75
+  data.tar.gz: ff72078f7fb2e6eab1207659eb0a66b4bfed98cbf66ca82778830ecfe545e5f4
 SHA512:
-  metadata.gz: 4252161549ecd67b7bfd91c7b01673071b54d76179472ac2824965281147a5b40b14b2cc120fc8d2d1a41bc1956041c1c39bf820f3d538f2ee85b61771d11c66
-  data.tar.gz: 3f1be719448a8c6cb39be6b5cb2f1c9017e05abd223d3b2bc23aedb4891a8663e259f6a3f2828a8a7e5809f52dde821fcefaeeb534af80cc4729ba19bcc63514
+  metadata.gz: e0bd1cc8142814db7d670a19cb6c49d7ccbfa7e029ae33ec79d194f27c03abdf07c215e155e50cc052893f9b3aef15a1c4de414e40e370753595fb877fa2c574
+  data.tar.gz: 23424895d514fe8ca3384e1155a75cbaba60a684aac6f4e53c924bb34733194691642a3b877f09c8e377b8a0fe59075bb2380d0bba9c8ed0c8abb59eea758aa2

data/Gemfile

@@ -9,14 +9,14 @@ gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "ch
 
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle", "2.1.2"
+  gem "chefstyle", "2.1.3"
   gem "ipaddr_extensions"
   gem "rake", ">= 10.1.0"
   gem "rspec-collection_matchers", "~> 1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
-  gem "rubocop-performance", "1.11.5"
+  gem "rubocop-performance", "1.12.0"
   gem "rubocop-rspec"
 end
 

data/lib/ohai/plugins/rpm.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2021 Meta Platforms, Inc. and affiliates.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:Rpm) do
+  provides "rpm"
+  optional "true"
+
+  MACROS_MARKER = /========================/.freeze
+
+  DO_NOT_SPLIT = %w{
+    build_arch
+    build_os
+    install_arch
+    install_os
+    archcolor
+    optflags
+  }.freeze
+
+  collect_data(:aix, :darwin, :dragonflybsd, :freebsd, :linux, :netbsd, :openbsd, :solaris2) do
+    rpm_path = which("rpm")
+    if rpm_path
+      rpm_version_out = shell_out("#{rpm_path} --version")
+      rpm_showrc_out = shell_out("#{rpm_path} --showrc")
+
+      rpm Mash.new unless rpm
+      rpm[:macros] ||= Mash.new
+
+      m = rpm_version_out.stdout.match(/\w+ (\d.*)/)
+      if m
+        rpm[:version] = m[1]
+      end
+
+      lines = rpm_showrc_out.stdout.split("\n")
+      # there's a marker to separate the beginning and end of the macros list
+      macros_start_idx = lines.index { |x| x.match(MACROS_MARKER) }
+      macros_end_idx = lines.rindex { |x| x.match(MACROS_MARKER) }
+      section = nil
+      lines[0..macros_start_idx - 1].each do |line|
+        if line.start_with?("ARCHITECTURE AND OS")
+          section = :arch_os
+          rpm[section] ||= Mash.new
+        elsif line.start_with?("RPMRC VALUES")
+          section = :rpmrc
+          rpm[section] ||= Mash.new
+        elsif line.start_with?("Features supported by rpmlib")
+          section = :features
+          rpm[section] ||= Mash.new
+        elsif line.start_with?("Macro path")
+          fields = line.split(":", 2)
+          if fields
+            rpm[:macro_path] = fields[1].strip.split(":")
+          end
+          section = nil
+        elsif %i{arch_os rpmrc}.include?(section)
+          fields = line.split(":")
+          if fields && fields[0] && fields[1]
+            key = fields[0].strip.sub("'s", "es").tr(" ", "_")
+            if DO_NOT_SPLIT.include?(key)
+              values = fields[1].strip
+            else
+              values = fields[1].strip.split(" ")
+            end
+            rpm[section][key] = values
+          end
+        elsif section == :features
+          fields = line.split("=")
+          if fields && fields[0] && fields[1]
+            rpm[section][fields[0].strip] = fields[1].strip
+          end
+        end
+      end
+
+      name = nil
+      value = ""
+      lines[macros_start_idx + 1..macros_end_idx - 1].each do |line|
+        if line.start_with?("-")
+          if name
+            rpm[:macros][name] = value
+            name = nil
+            value = ""
+          else
+            _prefix, name, value = line.split(" ", 3)
+          end
+        else
+          value += "\n#{line}"
+        end
+      end
+    else
+      logger.trace("Plugin RPM: Could not find rpm. Skipping plugin.")
+    end
+  end
+end

data/lib/ohai/version.rb

@@ -19,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "17.7.8"
+  VERSION = "17.7.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 17.7.8
+  version: 17.7.12
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -341,6 +341,7 @@ files:
 - lib/ohai/plugins/python.rb
 - lib/ohai/plugins/rackspace.rb
 - lib/ohai/plugins/root_group.rb
+- lib/ohai/plugins/rpm.rb
 - lib/ohai/plugins/ruby.rb
 - lib/ohai/plugins/rust.rb
 - lib/ohai/plugins/scala.rb