ohai 16.4.12 → 16.5.0

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

@@ -2,7 +2,7 @@
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-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/aix/platform.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Joshua Timberman <joshua@chef.io>
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-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/aix/uptime.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-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/aix/virtualization.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Julian C. Dunn (<jdunn@chef.io>)
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-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/azure.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright 2013-2017 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/bsd/virtualization.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
-# Copyright:: Copyright (c) 2015-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");
@@ -49,7 +49,7 @@ Ohai.plugin(:Virtualization) do
     end
 
     # detect from modules
-    so = shell_out((Ohai.abs_path("/sbin/kldstat")).to_s)
+    so = shell_out(Ohai.abs_path("/sbin/kldstat").to_s)
     so.stdout.lines do |line|
       case line
       when /vboxdrv/

data/lib/ohai/plugins/cloud.rb

@@ -100,7 +100,7 @@ Ohai.plugin(:Cloud) do
       @cloud[:local_ipv6] = @cloud[:local_ipv6_addrs][0] if @cloud[:local_ipv6_addrs]
 
       # if empty, return nil
-      (@cloud.empty?) ? nil : @cloud
+      @cloud.empty? ? nil : @cloud
     end
 
     private

data/lib/ohai/plugins/command.rb

@@ -1,6 +1,6 @@
 #
 # 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/cpu.rb

@@ -8,7 +8,7 @@
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
 # Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2008-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");
@@ -61,7 +61,7 @@ Ohai.plugin(:CPU) do
         cpu_number += 1
       when /vendor_id\s+:\s(.+)/
         vendor_id = $1
-        if vendor_id =~ (%r{IBM/S390})
+        if vendor_id.include?("IBM/S390")
           cpuinfo["vendor_id"] = vendor_id
         else
           cpuinfo[current_cpu]["vendor_id"] = vendor_id

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

@@ -1,6 +1,6 @@
 #
 # Author:: Patrick Collins (<pat@burned.com>)
-# Copyright:: Copyright (c) 2013-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/darwin/network.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Benjamin Black (<bb@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/darwin/platform.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 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,7 +20,7 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_build", "platform_family"
 
   collect_data(:darwin) do
-    so = shell_out((Ohai.abs_path( "/usr/bin/sw_vers" )).to_s)
+    so = shell_out(Ohai.abs_path( "/usr/bin/sw_vers" ).to_s)
     so.stdout.lines do |line|
       case line
       when /^ProductVersion:\s+(.+)$/

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

@@ -2,7 +2,7 @@
 # Author:: Pavel Yudin (<pyudin@parallels.com>)
 # Author:: Tim Smith (<tsmith@chef.io>)
 # Copyright:: Copyright (c) 2015 Pavel Yudin
-# 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");

data/lib/ohai/plugins/docker.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: 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/ec2.rb

@@ -3,7 +3,7 @@
 # Author:: Benjamin Black (<bb@chef.io>)
 # Author:: Christopher Brown (<cb@chef.io>)
 # Author:: Tim Smith (<tsmith@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");
@@ -114,7 +114,7 @@ Ohai.plugin(:EC2) do
   end
 
   collect_data do
-    require "base64"
+    require "base64" unless defined?(Base64)
 
     if looks_like_ec2?
       logger.trace("Plugin EC2: looks_like_ec2? == true")

data/lib/ohai/plugins/erlang.rb

@@ -1,6 +1,6 @@
 #
 # 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

@@ -2,7 +2,7 @@
 # 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");

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
 #

data/lib/ohai/plugins/fips.rb

@@ -1,6 +1,6 @@
 #
 # 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/hostname.rb

@@ -6,7 +6,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,6 @@
 #
 # 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");

data/lib/ohai/plugins/java.rb

@@ -1,6 +1,6 @@
 #
 # 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/kernel.rb

@@ -4,7 +4,7 @@
 # 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 +42,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\_]+)/

data/lib/ohai/plugins/keys.rb

@@ -2,7 +2,7 @@
 # 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,6 @@
 #
 # 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,6 @@
 #
 # 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

@@ -25,7 +25,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,6 @@
 #
 # 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/linux/lsb.rb

@@ -1,6 +1,6 @@
 #
 # 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/linux/memory.rb

@@ -1,6 +1,6 @@
 #
 # 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/linux/network.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Chris Read <chris.read@gmail.com>
-# Copyright:: Copyright (c) 2008-2017, 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");
@@ -141,12 +141,12 @@ Ohai.plugin(:Network) do
   # using a temporary var to hold routes and their interface name
   def parse_routes(family, iface)
     iface.collect do |i, iv|
-      if iv[:routes]
-        iv[:routes].collect do |r|
-          r.merge(dev: i) if r[:family] == family[:name]
-        end.compact
-      end
-    end.compact.flatten
+      next unless iv[:routes]
+
+      iv[:routes].collect do |r|
+        r.merge(dev: i) if r[:family] == family[:name]
+      end.compact # @todo: when we drop ruby 2.6 this should be a filter_map
+    end.compact.flatten # @todo: when we drop ruby 2.6 this should be a filter_map
   end
 
   # determine layer 1 details for the interface using ethtool
@@ -264,7 +264,7 @@ Ohai.plugin(:Network) do
         end
         key, val = line.split(/:\s+/)
         if val
-          coalesce_key = "#{key.downcase.tr(" ", "_")}"
+          coalesce_key = key.downcase.tr(" ", "_").to_s
           iface[tmp_int]["coalesce_params"][coalesce_key] = val.to_i
         end
       end
@@ -289,7 +289,7 @@ Ohai.plugin(:Network) do
         if val.nil?
           val = ""
         end
-        driver_key = "#{key.downcase.tr(" ", "_")}"
+        driver_key = key.downcase.tr(" ", "_").to_s
         iface[tmp_int]["driver_info"][driver_key] = val.chomp
       end
     end

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

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2015-2017, 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/linux/virtualization.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Thom May (<thom@clearairturbulence.org>)
-# 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/network.rb

@@ -1,6 +1,6 @@
 #
 # 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/ohai_time.rb

@@ -1,6 +1,6 @@
 #
 # 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/openstack.rb

@@ -1,7 +1,7 @@
 #
 # 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

@@ -2,7 +2,7 @@
 # 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
 #

data/lib/ohai/plugins/packages.rb

@@ -209,4 +209,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