ohai 8.8.0 → 8.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85e95271fa844c86e7109612c85d6e9dd4c76f0c
-  data.tar.gz: 41c785220f4364c44d6b8df5f267212e60c2854d
+  metadata.gz: 1414aa396729e3e5d9345bc1219a066485bed692
+  data.tar.gz: 5ec38bc64cee9310d3ed0ec2b1a25c9ed8cbddc1
 SHA512:
-  metadata.gz: 468cc81d43c4067f7c34dd737fdd4d17acfd26e25082c58b157d228ba22e26534b44ba4741c887e60147461d675b42057a191f28cd4446f16305708066b32e55
-  data.tar.gz: 69873511516a5cad588aa6e241615eebb4b7eedcfdc26e40519018f5829af581700f8bb55441a8098d2bc0d407a5c4d8455b2b2432627bc902be785e924b1125
+  metadata.gz: 90f69711502fe20ff5e64be54bcdea36b08c68204180a2eace90909fc1622beba40dcd55653bcae8457d2ada4bcd0388ea4f7c0faf1f164570dcf60735ee9810
+  data.tar.gz: ec2700012b9d071d6fdfb5d6f2f08dad4ab1624a4d7f52ae3c93e6405972d4dba7d9f0f0c25f5c5367a04ec14265e6fcdb4dde783bac266441046b1510528b73

data/README.md

@@ -54,13 +54,11 @@ You can run individual test files by running the rspec executable:
 Ohai has some Rake tasks for doing various things.
 
     rake -T
-    rake clobber_package  # Remove package products
-    rake gem              # Build the gem file ohai-$VERSION.gem
-    rake install          # install the gem locally
-    rake make_spec        # create a gemspec file
-    rake package          # Build all the packages
-    rake repackage        # Force a rebuild of the package files
-    rake spec             # Run specs
+    rake build          # Build the gem file ohai-$VERSION.gem
+    rake install        # install the gem locally
+    rake install:local  # install the gem locally without network access
+    rake release        # Create tag $VERSION, build gem, and push to Rubygems
+    rake spec           # Run RSpec tests
 
     ($VERSION is the current version, from the GemSpec in Rakefile)
 

data/lib/ohai/plugins/vmware.rb

@@ -1,7 +1,7 @@
 #
-# Author:: "Dan Robinson" <drobinson@getchef.com>
+# Author:: "Dan Robinson" <drobinson@chef.io>
 # Author:: "Christopher M. Luciano" <cmlucian@us.ibm.com>
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright (c) 2014-2015 Chef Software, Inc.
 # Copyright (C) 2015 IBM Corp.
 # License:: Apache License, Version 2.0
 #
@@ -33,6 +33,7 @@
 
 Ohai.plugin(:VMware) do
   provides "vmware"
+  depends "virtualization"
 
   def from_cmd(cmd)
     so = shell_out(cmd)
@@ -67,7 +68,7 @@ Ohai.plugin(:VMware) do
   end
 
   collect_data(:linux) do
-    get_vm_attributes("/usr/bin/vmware-toolbox-cmd")
+    get_vm_attributes("/usr/bin/vmware-toolbox-cmd") if virtualization[:systems][:vmware]
   end
 
 end

data/lib/ohai/version.rb

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

data/ohai.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.0.0"
 
-  s.add_dependency "mime-types", "~> 3.0"
   s.add_dependency "systemu", "~> 2.6.4"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "mixlib-cli"

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

@@ -1,14 +1,14 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,24 +16,25 @@
 # limitations under the License.
 #
 
+require 'tempfile'
 
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 shared_examples "Common cpu info" do |total_cpu, real_cpu|
   describe "cpu" do
     it "has cpu[:total] equals to #{total_cpu}" do
-      @plugin.run
-      expect(@plugin[:cpu][:total]).to eq(total_cpu)
+      plugin.run
+      expect(plugin[:cpu][:total]).to eq(total_cpu)
     end
 
     it "has cpu[:real] equals to #{real_cpu}" do
-      @plugin.run
-      expect(@plugin[:cpu][:real]).to eq(real_cpu)
+      plugin.run
+      expect(plugin[:cpu][:real]).to eq(real_cpu)
     end
 
     it "has a cpu 0" do
-      @plugin.run
-      expect(@plugin[:cpu]).to have_key("0")
+      plugin.run
+      expect(plugin[:cpu]).to have_key("0")
     end
   end
 end
@@ -41,133 +42,281 @@ end
 shared_examples "S390 processor info" do |cpu_no, version, identification, machine|
   describe "S390 processor" do
     it "has a version for cpu #{cpu_no}" do
-      @plugin.run
-      expect(@plugin[:cpu]["#{cpu_no}"]).to have_key("version")
-      expect(@plugin[:cpu]["#{cpu_no}"]["version"]).to eql(version)
+      plugin.run
+      expect(plugin[:cpu]["#{cpu_no}"]).to have_key("version")
+      expect(plugin[:cpu]["#{cpu_no}"]["version"]).to eql(version)
     end
 
     it "has a identification for cpu #{cpu_no}" do
-      @plugin.run
-      expect(@plugin[:cpu]["#{cpu_no}"]).to have_key("identification")
-      expect(@plugin[:cpu]["#{cpu_no}"]["identification"]).to eql(identification)
+      plugin.run
+      expect(plugin[:cpu]["#{cpu_no}"]).to have_key("identification")
+      expect(plugin[:cpu]["#{cpu_no}"]["identification"]).to eql(identification)
     end
 
     it "has a machine for cpu #{cpu_no}" do
-      @plugin.run
-      expect(@plugin[:cpu]["#{cpu_no}"]).to have_key("machine")
-      expect(@plugin[:cpu]["#{cpu_no}"]["machine"]).to eql(machine)
+      plugin.run
+      expect(plugin[:cpu]["#{cpu_no}"]).to have_key("machine")
+      expect(plugin[:cpu]["#{cpu_no}"]["machine"]).to eql(machine)
     end
   end
-end 
+end
 
 describe Ohai::System, "General Linux cpu plugin" do
+  let(:plugin) { get_plugin("linux/cpu") }
+
+  let(:cpuinfo_contents) do
+    <<-EOF
+processor     : 0
+vendor_id     : GenuineIntel
+cpu family    : 6
+model         : 23
+model name    : Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz
+stepping      : 6
+cpu MHz       : 1968.770
+cache size    : 64 KB
+fdiv_bug      : no
+hlt_bug       : no
+f00f_bug      : no
+coma_bug      : no
+fpu           : yes
+fpu_exception : yes
+cpuid level   : 10
+wp            : yes
+flags         : fpu pse tsc msr mce cx8 sep mtrr pge cmov
+bogomips      : 2575.86
+clflush size  : 32
+    EOF
+  end
+
+  let(:tempfile_handle) do
+    tempfile = Tempfile.new('ohai-rspec-proc-cpuinfo')
+    tempfile.write cpuinfo_contents
+    tempfile.rewind
+    tempfile
+  end
+
   before(:each) do
-    @plugin = get_plugin("linux/cpu")
-    allow(@plugin).to receive(:collect_os).and_return(:linux)
-    @double_file = double("/proc/cpuinfo")
-    allow(@double_file).to receive(:each).
-      and_yield("processor     : 0").
-      and_yield("vendor_id     : GenuineIntel").
-      and_yield("cpu family    : 6").
-      and_yield("model         : 23").
-      and_yield("model name    : Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz").
-      and_yield("stepping      : 6").
-      and_yield("cpu MHz       : 1968.770").
-      and_yield("cache size    : 64 KB").
-      and_yield("fdiv_bug      : no").
-      and_yield("hlt_bug       : no").
-      and_yield("f00f_bug      : no").
-      and_yield("coma_bug      : no").
-      and_yield("fpu           : yes").
-      and_yield("fpu_exception : yes").
-      and_yield("cpuid level   : 10").
-      and_yield("wp            : yes").
-      and_yield("flags         : fpu pse tsc msr mce cx8 sep mtrr pge cmov").
-      and_yield("bogomips      : 2575.86").
-      and_yield("clflush size  : 32")
-    allow(File).to receive(:open).with("/proc/cpuinfo").and_return(@double_file)
+    allow(plugin).to receive(:collect_os).and_return(:linux)
+    allow(File).to receive(:open).with("/proc/cpuinfo").and_return(tempfile_handle)
+  end
+
+  after(:each) do
+    begin
+      tempfile.close
+      tempfile.unlink
+    rescue
+      # really do not care
+    end
   end
-  
+
   it_behaves_like "Common cpu info", 1, 0
-  
+
   it "gets total cores" do
-    @plugin.run
-    expect(@plugin[:cpu][:cores]).to eql(0)
+    plugin.run
+    expect(plugin[:cpu][:cores]).to eql(0)
   end
 
   it "doesn't have a cpu 1" do
-    @plugin.run
-    expect(@plugin[:cpu]).not_to have_key("1")
+    plugin.run
+    expect(plugin[:cpu]).not_to have_key("1")
   end
 
   it "has a vendor_id for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).to have_key("vendor_id")
-    expect(@plugin[:cpu]["0"]["vendor_id"]).to eql("GenuineIntel")
+    plugin.run
+    expect(plugin[:cpu]["0"]).to have_key("vendor_id")
+    expect(plugin[:cpu]["0"]["vendor_id"]).to eql("GenuineIntel")
   end
 
   it "has a family for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).to have_key("family")
-    expect(@plugin[:cpu]["0"]["family"]).to eql("6")
+    plugin.run
+    expect(plugin[:cpu]["0"]).to have_key("family")
+    expect(plugin[:cpu]["0"]["family"]).to eql("6")
   end
 
   it "has a model for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).to have_key("model")
-    expect(@plugin[:cpu]["0"]["model"]).to eql("23")
+    plugin.run
+    expect(plugin[:cpu]["0"]).to have_key("model")
+    expect(plugin[:cpu]["0"]["model"]).to eql("23")
   end
 
   it "has a stepping for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).to have_key("stepping")
-    expect(@plugin[:cpu]["0"]["stepping"]).to eql("6")
+    plugin.run
+    expect(plugin[:cpu]["0"]).to have_key("stepping")
+    expect(plugin[:cpu]["0"]["stepping"]).to eql("6")
   end
 
   it "doesn't have a phyiscal_id for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).not_to have_key("physical_id")
+    plugin.run
+    expect(plugin[:cpu]["0"]).not_to have_key("physical_id")
   end
 
   it "doesn't have a core_id for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).not_to have_key("core_id")
+    plugin.run
+    expect(plugin[:cpu]["0"]).not_to have_key("core_id")
   end
 
   it "doesn't have a cores for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).not_to have_key("cores")
+    plugin.run
+    expect(plugin[:cpu]["0"]).not_to have_key("cores")
   end
 
   it "has a model name for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).to have_key("model_name")
-    expect(@plugin[:cpu]["0"]["model_name"]).to eql("Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz")
+    plugin.run
+    expect(plugin[:cpu]["0"]).to have_key("model_name")
+    expect(plugin[:cpu]["0"]["model_name"]).to eql("Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz")
   end
 
   it "has a mhz for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).to have_key("mhz")
-    expect(@plugin[:cpu]["0"]["mhz"]).to eql("1968.770")
+    plugin.run
+    expect(plugin[:cpu]["0"]).to have_key("mhz")
+    expect(plugin[:cpu]["0"]["mhz"]).to eql("1968.770")
   end
 
   it "has a cache_size for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).to have_key("cache_size")
-    expect(@plugin[:cpu]["0"]["cache_size"]).to eql("64 KB")
+    plugin.run
+    expect(plugin[:cpu]["0"]).to have_key("cache_size")
+    expect(plugin[:cpu]["0"]["cache_size"]).to eql("64 KB")
   end
 
   it "has flags for cpu 0" do
-    @plugin.run
-    expect(@plugin[:cpu]["0"]).to have_key("flags")
-    expect(@plugin[:cpu]["0"]["flags"]).to eq(%w{fpu pse tsc msr mce cx8 sep mtrr pge cmov})
+    plugin.run
+    expect(plugin[:cpu]["0"]).to have_key("flags")
+    expect(plugin[:cpu]["0"]["flags"]).to eq(%w{fpu pse tsc msr mce cx8 sep mtrr pge cmov})
+  end
+
+  context "with a dual-core hyperthreaded /proc/cpuinfo" do
+    let(:cpuinfo_contents) do
+      <<-EOF
+processor   : 0
+vendor_id   : GenuineIntel
+cpu family  : 6
+model       : 69
+model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
+stepping    : 1
+microcode   : 0x17
+cpu MHz     : 774.000
+cache size  : 4096 KB
+physical id : 0
+siblings    : 4
+core id     : 0
+cpu cores   : 2
+apicid      : 0
+initial apicid  : 0
+fpu     : yes
+fpu_exception   : yes
+cpuid level : 13
+wp      : yes
+flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
+bogomips    : 3591.40
+clflush size    : 64
+cache_alignment : 64
+address sizes   : 39 bits physical, 48 bits virtual
+power management:
+
+processor   : 1
+vendor_id   : GenuineIntel
+cpu family  : 6
+model       : 69
+model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
+stepping    : 1
+microcode   : 0x17
+cpu MHz     : 1600.000
+cache size  : 4096 KB
+physical id : 0
+siblings    : 4
+core id     : 0
+cpu cores   : 2
+apicid      : 1
+initial apicid  : 1
+fpu     : yes
+fpu_exception   : yes
+cpuid level : 13
+wp      : yes
+flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
+bogomips    : 3591.40
+clflush size    : 64
+cache_alignment : 64
+address sizes   : 39 bits physical, 48 bits virtual
+power management:
+
+processor   : 2
+vendor_id   : GenuineIntel
+cpu family  : 6
+model       : 69
+model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
+stepping    : 1
+microcode   : 0x17
+cpu MHz     : 800.000
+cache size  : 4096 KB
+physical id : 0
+siblings    : 4
+core id     : 1
+cpu cores   : 2
+apicid      : 2
+initial apicid  : 2
+fpu     : yes
+fpu_exception   : yes
+cpuid level : 13
+wp      : yes
+flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
+bogomips    : 3591.40
+clflush size    : 64
+cache_alignment : 64
+address sizes   : 39 bits physical, 48 bits virtual
+power management:
+
+processor   : 3
+vendor_id   : GenuineIntel
+cpu family  : 6
+model       : 69
+model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
+stepping    : 1
+microcode   : 0x17
+cpu MHz     : 774.000
+cache size  : 4096 KB
+physical id : 0
+siblings    : 4
+core id     : 1
+cpu cores   : 2
+apicid      : 3
+initial apicid  : 3
+fpu     : yes
+fpu_exception   : yes
+cpuid level : 13
+wp      : yes
+flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
+bogomips    : 3591.40
+clflush size    : 64
+cache_alignment : 64
+address sizes   : 39 bits physical, 48 bits virtual
+power management:
+
+      EOF
+    end
+
+    it "has 1 physical socket" do
+      plugin.run
+      expect(plugin[:cpu][:real]).to eq(1)
+    end
+
+    it "has 2 physical cores" do
+      plugin.run
+      expect(plugin[:cpu][:cores]).to eq(2)
+    end
+
+    it "has 4 logical, hyper-threaded cores" do
+      plugin.run
+      expect(plugin[:cpu][:total]).to eq(4)
+    end
   end
 end
 
 describe Ohai::System, "S390 linux cpu plugin" do
+  let(:plugin) { get_plugin("linux/cpu") }
+
   before(:each) do
-    @plugin = get_plugin("linux/cpu")
-    allow(@plugin).to receive(:collect_os).and_return(:linux)
+    allow(plugin).to receive(:collect_os).and_return(:linux)
+
     @double_file = double("/proc/cpuinfo")
     allow(@double_file).to receive(:each).
       and_yield("vendor_id : IBM/S390").
@@ -180,28 +329,28 @@ describe Ohai::System, "S390 linux cpu plugin" do
   end
 
   it_behaves_like "Common cpu info", 2, 0
- 
+
   it "has a cpu 1" do
-    @plugin.run
-    expect(@plugin[:cpu]).to have_key("1")
+    plugin.run
+    expect(plugin[:cpu]).to have_key("1")
   end
 
   it "has a vendor_id" do
-    @plugin.run
-    expect(@plugin[:cpu]).to have_key("vendor_id")
-    expect(@plugin[:cpu]["vendor_id"]).to eql("IBM/S390")
+    plugin.run
+    expect(plugin[:cpu]).to have_key("vendor_id")
+    expect(plugin[:cpu]["vendor_id"]).to eql("IBM/S390")
   end
 
   it "has a bogomips per cpu" do
-    @plugin.run
-    expect(@plugin[:cpu]).to have_key("bogomips_per_cpu")
-    expect(@plugin[:cpu]["bogomips_per_cpu"]).to eql("9328.00")
+    plugin.run
+    expect(plugin[:cpu]).to have_key("bogomips_per_cpu")
+    expect(plugin[:cpu]["bogomips_per_cpu"]).to eql("9328.00")
   end
 
   it "has features" do
-    @plugin.run
-    expect(@plugin[:cpu]).to have_key("features")
-    expect(@plugin[:cpu]["features"]).to eq(%w{esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs})
+    plugin.run
+    expect(plugin[:cpu]).to have_key("features")
+    expect(plugin[:cpu]["features"]).to eq(%w{esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs})
   end
 
   it_behaves_like "S390 processor info", 0, "EE", "06E276", "2717"

data/spec/unit/plugins/vmware_spec.rb

@@ -16,47 +16,63 @@
 # limitations under the License.
 require 'spec_helper'
 
-describe Ohai::System, "plugin vmware" do
-
-  let(:plugin) { get_plugin("vmware") }
-  let(:path) { "/usr/bin/vmware-toolbox-cmd" }
-
-  context "vmware toolbox" do
-
-    def setup_stubs
-      allow(File).to receive(:exist?).and_return(true)
-      allow(plugin).to receive(:collect_os).and_return(:linux)
-      allow(plugin).to receive(:shell_out).with("#{path} stat speed").and_return(mock_shell_out(0, "2000 MHz", nil))
-      allow(plugin).to receive(:shell_out).with("#{path} stat hosttime").and_return(mock_shell_out(0, "04 Jun 2015 19:21:16", nil))
-      allow(plugin).to receive(:shell_out).with("#{path} stat sessionid").and_return(mock_shell_out(0, "0x0000000000000000", nil))
-      allow(plugin).to receive(:shell_out).with("#{path} stat balloon").and_return(mock_shell_out(0, "0 MB", nil))
-      allow(plugin).to receive(:shell_out).with("#{path} stat swap").and_return(mock_shell_out(0, "0 MB", nil))
-      allow(plugin).to receive(:shell_out).with("#{path} stat memlimit").and_return(mock_shell_out(0, "4000000000 MB", nil))
-      allow(plugin).to receive(:shell_out).with("#{path} stat memres").and_return(mock_shell_out(0, "0 MB", nil))
-      allow(plugin).to receive(:shell_out).with("#{path} stat cpures").and_return(mock_shell_out(0, "0 MHz", nil))
-      allow(plugin).to receive(:shell_out).with("#{path} stat cpulimit").and_return(mock_shell_out(0, "4000000000 MB", nil))
-      allow(plugin).to receive(:shell_out).with("#{path} upgrade status").and_return(mock_shell_out(0, "VMware Tools are up-to-date.", nil))
-      allow(plugin).to receive(:shell_out).with("#{path} timesync status").and_return(mock_shell_out(0, "Disabled", nil))
+describe Ohai::System, 'plugin vmware' do
+  let(:plugin) { get_plugin('vmware') }
+  let(:path) { '/usr/bin/vmware-toolbox-cmd' }
+
+  before(:each) do
+    allow(plugin).to receive(:collect_os).and_return(:linux)
+  end
+
+  context 'on vmware guest with toolbox installed' do
+    before(:each) do
+      allow(File).to receive(:exist?).with('/usr/bin/vmware-toolbox-cmd').and_return(true)
+      allow(plugin).to receive(:shell_out).with("#{path} stat speed").and_return(mock_shell_out(0, '2000 MHz', nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat hosttime").and_return(mock_shell_out(0, '04 Jun 2015 19:21:16', nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat sessionid").and_return(mock_shell_out(0, '0x0000000000000000', nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat balloon").and_return(mock_shell_out(0, '0 MB', nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat swap").and_return(mock_shell_out(0, '0 MB', nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat memlimit").and_return(mock_shell_out(0, '4000000000 MB', nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat memres").and_return(mock_shell_out(0, '0 MB', nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat cpures").and_return(mock_shell_out(0, '0 MHz', nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat cpulimit").and_return(mock_shell_out(0, '4000000000 MB', nil))
+      allow(plugin).to receive(:shell_out).with("#{path} upgrade status").and_return(mock_shell_out(0, 'VMware Tools are up-to-date.', nil))
+      allow(plugin).to receive(:shell_out).with("#{path} timesync status").and_return(mock_shell_out(0, 'Disabled', nil))
+      plugin[:virtualization] = Mash.new
+      plugin[:virtualization][:systems] = Mash.new
+      plugin[:virtualization][:systems][:vmware] = Mash.new
       plugin.run
     end
 
-    before(:each) do
-      setup_stubs
+    it 'gets the speed' do
+      expect(plugin[:vmware][:speed]).to eq('2000 MHz')
     end
 
-    context "the vmware toolbox cmd" do
+    it 'gets the hosttime' do
+      expect(plugin[:vmware][:hosttime]).to eq('04 Jun 2015 19:21:16')
+    end
 
-      it "gets the speed" do
-        expect(plugin[:vmware][:speed]).to eq("2000 MHz")
-      end
+    it 'gets tools update status' do
+      expect(plugin[:vmware][:upgrade]).to eq('VMware Tools are up-to-date.')
+    end
+  end
 
-      it "gets the hosttime" do
-        expect(plugin[:vmware][:hosttime]).to eq("04 Jun 2015 19:21:16")
-      end
+  context 'on vmware guest without toolbox' do
+    it 'should not create a vmware attribute' do
+      plugin[:virtualization] = Mash.new
+      plugin[:virtualization][:systems] = Mash.new
+      plugin[:virtualization][:systems][:vmware] = Mash.new
+      allow(File).to receive(:exist?).with('/usr/bin/vmware-toolbox-cmd').and_return(false)
+      expect(plugin).not_to have_key(:vmware)
+    end
+  end
 
-      it "gets tools update status" do
-        expect(plugin[:vmware][:upgrade]).to eq("VMware Tools are up-to-date.")
-      end
+  context 'on vbox guest' do
+    it 'should not create a vmware attribute' do
+      plugin[:virtualization] = Mash.new
+      plugin[:virtualization][:systems] = Mash.new
+      plugin[:virtualization][:systems][:vbox] = Mash.new
+      expect(plugin).not_to have_key(:vmware)
     end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.8.0
+  version: 8.8.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement