ohai 16.4.12 → 16.7.18

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,6 +1,7 @@
+# frozen_string_literal: true
 #
 # Author:: Joe Williams (<joe@joetify.com>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/eucalyptus.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Dysinger (<tim@dysinger.net>)
 # Author:: Benjamin Black (<bb@chef.io>)
 # Author:: Christopher Brown (<cb@chef.io>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -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

@@ -6,7 +6,7 @@
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2008-2020 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: Copyright (c) 2015 Facebook, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -24,12 +24,12 @@
 #
 
 Ohai.plugin(:Filesystem) do
-  provides "filesystem"
+  provides "filesystem".freeze
 
   def find_device(name)
     %w{/dev /dev/mapper}.each do |dir|
       path = File.join(dir, name)
-      return path if File.exist?(path)
+      return path if file_exist?(path)
     end
     name
   end
@@ -371,11 +371,11 @@ Ohai.plugin(:Filesystem) do
     end
 
     # Grab any missing mount information from /proc/mounts
-    if File.exist?("/proc/mounts")
+    if file_exist?("/proc/mounts")
       mounts = ""
       # Due to https://tickets.opscode.com/browse/OHAI-196
       # we have to non-block read dev files. Ew.
-      f = File.open("/proc/mounts")
+      f = file_open("/proc/mounts")
       loop do
         data = f.read_nonblock(4096)
         mounts << data

data/lib/ohai/plugins/fips.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 2016-2018 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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
@@ -40,8 +41,8 @@ Ohai.plugin(:GCE) do
   # @param path[String] abs path to the file
   # @return [String] contents of the file if it exists
   def file_val_if_exists(path)
-    if ::File.exist?(path)
-      ::File.read(path)
+    if file_exist?(path)
+      file_read(path)
     end
   end
 

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>)
@@ -6,7 +7,7 @@
 # Author:: Doug MacEachern (<dougm@vmware.com>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2008-2018, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # Copyright:: Copyright (c) 2009 Daniel DeLeo
 # Copyright:: Copyright (c) 2010 VMware, Inc.

data/lib/ohai/plugins/init_package.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 #
 # Author:: Caleb Tennis (<caleb.tennis@gmail.com>)
-# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +21,6 @@ Ohai.plugin(:InitPackage) do
   provides "init_package"
 
   collect_data(:linux) do
-    init_package File.exist?("/proc/1/comm") ? File.open("/proc/1/comm").gets.chomp : "init"
+    init_package file_exist?("/proc/1/comm") ? file_open("/proc/1/comm").gets.chomp : "init"
   end
 end

data/lib/ohai/plugins/java.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<bb@chef.io>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/joyent.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author: sawanoboriyu@higanworks.com
 # Copyright (C) 2014 HiganWorks LLC
@@ -25,7 +26,7 @@ Ohai.plugin(:Joyent) do
   depends "os", "platform", "virtualization"
 
   def collect_product_file
-    data = ::File.read("/etc/product") rescue nil
+    data = file_read("/etc/product") rescue nil
     if data
       data.strip.split("\n")
     else
@@ -34,7 +35,7 @@ Ohai.plugin(:Joyent) do
   end
 
   def collect_pkgsrc
-    data = ::File.read("/opt/local/etc/pkg_install.conf") rescue nil
+    data = file_read("/opt/local/etc/pkg_install.conf") rescue nil
     if data
       /PKG_PATH=(.*)/.match(data)[1] rescue nil
     end

data/lib/ohai/plugins/kernel.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Benjamin Black (<nostromo@gmail.com>)
 # Author:: Bryan McLellan (<btm@loftninjas.org>)
 # Author:: Claire McQuin (<claire@chef.io>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
@@ -42,7 +43,7 @@ Ohai.plugin(:Kernel) do
   # @return [Mash]
   def bsd_modules(path)
     modules = Mash.new
-    so = shell_out((Ohai.abs_path(path)).to_s)
+    so = shell_out(Ohai.abs_path(path).to_s)
     so.stdout.lines do |line|
       #  1    7 0xc0400000 97f830   kernel
       if line =~ /(\d+)\s+(\d+)\s+([0-9a-fx]+)\s+([0-9a-fx]+)\s+([a-zA-Z0-9\_]+)/
@@ -156,6 +157,10 @@ Ohai.plugin(:Kernel) do
     ].include?(name)
   end
 
+  collect_data(:target) do
+    # intentionally left blank
+  end
+
   collect_data(:default) do
     kernel init_kernel
   end
@@ -204,8 +209,8 @@ Ohai.plugin(:Kernel) do
       if line =~ /([a-zA-Z0-9\_]+)\s+(\d+)\s+(\d+)/
         modules[$1] = { size: $2, refcount: $3 }
         # Making sure to get the module version that has been loaded
-        if File.exist?("/sys/module/#{$1}/version")
-          version = File.read("/sys/module/#{$1}/version").chomp.strip
+        if file_exist?("/sys/module/#{$1}/version")
+          version = file_read("/sys/module/#{$1}/version").chomp.strip
           modules[$1]["version"] = version unless version.empty?
         end
       end
@@ -230,7 +235,7 @@ Ohai.plugin(:Kernel) do
     so = shell_out("uname -s")
     kernel[:os] = so.stdout.split($/)[0]
 
-    so = File.open("/etc/release", &:gets)
+    so = file_open("/etc/release", &:gets)
     md = /(?<update>\d.*\d)/.match(so)
     kernel[:update] = md[:update] if md
 
@@ -240,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,8 +1,9 @@
+# frozen_string_literal: true
 #
 # Cookbook Name:: apache2
 # Recipe:: default
 #
-# Copyright 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ohai/plugins/languages.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/libvirt.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<bb@chef.io>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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
@@ -25,7 +26,7 @@ Ohai.plugin(:Linode) do
   # Returns true or false
   def has_linode_kernel?
     if ( kernel_data = kernel )
-      kernel_data[:release].split("-").last =~ /linode/
+      kernel_data[:release].split("-").last.include?("linode")
     end
   end
 

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

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,24 +21,24 @@ Ohai.plugin(:BlockDevice) do
   provides "block_device"
 
   collect_data(:linux) do
-    if File.exist?("/sys/block")
+    if file_exist?("/sys/block")
       block = Mash.new
-      Dir["/sys/block/*"].each do |block_device_dir|
+      dir_glob("/sys/block/*").each do |block_device_dir|
         dir = File.basename(block_device_dir)
         block[dir] = Mash.new
         %w{size removable}.each do |check|
-          if File.exist?("/sys/block/#{dir}/#{check}")
-            File.open("/sys/block/#{dir}/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
+          if file_exist?("/sys/block/#{dir}/#{check}")
+            file_open("/sys/block/#{dir}/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
           end
         end
         %w{model rev state timeout vendor queue_depth}.each do |check|
-          if File.exist?("/sys/block/#{dir}/device/#{check}")
-            File.open("/sys/block/#{dir}/device/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
+          if file_exist?("/sys/block/#{dir}/device/#{check}")
+            file_open("/sys/block/#{dir}/device/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
           end
         end
         %w{rotational physical_block_size logical_block_size}.each do |check|
-          if File.exist?("/sys/block/#{dir}/queue/#{check}")
-            File.open("/sys/block/#{dir}/queue/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
+          if file_exist?("/sys/block/#{dir}/queue/#{check}")
+            file_open("/sys/block/#{dir}/queue/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
           end
         end
       end

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
@@ -25,7 +26,7 @@ Ohai.plugin(:Interrupts) do
   # format: comma-separate list of 32bit bitmask in hex
   # each bit is a CPU, right to left ordering (i.e. CPU0 is rightmost)
   def parse_smp_affinity(path, cpus)
-    masks = File.read(path).strip
+    masks = file_read(path).strip
     bit_masks = []
     masks.split(",").each do |mask|
       bit_masks << mask.rjust(8, "0").to_i(16).to_s(2)
@@ -47,7 +48,7 @@ Ohai.plugin(:Interrupts) do
       parse_smp_affinity("/proc/irq/default_smp_affinity", cpus)
 
     interrupts[:irq] = Mash.new
-    File.open("/proc/interrupts").each do |line|
+    file_open("/proc/interrupts").each do |line|
       # Documentation: https://www.kernel.org/doc/Documentation/filesystems/proc.txt
       # format is "{irqn}: {CPUn...} [type] [vector] [device]"
       irqn, fields = line.split(":", 2)
@@ -70,7 +71,7 @@ Ohai.plugin(:Interrupts) do
         interrupts[:irq][irqn][:vector],
         interrupts[:irq][irqn][:device] =
           fields[cpus].split
-        if File.exist?("/proc/irq/#{irqn}/smp_affinity")
+        if file_exist?("/proc/irq/#{irqn}/smp_affinity")
           interrupts[:irq][irqn][:smp_affinity_by_cpu] =
             parse_smp_affinity("/proc/irq/#{irqn}/smp_affinity", cpus)
         end

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>
@@ -41,7 +42,7 @@ Ohai.plugin(:IPC) do
           "perms" => parts[3],
           "bytes" => parts[4].to_i,
           "nattch" => parts[5].to_i,
-          "status" => parts[6] ? parts[6] : "",
+          "status" => parts[6] || "",
         }
 
         ipc["shm"][parts[1].to_i] = segment

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

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,38 +23,24 @@ Ohai.plugin(:LSB) do
   collect_data(:linux) do
     lsb Mash.new
 
-    if File.exist?("/usr/bin/lsb_release")
+    if file_exist?("/usr/bin/lsb_release")
       # 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