ohai 16.6.5 → 16.7.18

data/lib/ohai/plugins/dragonflybsd/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan

data/lib/ohai/plugins/ec2.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Dysinger (<tim@dysinger.net>)
 # Author:: Benjamin Black (<bb@chef.io>)

data/lib/ohai/plugins/elixir.rb

@@ -15,7 +15,7 @@
 
 Ohai.plugin(:Elixir) do
   provides "languages/elixir"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/erlang.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joe Williams (<joe@joetify.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/eucalyptus.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Dysinger (<tim@dysinger.net>)
 # Author:: Benjamin Black (<bb@chef.io>)
@@ -28,6 +29,8 @@ Ohai.plugin(:Eucalyptus) do
   provides "eucalyptus"
   depends "network/interfaces"
 
+  MAC_MATCH = /^[dD]0:0[dD]:/.freeze
+
   # returns the mac address from the collection of all address types
   def get_mac_address(addresses)
     detected_addresses = addresses.detect { |address, keypair| keypair == { "family" => "lladdr" } }
@@ -42,7 +45,7 @@ Ohai.plugin(:Eucalyptus) do
   def has_euca_mac?
     network[:interfaces].each_value do |iface|
       mac = get_mac_address(iface[:addresses])
-      if /^[dD]0:0[dD]:/.match?(mac)
+      if MAC_MATCH.match?(mac)
         logger.trace("Plugin Eucalyptus: has_euca_mac? == true (#{mac})")
         return true
       end

data/lib/ohai/plugins/filesystem.rb

@@ -24,7 +24,7 @@
 #
 
 Ohai.plugin(:Filesystem) do
-  provides "filesystem"
+  provides "filesystem".freeze
 
   def find_device(name)
     %w{/dev /dev/mapper}.each do |dir|

data/lib/ohai/plugins/fips.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/freebsd/memory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan

data/lib/ohai/plugins/freebsd/network.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan

data/lib/ohai/plugins/freebsd/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan

data/lib/ohai/plugins/gce.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Ranjib Dey (<dey.ranjib@google.com>)
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/go.rb

@@ -15,7 +15,7 @@
 
 Ohai.plugin(:Go) do
   provides "languages/go"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/groovy.rb

@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Groovy) do
   provides "languages/groovy"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/haskell.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Author:: Chris Dituri (<csdituri@gmail.com>)
 # Copyright:: Copyright (c) 2016 Chris Dituri
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/hostname.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Benjamin Black (<nostromo@gmail.com>)

data/lib/ohai/plugins/init_package.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Caleb Tennis (<caleb.tennis@gmail.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/java.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<bb@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/joyent.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author: sawanoboriyu@higanworks.com
 # Copyright (C) 2014 HiganWorks LLC

data/lib/ohai/plugins/kernel.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Benjamin Black (<nostromo@gmail.com>)
@@ -244,7 +245,7 @@ Ohai.plugin(:Kernel) do
     # EXAMPLE:
     # Id Loadaddr   Size Info Rev Module Name
     #  6  1180000   4623   1   1  specfs (filesystem for specfs)
-    module_description = /[\s]*([\d]+)[\s]+([a-f\d]+)[\s]+([a-f\d]+)[\s]+(?:[\-\d]+)[\s]+(?:[\d]+)[\s]+([\S]+)[\s]+\((.+)\)$/
+    module_description = /\s*(\d+)\s+([a-f\d]+)\s+([a-f\d]+)\s+(?:[\-\d]+)\s+(?:\d+)\s+(\S+)\s+\((.+)\)$/
     so.stdout.lines do |line|
       if ( mod = module_description.match(line) )
         modules[mod[4]] = { id: mod[1].to_i, loadaddr: mod[2], size: mod[3].to_i(16), description: mod[5] }

data/lib/ohai/plugins/keys.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Cookbook Name:: apache2
 # Recipe:: default

data/lib/ohai/plugins/languages.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/libvirt.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<bb@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/linode.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Aaron Kalin (<akalin@martinisoftware.com>)
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/linux/block_device.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/linux/hostnamectl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca (<dcavalca@fb.com>)
 # Copyright:: Copyright (c) 2016 Facebook
@@ -25,8 +26,8 @@ Ohai.plugin(:Hostnamectl) do
     hostnamectl_path = which("hostnamectl")
     if hostnamectl_path
       shell_out(hostnamectl_path).stdout.split("\n").each do |line|
-        key, val = line.split(":")
-        hostnamectl[key.chomp.lstrip.tr(" ", "_").downcase] = val.chomp.lstrip
+        key, val = line.split(": ", 2)
+        hostnamectl[key.chomp.lstrip.tr(" ", "_").downcase] = val
       end
     end
   end

data/lib/ohai/plugins/linux/interrupts.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca <dcavalca@fb.com>
 # Copyright:: Copyright (c) 2020 Facebook

data/lib/ohai/plugins/linux/ipc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Jay Vana <jsvana@fb.com>
 # Author:: Davide Cavalca <dcavalca@fb.com>

data/lib/ohai/plugins/linux/lsb.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -26,34 +27,20 @@ Ohai.plugin(:LSB) do
       # From package redhat-lsb on Fedora/Redhat, lsb-release on Debian/Ubuntu
       shell_out("lsb_release -a").stdout.lines do |line|
         case line
-        when /^Distributor ID:\s+(.+)$/
+        when /^Distributor ID:\s+(.+)/
           lsb[:id] = $1
-        when /^Description:\s+(.+)$/
+        when /^Description:\s+(.+)/
           lsb[:description] = $1
-        when /^Release:\s+(.+)$/
+        when /^Release:\s+(.+)/
           lsb[:release] = $1
-        when /^Codename:\s+(.+)$/
+        when /^Codename:\s+(.+)/
           lsb[:codename] = $1
         else
           lsb[:id] = line
         end
       end
-    elsif file_exist?("/etc/lsb-release")
-      # Old, non-standard Debian support
-      file_open("/etc/lsb-release").each do |line|
-        case line
-        when /^DISTRIB_ID=["']?(.+?)["']?$/
-          lsb[:id] = $1
-        when /^DISTRIB_RELEASE=["']?(.+?)["']?$/
-          lsb[:release] = $1
-        when /^DISTRIB_CODENAME=["']?(.+?)["']?$/
-          lsb[:codename] = $1
-        when /^DISTRIB_DESCRIPTION=["']?(.+?)["']?$/
-          lsb[:description] = $1
-        end
-      end
     else
-      logger.trace("Plugin LSB: Skipping LSB, cannot find /etc/lsb-release or /usr/bin/lsb_release")
+      logger.trace("Plugin LSB: Skipping LSB, cannot find /usr/bin/lsb_release")
     end
   end
 end

data/lib/ohai/plugins/linux/lspci.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joerg Herzinger <joerg.herzinger@oiml.at>
 # Author:: Phil Dibowitz <phil@ipom.com>

data/lib/ohai/plugins/linux/machineid.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca (<dcavalca@fb.com>)
 # Copyright:: Copyright (c) 2016 Facebook

data/lib/ohai/plugins/linux/mdadm.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Smith <tsmith@limelight.com>
 # Author:: Phil Dibowitz <phild@ipomc.com>

data/lib/ohai/plugins/linux/memory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -27,77 +28,77 @@ Ohai.plugin(:Memory) do
 
     file_open("/proc/meminfo").each do |line|
       case line
-      when /^MemTotal:\s+(\d+) (.+)$/
+      when /^MemTotal:\s+(\d+) (.+)/
         memory[:total] = "#{$1}#{$2}"
-      when /^MemFree:\s+(\d+) (.+)$/
+      when /^MemFree:\s+(\d+) (.+)/
         memory[:free] = "#{$1}#{$2}"
-      when /^MemAvailable:\s+(\d+) (.+)$/
+      when /^MemAvailable:\s+(\d+) (.+)/
         memory[:available] = "#{$1}#{$2}"
-      when /^Buffers:\s+(\d+) (.+)$/
+      when /^Buffers:\s+(\d+) (.+)/
         memory[:buffers] = "#{$1}#{$2}"
-      when /^Cached:\s+(\d+) (.+)$/
+      when /^Cached:\s+(\d+) (.+)/
         memory[:cached] = "#{$1}#{$2}"
-      when /^Active:\s+(\d+) (.+)$/
+      when /^Active:\s+(\d+) (.+)/
         memory[:active] = "#{$1}#{$2}"
-      when /^Inactive:\s+(\d+) (.+)$/
+      when /^Inactive:\s+(\d+) (.+)/
         memory[:inactive] = "#{$1}#{$2}"
-      when /^HighTotal:\s+(\d+) (.+)$/
+      when /^HighTotal:\s+(\d+) (.+)/
         memory[:high_total] = "#{$1}#{$2}"
-      when /^HighFree:\s+(\d+) (.+)$/
+      when /^HighFree:\s+(\d+) (.+)/
         memory[:high_free] = "#{$1}#{$2}"
-      when /^LowTotal:\s+(\d+) (.+)$/
+      when /^LowTotal:\s+(\d+) (.+)/
         memory[:low_total] = "#{$1}#{$2}"
-      when /^LowFree:\s+(\d+) (.+)$/
+      when /^LowFree:\s+(\d+) (.+)/
         memory[:low_free] = "#{$1}#{$2}"
-      when /^Dirty:\s+(\d+) (.+)$/
+      when /^Dirty:\s+(\d+) (.+)/
         memory[:dirty] = "#{$1}#{$2}"
-      when /^Writeback:\s+(\d+) (.+)$/
+      when /^Writeback:\s+(\d+) (.+)/
         memory[:writeback] = "#{$1}#{$2}"
-      when /^AnonPages:\s+(\d+) (.+)$/
+      when /^AnonPages:\s+(\d+) (.+)/
         memory[:anon_pages] = "#{$1}#{$2}"
-      when /^Mapped:\s+(\d+) (.+)$/
+      when /^Mapped:\s+(\d+) (.+)/
         memory[:mapped] = "#{$1}#{$2}"
-      when /^Slab:\s+(\d+) (.+)$/
+      when /^Slab:\s+(\d+) (.+)/
         memory[:slab] = "#{$1}#{$2}"
-      when /^SReclaimable:\s+(\d+) (.+)$/
+      when /^SReclaimable:\s+(\d+) (.+)/
         memory[:slab_reclaimable] = "#{$1}#{$2}"
-      when /^SUnreclaim:\s+(\d+) (.+)$/
+      when /^SUnreclaim:\s+(\d+) (.+)/
         memory[:slab_unreclaim] = "#{$1}#{$2}"
-      when /^PageTables:\s+(\d+) (.+)$/
+      when /^PageTables:\s+(\d+) (.+)/
         memory[:page_tables] = "#{$1}#{$2}"
-      when /^NFS_Unstable:\s+(\d+) (.+)$/
+      when /^NFS_Unstable:\s+(\d+) (.+)/
         memory[:nfs_unstable] = "#{$1}#{$2}"
-      when /^Bounce:\s+(\d+) (.+)$/
+      when /^Bounce:\s+(\d+) (.+)/
         memory[:bounce] = "#{$1}#{$2}"
-      when /^CommitLimit:\s+(\d+) (.+)$/
+      when /^CommitLimit:\s+(\d+) (.+)/
         memory[:commit_limit] = "#{$1}#{$2}"
-      when /^Committed_AS:\s+(\d+) (.+)$/
+      when /^Committed_AS:\s+(\d+) (.+)/
         memory[:committed_as] = "#{$1}#{$2}"
-      when /^VmallocTotal:\s+(\d+) (.+)$/
+      when /^VmallocTotal:\s+(\d+) (.+)/
         memory[:vmalloc_total] = "#{$1}#{$2}"
-      when /^VmallocUsed:\s+(\d+) (.+)$/
+      when /^VmallocUsed:\s+(\d+) (.+)/
         memory[:vmalloc_used] = "#{$1}#{$2}"
-      when /^VmallocChunk:\s+(\d+) (.+)$/
+      when /^VmallocChunk:\s+(\d+) (.+)/
         memory[:vmalloc_chunk] = "#{$1}#{$2}"
-      when /^SwapCached:\s+(\d+) (.+)$/
+      when /^SwapCached:\s+(\d+) (.+)/
         memory[:swap][:cached] = "#{$1}#{$2}"
-      when /^SwapTotal:\s+(\d+) (.+)$/
+      when /^SwapTotal:\s+(\d+) (.+)/
         memory[:swap][:total] = "#{$1}#{$2}"
-      when /^SwapFree:\s+(\d+) (.+)$/
+      when /^SwapFree:\s+(\d+) (.+)/
         memory[:swap][:free] = "#{$1}#{$2}"
-      when /^HugePages_Total:\s+(\d+)$/
+      when /^HugePages_Total:\s+(\d+)/
         memory[:hugepages][:total] = $1.to_s
-      when /^HugePages_Free:\s+(\d+)$/
+      when /^HugePages_Free:\s+(\d+)/
         memory[:hugepages][:free] = $1.to_s
-      when /^HugePages_Rsvd:\s+(\d+)$/
+      when /^HugePages_Rsvd:\s+(\d+)/
         memory[:hugepages][:reserved] = $1.to_s
-      when /^HugePages_Surp:\s+(\d+)$/
+      when /^HugePages_Surp:\s+(\d+)/
         memory[:hugepages][:surplus] = $1.to_s
-      when /^Hugepagesize:\s+(\d+) (.+)$/
+      when /^Hugepagesize:\s+(\d+) (.+)/
         memory[:hugepage_size] = "#{$1}#{$2}"
-      when /^Hugetlb:\s+(\d+) (.+)$/
+      when /^Hugetlb:\s+(\d+) (.+)/
         memory[:hugetlb] = "#{$1}#{$2}"
-      when /^DirectMap([0-9]+[a-zA-Z]):\s+(\d+) (.+)$/
+      when /^DirectMap([0-9]+[a-zA-Z]):\s+(\d+) (.+)/
         memory[:directmap][$1.to_sym] = "#{$2}#{$3}"
       end
     end

data/lib/ohai/plugins/linux/network.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Chris Read <chris.read@gmail.com>

data/lib/ohai/plugins/linux/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -132,7 +133,7 @@ Ohai.plugin(:Platform) do
   #
   def platform_family_from_platform(plat)
     case plat
-    when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/, /kali/
+    when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/, /kali/, /pop/
       # apt-get+dpkg almost certainly goes here
       "debian"
     when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /xcp/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"

data/lib/ohai/plugins/linux/selinux.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca <dcavalca@fb.com>
 # Copyright:: Copyright (c) 2020 Facebook

data/lib/ohai/plugins/linux/sessions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca <dcavalca@fb.com>
 # Copyright:: Copyright (c) 2016 Facebook

data/lib/ohai/plugins/linux/sysctl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joshua Miller <joshmiller@fb.com>
 # Copyright:: Copyright (c) 2019 Facebook

data/lib/ohai/plugins/linux/systemd_paths.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca <dcavalca@fb.com>
 # Copyright:: Copyright (c) 2017 Facebook

data/lib/ohai/plugins/linux/virtualization.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Thom May (<thom@clearairturbulence.org>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/lua.rb

@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Lua) do
   provides "languages/lua"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do