ohai 8.10.0 → 8.11.1

data/spec/unit/plugins/ruby_spec.rb

@@ -16,10 +16,9 @@
 # limitations under the License.
 #
 
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
-
-ruby_bin = File.join(::RbConfig::CONFIG['bindir'], ::RbConfig::CONFIG['ruby_install_name'])
+ruby_bin = File.join(::RbConfig::CONFIG["bindir"], ::RbConfig::CONFIG["ruby_install_name"])
 
 describe Ohai::System, "plugin ruby" do
 
@@ -39,18 +38,18 @@ describe Ohai::System, "plugin ruby" do
     :platform => RUBY_PLATFORM,
     :version => RUBY_VERSION,
     :release_date => RUBY_RELEASE_DATE,
-    :target => ::RbConfig::CONFIG['target'],
-    :target_cpu => ::RbConfig::CONFIG['target_cpu'],
-    :target_vendor => ::RbConfig::CONFIG['target_vendor'],
-    :target_os => ::RbConfig::CONFIG['target_os'],
-    :host => ::RbConfig::CONFIG['host'],
-    :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,
-    :gem_bin => [ ::Gem.default_exec_format % 'gem', 'gem' ].map{|bin| "#{::RbConfig::CONFIG['bindir']}/#{bin}"
-    }.find{|bin| ::File.exists? bin},
-    :ruby_bin => ruby_bin
+    :target => ::RbConfig::CONFIG["target"],
+    :target_cpu => ::RbConfig::CONFIG["target_cpu"],
+    :target_vendor => ::RbConfig::CONFIG["target_vendor"],
+    :target_os => ::RbConfig::CONFIG["target_os"],
+    :host => ::RbConfig::CONFIG["host"],
+    :host_cpu => ::RbConfig::CONFIG["host_cpu"],
+    :host_os => ::RbConfig::CONFIG["host_os"],
+    :host_vendor => ::RbConfig::CONFIG["host_vendor"],
+    :gems_dir => `#{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 to #{value.inspect}" do
       expect(@ruby_ohai_data[attribute]).to eql(value)

data/spec/unit/plugins/rust_spec.rb

@@ -14,10 +14,10 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
 
 describe Ohai::System, "plugin rust" do
-  let(:stdout) {"rustc 1.0.0-nightly (29bd9a06e 2015-01-20 23:03:09 +0000)"}
+  let(:stdout) { "rustc 1.0.0-nightly (29bd9a06e 2015-01-20 23:03:09 +0000)" }
   let (:plugin) do
     plugin = get_plugin("rust")
     plugin[:languages] = Mash.new

data/spec/unit/plugins/sigar/network_route_spec.rb

@@ -16,16 +16,16 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 sigar_available = begin
-  require 'sigar'
+  require "sigar"
   true
 rescue LoadError
   false
 end
 
-require 'ohai'
+require "ohai"
 
 describe Ohai::System, "Sigar network route plugin" do
 
@@ -36,18 +36,18 @@ describe Ohai::System, "Sigar network route plugin" do
       @plugin = get_plugin("sigar/network", @ohai)
       allow(@plugin).to receive(:collect_os).and_return(:sigar)
       @sigar = double("Sigar")
-      @net_info_conf={
+      @net_info_conf = {
         :default_gateway => "192.168.1.254",
         :default_gateway_interface => "eth0",
         :primary_dns => "192.168.1.254",
         :secondary_dns => "8.8.8.8",
-        :host_name => "localhost"
+        :host_name => "localhost",
       }
-      net_info=double("Sigar::NetInfo")
-      @net_info_conf.each_pair do |k,v|
+      net_info = double("Sigar::NetInfo")
+      @net_info_conf.each_pair do |k, v|
         allow(net_info).to receive(k).and_return(v)
       end
-      @net_route_conf={
+      @net_route_conf = {
         :destination => "192.168.1.0",
         :gateway => "0.0.0.0",
         :mask => "255.255.255.0",
@@ -58,13 +58,13 @@ describe Ohai::System, "Sigar network route plugin" do
         :mtu => 0,
         :window => 0,
         :irtt => 0,
-        :ifname => "eth0"
+        :ifname => "eth0",
       }
-      net_route=double("Sigar::NetRoute")
-      @net_route_conf.each_pair do |k,v|
+      net_route = double("Sigar::NetRoute")
+      @net_route_conf.each_pair do |k, v|
         allow(net_route).to receive(k).and_return(v)
       end
-      @net_interface_conf={
+      @net_interface_conf = {
         :flags => 2115,
         :destination => "192.168.1.1",
         :mtu => 1500,
@@ -77,39 +77,39 @@ describe Ohai::System, "Sigar network route plugin" do
         :tx_queue_len => 1000,
         :prefix6_length => 0,
       }
-      net_conf=double("Sigar::NetConf")
-      @net_interface_conf.each_pair do |k,v|
+      net_conf = double("Sigar::NetConf")
+      @net_interface_conf.each_pair do |k, v|
         allow(net_conf).to receive(k).and_return(v)
       end
-      @net_interface_stat={
-        :rx_bytes=>1369035618,
-        :rx_dropped=>0,
-        :rx_errors=>0,
-        :rx_frame=>0,
-        :rx_overruns=>0,
-        :rx_packets=>7271669,
-        :speed=>-1,
-        :tx_bytes=>3482843666,
-        :tx_carrier=>0,
-        :tx_collisions=>0,
-        :tx_dropped=>0,
-        :tx_errors=>0,
-        :tx_overruns=>0,
-        :tx_packets=>4392794
+      @net_interface_stat = {
+        :rx_bytes => 1369035618,
+        :rx_dropped => 0,
+        :rx_errors => 0,
+        :rx_frame => 0,
+        :rx_overruns => 0,
+        :rx_packets => 7271669,
+        :speed => -1,
+        :tx_bytes => 3482843666,
+        :tx_carrier => 0,
+        :tx_collisions => 0,
+        :tx_dropped => 0,
+        :tx_errors => 0,
+        :tx_overruns => 0,
+        :tx_packets => 4392794,
       }
-      net_stat=double("Sigar::NetStat")
-      @net_interface_stat.each_pair do |k,v|
+      net_stat = double("Sigar::NetStat")
+      @net_interface_stat.each_pair do |k, v|
         allow(net_stat).to receive(k).and_return(v)
       end
-      @net_arp_conf={
+      @net_arp_conf = {
         :address => "192.168.1.5",
         :flags => 2,
         :hwaddr => "00:15:62:96:01:D0",
         :ifname => "eth0",
         :type => "ether",
       }
-      net_arp=double("Sigar::NetArp")
-      @net_arp_conf.each_pair do |k,v|
+      net_arp = double("Sigar::NetArp")
+      @net_arp_conf.each_pair do |k, v|
         allow(net_arp).to receive(k).and_return(v)
       end
       allow(@sigar).to receive(:fqdn).and_return("localhost.localdomain")
@@ -131,10 +131,10 @@ describe Ohai::System, "Sigar network route plugin" do
     end
 
     it "should set the route details" do
-      @net_route_conf.each_pair do |k,v|
+      @net_route_conf.each_pair do |k, v|
         # Work around the above doubleing of net_route_list skipping the call to flags()
         if k == :flags
-          v="U"
+          v = "U"
           @plugin[:network][:interfaces][:eth0][:route]["192.168.1.0"][k] = v
         end
         expect(@plugin[:network][:interfaces][:eth0][:route]["192.168.1.0"]).to have_key(k)

data/spec/unit/plugins/softlayer_spec.rb

@@ -17,42 +17,42 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 
-describe Ohai::System, 'plugin softlayer' do
+describe Ohai::System, "plugin softlayer" do
   let(:plugin) { get_plugin("softlayer") }
 
   it "not create softlayer if hint file doesn't exists" do
-    allow(@plugin).to receive(:hint?).with('softlayer').and_return(false)
+    allow(@plugin).to receive(:hint?).with("softlayer").and_return(false)
     plugin.run
     expect(plugin[:softlayer]).to be_nil
   end
 
   it "do not create node if fetch_metadata raise an error" do
-    allow(plugin).to receive(:hint?).with('softlayer').and_return(false)
+    allow(plugin).to receive(:hint?).with("softlayer").and_return(false)
     allow(plugin).to receive(:fetch_metadata).and_raise(StandardError.new("TEST"))
     plugin.run
     expect(plugin[:softlayer]).to be_nil
   end
 
   it "create empty node if fetch_metadata return empty hash" do
-    allow(plugin).to receive(:hint?).with('softlayer').and_return(true)
+    allow(plugin).to receive(:hint?).with("softlayer").and_return(true)
     allow(plugin).to receive(:fetch_metadata).and_return({})
     plugin.run
     expect(plugin[:softlayer]).to eq({})
   end
 
   it "create empty node if fetch_metadata return hash with nil values" do
-    metadata = { 'local_ipv4' => nil, 'public_ipv4' => nil, 'public_fqdn' => nil}
-    allow(plugin).to receive(:hint?).with('softlayer').and_return(true)
+    metadata = { "local_ipv4" => nil, "public_ipv4" => nil, "public_fqdn" => nil }
+    allow(plugin).to receive(:hint?).with("softlayer").and_return(true)
     allow(plugin).to receive(:fetch_metadata).and_return(metadata)
     plugin.run
     expect(plugin[:softlayer]).to eq(metadata)
   end
 
-  it 'populate softlayer node with required attributes' do
-    metadata = { 'local_ipv4' => '192.168.0.1', 'public_ipv4' => '8.8.8.8', 'public_fqdn' => 'abc1234.public.com'}
-    allow(plugin).to receive(:hint?).with('softlayer').and_return(true)
+  it "populate softlayer node with required attributes" do
+    metadata = { "local_ipv4" => "192.168.0.1", "public_ipv4" => "8.8.8.8", "public_fqdn" => "abc1234.public.com" }
+    allow(plugin).to receive(:hint?).with("softlayer").and_return(true)
     allow(plugin).to receive(:fetch_metadata).and_return(metadata)
     plugin.run
     expect(plugin[:softlayer]).to eq(metadata)

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

@@ -14,14 +14,14 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "Solaris2.X cpu plugin" do
   before(:each) do
     @plugin = get_plugin("solaris2/cpu")
     allow(@plugin).to receive(:collect_os).and_return("solaris2")
   end
-  
+
   describe "on x86 processors" do
     before(:each) do
       kstatinfo_output = <<-END
@@ -91,7 +91,7 @@ cpu_info:2:cpu_info2:current_cstate     0
 cpu_info:2:cpu_info2:family     12
 cpu_info:2:cpu_info2:fpu_type   i387 compatible
 cpu_info:2:cpu_info2:implementation     x86 (chipid 0x1 GenuineIntel family 6 model 26 step 5 clock 2926 MHz)
-cpu_info:2:cpu_info2:model     93 
+cpu_info:2:cpu_info2:model     93
 cpu_info:2:cpu_info2:ncore_per_chip     4
 cpu_info:2:cpu_info2:ncpu_per_chip      8
 cpu_info:2:cpu_info2:pg_id      7
@@ -247,7 +247,7 @@ cpu_info:8:cpu_info8:current_cstate     1
 cpu_info:8:cpu_info8:family     12
 cpu_info:8:cpu_info8:fpu_type   i387 compatible
 cpu_info:8:cpu_info8:implementation     x86 (chipid 0x1 GenuineIntel family 6 model 26 step 5 clock 2926 MHz)
-cpu_info:8:cpu_info8:model     93 
+cpu_info:8:cpu_info8:model     93
 cpu_info:8:cpu_info8:ncore_per_chip     4
 cpu_info:8:cpu_info8:ncpu_per_chip      8
 cpu_info:8:cpu_info8:pg_id      1
@@ -461,14 +461,14 @@ END
     it "should get the total number of online cores" do
       expect(@plugin["cpu"]["cpustates"]["on-line"]).to eql (8)
     end
-   
+
     it "should get the total number of offline cores" do
       expect(@plugin["cpu"]["cpustates"]["off-line"]).to eql (8)
     end
- 
+
     describe "per-cpu information" do
       it "should include processor vendor_ids" do
-        # CPU Socket 0 
+        # CPU Socket 0
         expect(@plugin["cpu"]["15"]["vendor_id"]).to eql("GenuineIntel")
         expect(@plugin["cpu"]["13"]["vendor_id"]).to eql("GenuineIntel")
         expect(@plugin["cpu"]["11"]["vendor_id"]).to eql("GenuineIntel")
@@ -566,7 +566,7 @@ END
         expect(@plugin["cpu"]["4"]["stepping"]).to eql("9")
         expect(@plugin["cpu"]["2"]["stepping"]).to eql("9")
         expect(@plugin["cpu"]["0"]["stepping"]).to eql("9")
- 
+
       end
 
       it "should include processor model names" do
@@ -627,8 +627,7 @@ END
       end
     end
   end
-  
-  
+
   describe "on sparc processors" do
     before(:each) do
       kstatinfo_output = <<-END
@@ -2812,7 +2811,7 @@ END
       allow(@plugin).to receive(:shell_out).with("kstat -p cpu_info").and_return(mock_shell_out(0, kstatinfo_output, ""))
       @plugin.run
     end
-    
+
     it "should get the total virtual processor count" do
       expect(@plugin["cpu"]["total"]).to eql(128)
     end
@@ -2820,11 +2819,11 @@ END
     it "should get the total processor count" do
       expect(@plugin["cpu"]["real"]).to eql(1)
     end
-    
+
     it "should get the total core count" do
       expect(@plugin["cpu"]["cores"]).to eql(16)
     end
-   
+
     it "should get the number of threads per core" do
       expect(@plugin["cpu"]["corethreads"]).to eql(8)
     end
@@ -2832,11 +2831,11 @@ END
     it "should get the total number of online cores" do
       expect(@plugin["cpu"]["cpustates"]["on-line"]).to eql(124)
     end
-   
+
     it "should get the total number of offline cores" do
       expect(@plugin["cpu"]["cpustates"]["off-line"]).to eql(4)
     end
-     
+
     describe "per-cpu information" do
       it "should include processor model names" do
         expect(@plugin["cpu"]["0"]["model_name"]).to eql("SPARC-T3")
@@ -2890,7 +2889,7 @@ END
         expect(@plugin["cpu"]["120"]["core_id"]).to eql("1131")
       end
 
-     it "should include processor architecture" do
+      it "should include processor architecture" do
         expect(@plugin["cpu"]["0"]["arch"]).to eql("sparcv9")
         expect(@plugin["cpu"]["1"]["arch"]).to eql("sparcv9")
         expect(@plugin["cpu"]["2"]["arch"]).to eql("sparcv9")
@@ -2899,9 +2898,9 @@ END
         expect(@plugin["cpu"]["125"]["arch"]).to eql("sparcv9")
         expect(@plugin["cpu"]["126"]["arch"]).to eql("sparcv9")
         expect(@plugin["cpu"]["127"]["arch"]).to eql("sparcv9")
-     end
+      end
 
-     it "should include processor FPU type" do
+      it "should include processor FPU type" do
         expect(@plugin["cpu"]["0"]["fpu_type"]).to eql("sparcv9")
         expect(@plugin["cpu"]["1"]["fpu_type"]).to eql("sparcv9")
         expect(@plugin["cpu"]["2"]["fpu_type"]).to eql("sparcv9")
@@ -2910,9 +2909,9 @@ END
         expect(@plugin["cpu"]["125"]["fpu_type"]).to eql("sparcv9")
         expect(@plugin["cpu"]["126"]["fpu_type"]).to eql("sparcv9")
         expect(@plugin["cpu"]["127"]["fpu_type"]).to eql("sparcv9")
-     end
+      end
 
-     it "should include processor state" do
+      it "should include processor state" do
         expect(@plugin["cpu"]["0"]["state"]).to eql("on-line")
         expect(@plugin["cpu"]["1"]["state"]).to eql("on-line")
         expect(@plugin["cpu"]["2"]["state"]).to eql("on-line")
@@ -2921,7 +2920,7 @@ END
         expect(@plugin["cpu"]["125"]["state"]).to eql("off-line")
         expect(@plugin["cpu"]["126"]["state"]).to eql("off-line")
         expect(@plugin["cpu"]["127"]["state"]).to eql("off-line")
-     end
+      end
     end
   end
 end

data/spec/unit/plugins/solaris2/dmi_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 SOLARIS_DMI_OUT = <<-EOS
 ID    SIZE TYPE
@@ -127,16 +127,16 @@ describe Ohai::System, "Solaris2.X DMI plugin" do
   {
     bios: {
       vendor: "American Megatrends Inc.",
-      release_date: "08/26/2014"
+      release_date: "08/26/2014",
     },
     system: {
       manufacturer: "System manufacturer",
-      product: "System Product Name"
+      product: "System Product Name",
     },
     chassis: {
       lock_present: "N",
-      asset_tag: "PCS"
-    }
+      asset_tag: "PCS",
+    },
   }.each do |id, data|
     data.each do |attribute, value|
       it "should have [:dmi][:#{id}][:#{attribute}] set" do
@@ -151,4 +151,3 @@ describe Ohai::System, "Solaris2.X DMI plugin" do
     expect(@plugin[:dmi]).not_to have_key(:on_board_devices)
   end
 end
-

data/spec/unit/plugins/solaris2/filesystem.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative '../../../spec_helper'
+require_relative "../../../spec_helper"
 
 describe Ohai::System, "Solaris2.X filesystem plugin" do
   let(:plugin) { get_plugin("solaris2/filesystem") }
@@ -68,15 +68,15 @@ describe Ohai::System, "Solaris2.X filesystem plugin" do
 
       context "as a String" do
         include_examples "configured zfs properties" do
-          let(:zfs_properties) { 'mountpoint,creation,available,used' }
-          let(:expected_cmd) { 'mountpoint,creation,available,used' }
+          let(:zfs_properties) { "mountpoint,creation,available,used" }
+          let(:expected_cmd) { "mountpoint,creation,available,used" }
         end
       end
 
       context "as an Array" do
         include_examples "configured zfs properties" do
-          let(:zfs_properties) { ['mountpoint', 'creation', 'available', 'used'] }
-          let(:expected_cmd) { 'mountpoint,creation,available,used' }
+          let(:zfs_properties) { %w{mountpoint creation available used} }
+          let(:expected_cmd) { "mountpoint,creation,available,used" }
         end
       end
     end