ohai 8.4.0 → 8.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 036936f26eb1e8ff1d24656e93a1274bc2a5c115
-  data.tar.gz: 832dd245bca01ebdc443af9c0fdd5e5b5346243b
+  metadata.gz: c04612616e40294b66bb4d491b79ccdcc76bd5da
+  data.tar.gz: fa3e3c8a9194bc1260e41bef0175dd3f0e1bfcba
 SHA512:
-  metadata.gz: c0ce10ecd7bee45863d127dd60048987e57fad2191068219ec1a0c6af66577b9cde5ee429d203dd0526f14bb39f5edd10e645a2248fa2a6fca77ead1ac20f5a6
-  data.tar.gz: 26f1fd48769e60f05b344137d70d5fd701af2f982697722206c678ffb622bb0b10e89b98b6b8909bf6fe31a1fe8be65e4e57f14f4dc863b4ca34b676cde804dc
+  metadata.gz: 06f53f0663a21eff360e7e3466472484238832b5b4b7e04d9cbedc8bcdd060810aa6f93992f01c7f4033ee4d730e2e674fe6b98429885673a3639092c8c869e2
+  data.tar.gz: b37a7bc60df9b61f293e62c8d2cdc784a507b4e2e84a118178f24b41b4f2645881c3b47898b2e429d35e8ab36de55f22c5b69d05c73c8ef9cc2894d4d38ded0c

data/lib/ohai/plugins/cloud_v2.rb

@@ -62,7 +62,7 @@ Ohai.plugin(:CloudV2) do
         @cloud[:local_ipv4_addrs] ||= Array.new
         @cloud[:local_ipv4_addrs] << ipaddr.to_s
       else
-        raise "ERROR: in valid accessibility param of '#{accessibility}'. must be :public or :private."
+        raise "ERROR: invalid accessibility param of '#{accessibility}'. must be :public or :private."
       end
     end
 
@@ -79,7 +79,7 @@ Ohai.plugin(:CloudV2) do
         @cloud[:local_ipv6_addrs] ||= Array.new
         @cloud[:local_ipv6_addrs] << ipaddr.to_s
       else
-        raise "ERROR: in valid accessibility param of '#{accessibility}'. must be :public or :private."
+        raise "ERROR: invalid accessibility param of '#{accessibility}'. must be :public or :private."
       end
     end
 

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

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,17 +28,31 @@ Ohai.plugin(:Platform) do
     contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/release ([\d\.]+)/, 1]
   end
 
+  def os_release_file_is_cisco?
+    return false unless File.exist?('/etc/os-release')
+    os_release_info = File.read('/etc/os-release').split.inject({}) do |map, key_value_line|
+      key, _separator, value = key_value_line.partition('=')
+      map[key] = value
+      map
+    end
+    if os_release_info['CISCO_RELEASE_INFO'] && File.exist?(os_release_info['CISCO_RELEASE_INFO'])
+      os_release_info
+    else
+      false
+    end
+  end
+
   collect_data(:linux) do
     # platform [ and platform_version ? ] should be lower case to avoid dealing with RedHat/Redhat/redhat matching
-    if File.exists?("/etc/oracle-release")
+    if File.exist?("/etc/oracle-release")
       contents = File.read("/etc/oracle-release").chomp
       platform "oracle"
       platform_version get_redhatish_version(contents)
-    elsif File.exists?("/etc/enterprise-release")
+    elsif File.exist?("/etc/enterprise-release")
       contents = File.read("/etc/enterprise-release").chomp
       platform "oracle"
       platform_version get_redhatish_version(contents)
-    elsif File.exists?("/etc/debian_version")
+    elsif File.exist?("/etc/debian_version")
       # Ubuntu and Debian both have /etc/debian_version
       # Ubuntu should always have a working lsb, debian does not by default
       if lsb[:id] =~ /Ubuntu/i
@@ -48,29 +62,35 @@ Ohai.plugin(:Platform) do
         platform "linuxmint"
         platform_version lsb[:release]
       else
-        if File.exists?("/usr/bin/raspi-config")
+        if File.exist?("/usr/bin/raspi-config")
           platform "raspbian"
         else
           platform "debian"
         end
         platform_version File.read("/etc/debian_version").chomp
       end
-    elsif File.exists?("/etc/parallels-release")
+    elsif File.exist?("/etc/parallels-release")
       contents = File.read("/etc/parallels-release").chomp
       platform get_redhatish_platform(contents)
       platform_version contents.match(/(\d\.\d\.\d)/)[0]
-    elsif File.exists?("/etc/redhat-release")
-      contents = File.read("/etc/redhat-release").chomp
-      platform get_redhatish_platform(contents)
-      platform_version get_redhatish_version(contents)
-    elsif File.exists?("/etc/system-release")
+    elsif File.exist?("/etc/redhat-release")
+      if File.exist?('/etc/os-release') && (os_release_info = os_release_file_is_cisco? ) # check if Cisco
+        platform os_release_info['ID']
+        platform_family os_release_info['ID_LIKE']
+        platform_version os_release_info['VERSION'] || ""
+      else
+        contents = File.read("/etc/redhat-release").chomp
+        platform get_redhatish_platform(contents)
+        platform_version get_redhatish_version(contents)
+      end
+    elsif File.exist?("/etc/system-release")
       contents = File.read("/etc/system-release").chomp
       platform get_redhatish_platform(contents)
       platform_version get_redhatish_version(contents)
-    elsif File.exists?('/etc/gentoo-release')
+    elsif File.exist?('/etc/gentoo-release')
       platform "gentoo"
       platform_version File.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
-    elsif File.exists?('/etc/SuSE-release')
+    elsif File.exist?('/etc/SuSE-release')
       suse_release = File.read("/etc/SuSE-release")
       suse_version = suse_release.scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join(".")
       suse_version = suse_release[/VERSION = ([\d\.]{2,})/, 1] if suse_version == ""
@@ -80,15 +100,15 @@ Ohai.plugin(:Platform) do
       else
         platform "suse"
       end
-    elsif File.exists?('/etc/slackware-version')
+    elsif File.exist?('/etc/slackware-version')
       platform "slackware"
       platform_version File.read("/etc/slackware-version").scan(/(\d+|\.+)/).join
-    elsif File.exists?('/etc/arch-release')
+    elsif File.exist?('/etc/arch-release')
       platform "arch"
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 2.6.32-ARCH
       platform_version `uname -r`.strip
-    elsif File.exists?('/etc/exherbo-release')
+    elsif File.exist?('/etc/exherbo-release')
       platform "exherbo"
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 3.13

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

@@ -53,13 +53,19 @@
 # srcof qfe1
 # inet6 fe80::203:baff:fe17:4444/128
 
+# Extracted from http://illumos.org/hcl/
+ETHERNET_ENCAPS = %w{ afe amd8111s arn atge ath bfe bge bnx bnxe ce cxgbe
+                      dmfe e1000g efe elxl emlxs eri hermon hme hxge igb
+                      iprb ipw iwh iwi iwk iwp ixgb ixgbe mwl mxfe myri10ge
+                      nge ntxn nxge pcn platform qfe qlc ral rge rtls rtw rwd
+                      rwn sfe tavor vr wpi xge yge}
+
 Ohai.plugin(:Network) do
   provides "network", "network/interfaces"
   provides "counters/network", "counters/network/interfaces"
 
   def solaris_encaps_lookup(ifname)
-    return "Ethernet" if ifname.eql?("e1000g")
-    return "Ethernet" if ifname.eql?("eri")
+    return "Ethernet" if ETHERNET_ENCAPS.include?(ifname)
     return "Ethernet" if ifname.eql?("net")
     return "Loopback" if ifname.eql?("lo")
     "Unknown"
@@ -117,9 +123,11 @@ Ohai.plugin(:Network) do
       end
     end
 
+    # Device   IP Address               Mask      Flags      Phys Addr
+    # bge1   172.16.0.129         255.255.255.255 SPLA     00:03:ba:xx:xx:xx
     so = shell_out("arp -an")
     so.stdout.lines do |line|
-      if line =~ /([0-9a-zA-Z]+)\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\w+)\s+([a-zA-Z0-9\.\:\-]+)/
+      if line =~ /([0-9a-zA-Z]+)\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\w+)?\s+([a-zA-Z0-9\.\:\-]+)/
         next unless iface[arpname_to_ifname(iface, $1)] # this should never happen, except on solaris because sun hates you.
         iface[arpname_to_ifname(iface, $1)][:arp] = Mash.new unless iface[arpname_to_ifname(iface, $1)][:arp]
         iface[arpname_to_ifname(iface, $1)][:arp][$2] = $5

data/lib/ohai/system.rb

@@ -178,7 +178,7 @@ module Ohai
     # Pretty Print this object as JSON
     #
     def json_pretty_print(item=nil)
-      FFI_Yajl::Encoder.new(:pretty => true).encode(item || @data)
+      FFI_Yajl::Encoder.new(pretty: true, validate_utf8: false).encode(item || @data)
     end
 
     def attributes_print(a)

data/lib/ohai/version.rb

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

data/spec/spec_helper.rb

@@ -33,7 +33,7 @@ def get_plugin(plugin, ohai = Ohai::System.new, path = PLUGIN_PATH)
 end
 
 def convert_windows_output(stdout)
-    stdout.gsub("\n", "\r\n")
+  stdout.gsub("\n", "\r\n")
 end
 
 def it_should_check_from(plugin, attribute, from, value)
@@ -91,6 +91,10 @@ end
 
 RSpec.configure do |config|
 
+  # Not worth addressing warnings in Ohai until upstream ones in ffi-yajl are
+  # fixed.
+  # config.warnings = true
+
   config.raise_errors_for_deprecations!
 
   # `expect` should be preferred for new tests or when refactoring old tests,

data/spec/unit/mixin/ec2_metadata_spec.rb

@@ -49,7 +49,7 @@ describe Ohai::Mixin::Ec2Metadata do
       let(:response) { double("Net::HTTP Response", :body => "2020-01-01\nUnsupported", :code => "200") }
 
       it "raises an error" do
-        expect { mixin.best_api_version}.to raise_error
+        expect { mixin.best_api_version}.to raise_error(RuntimeError)
       end
     end
 
@@ -66,7 +66,7 @@ describe Ohai::Mixin::Ec2Metadata do
       let(:response) { double("Net::HTTP Response", :body => "1.0\n2011-05-01\n2012-01-12\nUnsupported", :code => "418") }
 
       it "raises an error" do
-        expect { mixin.best_api_version}.to raise_error
+        expect { mixin.best_api_version}.to raise_error(RuntimeError)
       end
     end
   end

data/spec/unit/plugins/cloud_v2_spec.rb

@@ -52,22 +52,22 @@ describe "CloudAttrs object" do
 
   it "throws exception with a bad ipv4 address" do
     @cloud_attr_obj = ::CloudAttrs.new()
-    expect {  @cloud_attr_obj.add_ipv6_addr("somebogusstring", :public) }.to raise_error
+    expect {  @cloud_attr_obj.add_ipv6_addr("somebogusstring", :public) }.to raise_error(RuntimeError)
   end
 
   it "throws exception with a bad ipv6 address" do
     @cloud_attr_obj = ::CloudAttrs.new()
-    expect {  @cloud_attr_obj.add_ipv6_addr("FEED:B0B:DEAD:BEEF", :public)  }.to raise_error
+    expect {  @cloud_attr_obj.add_ipv6_addr("FEED:B0B:DEAD:BEEF", :public)  }.to raise_error(RuntimeError)
   end
 
   it "throws exception with ipv6 address passed to ipv4" do
     @cloud_attr_obj = ::CloudAttrs.new()
-    expect {  @cloud_attr_obj.add_ipv4_addr("3ffe:506:2::1", :public) }.to raise_error
+    expect {  @cloud_attr_obj.add_ipv4_addr("3ffe:506:2::1", :public) }.to raise_error(RuntimeError)
   end
 
   it "throws exception with ipv4 address passed to ipv6" do
     @cloud_attr_obj = ::CloudAttrs.new()
-    expect {  @cloud_attr_obj.add_ipv6_addr("1.2.3.4", :public) }.to raise_error
+    expect {  @cloud_attr_obj.add_ipv6_addr("1.2.3.4", :public) }.to raise_error(RuntimeError)
   end
 
 

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

@@ -21,22 +21,40 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux plugin platform" do
+
+  let(:have_debian_version) { false }
+  let(:have_redhat_release) { false }
+  let(:have_gentoo_release) { false }
+  let(:have_exherbo_release) { false }
+  let(:have_suse_release) { false }
+  let(:have_arch_release) { false }
+  let(:have_system_release) { false }
+  let(:have_slackware_version) { false }
+  let(:have_enterprise_release) { false }
+  let(:have_oracle_release) { false }
+  let(:have_parallels_release) { false }
+  let(:have_raspi_config) { false }
+  let(:have_os_release) { false }
+
   before(:each) do
     @plugin = get_plugin("linux/platform")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
     @plugin[:lsb] = Mash.new
-    allow(File).to receive(:exists?).with("/etc/debian_version").and_return(false)
-    allow(File).to receive(:exists?).with("/etc/redhat-release").and_return(false)
-    allow(File).to receive(:exists?).with("/etc/gentoo-release").and_return(false)
-    allow(File).to receive(:exists?).with("/etc/exherbo-release").and_return(false)
-    allow(File).to receive(:exists?).with("/etc/SuSE-release").and_return(false)
-    allow(File).to receive(:exists?).with("/etc/arch-release").and_return(false)
-    allow(File).to receive(:exists?).with("/etc/system-release").and_return(false)
-    allow(File).to receive(:exists?).with("/etc/slackware-version").and_return(false)
-    allow(File).to receive(:exists?).with("/etc/enterprise-release").and_return(false)
-    allow(File).to receive(:exists?).with("/etc/oracle-release").and_return(false)
-    allow(File).to receive(:exists?).with("/etc/parallels-release").and_return(false)
-    allow(File).to receive(:exists?).with("/usr/bin/raspi-config").and_return(false)
+    allow(File).to receive(:exist?).with("/etc/debian_version").and_return(have_debian_version)
+    allow(File).to receive(:exist?).with("/etc/redhat-release").and_return(have_redhat_release)
+    allow(File).to receive(:exist?).with("/etc/gentoo-release").and_return(have_gentoo_release)
+    allow(File).to receive(:exist?).with("/etc/exherbo-release").and_return(have_exherbo_release)
+    allow(File).to receive(:exist?).with("/etc/SuSE-release").and_return(have_suse_release)
+    allow(File).to receive(:exist?).with("/etc/arch-release").and_return(have_arch_release)
+    allow(File).to receive(:exist?).with("/etc/system-release").and_return(have_system_release)
+    allow(File).to receive(:exist?).with("/etc/slackware-version").and_return(have_slackware_version)
+    allow(File).to receive(:exist?).with("/etc/enterprise-release").and_return(have_enterprise_release)
+    allow(File).to receive(:exist?).with("/etc/oracle-release").and_return(have_oracle_release)
+    allow(File).to receive(:exist?).with("/etc/parallels-release").and_return(have_parallels_release)
+    allow(File).to receive(:exist?).with("/usr/bin/raspi-config").and_return(have_raspi_config)
+    allow(File).to receive(:exist?).with("/etc/os-release").and_return(have_os_release)
+
+    allow(File).to receive(:read).with("PLEASE STUB ALL File.read CALLS")
   end
 
   describe "on lsb compliant distributions" do
@@ -109,9 +127,11 @@ describe Ohai::System, "Linux plugin platform" do
   end
 
   describe "on debian" do
+
+    let(:have_debian_version) { true }
+
     before(:each) do
       @plugin.lsb = nil
-      expect(File).to receive(:exists?).with("/etc/debian_version").and_return(true)
     end
 
     it "should read the version from /etc/debian_version" do
@@ -134,20 +154,26 @@ describe Ohai::System, "Linux plugin platform" do
       expect(@plugin[:platform]).to eq("ubuntu")
     end
 
-    # Raspbian is a debian clone
-    it "should detect Raspbian as itself with debian as the family" do
-      expect(File).to receive(:exists?).with("/usr/bin/raspi-config").and_return(true)
-      expect(File).to receive(:read).with("/etc/debian_version").and_return("wheezy/sid")
-      @plugin.run
-      expect(@plugin[:platform]).to eq("raspbian")
-      expect(@plugin[:platform_family]).to eq("debian")
+    context "on raspbian" do
+
+      let(:have_raspi_config) { true }
+
+      # Raspbian is a debian clone
+      it "should detect Raspbian as itself with debian as the family" do
+        expect(File).to receive(:read).with("/etc/debian_version").and_return("wheezy/sid")
+        @plugin.run
+        expect(@plugin[:platform]).to eq("raspbian")
+        expect(@plugin[:platform_family]).to eq("debian")
+      end
     end
   end
 
   describe "on slackware" do
+
+    let(:have_slackware_version) { true }
+
     before(:each) do
       @plugin.lsb = nil
-      expect(File).to receive(:exists?).with("/etc/slackware-version").and_return(true)
     end
 
     it "should set platform and platform_family to slackware" do
@@ -159,9 +185,11 @@ describe Ohai::System, "Linux plugin platform" do
   end
 
   describe "on arch" do
+
+    let(:have_arch_release) { true }
+
     before(:each) do
       @plugin.lsb = nil
-      expect(File).to receive(:exists?).with("/etc/arch-release").and_return(true)
     end
 
     it "should set platform to arch and platform_family to arch" do
@@ -175,13 +203,14 @@ describe Ohai::System, "Linux plugin platform" do
       @plugin.run
       expect(@plugin[:platform_version]).to eq('3.18.2-2-ARCH')
     end
-
   end
 
   describe "on gentoo" do
+
+    let(:have_gentoo_release) { true }
+
     before(:each) do
       @plugin.lsb = nil
-      expect(File).to receive(:exists?).with("/etc/gentoo-release").and_return(true)
     end
 
     it "should set platform and platform_family to gentoo" do
@@ -193,9 +222,11 @@ describe Ohai::System, "Linux plugin platform" do
   end
 
   describe "on exherbo" do
+
+    let(:have_exherbo_release) { true }
+
     before(:each) do
       @plugin.lsb = nil
-      expect(File).to receive(:exists?).with("/etc/exherbo-release").and_return(true)
     end
 
     it "should set platform and platform_family to exherbo" do
@@ -264,9 +295,11 @@ describe Ohai::System, "Linux plugin platform" do
     end
 
     describe "without lsb_release results" do
+
+      let(:have_redhat_release) { true }
+
       before(:each) do
         @plugin.lsb = nil
-        expect(File).to receive(:exists?).with("/etc/redhat-release").and_return(true)
       end
 
       it "should read the platform as centos and version as 5.3" do
@@ -310,17 +343,56 @@ describe Ohai::System, "Linux plugin platform" do
         expect(@plugin[:platform_version].to_i).to eq(13)
       end
 
+      # https://github.com/chef/ohai/issues/560
+      # Issue is seen on EL7, so that's what we're testing.
+      context "on versions that have /etc/os-release" do
+
+        let(:have_os_release) { true }
+
+        let(:os_release_content) do
+          <<-OS_RELEASE
+NAME="CentOS Linux"
+VERSION="7 (Core)"
+ID="centos"
+ID_LIKE="rhel fedora"
+VERSION_ID="7"
+PRETTY_NAME="CentOS Linux 7 (Core)"
+ANSI_COLOR="0;31"
+CPE_NAME="cpe:/o:centos:centos:7"
+HOME_URL="https://www.centos.org/"
+BUG_REPORT_URL="https://bugs.centos.org/"
+
+OS_RELEASE
+        end
+
+        before do
+          expect(File).to receive(:read).with("/etc/os-release").and_return(os_release_content)
+          expect(File).to receive(:read).with("/etc/redhat-release").and_return("CentOS release 7.1")
+        end
+
+        it "correctly detects EL7" do
+          @plugin.run
+          expect(@plugin[:platform]).to eq("centos")
+          expect(@plugin[:platform_version]).to eq("7.1")
+        end
+
+      end
+
     end
+
   end
 
   describe "on pcs linux" do
+
+    let(:have_redhat_release) { true }
+    let(:have_parallels_release) { true }
+
     describe "with lsb_result" do
+
       it "should read the platform as parallels and version as 6.0.5" do
         @plugin[:lsb][:id] = "CloudLinuxServer"
         @plugin[:lsb][:release] = "6.5"
-        allow(File).to receive(:exists?).with("/etc/redhat-release").and_return(true)
         allow(File).to receive(:read).with("/etc/redhat-release").and_return("CloudLinux Server release 6.5 (Pavel Popovich)")
-        expect(File).to receive(:exists?).with("/etc/parallels-release").and_return(true)
         expect(File).to receive(:read).with("/etc/parallels-release").and_return("Parallels Cloud Server 6.0.5 (20007)")
         @plugin.run
         expect(@plugin[:platform]).to eq("parallels")
@@ -330,14 +402,13 @@ describe Ohai::System, "Linux plugin platform" do
     end
 
     describe "without lsb_results" do
+
       before(:each) do
         @plugin.lsb = nil
       end
 
       it "should read the platform as parallels and version as 6.0.5" do
-        allow(File).to receive(:exists?).with("/etc/redhat-release").and_return(true)
         allow(File).to receive(:read).with("/etc/redhat-release").and_return("CloudLinux Server release 6.5 (Pavel Popovich)")
-        expect(File).to receive(:exists?).with("/etc/parallels-release").and_return(true)
         expect(File).to receive(:read).with("/etc/parallels-release").and_return("Parallels Cloud Server 6.0.5 (20007)")
         @plugin.run
         expect(@plugin[:platform]).to eq("parallels")
@@ -348,93 +419,104 @@ describe Ohai::System, "Linux plugin platform" do
   end
 
   describe "on oracle enterprise linux" do
-    describe "with lsb_results" do
-      it "should read the platform as oracle and version as 5.7" do
-        @plugin[:lsb][:id] = "EnterpriseEnterpriseServer"
-        @plugin[:lsb][:release] = "5.7"
-        allow(File).to receive(:exists?).with("/etc/redhat-release").and_return(true)
-        allow(File).to receive(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 5.7 (Tikanga)")
-        expect(File).to receive(:exists?).with("/etc/enterprise-release").and_return(true)
-        expect(File).to receive(:read).with("/etc/enterprise-release").and_return("Enterprise Linux Enterprise Linux Server release 5.7 (Carthage)")
-        @plugin.run
-        expect(@plugin[:platform]).to eq("oracle")
-        expect(@plugin[:platform_version]).to eq("5.7")
+
+    let(:have_redhat_release) { true }
+
+    context "with lsb_results" do
+
+      context "on version 5.x" do
+
+        let(:have_enterprise_release) { true }
+
+        it "should read the platform as oracle and version as 5.7" do
+          @plugin[:lsb][:id] = "EnterpriseEnterpriseServer"
+          @plugin[:lsb][:release] = "5.7"
+          allow(File).to receive(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 5.7 (Tikanga)")
+          expect(File).to receive(:read).with("/etc/enterprise-release").and_return("Enterprise Linux Enterprise Linux Server release 5.7 (Carthage)")
+          @plugin.run
+          expect(@plugin[:platform]).to eq("oracle")
+          expect(@plugin[:platform_version]).to eq("5.7")
+        end
       end
 
-      it "should read the platform as oracle and version as 6.1" do
-        @plugin[:lsb][:id] = "OracleServer"
-        @plugin[:lsb][:release] = "6.1"
-        allow(File).to receive(:exists?).with("/etc/redhat-release").and_return(true)
-        allow(File).to receive(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 6.1 (Santiago)")
-        expect(File).to receive(:exists?).with("/etc/oracle-release").and_return(true)
-        expect(File).to receive(:read).with("/etc/oracle-release").and_return("Oracle Linux Server release 6.1")
-        @plugin.run
-        expect(@plugin[:platform]).to eq("oracle")
-        expect(@plugin[:platform_version]).to eq("6.1")
+      context "on version 6.x" do
+
+        let(:have_oracle_release) { true }
+
+        it "should read the platform as oracle and version as 6.1" do
+          @plugin[:lsb][:id] = "OracleServer"
+          @plugin[:lsb][:release] = "6.1"
+          allow(File).to receive(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 6.1 (Santiago)")
+          expect(File).to receive(:read).with("/etc/oracle-release").and_return("Oracle Linux Server release 6.1")
+          @plugin.run
+          expect(@plugin[:platform]).to eq("oracle")
+          expect(@plugin[:platform_version]).to eq("6.1")
+        end
+
       end
     end
 
-    describe "without lsb_results" do
+    context "without lsb_results" do
       before(:each) do
         @plugin.lsb = nil
       end
 
-      it "should read the platform as oracle and version as 5" do
-        allow(File).to receive(:exists?).with("/etc/redhat-release").and_return(true)
-        allow(File).to receive(:read).with("/etc/redhat-release").and_return("Enterprise Linux Enterprise Linux Server release 5 (Carthage)")
-        expect(File).to receive(:exists?).with("/etc/enterprise-release").and_return(true)
-        expect(File).to receive(:read).with("/etc/enterprise-release").and_return("Enterprise Linux Enterprise Linux Server release 5 (Carthage)")
-        @plugin.run
-        expect(@plugin[:platform]).to eq("oracle")
-        expect(@plugin[:platform_version]).to eq("5")
-      end
+      context "on version 5.x" do
 
-      it "should read the platform as oracle and version as 5.1" do
-        allow(File).to receive(:exists?).with("/etc/redhat-release").and_return(true)
-        allow(File).to receive(:read).with("/etc/redhat-release").and_return("Enterprise Linux Enterprise Linux Server release 5.1 (Carthage)")
-        expect(File).to receive(:exists?).with("/etc/enterprise-release").and_return(true)
-        expect(File).to receive(:read).with("/etc/enterprise-release").and_return("Enterprise Linux Enterprise Linux Server release 5.1 (Carthage)")
-        @plugin.run
-        expect(@plugin[:platform]).to eq("oracle")
-        expect(@plugin[:platform_version]).to eq("5.1")
-      end
+        let(:have_enterprise_release) { true }
 
-      it "should read the platform as oracle and version as 5.7" do
-        allow(File).to receive(:exists?).with("/etc/redhat-release").and_return(true)
-        allow(File).to receive(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 5.7 (Tikanga)")
-        expect(File).to receive(:exists?).with("/etc/enterprise-release").and_return(true)
-        expect(File).to receive(:read).with("/etc/enterprise-release").and_return("Enterprise Linux Enterprise Linux Server release 5.7 (Carthage)")
-        @plugin.run
-        expect(@plugin[:platform]).to eq("oracle")
-        expect(@plugin[:platform_version]).to eq("5.7")
-      end
+        it "should read the platform as oracle and version as 5" do
+          allow(File).to receive(:read).with("/etc/redhat-release").and_return("Enterprise Linux Enterprise Linux Server release 5 (Carthage)")
+          expect(File).to receive(:read).with("/etc/enterprise-release").and_return("Enterprise Linux Enterprise Linux Server release 5 (Carthage)")
+          @plugin.run
+          expect(@plugin[:platform]).to eq("oracle")
+          expect(@plugin[:platform_version]).to eq("5")
+        end
+
+        it "should read the platform as oracle and version as 5.1" do
+          allow(File).to receive(:read).with("/etc/redhat-release").and_return("Enterprise Linux Enterprise Linux Server release 5.1 (Carthage)")
+          expect(File).to receive(:read).with("/etc/enterprise-release").and_return("Enterprise Linux Enterprise Linux Server release 5.1 (Carthage)")
+          @plugin.run
+          expect(@plugin[:platform]).to eq("oracle")
+          expect(@plugin[:platform_version]).to eq("5.1")
+        end
+
+        it "should read the platform as oracle and version as 5.7" do
+          allow(File).to receive(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 5.7 (Tikanga)")
+          expect(File).to receive(:read).with("/etc/enterprise-release").and_return("Enterprise Linux Enterprise Linux Server release 5.7 (Carthage)")
+          @plugin.run
+          expect(@plugin[:platform]).to eq("oracle")
+          expect(@plugin[:platform_version]).to eq("5.7")
+        end
 
-      it "should read the platform as oracle and version as 6.0" do
-        allow(File).to receive(:exists?).with("/etc/redhat-release").and_return(true)
-        allow(File).to receive(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 6.0 (Santiago)")
-        expect(File).to receive(:exists?).with("/etc/oracle-release").and_return(true)
-        expect(File).to receive(:read).with("/etc/oracle-release").and_return("Oracle Linux Server release 6.0")
-        @plugin.run
-        expect(@plugin[:platform]).to eq("oracle")
-        expect(@plugin[:platform_version]).to eq("6.0")
       end
 
-      it "should read the platform as oracle and version as 6.1" do
-        allow(File).to receive(:exists?).with("/etc/redhat-release").and_return(true)
-        allow(File).to receive(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 6.1 (Santiago)")
-        expect(File).to receive(:exists?).with("/etc/oracle-release").and_return(true)
-        expect(File).to receive(:read).with("/etc/oracle-release").and_return("Oracle Linux Server release 6.1")
-        @plugin.run
-        expect(@plugin[:platform]).to eq("oracle")
-        expect(@plugin[:platform_version]).to eq("6.1")
+      context "on version 6.x" do
+
+        let(:have_oracle_release) { true }
+
+        it "should read the platform as oracle and version as 6.0" do
+          allow(File).to receive(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 6.0 (Santiago)")
+          expect(File).to receive(:read).with("/etc/oracle-release").and_return("Oracle Linux Server release 6.0")
+          @plugin.run
+          expect(@plugin[:platform]).to eq("oracle")
+          expect(@plugin[:platform_version]).to eq("6.0")
+        end
+
+        it "should read the platform as oracle and version as 6.1" do
+          allow(File).to receive(:read).with("/etc/redhat-release").and_return("Red Hat Enterprise Linux Server release 6.1 (Santiago)")
+          expect(File).to receive(:read).with("/etc/oracle-release").and_return("Oracle Linux Server release 6.1")
+          @plugin.run
+          expect(@plugin[:platform]).to eq("oracle")
+          expect(@plugin[:platform_version]).to eq("6.1")
+        end
       end
     end
   end
 
   describe "on suse" do
-    before(:each) do
-      expect(File).to receive(:exists?).with("/etc/SuSE-release").and_return(true)
-    end
+
+    let(:have_suse_release) { true }
 
     describe "with lsb_release results" do
       before(:each) do
@@ -510,4 +592,19 @@ describe Ohai::System, "Linux plugin platform" do
       end
     end
   end
+
+  describe "on Wind River Linux for Cisco Nexus" do
+
+    let(:have_redhat_release) { true }
+
+    let(:have_os_release) { true }
+
+    it "should set platform to nexus and platform_family to wrlinux" do
+      @plugin.lsb = nil
+      expect(File).to receive(:read).with("/etc/os-release").and_return("ID_LIKE=wrlinux\nID=nexus\nCISCO_RELEASE_INFO=/etc/os-release")
+      @plugin.run
+      expect(@plugin[:platform]).to eq("nexus")
+      expect(@plugin[:platform_family]).to eq("wrlinux")
+    end
+  end
 end

data/spec/unit/plugins/platform_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -32,20 +32,20 @@ describe Ohai::System, "plugin platform" do
     expect(@plugin[:platform]).to eql("monkey")
     expect(@plugin[:platform_family]).to eql("monkey")
   end
-  
+
   it "should not set the platform to the os if it was set earlier" do
     @plugin[:platform] = 'lars'
     @plugin.run
     expect(@plugin[:platform]).to eql("lars")
   end
-  
+
   it "should set the platform_family to the platform if platform was set earlier but not platform_family" do
     @plugin[:platform] = 'lars'
     @plugin[:platform_family] = 'jack'
     @plugin.run
     expect(@plugin[:platform_family]).to eql("jack")
   end
- 
+
   it "should not set the platform_family if the platform_family was set earlier." do
     @plugin[:platform] = 'lars'
     @plugin.run
@@ -57,7 +57,7 @@ describe Ohai::System, "plugin platform" do
     @plugin.run
     expect(@plugin[:os_version]).to eql("poop")
   end
-  
+
   it "should not set the platform to the os if it was set earlier" do
     @plugin[:platform_version] = 'ulrich'
     @plugin.run

data/spec/unit/plugins/ruby_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -47,14 +47,14 @@ describe Ohai::System, "plugin ruby" do
     :host_cpu => ::RbConfig::CONFIG['host_cpu'],
     :host_os => ::RbConfig::CONFIG['host_os'],
     :host_vendor => ::RbConfig::CONFIG['host_vendor'],
-    :gems_dir => %x{#{ruby_bin} #{::RbConfig::CONFIG['bindir']}/gem env gemdir}.chomp!,
+    :gems_dir => %x{#{ruby_bin} #{::RbConfig::CONFIG['bindir']}/gem env gemdir}.chomp,
     :gem_bin => [ ::Gem.default_exec_format % 'gem', 'gem' ].map{|bin| "#{::RbConfig::CONFIG['bindir']}/#{bin}"
       }.find{|bin| ::File.exists? bin},
     :ruby_bin => ruby_bin
   }.each do |attribute, value|
-    it "should have #{attribute} set" do
+    it "should have #{attribute} set to #{value.inspect}" do
       expect(@ruby_ohai_data[attribute]).to eql(value)
     end
   end
-  
+
 end

data/spec/unit/runner_spec.rb

@@ -141,7 +141,7 @@ describe Ohai::Runner, "run_plugin" do
       end
 
       it "should not run the plugin" do
-        expect{ @runner.run_plugin(@plugin) }.to raise_error
+        expect{ @runner.run_plugin(@plugin) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
         expect(@plugin.has_run?).to be false
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.4.0
+  version: 8.5.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -42,22 +42,16 @@ dependencies:
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -537,7 +531,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON