ohai 8.9.0 → 8.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 045c43590e3c7ece0dc1cf3c6aa928b5f116c136
-  data.tar.gz: 020c8dfeabd26ba77291ba80e445b5ca3d61d661
+  metadata.gz: df97b8b25c82b3afc5230e4be648989481aa4082
+  data.tar.gz: b6814cfa34071bd5e11bee94c417c0e57035c32e
 SHA512:
-  metadata.gz: 482f14bc6fee2caab189234bf52ee9bbc0c0437f18da3efe2a52b28544ff6080886ef7d4d2ffb84f647a4d19de9144f00c6f16a92ccaa2a6a5dfe3ce105627e8
-  data.tar.gz: fe03f4ace8579e38373ff3fd244c3dd6a47a0738a401f65c673ff4a22c6fc284c3cca8c1788d6c533f03140f78f2ad7dd8a2d71ed8689bbf1d626ac51bcce636
+  metadata.gz: aa2aa6235d8baf1371e4a40c6fb3b7d2e238a6d3da7a460cb312519ed24d4a8edd9d9188b0f02b9c77e47bcc838583fffe2422aba57663750b4003c8945386ea
+  data.tar.gz: 8578b6b564b23aef84eea2efcc356df71f4a410ae212a25ee213542eab8ce63c4f82a026741c2f78cef647729e405289f71ac641df52f30f7cd9c3d68bc04364

data/lib/ohai/mixin/dmi_decode.rb

@@ -17,7 +17,7 @@
 
 # http://www.dmo.ca/blog/detecting-virtualization-on-linux
 module ::Ohai::Mixin::DmiDecode
-  def determine_guest(dmi_data)
+  def guest_from_dmi(dmi_data)
     dmi_data.each_line do |line|
       case line
       when /Manufacturer: Microsoft/

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

@@ -69,7 +69,7 @@ Ohai.plugin(:Virtualization) do
 
     # parse dmidecode to discover various virtualization guests
     if File.exist?('/usr/local/sbin/dmidecode') || File.exist?('/usr/pkg/sbin/dmidecode')
-      guest = determine_guest(shell_out('dmidecode').stdout)
+      guest = guest_from_dmi(shell_out('dmidecode').stdout)
       if guest
         virtualization[:system] = guest
         virtualization[:role] = 'guest'

data/lib/ohai/plugins/ec2.rb

@@ -26,7 +26,9 @@ Ohai.plugin(:EC2) do
   provides "ec2"
 
   depends "network/interfaces"
+  depends "dmi"
 
+  # look for arp address that non-VPC hosts will have
   def has_ec2_mac?
     network[:interfaces].values.each do |iface|
       unless iface[:arp].nil?
@@ -40,10 +42,26 @@ Ohai.plugin(:EC2) do
     false
   end
 
+  # look for amazon string in dmi bios data
+  # this only works on hvm instances as paravirt instances have no dmi data
+  def has_ec2_dmi?
+    begin
+      # detect a version of '4.2.amazon'
+      if dmi[:bios][:all_records][0][:Version] =~ /amazon/
+        Ohai::Log.debug("has_ec2_dmi? == true")
+        true
+      end
+    rescue NoMethodError
+      Ohai::Log.debug("has_ec2_dmi? == false")
+      false
+    end
+  end
+
+
   def looks_like_ec2?
     # Try non-blocking connect so we don't "block" if
     # the Xen environment is *not* EC2
-    hint?('ec2') || has_ec2_mac? && can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR,80)
+    hint?('ec2') || ( has_ec2_dmi? || has_ec2_mac?) && can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR,80)
   end
 
   collect_data do
@@ -60,7 +78,7 @@ Ohai.plugin(:EC2) do
       end
       ec2[:userdata] = self.fetch_userdata
       #ASCII-8BIT is equivalent to BINARY in this case
-      if ec2[:userdata].encoding.to_s == "ASCII-8BIT"
+      if ec2[:userdata] && ec2[:userdata].encoding.to_s == "ASCII-8BIT"
         Ohai::Log.debug("Binary UserData Found. Storing in base64")
         ec2[:userdata] = Base64.encode64(ec2[:userdata])
       end

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

@@ -41,15 +41,15 @@ Ohai.plugin(:Virtualization) do
     # virtualization[:mechanism]
 
     ## Xen
-    # /proc/xen is an empty dir for EL6 + Linode Guests
-    if File.exists?("/proc/xen")
+    # /proc/xen is an empty dir for EL6 + Linode Guests + Paravirt EC2 instances
+    if File.exist?("/proc/xen")
       virtualization[:system] = "xen"
       # Assume guest
       virtualization[:role] = "guest"
       virtualization[:systems][:xen] = "guest"
 
       # This file should exist on most Xen systems, normally empty for guests
-      if File.exists?("/proc/xen/capabilities")
+      if File.exist?("/proc/xen/capabilities")
         if File.read("/proc/xen/capabilities") =~ /control_d/i
           virtualization[:role] = "host"
           virtualization[:systems][:xen] = "host"
@@ -65,7 +65,7 @@ Ohai.plugin(:Virtualization) do
     #   but rather be additive - btm
 
     # Detect from kernel module
-    if File.exists?("/proc/modules")
+    if File.exist?("/proc/modules")
       modules = File.read("/proc/modules")
       if modules =~ /^kvm/
         virtualization[:system] = "kvm"
@@ -87,7 +87,7 @@ Ohai.plugin(:Virtualization) do
     # 2.6.27-9-server (intrepid) has this / 2.6.18-6-amd64 (etch) does not
     # It would be great if we could read pv_info in the kernel
     # Wait for reply to: http://article.gmane.org/gmane.comp.emulators.kvm.devel/27885
-    if File.exists?("/proc/cpuinfo")
+    if File.exist?("/proc/cpuinfo")
       if File.read("/proc/cpuinfo") =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/
         virtualization[:system] = "kvm"
         virtualization[:role] = "guest"
@@ -97,18 +97,18 @@ Ohai.plugin(:Virtualization) do
 
     # Detect OpenVZ / Virtuozzo.
     # http://wiki.openvz.org/BC_proc_entries
-    if File.exists?("/proc/bc/0")
+    if File.exist?("/proc/bc/0")
       virtualization[:system] = "openvz"
       virtualization[:role] = "host"
       virtualization[:systems][:openvz] = "host"
-    elsif File.exists?("/proc/vz")
+    elsif File.exist?("/proc/vz")
       virtualization[:system] = "openvz"
       virtualization[:role] = "guest"
       virtualization[:systems][:openvz] = "guest"
     end
 
     # Detect Parallels virtual machine from pci devices
-    if File.exists?("/proc/bus/pci/devices")
+    if File.exist?("/proc/bus/pci/devices")
       if File.read("/proc/bus/pci/devices") =~ /1ab84000/
         virtualization[:system] = "parallels"
         virtualization[:role] = "guest"
@@ -117,8 +117,8 @@ Ohai.plugin(:Virtualization) do
     end
 
     # parse dmidecode to discover various virtualization guests
-    if File.exists?("/usr/sbin/dmidecode")
-      guest = determine_guest(shell_out('dmidecode').stdout)
+    if File.exist?("/usr/sbin/dmidecode")
+      guest = guest_from_dmi(shell_out('dmidecode').stdout)
       if guest
         virtualization[:system] = guest
         virtualization[:role] = 'guest'
@@ -127,10 +127,10 @@ Ohai.plugin(:Virtualization) do
     end
 
     # Detect Linux-VServer
-    if File.exists?("/proc/self/status")
+    if File.exist?("/proc/self/status")
       proc_self_status = File.read("/proc/self/status")
       vxid = proc_self_status.match(/^(s_context|VxID):\s*(\d+)$/)
-      if vxid and vxid[2]
+      if vxid && vxid[2]
         virtualization[:system] = "linux-vserver"
         if vxid[2] == "0"
           virtualization[:role] = "host"
@@ -160,7 +160,7 @@ Ohai.plugin(:Virtualization) do
     #
     # Full notes, https://tickets.opscode.com/browse/OHAI-551
     # Kernel docs, https://www.kernel.org/doc/Documentation/cgroups
-    if File.exists?("/proc/self/cgroup")
+    if File.exist?("/proc/self/cgroup")
       cgroup_content = File.read("/proc/self/cgroup")
       if cgroup_content =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$} ||
          cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-.+$}
@@ -180,10 +180,10 @@ Ohai.plugin(:Virtualization) do
         # If so, we may need to look further for a differentiator (OHAI-573)
         virtualization[:systems][:lxc] = "host"
       end
-    elsif File.exists?("/.dockerenv") || File.exists?("/.dockerinit")
-        virtualization[:system] = "docker"
-        virtualization[:role] = "guest"
-        virtualization[:systems][:docker] = "guest"
+    elsif File.exist?("/.dockerenv") || File.exist?("/.dockerinit")
+      virtualization[:system] = "docker"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:docker] = "guest"
     end
   end
 end

data/lib/ohai/plugins/packages.rb

@@ -23,58 +23,62 @@ Ohai.plugin(:Packages) do
   depends 'platform_family'
 
   collect_data(:linux) do
-    packages Mash.new
+    if configuration(:enabled)
+      packages Mash.new
+      if %w(debian).include? platform_family
+        so = shell_out('dpkg-query -W')
+        pkgs = so.stdout.lines
 
-    if %w(debian).include? platform_family
-      so = shell_out('dpkg-query -W')
-      pkgs = so.stdout.lines
-
-      pkgs.each do |pkg|
-        name, version = pkg.split
-        packages[name] = { 'version' => version }
-      end
+        pkgs.each do |pkg|
+          name, version = pkg.split
+          packages[name] = { 'version' => version }
+        end
 
-    elsif %w(rhel fedora suse).include? platform_family
-      require 'shellwords'
-      format = Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n'
-      so = shell_out("rpm -qa --queryformat #{format}")
-      pkgs = so.stdout.lines
+      elsif %w(rhel fedora suse).include? platform_family
+        require 'shellwords'
+        format = Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n'
+        so = shell_out("rpm -qa --queryformat #{format}")
+        pkgs = so.stdout.lines
 
-      pkgs.each do |pkg|
-        name, version, release = pkg.split
-        packages[name] = { 'version' => version, 'release' => release }
+        pkgs.each do |pkg|
+          name, version, release = pkg.split
+          packages[name] = { 'version' => version, 'release' => release }
+        end
       end
     end
   end
 
   collect_data(:windows) do
-    packages Mash.new
-
-    require 'wmi-lite'
+    if configuration(:enabled)
+      packages Mash.new
+      require 'wmi-lite'
 
-    wmi = WmiLite::Wmi.new
-    w32_product = wmi.instances_of('Win32_Product')
+      wmi = WmiLite::Wmi.new
+      w32_product = wmi.instances_of('Win32_Product')
 
-    w32_product.find_all.each do |product|
-      name = product['name']
-      package = packages[name] = Mash.new
-      %w(version vendor installdate).each do |attr|
-        package[attr] = product[attr]
+      w32_product.find_all.each do |product|
+        name = product['name']
+        package = packages[name] = Mash.new
+        %w(version vendor installdate).each do |attr|
+          package[attr] = product[attr]
+        end
       end
     end
   end
 
   collect_data(:aix) do
-    packages Mash.new
-    so = shell_out('lslpp -L -q -c')
-    pkgs = so.stdout.lines
+    if configuration(:enabled)
+      packages Mash.new
+      so = shell_out('lslpp -L -q -c')
+      pkgs = so.stdout.lines
 
-    # Output format is
-    # Package Name:Fileset:Level
-    # On aix, filesets are packages and levels are versions
-    pkgs.each do |pkg|
-      _, name, version = pkg.split(':')
-      packages[name] = { 'version' => version }
+      # Output format is
+      # Package Name:Fileset:Level
+      # On aix, filesets are packages and levels are versions
+      pkgs.each do |pkg|
+        _, name, version = pkg.split(':')
+        packages[name] = { 'version' => version }
+      end
     end
   end
 
@@ -115,8 +119,10 @@ Ohai.plugin(:Packages) do
   end
 
   collect_data(:solaris2) do
-    packages Mash.new
-    collect_ips_packages
-    collect_sysv_packages
+    if configuration(:enabled)
+      packages Mash.new
+      collect_ips_packages
+      collect_sysv_packages
+    end
   end
 end

data/lib/ohai/plugins/windows/drivers.rb

@@ -20,28 +20,32 @@ Ohai.plugin(:Drivers) do
   depends "kernel"
 
   collect_data(:windows) do
-    require 'wmi-lite/wmi'
+    if configuration(:enabled)
 
-    wmi = WmiLite::Wmi.new
+      require 'wmi-lite/wmi'
 
-    kext = Mash.new
-    pnp_drivers = Mash.new
+      kext = Mash.new
+      pnp_drivers = Mash.new
 
-    drivers = wmi.instances_of('Win32_PnPSignedDriver')
-    drivers.each do |driver|
-      pnp_drivers[driver['deviceid']] = Mash.new
-      driver.wmi_ole_object.properties_.each do |p|
-        pnp_drivers[driver['deviceid']][p.name.wmi_underscore.to_sym] = driver[p.name.downcase]
-      end
-      if driver['devicename']
-        kext[driver['devicename']] = pnp_drivers[driver['deviceid']]
-        kext[driver['devicename']][:version] = pnp_drivers[driver['deviceid']][:driver_version]
-        kext[driver['devicename']][:date] = pnp_drivers[driver['deviceid']][:driver_date] ? pnp_drivers[driver['deviceid']][:driver_date].to_s[0..7] : nil
+      wmi = WmiLite::Wmi.new
+
+      drivers = wmi.instances_of('Win32_PnPSignedDriver')
+      drivers.each do |driver|
+        pnp_drivers[driver['deviceid']] = Mash.new
+        driver.wmi_ole_object.properties_.each do |p|
+          pnp_drivers[driver['deviceid']][p.name.wmi_underscore.to_sym] = driver[p.name.downcase]
+        end
+        if driver['devicename']
+          kext[driver['devicename']] = pnp_drivers[driver['deviceid']]
+          kext[driver['devicename']][:version] = pnp_drivers[driver['deviceid']][:driver_version]
+          kext[driver['devicename']][:date] = pnp_drivers[driver['deviceid']][:driver_date] ? pnp_drivers[driver['deviceid']][:driver_date].to_s[0..7] : nil
+        end
       end
-    end
 
-    kernel[:pnp_drivers] = pnp_drivers
-    kernel[:modules] = kext
+      kernel[:pnp_drivers] = pnp_drivers
+      kernel[:modules] = kext
 
+    end
   end
+
 end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '8.9.0'
+  VERSION = '8.10.0'
 end

data/spec/unit/plugins/ec2_spec.rb

@@ -270,6 +270,22 @@ end
     end
   end
 
+  describe "with ec2 dmi data" do
+    it_should_behave_like "ec2"
+
+    before(:each) do
+      @plugin[:dmi] = { :bios => { :all_records => [  { :Version => "4.2.amazon" } ] } }
+    end
+  end
+
+  describe "without ec2 dmi data" do
+    it_should_behave_like "!ec2"
+
+    before(:each) do
+      @plugin[:dmi] = nil
+    end
+  end
+
   describe "with ec2 cloud file" do
     it_should_behave_like "ec2"
 

data/spec/unit/plugins/linux/virtualization_spec.rb

@@ -25,24 +25,24 @@ describe Ohai::System, "Linux virtualization platform" do
     allow(plugin).to receive(:collect_os).and_return(:linux)
 
     # default to all requested Files not existing
-    allow(File).to receive(:exists?).with("/proc/xen").and_return(false)
-    allow(File).to receive(:exists?).with("/proc/xen/capabilities").and_return(false)
-    allow(File).to receive(:exists?).with("/proc/modules").and_return(false)
-    allow(File).to receive(:exists?).with("/proc/cpuinfo").and_return(false)
-    allow(File).to receive(:exists?).with("/usr/sbin/dmidecode").and_return(false)
-    allow(File).to receive(:exists?).with("/proc/self/status").and_return(false)
-    allow(File).to receive(:exists?).with("/proc/bc/0").and_return(false)
-    allow(File).to receive(:exists?).with("/proc/vz").and_return(false)
-    allow(File).to receive(:exists?).with("/proc/self/cgroup").and_return(false)
-    allow(File).to receive(:exists?).with("/.dockerenv").and_return(false)
-    allow(File).to receive(:exists?).with("/.dockerinit").and_return(false)
-    allow(File).to receive(:exists?).with("/proc/bus/pci/devices").and_return(false)
+    allow(File).to receive(:exist?).with("/proc/xen").and_return(false)
+    allow(File).to receive(:exist?).with("/proc/xen/capabilities").and_return(false)
+    allow(File).to receive(:exist?).with("/proc/modules").and_return(false)
+    allow(File).to receive(:exist?).with("/proc/cpuinfo").and_return(false)
+    allow(File).to receive(:exist?).with("/usr/sbin/dmidecode").and_return(false)
+    allow(File).to receive(:exist?).with("/proc/self/status").and_return(false)
+    allow(File).to receive(:exist?).with("/proc/bc/0").and_return(false)
+    allow(File).to receive(:exist?).with("/proc/vz").and_return(false)
+    allow(File).to receive(:exist?).with("/proc/self/cgroup").and_return(false)
+    allow(File).to receive(:exist?).with("/.dockerenv").and_return(false)
+    allow(File).to receive(:exist?).with("/.dockerinit").and_return(false)
+    allow(File).to receive(:exist?).with("/proc/bus/pci/devices").and_return(false)
   end
 
   describe "when we are checking for xen" do
     it "sets xen guest if /proc/xen exists but /proc/xen/capabilities does not" do
-      expect(File).to receive(:exists?).with("/proc/xen").and_return(true)
-      expect(File).to receive(:exists?).with("/proc/xen/capabilities").and_return(false)
+      expect(File).to receive(:exist?).with("/proc/xen").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/xen/capabilities").and_return(false)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("xen")
       expect(plugin[:virtualization][:role]).to eq("guest")
@@ -50,8 +50,8 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "sets xen host if /proc/xen/capabilities contains control_d " do
-      expect(File).to receive(:exists?).with("/proc/xen").and_return(true)
-      expect(File).to receive(:exists?).with("/proc/xen/capabilities").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/xen").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/xen/capabilities").and_return(true)
       allow(File).to receive(:read).with("/proc/xen/capabilities").and_return("control_d")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("xen")
@@ -60,8 +60,8 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "sets xen guest if /proc/xen/capabilities exists but is empty" do
-      expect(File).to receive(:exists?).with("/proc/xen").and_return(true)
-      expect(File).to receive(:exists?).with("/proc/xen/capabilities").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/xen").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/xen/capabilities").and_return(true)
       allow(File).to receive(:read).with("/proc/xen/capabilities").and_return("")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("xen")
@@ -70,7 +70,7 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "does not set virtualization if xen isn't there" do
-      expect(File).to receive(:exists?).at_least(:once).and_return(false)
+      expect(File).to receive(:exist?).at_least(:once).and_return(false)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
     end
@@ -78,7 +78,7 @@ describe Ohai::System, "Linux virtualization platform" do
 
   describe "when we are checking for kvm" do
     it "sets kvm host if /proc/modules contains kvm" do
-      expect(File).to receive(:exists?).with("/proc/modules").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/modules").and_return(true)
       allow(File).to receive(:read).with("/proc/modules").and_return("kvm 165872  1 kvm_intel")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("kvm")
@@ -87,7 +87,7 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "sets kvm guest if /proc/cpuinfo contains QEMU Virtual CPU" do
-      expect(File).to receive(:exists?).with("/proc/cpuinfo").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/cpuinfo").and_return(true)
       allow(File).to receive(:read).with("/proc/cpuinfo").and_return("QEMU Virtual CPU")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("kvm")
@@ -96,7 +96,7 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "sets kvm guest if /proc/cpuinfo contains Common KVM processor" do
-      expect(File).to receive(:exists?).with("/proc/cpuinfo").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/cpuinfo").and_return(true)
       allow(File).to receive(:read).with("/proc/cpuinfo").and_return("Common KVM processor")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("kvm")
@@ -105,7 +105,7 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "sets kvm guest if /proc/cpuinfo contains Common 32-bit KVM processor" do
-      expect(File).to receive(:exists?).with("/proc/cpuinfo").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/cpuinfo").and_return(true)
       allow(File).to receive(:read).with("/proc/cpuinfo").and_return("Common 32-bit KVM processor")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("kvm")
@@ -114,7 +114,7 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "does not set virtualization if kvm isn't there" do
-      expect(File).to receive(:exists?).at_least(:once).and_return(false)
+      expect(File).to receive(:exist?).at_least(:once).and_return(false)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
     end
@@ -122,7 +122,7 @@ describe Ohai::System, "Linux virtualization platform" do
 
   describe "when we are checking for VirtualBox" do
     it "sets vbox host if /proc/modules contains vboxdrv" do
-      expect(File).to receive(:exists?).with("/proc/modules").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/modules").and_return(true)
       allow(File).to receive(:read).with("/proc/modules").and_return("vboxdrv 268268 3 vboxnetadp,vboxnetflt")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("vbox")
@@ -131,7 +131,7 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "sets vbox gues if /proc/modules contains vboxguest" do
-      expect(File).to receive(:exists?).with("/proc/modules").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/modules").and_return(true)
       allow(File).to receive(:read).with("/proc/modules").and_return("vboxguest 214901 2 vboxsf, Live 0xffffffffa00db000 (OF)")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("vbox")
@@ -140,7 +140,7 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "does not set virtualization if vbox isn't there" do
-      expect(File).to receive(:exists?).at_least(:once).and_return(false)
+      expect(File).to receive(:exist?).at_least(:once).and_return(false)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
     end
@@ -148,7 +148,7 @@ describe Ohai::System, "Linux virtualization platform" do
 
   describe "when we are parsing dmidecode" do
     before(:each) do
-      expect(File).to receive(:exists?).with("/usr/sbin/dmidecode").and_return(true)
+      expect(File).to receive(:exist?).with("/usr/sbin/dmidecode").and_return(true)
     end
 
     it "sets virtualpc guest if dmidecode detects Microsoft Virtual Machine" do
@@ -308,7 +308,7 @@ RHEV
 
   describe "when we are checking for Linux-VServer" do
     it "sets Linux-VServer host if /proc/self/status contains s_context: 0" do
-      expect(File).to receive(:exists?).with("/proc/self/status").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/self/status").and_return(true)
       allow(File).to receive(:read).with("/proc/self/status").and_return("s_context: 0")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("linux-vserver")
@@ -317,7 +317,7 @@ RHEV
     end
 
     it "sets Linux-VServer host if /proc/self/status contains VxID: 0" do
-      expect(File).to receive(:exists?).with("/proc/self/status").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/self/status").and_return(true)
       allow(File).to receive(:read).with("/proc/self/status").and_return("VxID: 0")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("linux-vserver")
@@ -326,7 +326,7 @@ RHEV
     end
 
     it "sets Linux-VServer host if /proc/self/status contains multiple space VxID:   0" do
-      expect(File).to receive(:exists?).with("/proc/self/status").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/self/status").and_return(true)
       allow(File).to receive(:read).with("/proc/self/status").and_return("VxID:   0")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("linux-vserver")
@@ -335,7 +335,7 @@ RHEV
     end
 
     it "sets Linux-VServer host if /proc/self/status contains tabbed VxID:\t0" do
-      expect(File).to receive(:exists?).with("/proc/self/status").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/self/status").and_return(true)
       allow(File).to receive(:read).with("/proc/self/status").and_return("VxID:\t0")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("linux-vserver")
@@ -344,7 +344,7 @@ RHEV
     end
 
     it "sets Linux-VServer guest if /proc/self/status contains s_context > 0" do
-      expect(File).to receive(:exists?).with("/proc/self/status").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/self/status").and_return(true)
       allow(File).to receive(:read).with("/proc/self/status").and_return("s_context: 2")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("linux-vserver")
@@ -353,7 +353,7 @@ RHEV
     end
 
     it "sets Linux-VServer guest if /proc/self/status contains VxID > 0" do
-      expect(File).to receive(:exists?).with("/proc/self/status").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/self/status").and_return(true)
       allow(File).to receive(:read).with("/proc/self/status").and_return("VxID: 2")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("linux-vserver")
@@ -362,7 +362,7 @@ RHEV
     end
 
     it "does not set virtualization if Linux-VServer isn't there" do
-      expect(File).to receive(:exists?).at_least(:once).and_return(false)
+      expect(File).to receive(:exist?).at_least(:once).and_return(false)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
     end
@@ -370,7 +370,7 @@ RHEV
 
   describe "when we are checking for openvz" do
     it "sets openvz host if /proc/bc/0 exists" do
-      expect(File).to receive(:exists?).with("/proc/bc/0").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/bc/0").and_return(true)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("openvz")
       expect(plugin[:virtualization][:role]).to eq("host")
@@ -378,8 +378,8 @@ RHEV
     end
 
     it "sets openvz guest if /proc/bc/0 does not exist and /proc/vz exists" do
-      expect(File).to receive(:exists?).with("/proc/bc/0").and_return(false)
-      expect(File).to receive(:exists?).with("/proc/vz").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/bc/0").and_return(false)
+      expect(File).to receive(:exist?).with("/proc/vz").and_return(true)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("openvz")
       expect(plugin[:virtualization][:role]).to eq("guest")
@@ -387,8 +387,8 @@ RHEV
     end
 
     it "does not set virtualization if openvz isn't there" do
-      expect(File).to receive(:exists?).with("/proc/bc/0").and_return(false)
-      expect(File).to receive(:exists?).with("/proc/vz").and_return(false)
+      expect(File).to receive(:exist?).with("/proc/bc/0").and_return(false)
+      expect(File).to receive(:exist?).with("/proc/vz").and_return(false)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
     end
@@ -400,7 +400,7 @@ RHEV
 0018	1ab84000	1f	            8001	               0	               0	               0	               0	               0	               0	              20	               0	               0	               0	               0	               0	               0	prl_tg
 0028	1af41000	17	            8201	        ee000000	               0	               0	               0	               0	               0	              40	            1000	               0	               0	               0	               0	               0	virtio-pci
       DEVICES
-      expect(File).to receive(:exists?).with("/proc/bus/pci/devices").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/bus/pci/devices").and_return(true)
       allow(File).to receive(:read).with("/proc/bus/pci/devices").and_return(devices)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("parallels")
@@ -413,7 +413,7 @@ RHEV
 0030	1af41000	a	            8401	        ee040000	               0	               0	               0	               0	               0	              40	            1000	               0	               0	               0	               0	               0	virtio-pci
 0050	10110022	0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0	               0
       DEVICES
-      expect(File).to receive(:exists?).with("/proc/bus/pci/devices").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/bus/pci/devices").and_return(true)
       allow(File).to receive(:read).with("/proc/bus/pci/devices").and_return(devices)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
@@ -432,7 +432,7 @@ RHEV
 2:cpu:/lxc/baa660ed81bc81d262ac6e19486142aeec5fce2043e2a173eb2505c6fbed89bc
 1:cpuset:/
 CGROUP
-      expect(File).to receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
       allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("lxc")
@@ -451,7 +451,7 @@ CGROUP
 2:cpu:/lxc/vanilla
 1:cpuset:/lxc/vanilla
 CGROUP
-      expect(File).to receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
       allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("lxc")
@@ -470,7 +470,7 @@ CGROUP
 2:cpu:/Charlie
 1:cpuset:/Charlie
 CGROUP
-      expect(File).to receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      expect(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
       allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
@@ -488,7 +488,7 @@ CGROUP
 2:cpu:/
 1:cpuset:/
 CGROUP
-        expect(File).to receive(:exists?).with("/proc/self/cgroup").and_return(true)
+        expect(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
         allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
       end
 
@@ -521,7 +521,7 @@ CGROUP
     end
 
     it "does not set virtualization if /proc/self/cgroup isn't there" do
-      expect(File).to receive(:exists?).with("/proc/self/cgroup").and_return(false)
+      expect(File).to receive(:exist?).with("/proc/self/cgroup").and_return(false)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
     end
@@ -539,7 +539,7 @@ CGROUP
 2:cpu:/docker/baa660ed81bc81d262ac6e19486142aeec5fce2043e2a173eb2505c6fbed89bc
 1:cpuset:/
 CGROUP
-      allow(File).to receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      allow(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
       allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("docker")
@@ -558,7 +558,7 @@ CGROUP
 2:cpu:/docker/vanilla
 1:cpuset:/docker/vanilla
 CGROUP
-      allow(File).to receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      allow(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
       allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("docker")
@@ -579,7 +579,7 @@ CGROUP
 2:cpu,cpuacct:/system.slice/docker-47341c91be8d491cb3b8a475ad5b4aef6e79bf728cbb351c384e4a6c410f172f.scope
 1:name=systemd:/system.slice/docker-47341c91be8d491cb3b8a475ad5b4aef6e79bf728cbb351c384e4a6c410f172f.scope
 CGROUP
-      allow(File).to receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      allow(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
       allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("docker")
@@ -598,7 +598,7 @@ CGROUP
 2:cpu:/Charlie
 1:cpuset:/Charlie
 CGROUP
-      allow(File).to receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      allow(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
       allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
@@ -616,7 +616,7 @@ CGROUP
 2:cpu:/
 1:cpuset:/
 CGROUP
-        allow(File).to receive(:exists?).with("/proc/self/cgroup").and_return(true)
+        allow(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
         allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
         plugin.run
         expect(plugin[:virtualization]).to eq({'systems' => {}})
@@ -643,13 +643,13 @@ CGROUP
     end
 
     it "does not set virtualization if /proc/self/cgroup isn't there" do
-      allow(File).to receive(:exists?).with("/proc/self/cgroup").and_return(false)
+      allow(File).to receive(:exist?).with("/proc/self/cgroup").and_return(false)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
     end
 
     it "sets virtualization if /.dockerenv exists" do
-      allow(File).to receive(:exists?).with("/.dockerenv").and_return(true)
+      allow(File).to receive(:exist?).with("/.dockerenv").and_return(true)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("docker")
       expect(plugin[:virtualization][:role]).to eq("guest")
@@ -657,7 +657,7 @@ CGROUP
     end
 
     it "sets virtualization if /.dockerinit exists" do
-      allow(File).to receive(:exists?).with("/.dockerinit").and_return(true)
+      allow(File).to receive(:exist?).with("/.dockerinit").and_return(true)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("docker")
       expect(plugin[:virtualization][:role]).to eq("guest")
@@ -665,8 +665,8 @@ CGROUP
     end
 
     it "does not set virtualization if /.dockerenv or /.dockerinit does not exists" do
-      allow(File).to receive(:exists?).with("/.dockerenv").and_return(false)
-      allow(File).to receive(:exists?).with("/.dockerinit").and_return(false)
+      allow(File).to receive(:exist?).with("/.dockerenv").and_return(false)
+      allow(File).to receive(:exist?).with("/.dockerinit").and_return(false)
       plugin.run
       expect(plugin[:virtualization]).to eq({'systems' => {}})
     end

data/spec/unit/plugins/packages_spec.rb

@@ -20,222 +20,252 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, 'plugin packages' do
-  context 'on debian' do
+  context "when the packages plugin is disabled" do
+    before do
+      Ohai.config[:plugin][:packages][:enabled] = false
+      allow(plugin).to receive(:collect_os).and_return(platform_family.to_s)
+      plugin.run
+    end
+
     let(:plugin) do
       get_plugin('packages').tap do |plugin|
-        plugin[:platform_family] = 'debian'
+        plugin[:platform_family] = platform_family
       end
     end
 
-    let(:stdout) do
-      File.read(File.join(SPEC_PLUGIN_PATH, 'dpkg-query.output'))
-    end
+    [:debian, :fedora, :windows, :aix, :solaris2].each do |os|
+      context "on #{os}" do
+        let(:platform_family) { os }
 
-    before(:each) do
-      allow(plugin).to receive(:collect_os).and_return(:linux)
-      allow(plugin).to receive(:shell_out)
-        .with('dpkg-query -W')
-        .and_return(mock_shell_out(0, stdout, ''))
-      plugin.run
+        it "does not enumerate the packages" do
+          expect(plugin[:packages]).to eq(nil)
+        end
+      end
     end
+  end
 
-    it 'calls dpkg query' do
-      expect(plugin).to receive(:shell_out)
-        .with('dpkg-query -W')
-        .and_return(mock_shell_out(0, stdout, ''))
-      plugin.run
+  context "when the packages plugin is enabled" do
+    before do
+      Ohai.config[:plugin][:packages][:enabled] = true
     end
 
-    it 'gets packages and versions' do
-      expect(plugin[:packages]['vim-common'][:version]).to eq('2:7.4.052-1ubuntu3')
-    end
-  end
+    context 'on debian' do
+      let(:plugin) do
+        get_plugin('packages').tap do |plugin|
+          plugin[:platform_family] = 'debian'
+        end
+      end
 
-  context 'on fedora' do
-    let(:plugin) do
-      get_plugin('packages').tap do |plugin|
-        plugin[:platform_family] = 'fedora'
+      let(:stdout) do
+        File.read(File.join(SPEC_PLUGIN_PATH, 'dpkg-query.output'))
       end
-    end
 
-    let(:format) { Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n' }
+      before(:each) do
+        allow(plugin).to receive(:collect_os).and_return(:linux)
+        allow(plugin).to receive(:shell_out)
+          .with('dpkg-query -W')
+          .and_return(mock_shell_out(0, stdout, ''))
+        plugin.run
+      end
 
-    let(:stdout) do
-      File.read(File.join(SPEC_PLUGIN_PATH, 'rpmquery.output'))
-    end
+      it 'calls dpkg query' do
+        expect(plugin).to receive(:shell_out)
+          .with('dpkg-query -W')
+          .and_return(mock_shell_out(0, stdout, ''))
+        plugin.run
+      end
 
-    before(:each) do
-      allow(plugin).to receive(:collect_os).and_return(:linux)
-      allow(plugin).to receive(:shell_out).with("rpm -qa --queryformat #{format}").and_return(mock_shell_out(0, stdout, ''))
-      plugin.run
+      it 'gets packages and versions' do
+        expect(plugin[:packages]['vim-common'][:version]).to eq('2:7.4.052-1ubuntu3')
+      end
     end
 
-    it 'calls rpm -qa' do
-      expect(plugin).to receive(:shell_out)
-        .with("rpm -qa --queryformat #{format}")
-        .and_return(mock_shell_out(0, stdout, ''))
-      plugin.run
-    end
+    context 'on fedora' do
+      let(:plugin) do
+        get_plugin('packages').tap do |plugin|
+          plugin[:platform_family] = 'fedora'
+        end
+      end
 
-    it 'gets packages and versions/release' do
-      expect(plugin[:packages]['vim-common'][:version]).to eq('7.2.411')
-      expect(plugin[:packages]['vim-common'][:release]).to eq('1.8.el6')
-    end
-  end
+      let(:format) { Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n' }
 
-  context 'on windows', :windows_only do
-    require 'wmi-lite'
+      let(:stdout) do
+        File.read(File.join(SPEC_PLUGIN_PATH, 'rpmquery.output'))
+      end
 
-    let(:plugin) do
-      get_plugin('packages').tap do |plugin|
-        plugin[:platform_family] = 'windows'
+      before(:each) do
+        allow(plugin).to receive(:collect_os).and_return(:linux)
+        allow(plugin).to receive(:shell_out).with("rpm -qa --queryformat #{format}").and_return(mock_shell_out(0, stdout, ''))
+        plugin.run
       end
-    end
 
-    let(:win32_product_output) do
-      [{ 'assignmenttype' => 0,
-         'caption' => 'NXLOG-CE',
-         'description' => 'NXLOG-CE',
-         'helplink' => nil,
-         'helptelephone' => nil,
-         'identifyingnumber' => '{22FA28AB-3C1B-438B-A8B5-E23892C8B567}',
-         'installdate' => '20150511',
-         'installdate2' => nil,
-         'installlocation' => nil,
-         'installsource' => 'C:\\chef\\cache\\',
-         'installstate' => 5,
-         'language' => '1033',
-         'localpackage' => 'C:\\Windows\\Installer\\30884.msi',
-         'name' => 'NXLOG-CE',
-         'packagecache' => 'C:\\Windows\\Installer\\30884.msi',
-         'packagecode' => '{EC3A13C4-4634-47FC-9662-DC293CB96F9F}',
-         'packagename' => 'nexlog-ce-2.8.1248.msi',
-         'productid' => nil,
-         'regcompany' => nil,
-         'regowner' => nil,
-         'skunumber' => nil,
-         'transforms' => nil,
-         'urlinfoabout' => nil,
-         'urlupdateinfo' => nil,
-         'vendor' => 'nxsec.com',
-         'version' => '2.8.1248',
-         'wordcount' => 2 },
-       { 'assignmenttype' => 1,
-         'caption' => 'Chef Development Kit v0.7.0',
-         'description' => 'Chef Development Kit v0.7.0',
-         'helplink' => 'http://www.getchef.com/support/',
-         'helptelephone' => nil,
-         'identifyingnumber' => '{90754A33-404C-4172-8F3B-7F04CE98011C}',
-         'installdate' => '20150925', 'installdate2' => nil,
-         'installlocation' => nil,
-         'installsource' => 'C:\\Users\\skhajamohid1\\Downloads\\',
-         'installstate' => 5, 'language' => '1033',
-         'localpackage' => 'C:\\WINDOWS\\Installer\\d9e1ca7.msi',
-         'name' => 'Chef Development Kit v0.7.0',
-         'packagecache' => 'C:\\WINDOWS\\Installer\\d9e1ca7.msi',
-         'packagecode' => '{9B82FB86-40AE-4CDF-9DE8-97574F9395B9}',
-         'packagename' => 'chefdk-0.7.0-1 (2).msi',
-         'productid' => nil,
-         'regcompany' => nil,
-         'regowner' => nil,
-         'skunumber' => nil,
-         'transforms' => nil,
-         'urlinfoabout' => nil,
-         'urlupdateinfo' => nil,
-         'vendor' => "\"Chef Software, Inc. <maintainers@chef.io>\"",
-         'version' => '0.7.0.1',
-         'wordcount' => 2 }]
-    end
+      it 'calls rpm -qa' do
+        expect(plugin).to receive(:shell_out)
+          .with("rpm -qa --queryformat #{format}")
+          .and_return(mock_shell_out(0, stdout, ''))
+        plugin.run
+      end
 
-    before(:each) do
-      allow(plugin).to receive(:collect_os).and_return(:windows)
-      expect_any_instance_of(WmiLite::Wmi).to receive(:instances_of).with('Win32_Product').and_return(win32_product_output)
-      plugin.run
+      it 'gets packages and versions/release' do
+        expect(plugin[:packages]['vim-common'][:version]).to eq('7.2.411')
+        expect(plugin[:packages]['vim-common'][:release]).to eq('1.8.el6')
+      end
     end
 
-    it 'gets package info' do
-      expect(plugin[:packages]['Chef Development Kit v0.7.0'][:version]).to eq('0.7.0.1')
-      expect(plugin[:packages]['Chef Development Kit v0.7.0'][:vendor]).to eq("\"Chef Software, Inc. <maintainers@chef.io>\"")
-      expect(plugin[:packages]['Chef Development Kit v0.7.0'][:installdate]).to eq('20150925')
+    context 'on windows', :windows_only do
+      require 'wmi-lite'
 
-      expect(plugin[:packages]['NXLOG-CE'][:version]).to eq('2.8.1248')
-      expect(plugin[:packages]['NXLOG-CE'][:vendor]).to eq('nxsec.com')
-      expect(plugin[:packages]['NXLOG-CE'][:installdate]).to eq('20150511')
-    end
-  end
+      let(:plugin) do
+        get_plugin('packages').tap do |plugin|
+          plugin[:platform_family] = 'windows'
+        end
+      end
 
-  context 'on aix' do
-    let(:plugin) { get_plugin('packages') }
+      let(:win32_product_output) do
+        [{ 'assignmenttype' => 0,
+           'caption' => 'NXLOG-CE',
+           'description' => 'NXLOG-CE',
+           'helplink' => nil,
+           'helptelephone' => nil,
+           'identifyingnumber' => '{22FA28AB-3C1B-438B-A8B5-E23892C8B567}',
+           'installdate' => '20150511',
+           'installdate2' => nil,
+           'installlocation' => nil,
+           'installsource' => 'C:\\chef\\cache\\',
+           'installstate' => 5,
+           'language' => '1033',
+           'localpackage' => 'C:\\Windows\\Installer\\30884.msi',
+           'name' => 'NXLOG-CE',
+           'packagecache' => 'C:\\Windows\\Installer\\30884.msi',
+           'packagecode' => '{EC3A13C4-4634-47FC-9662-DC293CB96F9F}',
+           'packagename' => 'nexlog-ce-2.8.1248.msi',
+           'productid' => nil,
+           'regcompany' => nil,
+           'regowner' => nil,
+           'skunumber' => nil,
+           'transforms' => nil,
+           'urlinfoabout' => nil,
+           'urlupdateinfo' => nil,
+           'vendor' => 'nxsec.com',
+           'version' => '2.8.1248',
+           'wordcount' => 2 },
+           { 'assignmenttype' => 1,
+             'caption' => 'Chef Development Kit v0.7.0',
+             'description' => 'Chef Development Kit v0.7.0',
+             'helplink' => 'http://www.getchef.com/support/',
+             'helptelephone' => nil,
+             'identifyingnumber' => '{90754A33-404C-4172-8F3B-7F04CE98011C}',
+             'installdate' => '20150925', 'installdate2' => nil,
+             'installlocation' => nil,
+             'installsource' => 'C:\\Users\\skhajamohid1\\Downloads\\',
+             'installstate' => 5, 'language' => '1033',
+             'localpackage' => 'C:\\WINDOWS\\Installer\\d9e1ca7.msi',
+             'name' => 'Chef Development Kit v0.7.0',
+             'packagecache' => 'C:\\WINDOWS\\Installer\\d9e1ca7.msi',
+             'packagecode' => '{9B82FB86-40AE-4CDF-9DE8-97574F9395B9}',
+             'packagename' => 'chefdk-0.7.0-1 (2).msi',
+             'productid' => nil,
+             'regcompany' => nil,
+             'regowner' => nil,
+             'skunumber' => nil,
+             'transforms' => nil,
+             'urlinfoabout' => nil,
+             'urlupdateinfo' => nil,
+             'vendor' => "\"Chef Software, Inc. <maintainers@chef.io>\"",
+             'version' => '0.7.0.1',
+             'wordcount' => 2 }]
+      end
 
-    let(:stdout) do
-      File.read(File.join(SPEC_PLUGIN_PATH, 'lslpp.output'))
-    end
+      before(:each) do
+        allow(plugin).to receive(:collect_os).and_return(:windows)
+        expect_any_instance_of(WmiLite::Wmi).to receive(:instances_of).with('Win32_Product').and_return(win32_product_output)
+        plugin.run
+      end
 
-    before(:each) do
-      allow(plugin).to receive(:collect_os).and_return(:aix)
-      allow(plugin).to receive(:shell_out).with('lslpp -L -q -c').and_return(mock_shell_out(0, stdout, ''))
-      plugin.run
-    end
+      it 'gets package info' do
+        expect(plugin[:packages]['Chef Development Kit v0.7.0'][:version]).to eq('0.7.0.1')
+        expect(plugin[:packages]['Chef Development Kit v0.7.0'][:vendor]).to eq("\"Chef Software, Inc. <maintainers@chef.io>\"")
+        expect(plugin[:packages]['Chef Development Kit v0.7.0'][:installdate]).to eq('20150925')
 
-    it 'calls lslpp -L -q -c' do
-      expect(plugin).to receive(:shell_out)
-        .with('lslpp -L -q -c')
-        .and_return(mock_shell_out(0, stdout, ''))
-      plugin.run
+        expect(plugin[:packages]['NXLOG-CE'][:version]).to eq('2.8.1248')
+        expect(plugin[:packages]['NXLOG-CE'][:vendor]).to eq('nxsec.com')
+        expect(plugin[:packages]['NXLOG-CE'][:installdate]).to eq('20150511')
+      end
     end
 
-    it 'gets packages with version' do
-      expect(plugin[:packages]['chef'][:version]).to eq('12.5.1.1')
-    end
-  end
+    context 'on aix' do
+      let(:plugin) { get_plugin('packages') }
 
-  context 'on solaris2' do
-    let(:plugin) { get_plugin('packages') }
+      let(:stdout) do
+        File.read(File.join(SPEC_PLUGIN_PATH, 'lslpp.output'))
+      end
 
-    let(:pkglist_output) do
-      File.read(File.join(SPEC_PLUGIN_PATH, 'pkglist.output'))
-    end
+      before(:each) do
+        allow(plugin).to receive(:collect_os).and_return(:aix)
+        allow(plugin).to receive(:shell_out).with('lslpp -L -q -c').and_return(mock_shell_out(0, stdout, ''))
+        plugin.run
+      end
 
-    let(:pkginfo_output) do
-      File.read(File.join(SPEC_PLUGIN_PATH, 'pkginfo.output'))
-    end
+      it 'calls lslpp -L -q -c' do
+        expect(plugin).to receive(:shell_out)
+          .with('lslpp -L -q -c')
+          .and_return(mock_shell_out(0, stdout, ''))
+        plugin.run
+      end
 
-    before(:each) do
-      allow(plugin).to receive(:collect_os).and_return(:solaris2)
-      allow(plugin).to receive(:shell_out).with('pkg list -H').and_return(mock_shell_out(0, pkglist_output, ''))
-      allow(plugin).to receive(:shell_out).with('pkginfo -l').and_return(mock_shell_out(0, pkginfo_output, ''))
-      plugin.run
+      it 'gets packages with version' do
+        expect(plugin[:packages]['chef'][:version]).to eq('12.5.1.1')
+      end
     end
 
-    it 'calls pkg list -H' do
-      expect(plugin).to receive(:shell_out)
-        .with('pkg list -H')
-        .and_return(mock_shell_out(0, pkglist_output, ''))
-      plugin.run
-    end
+    context 'on solaris2' do
+      let(:plugin) { get_plugin('packages') }
 
-    it 'calls pkginfo -l' do
-      expect(plugin).to receive(:shell_out)
-        .with('pkginfo -l')
-        .and_return(mock_shell_out(0, pkginfo_output, ''))
-      plugin.run
-    end
+      let(:pkglist_output) do
+        File.read(File.join(SPEC_PLUGIN_PATH, 'pkglist.output'))
+      end
 
-    it 'gets ips packages with version' do
-      expect(plugin[:packages]['chef'][:version]).to eq('12.5.1')
-    end
+      let(:pkginfo_output) do
+        File.read(File.join(SPEC_PLUGIN_PATH, 'pkginfo.output'))
+      end
 
-    it 'gets ips packages with version and publisher' do
-      expect(plugin[:packages]['system/EMCpower'][:version]).to eq('6.0.0.1.0-3')
-      expect(plugin[:packages]['system/EMCpower'][:publisher]).to eq('emc.com')
-    end
+      before(:each) do
+        allow(plugin).to receive(:collect_os).and_return(:solaris2)
+        allow(plugin).to receive(:shell_out).with('pkg list -H').and_return(mock_shell_out(0, pkglist_output, ''))
+        allow(plugin).to receive(:shell_out).with('pkginfo -l').and_return(mock_shell_out(0, pkginfo_output, ''))
+        plugin.run
+      end
 
-    it 'gets sysv packages with version' do
-      expect(plugin[:packages]['chef'][:version]).to eq('12.5.1')
-    end
+      it 'calls pkg list -H' do
+        expect(plugin).to receive(:shell_out)
+          .with('pkg list -H')
+          .and_return(mock_shell_out(0, pkglist_output, ''))
+        plugin.run
+      end
 
-    it 'gets sysv packages with version' do
-      expect(plugin[:packages]['mqm'][:version]).to eq('7.0.1.4')
+      it 'calls pkginfo -l' do
+        expect(plugin).to receive(:shell_out)
+          .with('pkginfo -l')
+          .and_return(mock_shell_out(0, pkginfo_output, ''))
+        plugin.run
+      end
+
+      it 'gets ips packages with version' do
+        expect(plugin[:packages]['chef'][:version]).to eq('12.5.1')
+      end
+
+      it 'gets ips packages with version and publisher' do
+        expect(plugin[:packages]['system/EMCpower'][:version]).to eq('6.0.0.1.0-3')
+        expect(plugin[:packages]['system/EMCpower'][:publisher]).to eq('emc.com')
+      end
+
+      it 'gets sysv packages with version' do
+        expect(plugin[:packages]['chef'][:version]).to eq('12.5.1')
+      end
+
+      it 'gets sysv packages with version' do
+        expect(plugin[:packages]['mqm'][:version]).to eq('7.0.1.4')
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.9.0
+  version: 8.10.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -582,7 +582,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON