ohai 8.17.1 → 8.18.0

data/spec/unit/plugins/darwin/virtualization_spec.rb

@@ -1,6 +1,8 @@
 #
 # Author:: Pavel Yudin (<pyudin@parallels.com>)
+# Author:: Tim Smith (<tsmith@chef.io>)
 # Copyright:: Copyright (c) 2015 Pavel Yudin
+# Copyright:: Copyright (c) 2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,9 +27,32 @@ describe Ohai::System, "Darwin virtualization platform" do
     allow(plugin).to receive(:collect_os).and_return(:darwin)
     allow(plugin).to receive(:prlctl_exists?).and_return(false)
     allow(plugin).to receive(:ioreg_exists?).and_return(false)
+    allow(plugin).to receive(:vboxmanage_exists?).and_return(false)
+    allow(plugin).to receive(:fusion_exists?).and_return(false)
   end
 
-  describe "when we are checking for parallels" do
+  describe "when detecting OS X virtualization" do
+    it "should not set virtualization keys if no binaries are found" do
+      plugin.run
+      expect(plugin[:virtualization]).to eq({ "systems" => {} })
+    end
+
+    it "should set vmware host if /Applications/VMware\ Fusion.app exists" do
+      allow(plugin).to receive(:fusion_exists?).and_return(true)
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("vmware")
+      expect(plugin[:virtualization][:role]).to eq("host")
+      expect(plugin[:virtualization][:systems][:vmware]).to eq("host")
+    end
+
+    it "should set vbox host if /usr/local/bin/VBoxManage exists" do
+      allow(plugin).to receive(:vboxmanage_exists?).and_return("/usr/local/bin/VBoxManage")
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("vbox")
+      expect(plugin[:virtualization][:role]).to eq("host")
+      expect(plugin[:virtualization][:systems][:vbox]).to eq("host")
+    end
+
     it "should set parallels host if /usr/bin/prlctl exists" do
       allow(plugin).to receive(:prlctl_exists?).and_return("/usr/bin/prlctl")
       plugin.run
@@ -36,13 +61,7 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:parallels]).to eq("host")
     end
 
-    it "should not set parallels host if /usr/bin/prlctl not exist" do
-      allow(plugin).to receive(:prlctl_exists?).and_return(false)
-      plugin.run
-      expect(plugin[:virtualization]).to eq({ "systems" => {} })
-    end
-
-    it "should set parallels guest if /usr/sbin/ioreg exists and it's output contains pci1ab8,4000" do
+    it "should set parallels guest if /usr/sbin/ioreg exists and its output contains pci1ab8,4000" do
       allow(plugin).to receive(:ioreg_exists?).and_return(true)
       ioreg = <<-IOREG
     | |   +-o pci1ab8,4000@3  <class IOPCIDevice, id 0x1000001d1, registered, matched, active, busy 0 (40 ms), retain 9>
@@ -76,7 +95,7 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:parallels]).to eq("guest")
     end
 
-    it "should not set parallels guest if /usr/sbin/ioreg exists and it's output not contain pci1ab8,4000" do
+    it "should not set parallels guest if /usr/sbin/ioreg exists and its output not contain pci1ab8,4000" do
       allow(plugin).to receive(:ioreg_exists?).and_return(true)
       ioreg = <<-IOREG
     | |   +-o pci8086,2445@1F,4  <class IOPCIDevice, id 0x1000001d4, registered, matched, active, busy 0 (974 ms), retain 11>

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

@@ -50,9 +50,10 @@ describe Ohai::System, "Linux memory plugin" do
       and_yield("VmallocTotal: 34359738367 kB").
       and_yield("VmallocUsed:    276796 kB").
       and_yield("VmallocChunk: 34359461515 kB").
-      and_yield("HugePages_Total:     0").
-      and_yield("HugePages_Free:      0").
-      and_yield("HugePages_Rsvd:      0").
+      and_yield("HugePages_Total: 11542").
+      and_yield("HugePages_Free:  11235").
+      and_yield("HugePages_Rsvd:  11226").
+      and_yield("HugePages_Surp:      0").
       and_yield("Hugepagesize:     2048 kB")
     allow(File).to receive(:open).with("/proc/meminfo").and_return(@double_file)
   end
@@ -197,4 +198,28 @@ describe Ohai::System, "Linux memory plugin" do
     expect(@plugin[:memory][:swap][:free]).to eql("14127356kB")
   end
 
+  it "should get total hugepages" do
+    @plugin.run
+    expect(@plugin[:memory][:hugepages][:total]).to eql("11542")
+  end
+
+  it "should get free hugepages" do
+    @plugin.run
+    expect(@plugin[:memory][:hugepages][:free]).to eql("11235")
+  end
+
+  it "should get reserved hugepages" do
+    @plugin.run
+    expect(@plugin[:memory][:hugepages][:reserved]).to eql("11226")
+  end
+
+  it "should get surplus hugepages" do
+    @plugin.run
+    expect(@plugin[:memory][:hugepages][:surplus]).to eql("0")
+  end
+
+  it "should get hugepage size" do
+    @plugin.run
+    expect(@plugin[:memory][:hugepage_size]).to eql("2048kB")
+  end
 end

data/spec/unit/plugins/php_spec.rb

@@ -21,70 +21,77 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
 
 describe Ohai::System, "plugin php" do
+  let(:plugin) { get_plugin("php") }
 
   before(:each) do
-    @plugin = get_plugin("php")
-    @plugin[:languages] = Mash.new
+    plugin[:languages] = Mash.new
     @stdout = <<-OUT
 PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)
 Copyright (c) 1997-2006 The PHP Group
 Zend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies
 OUT
-    allow(@plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
+    allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
   end
 
-  it "should get the php version from running php -V" do
-    expect(@plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
-    @plugin.run
+  it "gets the php version by running php -V" do
+    expect(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
+    plugin.run
   end
 
-  it "should set languages[:php][:version]" do
-    @plugin.run
-    expect(@plugin.languages[:php][:version]).to eql("5.1.6")
+  it "sets languages[:php][:version] on PHP 5.X" do
+    plugin.run
+    expect(plugin.languages[:php][:version]).to eql("5.1.6")
   end
 
-  it "should not set the languages[:php] tree up if php command fails" do
-    @stdout = <<-OUT
-PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)
-Copyright (c) 1997-2006 The PHP Group
-Zend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies
+  it "sets languages[:php][:version] on PHP 7.0" do
+    stdout = <<-OUT
+PHP 7.0.4-7ubuntu2.1 (cli) ( NTS )
+Copyright (c) 1997-2016 The PHP Group
+Zend Engine v3.0.0, Copyright (c) 1998-2016 Zend Technologies
+    with Zend OPcache v7.0.6-dev, Copyright (c) 1999-2016, by Zend Technologies
 OUT
-    allow(@plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(1, @stdout, ""))
-    @plugin.run
-    expect(@plugin.languages).not_to have_key(:php)
+    allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
+    plugin.run
+    expect(plugin.languages[:php][:version]).to eql("7.0.4-7ubuntu2.1")
   end
 
-  it "should parse builddate even if it's suhosin patched" do
-    @stdout = <<-OUT
+  it "does not set the languages[:php] tree up if php command fails" do
+    allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(1, "", ""))
+    plugin.run
+    expect(plugin.languages).not_to have_key(:php)
+  end
+
+  it "parses builddate even if PHP is Suhosin patched" do
+    stdout = <<-OUT
 PHP 5.3.27 with Suhosin-Patch (cli) (built: Aug 30 2013 04:30:30)
 Copyright (c) 1997-2013 The PHP Group
 Zend Engine v2.3.0, Copyright (c) 1998-2013 Zend Technologies
 OUT
-    allow(@plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
-    @plugin.run
-    expect(@plugin.languages[:php][:builddate]).to eql("Aug 30 2013 04:30:30")
+    allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
+    plugin.run
+    expect(plugin.languages[:php][:builddate]).to eql("Aug 30 2013 04:30:30")
   end
 
-  it "should not set zend_optcache_version if not compiled with opcache" do
-    @stdout = <<-OUT
+  it "does not set zend_optcache_version if not compiled with opcache" do
+    stdout = <<-OUT
 PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)
 Copyright (c) 1997-2006 The PHP Group
 Zend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies
 OUT
-    allow(@plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
-    @plugin.run
-    expect(@plugin.languages[:php]).not_to have_key(:zend_opcache_version)
+    allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
+    plugin.run
+    expect(plugin.languages[:php]).not_to have_key(:zend_opcache_version)
   end
 
-  it "should parse zend_optcache_version if compiled with opcache" do
-    @stdout = <<-OUT
+  it "sets zend_optcache_version if compiled with opcache" do
+    stdout = <<-OUT
 PHP 5.5.9-1ubuntu4.5 (cli) (built: Oct 29 2014 11:59:10)
 Copyright (c) 1997-2014 The PHP Group
 Zend Engine v2.5.0, Copyright (c) 1998-2014 Zend Technologies
     with Zend OPcache v7.0.3, Copyright (c) 1999-2014, by Zend Technologies
 OUT
-    allow(@plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
-    @plugin.run
-    expect(@plugin.languages[:php][:zend_opcache_version]).to eql("7.0.3")
+    allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
+    plugin.run
+    expect(plugin.languages[:php][:zend_opcache_version]).to eql("7.0.3")
   end
 end

data/spec/unit/plugins/shells_spec.rb

@@ -0,0 +1,56 @@
+#
+# Author:: Tim Smith (<tsmith@chef.io>)
+# 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.
+#
+
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+
+describe Ohai::System, "plugin shells" do
+  let(:plugin) { get_plugin("shells") }
+
+  # content from OS X 10.11
+  shell_file = ["# List of acceptable shells for chpass(1).\n",
+                "# Ftpd will not allow users to connect who are not using\n",
+                "# one of these shells.\n",
+                "\n",
+                "/bin/bash\n",
+                "/bin/csh\n",
+                "/bin/ksh\n",
+                "/bin/sh\n",
+                "/bin/tcsh\n",
+                "/bin/zsh\n"]
+
+  let(:shell_file_content) { shell_file }
+
+  it "does not set shells attribute if /etc/shells does not exist" do
+    allow(::File).to receive(:exist?).with("/etc/shells").and_return(false)
+    plugin.run
+    expect(plugin).not_to have_key(:shells)
+  end
+
+  it "sets shells to an array of shells if /etc/shells exists" do
+    allow(::File).to receive(:readlines).with("/etc/shells").and_return(shell_file_content)
+    allow(::File).to receive(:exist?).with("/etc/shells").and_return(true)
+    plugin.run
+    expect(plugin.shells).to match_array([
+                                           "/bin/bash",
+                                           "/bin/csh",
+                                           "/bin/ksh",
+                                           "/bin/sh",
+                                           "/bin/tcsh",
+                                           "/bin/zsh",
+                                         ])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.17.1
+  version: 8.18.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -331,6 +331,7 @@ files:
 - lib/ohai/plugins/darwin/cpu.rb
 - lib/ohai/plugins/darwin/filesystem.rb
 - lib/ohai/plugins/darwin/filesystem2.rb
+- lib/ohai/plugins/darwin/hardware.rb
 - lib/ohai/plugins/darwin/memory.rb
 - lib/ohai/plugins/darwin/network.rb
 - lib/ohai/plugins/darwin/platform.rb
@@ -406,6 +407,7 @@ files:
 - lib/ohai/plugins/ruby.rb
 - lib/ohai/plugins/rust.rb
 - lib/ohai/plugins/scala.rb
+- lib/ohai/plugins/shells.rb
 - lib/ohai/plugins/sigar/cpu.rb
 - lib/ohai/plugins/sigar/filesystem.rb
 - lib/ohai/plugins/sigar/memory.rb
@@ -511,6 +513,8 @@ files:
 - spec/unit/plugins/darwin/cpu_spec.rb
 - spec/unit/plugins/darwin/filesystem2_spec.rb
 - spec/unit/plugins/darwin/filesystem_spec.rb
+- spec/unit/plugins/darwin/hardware_spec.rb
+- spec/unit/plugins/darwin/hardware_system_profiler_output.rb
 - spec/unit/plugins/darwin/hostname_spec.rb
 - spec/unit/plugins/darwin/kernel_spec.rb
 - spec/unit/plugins/darwin/memory_spec.rb
@@ -582,6 +586,7 @@ files:
 - spec/unit/plugins/ruby_spec.rb
 - spec/unit/plugins/rust_spec.rb
 - spec/unit/plugins/scala_spec.rb
+- spec/unit/plugins/shells_spec.rb
 - spec/unit/plugins/sigar/network_route_spec.rb
 - spec/unit/plugins/softlayer_spec.rb
 - spec/unit/plugins/solaris2/cpu_spec.rb
@@ -619,7 +624,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -627,9 +632,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON
 test_files: []
-has_rdoc: