ohai 16.4.12 → 16.7.18

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
 

data/lib/ohai/plugins/mono.rb

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
 # Copyright:: Copyright (c) 2009 Bryan McLellan

data/lib/ohai/plugins/netbsd/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/netbsd/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/network.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/nodejs.rb

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

data/lib/ohai/plugins/ohai.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tollef Fog Heen <tfheen@err.no>
 # Copyright:: Copyright (c) 2010 Tollef Fog Heen

data/lib/ohai/plugins/ohai_time.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");
@@ -19,7 +20,7 @@
 Ohai.plugin(:OhaiTime) do
   provides "ohai_time"
 
-  collect_data do
+  collect_data(:default, :target) do
     ohai_time Time.now.to_f
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
 # Copyright:: Copyright (c) 2009 Bryan McLellan

data/lib/ohai/plugins/openbsd/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/openbsd/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/openstack.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 #
 # Author:: Matt Ray (<matt@chef.io>)
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2012-2019 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/os.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Isa Farnik (<isa@chef.io>)
 # Author:: Richard Manyanza (<liseki@nyikacraftsmen.com>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: Copyright (c) 2014 Richard Manyanza.
 # License:: Apache License, Version 2.0
 #
@@ -37,6 +38,10 @@ Ohai.plugin(:OS) do
     os_version shell_out("sysctl -n kern.osreldate").stdout.split($/)[0]
   end
 
+  collect_data(:target) do
+    os collect_os
+  end
+
   collect_data do
     os collect_os
     os_version kernel[:release]

data/lib/ohai/plugins/packages.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Author:: "Christian Höltje" <choltje@us.ibm.com>
 # Author:: "Christopher M. Luciano" <cmlucian@us.ibm.com>
 # Author:: Shahul Khajamohideen (<skhajamohid1@bloomberg.net>)
@@ -209,4 +210,24 @@ Ohai.plugin(:Packages) do
     collect_ips_packages
     collect_sysv_packages
   end
+
+  def collect_system_profiler_apps
+    require "plist"
+    sp_std = shell_out("system_profiler SPApplicationsDataType -xml")
+    results = Plist.parse_xml(sp_std.stdout)
+    sw_array = results[0]["_items"]
+    sw_array.each do |pkg|
+      packages[pkg["_name"]] = {
+        "version" => pkg["version"],
+        "lastmodified" => pkg["lastModified"],
+        "source" => pkg["obtained_from"],
+      }
+    end
+  end
+
+  collect_data(:darwin) do
+    packages Mash.new
+    collect_system_profiler_apps
+  end
+
 end

data/lib/ohai/plugins/passwd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 Ohai.plugin(:Passwd) do
   provides "etc", "current_user"
@@ -42,6 +43,62 @@ Ohai.plugin(:Passwd) do
   end
 
   collect_data(:windows) do
-    # Etc returns nil on Windows
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
+
+    unless etc
+      etc Mash.new
+
+      wmi = WmiLite::Wmi.new
+
+      etc[:passwd] = Mash.new
+      users = wmi.query("SELECT * FROM Win32_UserAccount WHERE LocalAccount = True")
+      users.each do |user|
+        uname = user["Name"].strip.downcase
+        Ohai::Log.debug("processing user #{uname}")
+        etc[:passwd][uname] = Mash.new
+        wmi_obj = user.wmi_ole_object
+        wmi_obj.properties_.each do |key|
+          etc[:passwd][uname][key.name.downcase] = user[key.name]
+        end
+      end
+
+      etc[:group] = Mash.new
+      groups = wmi.query("SELECT * FROM Win32_Group WHERE LocalAccount = True")
+      groups.each do |group|
+        gname = group["Name"].strip.downcase
+        Ohai::Log.debug("processing group #{gname}")
+        etc[:group][gname] = Mash.new
+        wmi_obj = group.wmi_ole_object
+        wmi_obj.properties_.each do |key|
+          etc[:group][gname][key.name.downcase] = group[key.name]
+        end
+
+        # This is the primary reason that we're using WMI instead of powershell
+        # cmdlets - the powershell start up cost is huge, and you *must* do this
+        # query for every. single. group. individually.
+
+        # The query returns nothing unless you specify domain *and* name, it's
+        # a path, not a set of queries.
+        subq = "Win32_Group.Domain='#{group["Domain"]}',Name='#{group["Name"]}'"
+        members = wmi.query(
+          "SELECT * FROM Win32_GroupUser WHERE GroupComponent=\"#{subq}\""
+        )
+        etc[:group][gname]["members"] = members.map do |member|
+          mi = {}
+          info = Hash[
+            member["partcomponent"].split(",").map { |x| x.split("=") }.map { |a, b| [a, b.undump] }
+          ]
+          if info.keys.any? { |x| x.match?("Win32_UserAccount") }
+            mi["type"] = :user
+          else
+            # Note: the type here is actually Win32_SystemAccount, because,
+            # that's what groups are in the Windows universe.
+            mi["type"] = :group
+          end
+          mi["name"] = info["Name"]
+          mi
+        end
+      end
+    end
   end
 end

data/lib/ohai/plugins/perl.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Joshua Timberman (<joshua@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");
@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Perl) do
   provides "languages/perl"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/php.rb

@@ -20,7 +20,7 @@
 
 Ohai.plugin(:PHP) do
   provides "languages/php"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/platform.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/powershell.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-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");
@@ -17,7 +17,7 @@
 
 Ohai.plugin(:Powershell) do
   provides "languages/powershell"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data(:windows) do
 

data/lib/ohai/plugins/ps.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Bryan McLellan (<btm@loftninjas.org>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #

data/lib/ohai/plugins/python.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Thom May (<thom@clearairturbulence.org>)
-# 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");
@@ -19,7 +19,7 @@
 Ohai.plugin(:Python) do
   provides "languages/python"
 
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/rackspace.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Cary Penniman (<cary@rightscale.com>)
 # License:: Apache License, Version 2.0
@@ -25,7 +26,7 @@ Ohai.plugin(:Rackspace) do
   # true:: If kernel name matches
   # false:: Otherwise
   def has_rackspace_kernel?
-    kernel[:release].split("-").last.eql?("rscloud")
+    kernel[:release].end_with?("-rscloud")
   end
 
   # Checks for rackspace provider attribute
@@ -161,8 +162,8 @@ Ohai.plugin(:Rackspace) do
       unless rackspace[:public_ip].nil?
         rackspace[:public_hostname] = begin
                                         Resolv.getname(rackspace[:public_ip])
-                                      rescue Resolv::ResolvError, Resolv::ResolvTimeout
-                                        rackspace[:public_ip]
+        rescue Resolv::ResolvError, Resolv::ResolvTimeout
+          rackspace[:public_ip]
                                       end
       end
       rackspace[:local_ipv4] = rackspace[:private_ip]

data/lib/ohai/plugins/root_group.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joseph Anthony Pasquale Holsten (<joseph@josephholsten.com>)
 # Copyright:: Copyright (c) 2013 Joseph Anthony Pasquale Holsten

data/lib/ohai/plugins/ruby.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -48,13 +49,13 @@ Ohai.plugin(:Ruby) do
     }
 
     # Create a query string from above hash
-    env_string = ""
+    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})"
+    result = run_ruby "require 'rubygems'; puts %Q(#{env_string.join})"
 
     # Parse results to plugin hash
     result.split(",").each do |entry|

data/lib/ohai/plugins/rust.rb

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

data/lib/ohai/plugins/scala.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
 # © Copyright IBM Corporation 2015.
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/scaleway.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Jonathan Amiez (<jonathan.amiez@gmail.com>)
 # License:: Apache License, Version 2.0
@@ -26,7 +27,7 @@ Ohai.plugin(:Scaleway) do
   # 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"))
+    if file_exist?("/proc/cmdline") && /scaleway/.match?(file_read("/proc/cmdline"))
       logger.trace("Plugin Scaleway: has_scaleway_cmdline? == true")
       return true
     end

data/lib/ohai/plugins/scsi.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Phil Dibowitz <phil@ipom.com>
 # Copyright:: Copyright (c) 2018 Facebook, Inc.

data/lib/ohai/plugins/shard.rb

@@ -18,7 +18,7 @@
 
 Ohai.plugin(:ShardSeed) do
   depends "hostname", "dmi", "machine_id", "machinename", "fips", "hardware", "kernel"
-  provides "shard_seed"
+  provides "shard_seed".freeze
 
   def get_dmi_property(dmi, thing)
     %w{system base_board chassis}.each do |section|
@@ -52,7 +52,7 @@ Ohai.plugin(:ShardSeed) do
   def digest_algorithm
     case Ohai.config[:plugin][:shard_seed][:digest_algorithm] || default_digest_algorithm
     when "md5"
-      require "digest/md5"
+      require "digest/md5" unless defined?(Digest::MD5)
       Digest::MD5
     when "sha256"
       require "openssl/digest"

data/lib/ohai/plugins/shells.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 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,9 +21,9 @@ Ohai.plugin(:Shells) do
   provides "shells"
 
   collect_data do
-    if ::File.exist?("/etc/shells")
+    if file_exist?("/etc/shells")
       shells []
-      ::File.readlines("/etc/shells").each do |line|
+      file_open("/etc/shells").readlines.each do |line|
         # remove carriage returns and skip over comments / empty lines
         shells << line.chomp if line[0] == "/"
       end

data/lib/ohai/plugins/softlayer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Alexey Karpik <alexey.karpik@rightscale.com>
 # Author:: Peter Schroeter <peter.schroeter@rightscale.com>
@@ -39,7 +40,7 @@ Ohai.plugin(:Softlayer) do
       logger.trace("Plugin Softlayer: looks_like_softlayer? == true")
       metadata = fetch_metadata
       softlayer Mash.new
-      metadata.each { |k, v| softlayer[k] = v } if metadata
+      metadata&.each { |k, v| softlayer[k] = v }
     else
       logger.trace("Plugin Softlayer: looks_like_softlayer? == false")
     end