ohai 18.0.26 → 18.1.0

data/lib/ohai/plugins/rpm.rb

@@ -1,121 +1,121 @@
-# 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 unless defined?(MACROS_MARKER)
-
-  unless defined?(DO_NOT_SPLIT)
-    DO_NOT_SPLIT = %w{
-      build_arch
-      build_os
-      install_arch
-      install_os
-      archcolor
-      optflags
-    }.freeze
-  end
-
-  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?("-")
-          # new macros are always prefixed by a dash
-          if name
-            # if we had parsed a macro before, store it
-            rpm[:macros][name] = value
-            name = nil
-            value = ""
-          end
-
-          # parse the new macro definition
-          _prefix, name, value = line.split(" ", 3)
-        else
-          # continuations have no prefix and just append to the previous one
-          value += "\n#{line}"
-        end
-      end
-
-      # Once we're done parsing all lines, we might have a parsed definition
-      # we haven't stored - if so, store it.
-      if name
-        rpm[:macros][name] = value
-      end
-    else
-      logger.trace("Plugin RPM: Could not find rpm. Skipping plugin.")
-    end
-  end
-end
+# 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 unless defined?(MACROS_MARKER)
+
+  unless defined?(DO_NOT_SPLIT)
+    DO_NOT_SPLIT = %w{
+      build_arch
+      build_os
+      install_arch
+      install_os
+      archcolor
+      optflags
+    }.freeze
+  end
+
+  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?("-")
+          # new macros are always prefixed by a dash
+          if name
+            # if we had parsed a macro before, store it
+            rpm[:macros][name] = value
+            name = nil
+            value = ""
+          end
+
+          # parse the new macro definition
+          _prefix, name, value = line.split(" ", 3)
+        else
+          # continuations have no prefix and just append to the previous one
+          value += "\n#{line}"
+        end
+      end
+
+      # Once we're done parsing all lines, we might have a parsed definition
+      # we haven't stored - if so, store it.
+      if name
+        rpm[:macros][name] = value
+      end
+    else
+      logger.trace("Plugin RPM: Could not find rpm. Skipping plugin.")
+    end
+  end
+end

data/lib/ohai/plugins/ruby.rb

@@ -1,66 +1,66 @@
-# frozen_string_literal: true
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# 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(:Ruby) do
-  provides "languages/ruby"
-  depends "languages"
-
-  def run_ruby(command)
-    cmd = "ruby -e \"require 'rbconfig'; #{command}\""
-    so = shell_out(cmd)
-    so.stdout.strip
-  end
-
-  collect_data do
-    languages[:ruby] = Mash.new
-
-    values = {
-      platform: "RUBY_PLATFORM",
-      version: "RUBY_VERSION",
-      release_date: "RUBY_RELEASE_DATE",
-      target: "RbConfig::CONFIG['target']",
-      target_cpu: "RbConfig::CONFIG['target_cpu']",
-      target_vendor: "RbConfig::CONFIG['target_vendor']",
-      target_os: "RbConfig::CONFIG['target_os']",
-      host: "RbConfig::CONFIG['host']",
-      host_cpu: "RbConfig::CONFIG['host_cpu']",
-      host_os: "RbConfig::CONFIG['host_os']",
-      host_vendor: "RbConfig::CONFIG['host_vendor']",
-      bin_dir: "RbConfig::CONFIG['bindir']",
-      ruby_bin: "::File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])",
-      gem_bin: "::File.join(RbConfig::CONFIG['bindir'], ::Gem.default_exec_format % 'gem')",
-      gems_dir: "::Gem.dir",
-    }
-
-    # Create a query string from above hash
-    env_string = []
-    values.each_key do |v|
-      env_string << "#{v}=\#{#{values[v]}},"
-    end
-
-    # Query the system ruby
-    result = run_ruby "require 'rubygems'; puts %Q(#{env_string.join})"
-
-    # Parse results to plugin hash
-    result.split(",").each do |entry|
-      key, value = entry.split("=")
-      languages[:ruby][key.to_sym] = value || ""
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# 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(:Ruby) do
+  provides "languages/ruby"
+  depends "languages"
+
+  def run_ruby(command)
+    cmd = "ruby -e \"require 'rbconfig'; #{command}\""
+    so = shell_out(cmd)
+    so.stdout.strip
+  end
+
+  collect_data do
+    languages[:ruby] = Mash.new
+
+    values = {
+      platform: "RUBY_PLATFORM",
+      version: "RUBY_VERSION",
+      release_date: "RUBY_RELEASE_DATE",
+      target: "RbConfig::CONFIG['target']",
+      target_cpu: "RbConfig::CONFIG['target_cpu']",
+      target_vendor: "RbConfig::CONFIG['target_vendor']",
+      target_os: "RbConfig::CONFIG['target_os']",
+      host: "RbConfig::CONFIG['host']",
+      host_cpu: "RbConfig::CONFIG['host_cpu']",
+      host_os: "RbConfig::CONFIG['host_os']",
+      host_vendor: "RbConfig::CONFIG['host_vendor']",
+      bin_dir: "RbConfig::CONFIG['bindir']",
+      ruby_bin: "::File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])",
+      gem_bin: "::File.join(RbConfig::CONFIG['bindir'], ::Gem.default_exec_format % 'gem')",
+      gems_dir: "::Gem.dir",
+    }
+
+    # Create a query string from above hash
+    env_string = []
+    values.each_key do |v|
+      env_string << "#{v}=\#{#{values[v]}},"
+    end
+
+    # Query the system ruby
+    result = run_ruby "require 'rubygems'; puts %Q(#{env_string.join})"
+
+    # Parse results to plugin hash
+    result.split(",").each do |entry|
+      key, value = entry.split("=")
+      languages[:ruby][key.to_sym] = value || ""
+    end
+  end
+end

data/lib/ohai/plugins/rust.rb

@@ -1,34 +1,34 @@
-# Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
-# 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(:Rust) do
-  provides "languages/rust"
-  depends "languages".freeze
-
-  collect_data do
-
-    so = shell_out("rustc --version")
-    # Sample output:
-    # rustc 1.7.0
-    if so.exitstatus == 0
-      rust = Mash.new
-      rust[:version] = so.stdout.split[1]
-      languages[:rust] = rust if rust[:version]
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace('Plugin Rust: Could not shell_out "rustc --version". Skipping plugin')
-
-  end
-end
+# Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
+# 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(:Rust) do
+  provides "languages/rust"
+  depends "languages".freeze
+
+  collect_data do
+
+    so = shell_out("rustc --version")
+    # Sample output:
+    # rustc 1.7.0
+    if so.exitstatus == 0
+      rust = Mash.new
+      rust[:version] = so.stdout.split[1]
+      languages[:rust] = rust if rust[:version]
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Rust: Could not shell_out "rustc --version". Skipping plugin')
+
+  end
+end

data/lib/ohai/plugins/scala.rb

@@ -1,38 +1,38 @@
-# frozen_string_literal: true
-# Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
-# © Copyright IBM Corporation 2015.
-# 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(:Scala) do
-  provides "languages/scala"
-  depends "languages"
-
-  collect_data(:default) do
-    scala = Mash.new
-    begin
-      so = shell_out("scala -version")
-      # Sample output:
-      # cat: /release: No such file or directory
-      # Scala code runner version 2.12.1 -- Copyright 2002-2016, LAMP/EPFL and Lightbend, Inc.
-      if so.exitstatus == 0
-        scala[:version] = so.stderr.match(/.*version (\S*)/)[1]
-      end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Scala: Could not shell_out "scala -version". Skipping data')
-    end
-
-    languages[:scala] = scala unless scala.empty?
-  end
-end
+# frozen_string_literal: true
+# Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
+# © Copyright IBM Corporation 2015.
+# 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(:Scala) do
+  provides "languages/scala"
+  depends "languages"
+
+  collect_data(:default) do
+    scala = Mash.new
+    begin
+      so = shell_out("scala -version")
+      # Sample output:
+      # cat: /release: No such file or directory
+      # Scala code runner version 2.12.1 -- Copyright 2002-2016, LAMP/EPFL and Lightbend, Inc.
+      if so.exitstatus == 0
+        scala[:version] = so.stderr.match(/.*version (\S*)/)[1]
+      end
+    rescue Ohai::Exceptions::Exec
+      logger.trace('Plugin Scala: Could not shell_out "scala -version". Skipping data')
+    end
+
+    languages[:scala] = scala unless scala.empty?
+  end
+end

data/lib/ohai/plugins/scaleway.rb

@@ -1,58 +1,58 @@
-# frozen_string_literal: true
-#
-# Author:: Jonathan Amiez (<jonathan.amiez@gmail.com>)
-# 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(:Scaleway) do
-  require_relative "../mixin/scaleway_metadata"
-  require_relative "../mixin/http_helper"
-
-  include Ohai::Mixin::ScalewayMetadata
-  include Ohai::Mixin::HttpHelper
-
-  provides "scaleway"
-
-  # looks for `scaleway` keyword in kernel command line
-  # @return [Boolean] do we have the keyword or not?
-  def has_scaleway_cmdline?
-    if file_exist?("/proc/cmdline") && /scaleway/.match?(file_read("/proc/cmdline"))
-      logger.trace("Plugin Scaleway: has_scaleway_cmdline? == true")
-      return true
-    end
-    logger.trace("Plugin Scaleway: has_scaleway_cmdline? == false")
-    false
-  end
-
-  # a single check that combines all the various detection methods for Scaleway
-  # @return [Boolean] Does the system appear to be on Scaleway
-  def looks_like_scaleway?
-    return true if hint?("scaleway")
-    return true if has_scaleway_cmdline? && can_socket_connect?(Ohai::Mixin::ScalewayMetadata::SCALEWAY_METADATA_ADDR, 80)
-
-    false
-  end
-
-  collect_data(:linux) do
-    if looks_like_scaleway?
-      logger.trace("Plugin Scaleway: looks_like_scaleway? == true")
-      scaleway Mash.new
-      fetch_metadata.each do |k, v|
-        scaleway[k] = v
-      end
-    else
-      logger.trace("Plugin Scaleway: No hints present for and doesn't look like scaleway")
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Jonathan Amiez (<jonathan.amiez@gmail.com>)
+# 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(:Scaleway) do
+  require_relative "../mixin/scaleway_metadata"
+  require_relative "../mixin/http_helper"
+
+  include Ohai::Mixin::ScalewayMetadata
+  include Ohai::Mixin::HttpHelper
+
+  provides "scaleway"
+
+  # looks for `scaleway` keyword in kernel command line
+  # @return [Boolean] do we have the keyword or not?
+  def has_scaleway_cmdline?
+    if file_exist?("/proc/cmdline") && file_read("/proc/cmdline").include?("scaleway")
+      logger.trace("Plugin Scaleway: has_scaleway_cmdline? == true")
+      return true
+    end
+    logger.trace("Plugin Scaleway: has_scaleway_cmdline? == false")
+    false
+  end
+
+  # a single check that combines all the various detection methods for Scaleway
+  # @return [Boolean] Does the system appear to be on Scaleway
+  def looks_like_scaleway?
+    return true if hint?("scaleway")
+    return true if has_scaleway_cmdline? && can_socket_connect?(Ohai::Mixin::ScalewayMetadata::SCALEWAY_METADATA_ADDR, 80)
+
+    false
+  end
+
+  collect_data(:linux) do
+    if looks_like_scaleway?
+      logger.trace("Plugin Scaleway: looks_like_scaleway? == true")
+      scaleway Mash.new
+      fetch_metadata.each do |k, v|
+        scaleway[k] = v
+      end
+    else
+      logger.trace("Plugin Scaleway: No hints present for and doesn't look like scaleway")
+    end
+  end
+end