ohai 8.10.0 → 8.11.1

data/spec/unit/plugins/java_spec.rb

@@ -17,7 +17,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")
 
 describe Ohai::System, "plugin java (Java5 Client VM)" do
   before(:each) do
@@ -114,6 +114,51 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
     end
   end
 
+  shared_examples_for "when the openjdk 1.8 is installed" do
+
+    before(:each) do
+      @stderr = "openjdk version \"1.8.0_71\"\nOpenJDK Runtime Environment (build 1.8.0_71-b15)\nOpenJDK 64-Bit Server VM (build 25.71-b15, mixed mode)"
+      allow(@plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
+    end
+
+    it "should run java -mx64m -version" do
+      expect(@plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
+      @plugin.run
+    end
+
+    it "should set java[:version]" do
+      @plugin.run
+      expect(@plugin[:languages][:java][:version]).to eql("1.8.0_71")
+    end
+
+    it "should set java[:runtime][:name] to runtime name" do
+      @plugin.run
+      expect(@plugin[:languages][:java][:runtime][:name]).to eql("OpenJDK Runtime Environment")
+    end
+
+    it "should set java[:runtime][:build] to runtime build" do
+      @plugin.run
+      expect(@plugin[:languages][:java][:runtime][:build]).to eql("1.8.0_71-b15")
+    end
+
+    it "should set java[:hotspot][:name] to hotspot name" do
+      @plugin.run
+      expect(@plugin[:languages][:java][:hotspot][:name]).to eql("OpenJDK 64-Bit Server VM")
+    end
+
+    it "should set java[:hotspot][:build] to hotspot build" do
+      @plugin.run
+      expect(@plugin[:languages][:java][:hotspot][:build]).to eql("25.71-b15, mixed mode")
+    end
+
+    it "should not set the languages[:java] tree up if java command fails" do
+      @stderr = "Some error output here"
+      allow(@plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
+      @plugin.run
+      expect(@plugin[:languages]).not_to have_key(:java)
+    end
+  end
+
   context "when not on Mac OS X" do
     before do
       stub_const("RUBY_PLATFORM", "x86_64-linux")
@@ -125,6 +170,9 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
     context "and the server JRE is installed" do
       include_examples "when the Server JRE is installed"
     end
+    context "and the openjdk 1.8 is installed" do
+      include_examples "when the openjdk 1.8 is installed"
+    end
   end
 
   context "when on Mac OS X with Java installed" do
@@ -149,6 +197,9 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
       context "and the server JRE is installed" do
         include_examples "when the Server JRE is installed"
       end
+      context "and the openjdk 1.8 is installed" do
+        include_examples "when the openjdk 1.8 is installed"
+      end
     end
 
     context "and the JVM stubs are installed" do

data/spec/unit/plugins/joyent_spec.rb

@@ -1,9 +1,8 @@
-require 'spec_helper'
-
+require "spec_helper"
 
 describe Ohai::System, "plugin joyent" do
   before(:each) do
-    @plugin = get_plugin('joyent')
+    @plugin = get_plugin("joyent")
   end
 
   describe "without joyent" do
@@ -35,7 +34,7 @@ describe Ohai::System, "plugin joyent" do
       end
 
       it "should ditect global zone" do
-        expect(@plugin[:joyent][:sm_uuid]).to eql 'global'
+        expect(@plugin[:joyent][:sm_uuid]).to eql "global"
       end
 
       it "should NOT create sm_id" do
@@ -45,19 +44,19 @@ describe Ohai::System, "plugin joyent" do
 
     describe "under smartmachine" do
       before(:each) do
-        @plugin[:virtualization][:guest_uuid] = 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx'
-        @plugin[:virtualization][:guest_id] = '30'
+        @plugin[:virtualization][:guest_uuid] = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
+        @plugin[:virtualization][:guest_id] = "30"
         allow(@plugin).to receive(:collect_product_file).and_return(["Name: Joyent Instance", "Image: base64 13.4.2", "Documentation: http://wiki.joyent.com/jpc2/SmartMachine+Base"])
-        allow(@plugin).to receive(:collect_pkgsrc).and_return('http://pkgsrc.joyent.com/packages/SmartOS/2013Q4/x86_64/All')
+        allow(@plugin).to receive(:collect_pkgsrc).and_return("http://pkgsrc.joyent.com/packages/SmartOS/2013Q4/x86_64/All")
         @plugin.run
       end
 
       it "should retrive zone uuid" do
-        expect(@plugin[:joyent][:sm_uuid]).to eql 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx'
+        expect(@plugin[:joyent][:sm_uuid]).to eql "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
       end
 
       it "should collect sm_id" do
-        expect(@plugin[:joyent][:sm_id]).to eql '30'
+        expect(@plugin[:joyent][:sm_id]).to eql "30"
       end
 
       it "should collect images" do
@@ -66,9 +65,8 @@ describe Ohai::System, "plugin joyent" do
       end
 
       it "should collect pkgsrc" do
-        expect(@plugin[:joyent][:sm_pkgsrc]).to eql 'http://pkgsrc.joyent.com/packages/SmartOS/2013Q4/x86_64/All'
+        expect(@plugin[:joyent][:sm_pkgsrc]).to eql "http://pkgsrc.joyent.com/packages/SmartOS/2013Q4/x86_64/All"
       end
     end
   end
 end
-

data/spec/unit/plugins/kernel_spec.rb

@@ -16,8 +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")
 
 describe Ohai::System, "plugin kernel" do
   before(:each) do
@@ -39,7 +38,7 @@ describe Ohai::System, "plugin kernel" do
 
   describe "when running on windows", :windows_only do
     before do
-      require 'wmi-lite/wmi'
+      require "wmi-lite/wmi"
 
       @ohai_system = Ohai::System.new
       @plugin = get_plugin("kernel", @ohai_system)
@@ -52,30 +51,30 @@ describe Ohai::System, "plugin kernel" do
       os_type = double("WIN32OLE", :name => "OsType")
       os_properties = [ caption, version, build_number, csd_version, os_type ]
 
-      os =  double( "WIN32OLE",
+      os = double( "WIN32OLE",
                     :properties_ => os_properties)
 
-      allow(os).to receive(:invoke).with(build_number.name).and_return('7601')
-      allow(os).to receive(:invoke).with(csd_version.name).and_return('Service Pack 1')
+      allow(os).to receive(:invoke).with(build_number.name).and_return("7601")
+      allow(os).to receive(:invoke).with(csd_version.name).and_return("Service Pack 1")
       allow(os).to receive(:invoke).with(os_type.name).and_return(18)
-      allow(os).to receive(:invoke).with(caption.name).and_return('Microsoft Windows 7 Ultimate')
-      allow(os).to receive(:invoke).with(version.name).and_return('6.1.7601')
+      allow(os).to receive(:invoke).with(caption.name).and_return("Microsoft Windows 7 Ultimate")
+      allow(os).to receive(:invoke).with(version.name).and_return("6.1.7601")
 
       os_wmi = WmiLite::Wmi::Instance.new(os)
 
-      expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with('Win32_OperatingSystem').and_return(os_wmi)
+      expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with("Win32_OperatingSystem").and_return(os_wmi)
 
       # Mock a Win32_ComputerSystem OLE32 WMI object
-      x64_system_type = 'x64-based PC'
+      x64_system_type = "x64-based PC"
 
       cs = double("WIN32OLE",
                   :properties_ => [ double("WIN32OLE", :name => "SystemType") ])
 
-      allow(cs).to receive(:invoke).with('SystemType').and_return(x64_system_type)
+      allow(cs).to receive(:invoke).with("SystemType").and_return(x64_system_type)
 
       cs_wmi = WmiLite::Wmi::Instance.new(cs)
 
-      expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with('Win32_ComputerSystem').and_return(cs_wmi)
+      expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with("Win32_ComputerSystem").and_return(cs_wmi)
 
       @plugin.run
     end

data/spec/unit/plugins/linode_spec.rb

@@ -15,38 +15,38 @@
 # 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 linode" do
-  let(:hint_path_nix) { '/etc/chef/ohai/hints/linode.json' }
+  let(:hint_path_nix) { "/etc/chef/ohai/hints/linode.json" }
   let(:hint_path_win) { 'C:\chef\ohai\hints/linode.json' }
 
   before do
     @plugin = get_plugin("linode")
     @plugin[:network] = {
-      "interfaces"=> {
-        "eth0"=> {
-          "addresses"=> {
-            "1.2.3.4"=> {
-              "broadcast"=> "67.23.20.255",
-              "netmask"=> "255.255.255.0",
-              "family"=> "inet"
+      "interfaces" => {
+        "eth0" => {
+          "addresses" => {
+            "1.2.3.4" => {
+              "broadcast" => "67.23.20.255",
+              "netmask" => "255.255.255.0",
+              "family" => "inet",
             },
-            "fe80::4240:95ff:fe47:6eed"=> {
-              "scope"=> "Link",
-              "prefixlen"=> "64",
-              "family"=> "inet6"
+            "fe80::4240:95ff:fe47:6eed" => {
+              "scope" => "Link",
+              "prefixlen" => "64",
+              "family" => "inet6",
             },
             "40:40:95:47:6E:ED" => {
               "family" => "lladdr"
-            }
+            },
           }
         }
       }
     }
   end
 
-  shared_examples_for "!linode"  do
+  shared_examples_for "!linode" do
     it "does not create the linode mash" do
       @plugin.run
       expect(@plugin[:linode]).to be_nil
@@ -92,19 +92,19 @@ describe Ohai::System, "plugin linode" do
       before do
         @plugin[:network][:interfaces]["eth0:1"] = {
           "addresses" => {
-            "5.6.7.8"=> {
-              "broadcast"=> "10.176.191.255",
-              "netmask"=> "255.255.224.0",
-              "family"=> "inet"
+            "5.6.7.8" => {
+              "broadcast" => "10.176.191.255",
+              "netmask" => "255.255.224.0",
+              "family" => "inet",
             },
             "fe80::4240:f5ff:feab:2836" => {
-              "scope"=> "Link",
-              "prefixlen"=> "64",
-              "family"=> "inet6"
+              "scope" => "Link",
+              "prefixlen" => "64",
+              "family" => "inet6",
             },
             "40:40:F5:AB:28:36" => {
-              "family"=> "lladdr"
-            }
+              "family" => "lladdr"
+            },
           }
         }
       end
@@ -121,9 +121,9 @@ describe Ohai::System, "plugin linode" do
   describe "with linode cloud file" do
     before do
       allow(File).to receive(:exist?).with(hint_path_nix).and_return(true)
-      allow(File).to receive(:read).with(hint_path_nix).and_return('')
+      allow(File).to receive(:read).with(hint_path_nix).and_return("")
       allow(File).to receive(:exist?).with(hint_path_win).and_return(true)
-      allow(File).to receive(:read).with(hint_path_win).and_return('')
+      allow(File).to receive(:read).with(hint_path_win).and_return("")
     end
 
     it_should_behave_like "linode"
@@ -139,7 +139,7 @@ describe Ohai::System, "plugin linode" do
   end
 
   context "with ec2 cloud file" do
-    let(:ec2_hint_path_nix) { '/etc/chef/ohai/hints/ec2.json' }
+    let(:ec2_hint_path_nix) { "/etc/chef/ohai/hints/ec2.json" }
     let(:ec2_hint_path_win) { 'C:\chef\ohai\hints/ec2.json' }
 
     before do
@@ -147,9 +147,9 @@ describe Ohai::System, "plugin linode" do
       allow(File).to receive(:exist?).with(hint_path_win).and_return(false)
 
       allow(File).to receive(:exist?).with(ec2_hint_path_nix).and_return(true)
-      allow(File).to receive(:read).with(ec2_hint_path_nix).and_return('')
+      allow(File).to receive(:read).with(ec2_hint_path_nix).and_return("")
       allow(File).to receive(:exist?).with(ec2_hint_path_win).and_return(true)
-      allow(File).to receive(:read).with(ec2_hint_path_win).and_return('')
+      allow(File).to receive(:read).with(ec2_hint_path_win).and_return("")
     end
 
     it_should_behave_like "!linode"

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

@@ -15,24 +15,24 @@
 #  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, 'Linux Block Device Plugin' do
+describe Ohai::System, "Linux Block Device Plugin" do
   DISKS = {
-    'sda' => {
-      'size' => '7814037168',
-      'removable' => '0',
-      'model' => 'WDC WD4000F9YZ-0',
-      'rev' => '1A01',
-      'state' => 'running',
-      'timeout' => '30',
-      'queue_depth' => '1',
-      'vendor' => 'ATA'
+    "sda" => {
+      "size" => "7814037168",
+      "removable" => "0",
+      "model" => "WDC WD4000F9YZ-0",
+      "rev" => "1A01",
+      "state" => "running",
+      "timeout" => "30",
+      "queue_depth" => "1",
+      "vendor" => "ATA",
+    },
+    "dm-0" => {
+      "size" => "7806976",
+      "removable" => "0",
     },
-    'dm-0' => {
-      'size' => '7806976',
-      'removable' => '0'
-    }
   }
 
   def file_double(value)
@@ -42,11 +42,11 @@ describe Ohai::System, 'Linux Block Device Plugin' do
   end
 
   before(:each) do
-    @plugin = get_plugin('linux/block_device')
+    @plugin = get_plugin("linux/block_device")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
 
-    allow(File).to receive(:exists?).with('/sys/block').and_return(true)
-    allow(Dir).to receive(:[]).with('/sys/block/*') do
+    allow(File).to receive(:exists?).with("/sys/block").and_return(true)
+    allow(Dir).to receive(:[]).with("/sys/block/*") do
       DISKS.collect { |disk, _files| "/sys/block/#{disk}" }
     end
 
@@ -56,17 +56,17 @@ describe Ohai::System, 'Linux Block Device Plugin' do
       end
 
       allow(File).to receive(:exists?).with(Regexp.new(disk)) do |arg|
-        filepath = arg.split('/')
+        filepath = arg.split("/")
         checks[filepath.last].nil? ? false : true
       end
 
       allow(File).to receive(:basename) do |arg|
-        arg.split('/').last
+        arg.split("/").last
       end
     end
   end
 
-  it 'should collect all relevant data from disks' do
+  it "should collect all relevant data from disks" do
     @plugin.run
     DISKS.each do |disk, checks|
       expect(@plugin[:block_device][disk.to_sym]).to include(checks)

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

@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'tempfile'
+require "tempfile"
 
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 shared_examples "Common cpu info" do |total_cpu, real_cpu|
   describe "cpu" do
@@ -89,7 +89,7 @@ clflush size  : 32
   end
 
   let(:tempfile_handle) do
-    tempfile = Tempfile.new('ohai-rspec-proc-cpuinfo')
+    tempfile = Tempfile.new("ohai-rspec-proc-cpuinfo")
     tempfile.write cpuinfo_contents
     tempfile.rewind
     tempfile

data/spec/unit/plugins/linux/filesystem2_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")
 
 describe Ohai::System, "Linux filesystem plugin" do
   let (:plugin) { get_plugin("linux/filesystem2") }
@@ -166,7 +166,7 @@ MOUNT
 
     it "should set mount_options to an array of values from mount" do
       plugin.run
-      expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount_options]).to eq([ "ro", "noatime" ])
+      expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount_options]).to eq(%w{ro noatime})
     end
   end
 
@@ -338,7 +338,7 @@ MOUNTS
 
     it "should set mount_options to an array of values from /proc/mounts" do
       plugin.run
-      expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount_options]).to eq([ "ro", "noatime", "attr2", "noquota" ])
+      expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount_options]).to eq(%w{ro noatime attr2 noquota})
     end
   end
 
@@ -385,9 +385,9 @@ BLKID_TYPE
 
     it "should provide a devices view with all mountpoints" do
       plugin.run
-      expect(plugin[:filesystem2]["by_device"]["/dev/mapper/sys.vg-root.lv"][:mounts]).to eq(['/', '/var/chroot'])
-      expect(plugin[:filesystem2]["by_device"]["/dev/mapper/sys.vg-home.lv"][:mounts]).to eq(['/home', '/home2'])
-      expect(plugin[:filesystem2]["by_device"]["tmpfs"][:mounts]).to eq(['/lib/init/rw', '/dev/shm'])
+      expect(plugin[:filesystem2]["by_device"]["/dev/mapper/sys.vg-root.lv"][:mounts]).to eq(["/", "/var/chroot"])
+      expect(plugin[:filesystem2]["by_device"]["/dev/mapper/sys.vg-home.lv"][:mounts]).to eq(["/home", "/home2"])
+      expect(plugin[:filesystem2]["by_device"]["tmpfs"][:mounts]).to eq(["/lib/init/rw", "/dev/shm"])
     end
   end
 
@@ -431,7 +431,7 @@ BLKID_TYPE
 
     it "should provide a mounts view with all devices" do
       plugin.run
-      expect(plugin[:filesystem2]["by_mountpoint"]["/mnt"][:devices]).to eq(['/dev/sdb1', '/dev/sdc1'])
+      expect(plugin[:filesystem2]["by_mountpoint"]["/mnt"][:devices]).to eq(["/dev/sdb1", "/dev/sdc1"])
     end
   end
 end