ohai 8.22.1 → 8.23.0

data/lib/ohai/plugins/scala.rb

@@ -28,7 +28,7 @@ Ohai.plugin(:Scala) do
         scala[:version] = so.stderr.split[4]
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Scala plugin: Could not shell_out "scala -version". Skipping data')
+      Ohai::Log.debug('Plugin Scala: Could not shell_out "scala -version". Skipping data')
     end
 
     # Check for sbt
@@ -40,7 +40,7 @@ Ohai.plugin(:Scala) do
         scala[:sbt][:version] = so.stdout.split[3]
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Scala plugin: Could not shell_out "sbt --version". Skipping data')
+      Ohai::Log.debug('Plugin Scala: Could not shell_out "sbt --version". Skipping data')
     end
 
     languages[:scala] = scala unless scala.empty?

data/lib/ohai/plugins/solaris2/dmi.rb

@@ -153,7 +153,7 @@ Ohai.plugin(:DMI) do
 
       elsif data = data_key_value_line.match(line)
         if dmi_record == nil
-          Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+          Ohai::Log.debug("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
           next
         end
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = data[2]
@@ -161,7 +161,7 @@ Ohai.plugin(:DMI) do
 
       elsif data = data_key_only_line.match(line)
         if dmi_record == nil
-          Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+          Ohai::Log.debug("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
           next
         end
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = ""
@@ -169,11 +169,11 @@ Ohai.plugin(:DMI) do
 
       elsif extended_data = extended_data_line.match(line)
         if dmi_record == nil
-          Ohai::Log.debug("unexpected extended data line found before header; discarding:\n#{line}")
+          Ohai::Log.debug("Plugin DMI: unexpected extended data line found before header; discarding:\n#{line}")
           next
         end
         if field == nil
-          Ohai::Log.debug("unexpected extended data line found outside data section; discarding:\n#{line}")
+          Ohai::Log.debug("Plugin DMI: unexpected extended data line found outside data section; discarding:\n#{line}")
           next
         end
         # overwrite "raw" value with a new Mash
@@ -181,7 +181,7 @@ Ohai.plugin(:DMI) do
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = extended_data[2]
 
       else
-        Ohai::Log.debug("unrecognized output line; discarding:\n#{line}")
+        Ohai::Log.debug("Plugin DMI: unrecognized output line; discarding:\n#{line}")
 
       end
     end

data/lib/ohai/plugins/sysconf.rb

@@ -0,0 +1,45 @@
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2016 Facebook
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:Sysconf) do
+  provides "sysconf"
+
+  collect_data(:aix, :linux, :solaris2) do
+    getconf_path = which("getconf")
+    if getconf_path
+      getconf = shell_out("#{getconf_path} -a")
+
+      if getconf.exitstatus == 0
+        sysconf Mash.new unless sysconf
+
+        getconf.stdout.split("\n").each do |line|
+          key, val = /^(\S+)\s*(.*)?$/.match(line).captures
+          if val && !val.empty?
+            begin
+              sysconf[key] = Integer(val)
+            rescue
+              sysconf[key] = val
+            end
+          else
+            sysconf[key] = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ohai/plugins/virtualbox.rb

@@ -20,25 +20,30 @@ Ohai.plugin(:Virtualbox) do
   provides "virtualbox"
 
   collect_data do
-    so = shell_out("VBoxControl guestproperty enumerate")
-    if so.exitstatus == 0
-      virtualbox Mash.new
-      virtualbox[:host] = Mash.new
-      virtualbox[:guest] = Mash.new
-      so.stdout.lines.each do |line|
-        case line
-        when /LanguageID, value: (\S*),/
-          virtualbox[:host][:language] = Regexp.last_match(1)
-        when /VBoxVer, value: (\S*),/
-          virtualbox[:host][:version] = Regexp.last_match(1)
-        when /VBoxRev, value: (\S*),/
-          virtualbox[:host][:revision] = Regexp.last_match(1)
-        when /GuestAdd\/VersionExt, value: (\S*),/
-          virtualbox[:guest][:guest_additions_version] = Regexp.last_match(1)
-        when /GuestAdd\/Revision, value: (\S*),/
-          virtualbox[:guest][:guest_additions_revision] = Regexp.last_match(1)
+    begin
+      so = shell_out("VBoxControl guestproperty enumerate")
+
+      if so.exitstatus == 0
+        virtualbox Mash.new
+        virtualbox[:host] = Mash.new
+        virtualbox[:guest] = Mash.new
+        so.stdout.lines.each do |line|
+          case line
+          when /LanguageID, value: (\S*),/
+            virtualbox[:host][:language] = Regexp.last_match(1)
+          when /VBoxVer, value: (\S*),/
+            virtualbox[:host][:version] = Regexp.last_match(1)
+          when /VBoxRev, value: (\S*),/
+            virtualbox[:host][:revision] = Regexp.last_match(1)
+          when /GuestAdd\/VersionExt, value: (\S*),/
+            virtualbox[:guest][:guest_additions_version] = Regexp.last_match(1)
+          when /GuestAdd\/Revision, value: (\S*),/
+            virtualbox[:guest][:guest_additions_revision] = Regexp.last_match(1)
+          end
         end
       end
+    rescue Ohai::Exceptions::Exec
+      Ohai::Log.debug('Plugin Virtualbox: Could not execute "VBoxControl guestproperty enumerate". Skipping data')
     end
   end
 end

data/lib/ohai/plugins/vmware.rb

@@ -42,7 +42,7 @@ Ohai.plugin(:VMware) do
 
   def get_vm_attributes(vmtools_path)
     if !File.exist?(vmtools_path)
-      Ohai::Log.debug("#{vmtools_path} not found")
+      Ohai::Log.debug("Plugin VMware: #{vmtools_path} not found")
     else
       vmware Mash.new
       begin
@@ -62,7 +62,7 @@ Ohai.plugin(:VMware) do
           vmware[param] = from_cmd("#{vmtools_path} #{param} status")
         end
       rescue
-        Ohai::Log.debug("Error while collecting VMware guest attributes")
+        Ohai::Log.debug("Plugin VMware: Error while collecting VMware guest attributes")
       end
     end
   end

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

@@ -44,6 +44,20 @@ Ohai.plugin(:Virtualization) do
       virtualization[:system] = "kvm"
       virtualization[:role] = "guest"
       virtualization[:systems][:kvm] = "guest"
+    when "American Megatrends Inc."
+      if bios[0]["version"] =~ /VRTUAL -/
+        virtualization[:system] = "hyper-v"
+        virtualization[:role] = "guest"
+        virtualization[:systems][:hyperv] = "guest"
+      end
+    when "Xen"
+      virtualization[:system] = "xen"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:xen] = "guest"
+    when "Veertu"
+      virtualization[:system] = "veertu"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:veertu] = "guest"
     end
 
     # vmware fusion detection

data/lib/ohai/system.rb

@@ -220,10 +220,6 @@ module Ohai
     end
 
     def configure_logging
-      return if Ohai::Log.configured?
-
-      Ohai::Log.init(Ohai.config[:log_location])
-
       if Ohai.config[:log_level] == :auto
         Ohai::Log.level = :info
       else

data/lib/ohai/util/file_helper.rb

@@ -26,11 +26,11 @@ module Ohai
         paths.each do |path|
           filename = File.join(path, cmd)
           if File.executable?(filename)
-            Ohai::Log.debug("#{self.name} plugin: found #{cmd} at #{filename}")
+            Ohai::Log.debug("Plugin #{self.name}: found #{cmd} at #{filename}")
             return filename
           end
         end
-        Ohai::Log.debug("#{self.name} plugin: did not find #{cmd}")
+        Ohai::Log.debug("Plugin #{self.name}: did not find #{cmd}")
         false
       end
     end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "8.22.1"
+  VERSION = "8.23.0"
 end

data/spec/unit/plugins/c_spec.rb

@@ -16,41 +16,19 @@
 # limitations under the License.
 #
 
-require "rbconfig"
-
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
 
 C_GCC = <<EOF
-Reading specs from /usr/lib/gcc/x86_64-redhat-linux/3.4.6/specs
-Configured with: ../configure --prefix=/usr ... --host=x86_64-redhat-linux
+Using built-in specs.
+COLLECT_GCC=gcc
+COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper
+Target: x86_64-linux-gnu
+Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.4' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
 Thread model: posix
-gcc version 3.4.6 20060404 (Red Hat 3.4.6-3)
-EOF
-
-C_GLIBC_2_3_4 = <<EOF
-GNU C Library stable release version 2.3.4, by Roland McGrath et al.
-Copyright (C) 2005 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.
-Compiled by GNU CC version 3.4.6 20060404 (Red Hat 3.4.6-3).
-Compiled on a Linux 2.4.20 system on 2006-08-12.
-Available extensions:
-        GNU libio by Per Bothner
-        crypt add-on version 2.1 by Michael Glad and others
-        linuxthreads-0.10 by Xavier Leroy
-        The C stubs add-on version 2.1.2.
-        BIND-8.2.3-T5B
-        NIS(YP)/NIS+ NSS modules 0.19 by Thorsten Kukuk
-        Glibc-2.0 compatibility add-on by Cristian Gafton
-        GNU Libidn by Simon Josefsson
-        libthread_db work sponsored by Alpha Processor Inc
-Thread-local storage support included.
-For bug reporting instructions, please see:
-<http://www.gnu.org/software/libc/bugs.html>.
+gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.4)
 EOF
 
-C_GLIBC_2_5 = <<EOF
+C_GLIBC = <<EOF
 GNU C Library stable release version 2.5, by Roland McGrath et al.
 Copyright (C) 2006 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.
@@ -109,251 +87,306 @@ describe Ohai::System, "plugin c" do
     plugin[:languages] = Mash.new
     #gcc
     allow(plugin).to receive(:shell_out).with("gcc -v").and_return(mock_shell_out(0, "", C_GCC))
-    #glibc
-    allow(plugin).to receive(:shell_out).with("/lib/libc.so.6").and_return(mock_shell_out(0, C_GLIBC_2_3_4, ""))
-    #ms cl
-    allow(plugin).to receive(:shell_out).with("cl /\?").and_return(mock_shell_out(0, "", C_CL))
-    #ms vs
-    allow(plugin).to receive(:shell_out).with("devenv.com /\?").and_return(mock_shell_out(0, C_VS, ""))
-    #ibm xlc
-    allow(plugin).to receive(:shell_out).with("xlc -qversion").and_return(mock_shell_out(0, C_XLC, ""))
-    #sun pro
-    allow(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(0, "", C_SUN))
-    #hpux cc
-    allow(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_return(mock_shell_out(0, C_HPUX, ""))
-  end
-
-  #gcc
-  it "gets the gcc version from running gcc -v" do
-    expect(plugin).to receive(:shell_out).with("gcc -v").and_return(mock_shell_out(0, "", C_GCC))
-    plugin.run
-  end
-
-  it "sets languages[:c][:gcc][:version]" do
-    plugin.run
-    expect(plugin.languages[:c][:gcc][:version]).to eql("3.4.6")
-  end
-
-  it "sets languages[:c][:gcc][:description]" do
-    plugin.run
-    expect(plugin.languages[:c][:gcc][:description]).to eql(C_GCC.split($/).last)
-  end
-
-  it "does not set the languages[:c][:gcc] tree up if gcc command exits nonzero" do
-    allow(plugin).to receive(:shell_out).with("gcc -v").and_return(mock_shell_out(1, "", ""))
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:gcc)
-  end
-
-  it "does not set the languages[:c][:gcc] tree up if gcc command fails" do
-    allow(plugin).to receive(:shell_out).with("gcc -v").and_raise(Ohai::Exceptions::Exec)
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:gcc)
-    expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
-  end
-
-  #glibc
-  it "gets the glibc x.x.x version from running /lib/libc.so.6", :unix_only do
-    expect(plugin).to receive(:shell_out).with("/lib/libc.so.6").and_return(mock_shell_out(0, C_GLIBC_2_3_4, ""))
-    plugin.run
-  end
-
-  it "sets languages[:c][:glibc][:version]", :unix_only do
-    plugin.run
-    expect(plugin.languages[:c][:glibc][:version]).to eql("2.3.4")
-  end
-
-  it "sets languages[:c][:glibc][:description]", :unix_only do
-    plugin.run
-    expect(plugin.languages[:c][:glibc][:description]).to eql(C_GLIBC_2_3_4.split($/).first)
-  end
-
-  it "does not set the languages[:c][:glibc] tree up if glibc exits nonzero" do
-    allow(plugin).to receive(:shell_out).with("/lib/libc.so.6").and_return(mock_shell_out(1, "", ""))
-    allow(plugin).to receive(:shell_out).with("/lib64/libc.so.6").and_return(mock_shell_out(1, "", ""))
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:glibc)
-  end
-
-  it "does not set the languages[:c][:glibc] tree up if glibc fails" do
-    allow(plugin).to receive(:shell_out).with("/lib/libc.so.6").and_raise(Ohai::Exceptions::Exec)
-    allow(plugin).to receive(:shell_out).with("/lib64/libc.so.6").and_raise(Ohai::Exceptions::Exec)
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:glibc)
-    expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
-  end
-
-  it "gets the glibc x.x version from running /lib/libc.so.6", :unix_only do
-    allow(plugin).to receive(:shell_out).with("/lib/libc.so.6").and_return(mock_shell_out(0, C_GLIBC_2_5, ""))
-    expect(plugin).to receive(:shell_out).with("/lib/libc.so.6").and_return(mock_shell_out(0, C_GLIBC_2_5, ""))
-    plugin.run
-    expect(plugin.languages[:c][:glibc][:version]).to eql("2.5")
-  end
-
-  #ms cl
-  it "gets the cl version from running cl /?" do
-    expect(plugin).to receive(:shell_out).with("cl /\?").and_return(mock_shell_out(0, "", C_CL))
-    plugin.run
-  end
-
-  it "sets languages[:c][:cl][:version]" do
-    plugin.run
-    expect(plugin.languages[:c][:cl][:version]).to eql("14.00.50727.762")
-  end
-
-  it "sets languages[:c][:cl][:description]" do
-    plugin.run
-    expect(plugin.languages[:c][:cl][:description]).to eql(C_CL.split($/).first)
-  end
-
-  it "does not set the languages[:c][:cl] tree up if cl command exits nonzero" do
-    allow(plugin).to receive(:shell_out).with("cl /\?").and_return(mock_shell_out(1, "", ""))
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:cl)
-  end
-
-  it "does not set the languages[:c][:cl] tree up if cl command fails" do
-    allow(plugin).to receive(:shell_out).with("cl /\?").and_raise(Ohai::Exceptions::Exec)
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:cl)
-    expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
-  end
-
-  #ms vs
-  it "gets the vs version from running devenv.com /?" do
-    expect(plugin).to receive(:shell_out).with("devenv.com /\?").and_return(mock_shell_out(0, C_VS, ""))
-    plugin.run
-  end
-
-  it "sets languages[:c][:vs][:version]" do
-    plugin.run
-    expect(plugin.languages[:c][:vs][:version]).to eql("8.0.50727.762")
-  end
-
-  it "sets languages[:c][:vs][:description]" do
-    plugin.run
-    expect(plugin.languages[:c][:vs][:description]).to eql(C_VS.split($/)[1])
-  end
-
-  it "does not set the languages[:c][:vs] tree up if devenv command exits nonzero" do
-    allow(plugin).to receive(:shell_out).with("devenv.com /\?").and_return(mock_shell_out(1, "", ""))
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:vs)
-  end
-
-  it "does not set the languages[:c][:vs] tree up if devenv command fails" do
-    allow(plugin).to receive(:shell_out).with("devenv.com /\?").and_raise(Ohai::Exceptions::Exec)
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:vs)
-    expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
-  end
-
-  #ibm xlc
-  it "gets the xlc version from running xlc -qversion" do
-    expect(plugin).to receive(:shell_out).with("xlc -qversion").and_return(mock_shell_out(0, C_XLC, ""))
-    plugin.run
-  end
-
-  it "sets languages[:c][:xlc][:version]" do
-    plugin.run
-    expect(plugin.languages[:c][:xlc][:version]).to eql("9.0")
-  end
-
-  it "sets languages[:c][:xlc][:description]" do
-    plugin.run
-    expect(plugin.languages[:c][:xlc][:description]).to eql(C_XLC.split($/).first)
-  end
-
-  it "does not set the languages[:c][:xlc] tree up if xlc command exits nonzero" do
-    allow(plugin).to receive(:shell_out).with("xlc -qversion").and_return(mock_shell_out(1, "", ""))
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:xlc)
-  end
-
-  it "does not set the languages[:c][:xlc] tree up if xlc command fails" do
-    allow(plugin).to receive(:shell_out).with("xlc -qversion").and_raise(Ohai::Exceptions::Exec)
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:xlc)
-    expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
   end
 
-  it "sets the languages[:c][:xlc] tree up if xlc exit status is 249" do
-    allow(plugin).to receive(:shell_out).with("xlc -qversion").and_return(mock_shell_out(63744, "", ""))
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:xlc)
-  end
-
-  #sun pro
-  it "gets the cc version from running cc -V -flags" do
-    expect(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(0, "", C_SUN))
-    plugin.run
-  end
+  context "on AIX" do
+    before(:each) do
+      allow(plugin).to receive(:collect_os).and_return(:aix)
+      allow(plugin).to receive(:shell_out).with("xlc -qversion").and_return(mock_shell_out(0, C_XLC, ""))
+    end
 
-  it "sets languages[:c][:sunpro][:version]" do
-    plugin.run
-    expect(plugin.languages[:c][:sunpro][:version]).to eql("5.8")
-  end
-
-  it "sets languages[:c][:sunpro][:description]" do
-    plugin.run
-    expect(plugin.languages[:c][:sunpro][:description]).to eql(C_SUN.chomp)
-  end
-
-  it "does not set the languages[:c][:sunpro] tree up if cc command exits nonzero" do
-    allow(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(1, "", ""))
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:sunpro)
-  end
-
-  it "does not set the languages[:c][:sunpro] tree up if cc command fails" do
-    allow(plugin).to receive(:shell_out).with("cc -V -flags").and_raise(Ohai::Exceptions::Exec)
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:sunpro)
-    expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
-  end
-
-  it "does not set the languages[:c][:sunpro] tree if the corresponding cc command fails on linux" do
-    fedora_error_message = "cc: error trying to exec 'i686-redhat-linux-gcc--flags': execvp: No such file or directory"
-
-    allow(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(0, "", fedora_error_message))
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:sunpro)
-  end
+    #ibm xlc
+    it "gets the xlc version from running xlc -qversion" do
+      expect(plugin).to receive(:shell_out).with("xlc -qversion").and_return(mock_shell_out(0, C_XLC, ""))
+      plugin.run
+    end
+
+    it "sets languages[:c][:xlc][:version]" do
+      plugin.run
+      expect(plugin.languages[:c][:xlc][:version]).to eql("9.0")
+    end
+
+    it "sets languages[:c][:xlc][:description]" do
+      plugin.run
+      expect(plugin.languages[:c][:xlc][:description]).to eql("IBM XL C/C++ Enterprise Edition for AIX, V9.0")
+    end
+
+    it "does not set the languages[:c][:xlc] tree up if xlc command exits nonzero" do
+      allow(plugin).to receive(:shell_out).with("xlc -qversion").and_return(mock_shell_out(1, "", ""))
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:xlc)
+    end
+
+    it "does not set the languages[:c][:xlc] tree up if xlc command fails" do
+      allow(plugin).to receive(:shell_out).with("xlc -qversion").and_raise(Ohai::Exceptions::Exec)
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:xlc)
+      expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
+    end
+
+    it "sets the languages[:c][:xlc] tree up if xlc exit status is 249" do
+      allow(plugin).to receive(:shell_out).with("xlc -qversion").and_return(mock_shell_out(63744, "", ""))
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:xlc)
+    end
+
+  end
+
+  context "on HPUX" do
+    before(:each) do
+      allow(plugin).to receive(:collect_os).and_return(:hpux)
+      allow(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_return(mock_shell_out(0, C_HPUX, ""))
+    end
 
-  it "does not set the languages[:c][:sunpro] tree if the corresponding cc command fails on hpux" do
-    hpux_error_message = "cc: warning 901: unknown option: `-flags': use +help for online documentation.\ncc: HP C/aC++ B3910B A.06.25 [Nov 30 2009]"
-    allow(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(0, "", hpux_error_message))
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:sunpro)
-  end
+    #hpux cc
+    it "gets the cc version from running what cc" do
+      expect(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_return(mock_shell_out(0, C_HPUX, ""))
+      plugin.run
+    end
+
+    it "sets languages[:c][:hpcc][:version]" do
+      plugin.run
+      expect(plugin.languages[:c][:hpcc][:version]).to eql("B.11.11.16")
+    end
+
+    it "sets languages[:c][:hpcc][:description]" do
+      plugin.run
+      expect(plugin.languages[:c][:hpcc][:description]).to eql("HP92453-01 B.11.11.16 HP C Compiler")
+    end
+
+    it "does not set the languages[:c][:hpcc] tree up if cc command exits nonzero" do
+      allow(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_return(mock_shell_out(1, "", ""))
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:hpcc)
+    end
+
+    it "does not set the languages[:c][:hpcc] tree up if cc command fails" do
+      allow(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_raise(Ohai::Exceptions::Exec)
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:hpcc)
+      expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
+    end
+  end
+
+  context "on Darwin" do
+    before(:each) do
+      allow(plugin).to receive(:shell_out).with("/usr/bin/xcode-select -p").and_return(mock_shell_out(0, "", ""))
+      allow(plugin).to receive(:collect_os).and_return(:darwin)
+    end
+
+    it "shells out to see if xcode is installed" do
+      expect(plugin).to receive(:shell_out).with("/usr/bin/xcode-select -p")
+      plugin.run
+    end
+
+    it "doesnt shellout to gcc if xcode isn't installed" do
+      allow(plugin).to receive(:shell_out).with("/usr/bin/xcode-select -p").and_return(mock_shell_out(1, "", ""))
+      expect(plugin).not_to receive(:shell_out).with("gcc -v")
+      plugin.run
+    end
+
+  end
+
+  context "on Windows" do
+    before(:each) do
+      allow(plugin).to receive(:collect_os).and_return(:windows)
+      allow(plugin).to receive(:shell_out).with("cl /\?").and_return(mock_shell_out(0, "", C_CL))
+      allow(plugin).to receive(:shell_out).with("devenv.com /\?").and_return(mock_shell_out(0, C_VS, ""))
+    end
 
-  #hpux cc
-  it "gets the cc version from running what cc" do
-    expect(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_return(mock_shell_out(0, C_HPUX, ""))
-    plugin.run
-  end
+    #ms cl
+    it "gets the cl version from running cl /?" do
+      expect(plugin).to receive(:shell_out).with("cl /\?")
+      plugin.run
+    end
+
+    it "sets languages[:c][:cl][:version]" do
+      plugin.run
+      expect(plugin.languages[:c][:cl][:version]).to eql("14.00.50727.762")
+    end
+
+    it "sets languages[:c][:cl][:description]" do
+      plugin.run
+      expect(plugin.languages[:c][:cl][:description]).to eql("Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14.00.50727.762 for 80x86")
+    end
+
+    it "does not set the languages[:c][:cl] tree up if cl command exits nonzero" do
+      allow(plugin).to receive(:shell_out).with("cl /\?").and_return(mock_shell_out(1, "", ""))
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:cl)
+    end
+
+    it "does not set the languages[:c][:cl] tree up if cl command fails" do
+      allow(plugin).to receive(:shell_out).with("cl /\?").and_raise(Ohai::Exceptions::Exec)
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:cl)
+      expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
+    end
 
-  it "sets languages[:c][:hpcc][:version]" do
-    plugin.run
-    expect(plugin.languages[:c][:hpcc][:version]).to eql("B.11.11.16")
-  end
+    #ms vs
+    it "gets the vs version from running devenv.com /?" do
+      expect(plugin).to receive(:shell_out).with("devenv.com /\?").and_return(mock_shell_out(0, C_VS, ""))
+      plugin.run
+    end
+
+    it "sets languages[:c][:vs][:version]" do
+      plugin.run
+      expect(plugin.languages[:c][:vs][:version]).to eql("8.0.50727.762")
+    end
+
+    it "sets languages[:c][:vs][:description]" do
+      plugin.run
+      expect(plugin.languages[:c][:vs][:description]).to eql("Microsoft (R) Visual Studio Version 8.0.50727.762.")
+    end
+
+    it "does not set the languages[:c][:vs] tree up if devenv command exits nonzero" do
+      allow(plugin).to receive(:shell_out).with("devenv.com /\?").and_return(mock_shell_out(1, "", ""))
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:vs)
+    end
+
+    it "does not set the languages[:c][:vs] tree up if devenv command fails" do
+      allow(plugin).to receive(:shell_out).with("devenv.com /\?").and_raise(Ohai::Exceptions::Exec)
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:vs)
+      expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
+    end
+  end
+
+  context "on Linux" do
+    before(:each) do
+      allow(plugin).to receive(:collect_os).and_return(:linux)
+      # glibc
+      allow(plugin).to receive(:shell_out).with("/lib/libc.so.6").and_return(mock_shell_out(0, C_GLIBC, ""))
+      allow(plugin).to receive(:shell_out).with("/lib64/libc.so.6").and_return(mock_shell_out(0, C_GLIBC, ""))
+      #sun pro
+      allow(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(0, "", C_SUN))
+    end
 
-  it "sets languages[:c][:hpcc][:description]" do
-    plugin.run
-    expect(plugin.languages[:c][:hpcc][:description]).to eql(C_HPUX.split($/)[3].strip)
-  end
+    #gcc
+    it "gets the gcc version from running gcc -v" do
+      expect(plugin).to receive(:shell_out).with("gcc -v")
+      plugin.run
+    end
+
+    it "sets languages[:c][:gcc][:version]" do
+      plugin.run
+      expect(plugin.languages[:c][:gcc][:version]).to eql("5.4.0")
+    end
+
+    it "sets languages[:c][:gcc][:description]" do
+      plugin.run
+      expect(plugin.languages[:c][:gcc][:description]).to eql("gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.4)")
+    end
+
+    it "sets languages[:c][:gcc][:configured_with]" do
+      plugin.run
+      expect(plugin.languages[:c][:gcc][:configured_with]).to eql("../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.4' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu")
+    end
+
+    it "sets languages[:c][:gcc][:target]" do
+      plugin.run
+      expect(plugin.languages[:c][:gcc][:target]).to eql("x86_64-linux-gnu")
+    end
+
+    it "sets languages[:c][:gcc][:thread_model]" do
+      plugin.run
+      expect(plugin.languages[:c][:gcc][:thread_model]).to eql("posix")
+    end
+
+    it "does not set the languages[:c][:gcc] tree up if gcc command exits nonzero" do
+      allow(plugin).to receive(:shell_out).with("gcc -v").and_return(mock_shell_out(1, "", ""))
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:gcc)
+    end
+
+    it "does not set the languages[:c][:gcc] tree up if gcc command fails" do
+      allow(plugin).to receive(:shell_out).with("gcc -v").and_raise(Ohai::Exceptions::Exec)
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:gcc)
+      expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
+    end
 
-  it "does not set the languages[:c][:hpcc] tree up if cc command exits nonzero" do
-    allow(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_return(mock_shell_out(1, "", ""))
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:hpcc)
-  end
+    #glibc
+    it "gets the glibc x.x.x version from running /lib/libc.so.6" do
+      expect(plugin).to receive(:shell_out).with("/lib/libc.so.6")
+      plugin.run
+    end
+
+    it "sets languages[:c][:glibc][:version]", :unix_only do
+      plugin.run
+      expect(plugin.languages[:c][:glibc][:version]).to eql("2.5")
+    end
+
+    it "sets languages[:c][:glibc][:description]" do
+      plugin.run
+      expect(plugin.languages[:c][:glibc][:description]).to eql("GNU C Library stable release version 2.5, by Roland McGrath et al.")
+    end
+
+    it "does not set the languages[:c][:glibc] tree up if glibc exits nonzero" do
+      allow(plugin).to receive(:shell_out).with("/lib/libc.so.6").and_return(mock_shell_out(1, "", ""))
+      allow(plugin).to receive(:shell_out).with("/lib64/libc.so.6").and_return(mock_shell_out(1, "", ""))
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:glibc)
+    end
+
+    it "does not set the languages[:c][:glibc] tree up if glibc fails" do
+      allow(plugin).to receive(:shell_out).with("/lib/libc.so.6").and_raise(Ohai::Exceptions::Exec)
+      allow(plugin).to receive(:shell_out).with("/lib64/libc.so.6").and_raise(Ohai::Exceptions::Exec)
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:glibc)
+      expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
+    end
+
+    it "gets the glibc x.x version from running /lib/libc.so.6" do
+      allow(plugin).to receive(:shell_out).with("/lib/libc.so.6").and_return(mock_shell_out(0, C_GLIBC, ""))
+      expect(plugin).to receive(:shell_out).with("/lib/libc.so.6")
+      plugin.run
+      expect(plugin.languages[:c][:glibc][:version]).to eql("2.5")
+    end
 
-  it "does not set the languages[:c][:hpcc] tree up if cc command fails" do
-    allow(plugin).to receive(:shell_out).with("what /opt/ansic/bin/cc").and_raise(Ohai::Exceptions::Exec)
-    plugin.run
-    expect(plugin[:languages][:c]).not_to have_key(:hpcc)
-    expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
+    #sun pro
+    it "gets the cc version from running cc -V -flags" do
+      expect(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(0, "", C_SUN))
+      plugin.run
+    end
+
+    it "sets languages[:c][:sunpro][:version]" do
+      plugin.run
+      expect(plugin.languages[:c][:sunpro][:version]).to eql("5.8")
+    end
+
+    it "sets languages[:c][:sunpro][:description]" do
+      plugin.run
+      expect(plugin.languages[:c][:sunpro][:description]).to eql("cc: Sun C 5.8 Patch 121016-06 2007/08/01")
+    end
+
+    it "does not set the languages[:c][:sunpro] tree up if cc command exits nonzero" do
+      allow(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(1, "", ""))
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:sunpro)
+    end
+
+    it "does not set the languages[:c][:sunpro] tree up if cc command fails" do
+      allow(plugin).to receive(:shell_out).with("cc -V -flags").and_raise(Ohai::Exceptions::Exec)
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:sunpro)
+      expect(plugin[:languages][:c]).not_to be_empty # expect other attributes
+    end
+
+    it "does not set the languages[:c][:sunpro] tree if the corresponding cc command fails on linux" do
+      fedora_error_message = "cc: error trying to exec 'i686-redhat-linux-gcc--flags': execvp: No such file or directory"
+
+      allow(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(0, "", fedora_error_message))
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:sunpro)
+    end
+
+    it "does not set the languages[:c][:sunpro] tree if the corresponding cc command fails on hpux" do
+      hpux_error_message = "cc: warning 901: unknown option: `-flags': use +help for online documentation.\ncc: HP C/aC++ B3910B A.06.25 [Nov 30 2009]"
+      allow(plugin).to receive(:shell_out).with("cc -V -flags").and_return(mock_shell_out(0, "", hpux_error_message))
+      plugin.run
+      expect(plugin[:languages][:c]).not_to have_key(:sunpro)
+    end
   end
-
 end