ohai 8.14.0 → 8.15.0

data/spec/unit/plugins/c_spec.rb

@@ -153,17 +153,17 @@ describe Ohai::System, "plugin c" do
   end
 
   #glibc
-  it "gets the glibc x.x.x version from running /lib/libc.so.6" do
+  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]" do
+  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]" do
+  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
@@ -183,7 +183,7 @@ describe Ohai::System, "plugin c" do
     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
+  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

data/spec/unit/plugins/digital_ocean_spec.rb

@@ -19,26 +19,24 @@ require "ipaddress"
 require "spec_helper"
 
 describe Ohai::System, "plugin digital_ocean" do
-  let(:hint_path_nix) { "/etc/chef/ohai/hints/digital_ocean.json" }
-  let(:hint_path_win) { 'C:\chef\ohai\hints/digital_ocean.json' }
+  let(:plugin) { get_plugin("digital_ocean") }
   let(:digitalocean_path) { "/etc/digitalocean" }
   let(:hint) {
-    '{
-      "droplet_id": 12345678,
-      "name": "example.com",
-      "image_id": 3240036,
-      "size_id": 66,
-      "region_id": 4,
-      "ip_addresses": {
-        "public": "1.2.3.4",
-        "private": "5.6.7.8"
-      }
-    }'
+    {
+      "droplet_id" => 12345678,
+      "name" => "example.com",
+      "image_id" => 3240036,
+      "size_id" => 66,
+      "region_id" => 4,
+      "ip_addresses" => {
+        "public" => "1.2.3.4",
+        "private" => "5.6.7.8",
+      },
+    }
   }
 
   before do
-    @plugin = get_plugin("digital_ocean")
-    @plugin[:network] = {
+    plugin[:network] = {
       "interfaces" => {
         "eth0" => {
           "addresses" => {
@@ -54,64 +52,61 @@ describe Ohai::System, "plugin digital_ocean" do
       },
     }
 
-    allow(File).to receive(:exist?).with(hint_path_nix).and_return(true)
-    allow(File).to receive(:read).with(hint_path_nix).and_return(hint)
-    allow(File).to receive(:exist?).with(hint_path_win).and_return(true)
-    allow(File).to receive(:read).with(hint_path_win).and_return(hint)
+    allow(plugin).to receive(:hint?).with("digital_ocean").and_return(hint)
   end
 
   shared_examples_for "!digital_ocean" do
     before(:each) do
-      @plugin.run
+      plugin.run
     end
 
     it "does not create the digital_ocean mash" do
-      expect(@plugin[:digital_ocean]).to be_nil
+      expect(plugin[:digital_ocean]).to be_nil
     end
   end
 
   shared_examples_for "digital_ocean_networking" do
     it "creates the networks attribute" do
-      expect(@plugin[:digital_ocean][:networks]).not_to be_nil
+      expect(plugin[:digital_ocean][:networks]).not_to be_nil
     end
 
     it "pulls ip addresses from the network interfaces" do
-      expect(@plugin[:digital_ocean][:networks][:v4]).to eq([{ "ip_address" => "1.2.3.4",
-                                                               "type" => "public",
-                                                               "netmask" => "255.255.255.0" }])
-      expect(@plugin[:digital_ocean][:networks][:v6]).to eq([{ "ip_address" => "2400:6180:0000:00d0:0000:0000:0009:7001",
-                                                               "type" => "public",
-                                                               "cidr" => 128 }])
+      expect(plugin[:digital_ocean][:networks][:v4]).to eq([{ "ip_address" => "1.2.3.4",
+                                                              "type" => "public",
+                                                              "netmask" => "255.255.255.0" }])
+      expect(plugin[:digital_ocean][:networks][:v6]).to eq([{ "ip_address" => "2400:6180:0000:00d0:0000:0000:0009:7001",
+                                                              "type" => "public",
+                                                              "cidr" => 128 }])
     end
   end
 
   shared_examples_for "digital_ocean" do
     before(:each) do
-      @plugin.run
+      plugin.run
     end
 
     it "creates a digital_ocean mash" do
-      expect(@plugin[:digital_ocean]).not_to be_nil
+      expect(plugin[:digital_ocean]).not_to be_nil
     end
 
     it "has all hint attributes" do
-      expect(@plugin[:digital_ocean][:droplet_id]).not_to be_nil
-      expect(@plugin[:digital_ocean][:name]).not_to be_nil
-      expect(@plugin[:digital_ocean][:image_id]).not_to be_nil
-      expect(@plugin[:digital_ocean][:size_id]).not_to be_nil
-      expect(@plugin[:digital_ocean][:region_id]).not_to be_nil
+      expect(plugin[:digital_ocean][:droplet_id]).not_to be_nil
+      expect(plugin[:digital_ocean][:name]).not_to be_nil
+      expect(plugin[:digital_ocean][:image_id]).not_to be_nil
+      expect(plugin[:digital_ocean][:size_id]).not_to be_nil
+      expect(plugin[:digital_ocean][:region_id]).not_to be_nil
     end
 
     it "skips the ip_addresses hint attribute" do
-      expect(@plugin[:digital_ocean][:ip_addresses]).to be_nil
+      expect(plugin[:digital_ocean][:ip_addresses]).to be_nil
     end
 
     it "has correct values for all hint attributes" do
-      expect(@plugin[:digital_ocean][:droplet_id]).to eq(12345678)
-      expect(@plugin[:digital_ocean][:name]).to eq("example.com")
-      expect(@plugin[:digital_ocean][:image_id]).to eq(3240036)
-      expect(@plugin[:digital_ocean][:size_id]).to eq(66)
-      expect(@plugin[:digital_ocean][:region_id]).to eq(4)
+      expect(plugin[:digital_ocean][:droplet_id]).to eq(12345678)
+      expect(plugin[:digital_ocean][:name]).to eq("example.com")
+      expect(plugin[:digital_ocean][:image_id]).to eq(3240036)
+      expect(plugin[:digital_ocean][:size_id]).to eq(66)
+      expect(plugin[:digital_ocean][:region_id]).to eq(4)
     end
 
     include_examples "digital_ocean_networking"
@@ -119,17 +114,16 @@ describe Ohai::System, "plugin digital_ocean" do
 
   describe "with digital_ocean hint file" do
     before do
-      allow(File).to receive(:exist?).with(hint_path_nix).and_return(true)
-      allow(File).to receive(:exist?).with(hint_path_win).and_return(true)
+      allow(plugin).to receive(:hint?).with("digital_ocean").and_return(hint)
     end
 
     context "without private networking enabled" do
-      it_should_behave_like "digital_ocean"
+      it_behaves_like "digital_ocean"
     end
 
     context "with private networking enabled" do
       before do
-        @plugin[:network][:interfaces][:eth1] = {
+        plugin[:network][:interfaces][:eth1] = {
           "addresses" => {
             "10.128.142.89" => {
               "netmask" => "255.255.255.0",
@@ -138,19 +132,19 @@ describe Ohai::System, "plugin digital_ocean" do
           },
         }
 
-        @plugin.run
+        plugin.run
       end
 
-      it "should extract the private networking ips" do
-        expect(@plugin[:digital_ocean][:networks][:v4]).to eq([{ "ip_address" => "1.2.3.4",
-                                                                 "type" => "public",
-                                                                 "netmask" => "255.255.255.0" },
+      it "extracts the private networking ips" do
+        expect(plugin[:digital_ocean][:networks][:v4]).to eq([{ "ip_address" => "1.2.3.4",
+                                                                "type" => "public",
+                                                                "netmask" => "255.255.255.0" },
                                                             { "ip_address" => "10.128.142.89",
                                                               "type" => "private",
                                                               "netmask" => "255.255.255.0" }])
-        expect(@plugin[:digital_ocean][:networks][:v6]).to eq([{ "ip_address" => "2400:6180:0000:00d0:0000:0000:0009:7001",
-                                                                 "type" => "public",
-                                                                 "cidr" => 128 },
+        expect(plugin[:digital_ocean][:networks][:v6]).to eq([{ "ip_address" => "2400:6180:0000:00d0:0000:0000:0009:7001",
+                                                                "type" => "public",
+                                                                "cidr" => 128 },
                                                            { "ip_address" => "fdf8:f53b:82e4:0000:0000:0000:0000:0053",
                                                              "type" => "private",
                                                              "cidr" => 128 }])
@@ -160,53 +154,22 @@ describe Ohai::System, "plugin digital_ocean" do
 
   describe "without digital_ocean hint file" do
     before do
-      allow(File).to receive(:exist?).with(hint_path_nix).and_return(false)
-      allow(File).to receive(:exist?).with(hint_path_win).and_return(false)
-    end
-
-    describe "with the /etc/digitalocean file" do
-      before do
-        allow(File).to receive(:exist?).with(digitalocean_path).and_return(true)
-        @plugin.run
-      end
-      it_should_behave_like "digital_ocean_networking"
-    end
-
-    describe "without the /etc/digitalocean file" do
-      before do
-        allow(File).to receive(:exist?).with(digitalocean_path).and_return(false)
-      end
-      it_should_behave_like "!digital_ocean"
-    end
-  end
-
-  context "with ec2 hint file" do
-    let(:ec2_hint_path_nix) { "/etc/chef/ohai/hints/ec2.json" }
-    let(:ec2_hint_path_win) { 'C:\chef\ohai\hints/ec2.json' }
-
-    before do
-      allow(File).to receive(:exist?).with(hint_path_nix).and_return(false)
-      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(:exist?).with(ec2_hint_path_win).and_return(true)
-      allow(File).to receive(:read).with(ec2_hint_path_win).and_return("")
+      allow(plugin).to receive(:hint?).with("digital_ocean").and_return(false)
     end
 
     describe "with the /etc/digitalocean file" do
       before do
         allow(File).to receive(:exist?).with(digitalocean_path).and_return(true)
-        @plugin.run
+        plugin.run
       end
-      it_should_behave_like "digital_ocean_networking"
+      it_behaves_like "digital_ocean_networking"
     end
 
     describe "without the /etc/digitalocean file" do
       before do
         allow(File).to receive(:exist?).with(digitalocean_path).and_return(false)
       end
-      it_should_behave_like "!digital_ocean"
+      it_behaves_like "!digital_ocean"
     end
   end
 end

data/spec/unit/plugins/ec2_spec.rb

@@ -24,8 +24,7 @@ require "base64"
 describe Ohai::System, "plugin ec2" do
 
   before(:each) do
-    allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(false)
-    allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false)
+    allow(plugin).to receive(:hint?).with("ec2").and_return(false)
     allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(false)
   end
 
@@ -132,13 +131,7 @@ describe Ohai::System, "plugin ec2" do
 
     context "with ec2_iam hint file" do
       before do
-        if windows?
-          allow(File).to receive(:exist?).with('C:\chef\ohai\hints/iam.json').and_return(true)
-          allow(File).to receive(:read).with('C:\chef\ohai\hints/iam.json').and_return("")
-        else
-          allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/iam.json").and_return(true)
-          allow(File).to receive(:read).with("/etc/chef/ohai/hints/iam.json").and_return("")
-        end
+        allow(plugin).to receive(:hint?).with("iam").and_return(true)
       end
 
       it "parses ec2 iam/ directory and collect iam/security-credentials/" do
@@ -168,11 +161,7 @@ describe Ohai::System, "plugin ec2" do
 
     context "without ec2_iam hint file" do
       before do
-        if windows?
-          allow(File).to receive(:exist?).with('C:\chef\ohai\hints/iam.json').and_return(false)
-        else
-          allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/iam.json").and_return(false)
-        end
+        allow(plugin).to receive(:hint?).with("iam").and_return(false)
       end
 
       it "parses ec2 iam/ directory and NOT collect iam/security-credentials/" do
@@ -296,33 +285,14 @@ describe Ohai::System, "plugin ec2" do
     it_behaves_like "ec2"
 
     before(:each) do
-      if windows?
-        expect(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
-        allow(File).to receive(:read).with('C:\chef\ohai\hints/ec2.json').and_return("")
-      else
-        expect(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(true)
-        allow(File).to receive(:read).with("/etc/chef/ohai/hints/ec2.json").and_return("")
-      end
-    end
-  end
-
-  describe "with rackspace hint file" do
-    it_behaves_like "!ec2"
-
-    before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/rackspace.json").and_return(true)
-      allow(File).to receive(:read).with("/etc/chef/ohai/hints/rackspace.json").and_return("")
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return("")
+      allow(plugin).to receive(:hint?).with("ec2").and_return({})
     end
   end
-
   describe "without any hints that it is an ec2 system" do
     it_behaves_like "!ec2"
 
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false)
+      allow(plugin).to receive(:hint?).with("ec2").and_return(false)
       plugin[:dmi] = nil
     end
   end

data/spec/unit/plugins/elixir_spec.rb

@@ -17,29 +17,39 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
 
 describe Ohai::System, "plugin elixir" do
+  let(:plugin) { get_plugin("elixir") }
 
   before(:each) do
-    @plugin = get_plugin("elixir")
-    @plugin[:languages] = Mash.new
-    @stdout = "Elixir 1.0.2"
-    allow(@plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(0, @stdout, ""))
+    plugin[:languages] = Mash.new
   end
 
-  it "should get the elixir version" do
-    expect(@plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(0, @stdout, ""))
-    @plugin.run
+  it "should shellout to elixir -v" do
+    expect(plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(0, "Elixir 1.0.2", ""))
+    plugin.run
   end
 
-  it "should set languages[:elixir][:version]" do
-    @plugin.run
-    expect(@plugin.languages[:elixir][:version]).to eql("1.0.2")
+  it "sets languages[:elixir][:version] on older elixir" do
+    allow(plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(0, "Elixir 1.0.2", ""))
+    plugin.run
+    expect(plugin.languages[:elixir][:version]).to eql("1.0.2")
   end
 
-  it "should not set the languages[:elixir] if elixir command fails" do
-    @stdout = "Elixir 1.0.2\n"
-    allow(@plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(1, @stdout, ""))
-    @plugin.run
-    expect(@plugin.languages).not_to have_key(:elixir)
+  it "sets languages[:elixir][:version] on newer elixir" do
+    new_stdout = "Erlang/OTP 18 [erts-7.3] [source] [64-bit] [smp:8:8] [async-threads:10] [hipe] [kernel-poll:false] [dtrace]\n\nElixir 1.2.4\n"
+    allow(plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(0, new_stdout, ""))
+    plugin.run
+    expect(plugin.languages[:elixir][:version]).to eql("1.2.4")
   end
 
+  it "does not set languages[:elixir] if elixir command fails" do
+    allow(plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(1, "", ""))
+    plugin.run
+    expect(plugin.languages).not_to have_key(:elixir)
+  end
+
+  it "does not set languages[:elixir] if elixir command doesn't exist" do
+    allow(plugin).to receive(:shell_out).and_raise(Ohai::Exceptions::Exec)
+    plugin.run
+    expect(plugin.languages).not_to have_key(:elixir)
+  end
 end

data/spec/unit/plugins/erlang_spec.rb

@@ -20,41 +20,47 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 
 describe Ohai::System, "plugin erlang" do
+  let(:plugin) { get_plugin("erlang") }
 
   before(:each) do
-    @plugin = get_plugin("erlang")
-    @plugin[:languages] = Mash.new
-    @stderr = "Erlang (ASYNC_THREADS,SMP,HIPE) (BEAM) emulator version 5.6.2\n"
-    allow(@plugin).to receive(:shell_out).with("erl +V").and_return(mock_shell_out(0, "", @stderr))
+    plugin[:languages] = Mash.new
+    erl_v_output = "Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 7.3\n"
+    erl_systeminfo_output = "\"18\"\r\n\"7.3\"\r\n\"2.10\"\r\n"
+    allow(plugin).to receive(:shell_out).with("erl +V")
+                                        .and_return(mock_shell_out(0, "", erl_v_output))
+    allow(plugin).to receive(:shell_out).with("erl -eval 'erlang:display(erlang:system_info(otp_release)), erlang:display(erlang:system_info(version)), erlang:display(erlang:system_info(nif_version)), halt().'  -noshell")
+                                        .and_return(mock_shell_out(0, erl_systeminfo_output, ""))
   end
 
-  it "should get the erlang version from erl +V" do
-    expect(@plugin).to receive(:shell_out).with("erl +V").and_return(mock_shell_out(0, "", @stderr))
-    @plugin.run
+  it "sets languages[:erlang][:options]" do
+    plugin.run
+    expect(plugin.languages[:erlang][:options]).to eql(%w{SMP ASYNC_THREADS HIPE})
   end
 
-  it "should set languages[:erlang][:version]" do
-    @plugin.run
-    expect(@plugin.languages[:erlang][:version]).to eql("5.6.2")
+  it "sets languages[:erlang][:emulator]" do
+    plugin.run
+    expect(plugin.languages[:erlang][:emulator]).to eql("BEAM")
   end
 
-  it "should set languages[:erlang][:options]" do
-    @plugin.run
-    expect(@plugin.languages[:erlang][:options]).to eql(%w{ASYNC_THREADS SMP HIPE})
+  it "sets languages[:erlang][:version]" do
+    plugin.run
+    expect(plugin.languages[:erlang][:version]).to eql("18")
   end
 
-  it "should set languages[:erlang][:emulator]" do
-    @plugin.run
-    expect(@plugin.languages[:erlang][:emulator]).to eql("BEAM")
+  it "sets languages[:erlang][:erts_version]" do
+    plugin.run
+    expect(plugin.languages[:erlang][:erts_version]).to eql("7.3")
   end
 
-  it "should not set the languages[:erlang] tree up if erlang command fails" do
-    @status = 1
-    @stdin = ""
-    @stderr = "Erlang (ASYNC_THREADS,SMP,HIPE) (BEAM) emulator version 5.6.2\n"
-    allow(@plugin).to receive(:shell_out).with("erl +V").and_return(mock_shell_out(1, "", @stderr))
-    @plugin.run
-    expect(@plugin.languages).not_to have_key(:erlang)
+  it "sets languages[:erlang][:nif_version]" do
+    plugin.run
+    expect(plugin.languages[:erlang][:nif_version]).to eql("2.10")
+  end
+
+  it "does not set languages[:erlang] if the erl commands fails" do
+    allow(plugin).to receive(:shell_out).and_raise(Ohai::Exceptions::Exec)
+    plugin.run
+    expect(plugin.languages).not_to have_key(:erlang)
   end
 
 end