ohai 8.6.0.alpha.1 → 8.6.0

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

@@ -20,11 +20,24 @@ describe Ohai::System, "Solaris2.X memory plugin" do
   before(:each) do
     @plugin = get_plugin("solaris2/memory")
     allow(@plugin).to receive(:collect_os).and_return("solaris2")
-    allow(@plugin).to receive(:shell_out).with("prtconf -m").and_return(mock_shell_out(0, "8194\n", ""))
+    allow(@plugin).to receive(:shell_out).with("prtconf | grep Memory").and_return(mock_shell_out(0, "Memory size: 8194 Megabytes\n", ""))
+    @swap_s = "total: 112230656k bytes allocated + 357865576k reserved = 470096232k used, 47057688k available\n"
+    allow(@plugin).to receive(:shell_out).with("swap -s").and_return(mock_shell_out(0,@swap_s, ""))
   end
 
   it "should get the total memory" do
     @plugin.run
-    expect(@plugin['memory']['total']).to eql(8194)
+    expect(@plugin[:memory][:total]).to eql("#{8194 * 1024}kB")
   end
+  
+  it "should get total swap" do
+    @plugin.run
+    expect(@plugin[:memory][:swap][:total]).to eql("#{(470096232 + 47057688)}kB" )
+  end
+  
+  it "should get free swap" do
+    @plugin.run
+    expect(@plugin[:memory][:swap][:free]).to eql("47057688kB")
+  end
+  
 end

data/spec/unit/plugins/vmware_spec.rb

@@ -0,0 +1,62 @@
+#
+# Author:: "Christopher M. Luciano" <cmlucian@us.ibm.com>
+# Copyright (C) 2015 IBM Corp.
+# 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 'spec_helper'
+
+describe Ohai::System, "plugin vmware" do
+
+  let(:plugin) { get_plugin("vmware") }
+  let(:path) { "/usr/bin/vmware-toolbox-cmd" }
+
+  context "vmware toolbox" do
+
+    def setup_stubs
+      allow(File).to receive(:exist?).and_return(true)
+      allow(plugin).to receive(:collect_os).and_return(:linux)
+      allow(plugin).to receive(:shell_out).with("#{path} stat speed").and_return(mock_shell_out(0, "2000 MHz", nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat hosttime").and_return(mock_shell_out(0, "04 Jun 2015 19:21:16", nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat sessionid").and_return(mock_shell_out(0, "0x0000000000000000", nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat balloon").and_return(mock_shell_out(0, "0 MB", nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat swap").and_return(mock_shell_out(0, "0 MB", nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat memlimit").and_return(mock_shell_out(0, "4000000000 MB", nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat memres").and_return(mock_shell_out(0, "0 MB", nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat cpures").and_return(mock_shell_out(0, "0 MHz", nil))
+      allow(plugin).to receive(:shell_out).with("#{path} stat cpulimit").and_return(mock_shell_out(0, "4000000000 MB", nil))
+      allow(plugin).to receive(:shell_out).with("#{path} upgrade status").and_return(mock_shell_out(0, "VMware Tools are up-to-date.", nil))
+      allow(plugin).to receive(:shell_out).with("#{path} timesync status").and_return(mock_shell_out(0, "Disabled", nil))
+      plugin.run
+    end
+
+    before(:each) do
+      setup_stubs
+    end
+
+    context "the vmware toolbox cmd" do
+
+      it "gets the speed" do
+        expect(plugin[:vmware][:speed]).to eq("2000 MHz")
+      end
+
+      it "gets the hosttime" do
+        expect(plugin[:vmware][:hosttime]).to eq("04 Jun 2015 19:21:16")
+      end
+
+      it "gets tools update status" do
+        expect(plugin[:vmware][:upgrade]).to eq("VMware Tools are up-to-date.")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+#
+# 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, "Windows memory plugin", :windows_only do
+  before do
+    require "wmi-lite/wmi"
+    @plugin = get_plugin("windows/memory")
+    mock_os = { 
+                "TotalVisibleMemorySize" => "10485760",
+                "FreePhysicalMemory" => "5242880",
+                "SizeStoredInPagingFiles" => "20971520",
+                "FreeSpaceInPagingFiles" =>  "15728640"
+              }
+    expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with('Win32_OperatingSystem').and_return(mock_os)
+  end
+
+  it "should get total memory" do
+    @plugin.run
+    expect(@plugin["memory"]["total"]).to eql("10485760kB")
+  end
+
+  it "should get free memory" do
+    @plugin.run
+    expect(@plugin["memory"]["free"]).to eql("5242880kB")
+  end
+
+  it "should get total swap" do
+    @plugin.run
+    expect(@plugin["memory"]["swap"]["total"]).to eql("20971520kB")
+  end
+
+  it "should get free memory" do
+    @plugin.run
+    expect(@plugin["memory"]["swap"]["free"]).to eql("15728640kB")
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.6.0.alpha.1
+  version: 8.6.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -300,7 +300,9 @@ files:
 - lib/ohai/mixin/network_constants.rb
 - lib/ohai/mixin/os.rb
 - lib/ohai/mixin/seconds_to_human.rb
+- lib/ohai/mixin/softlayer_metadata.rb
 - lib/ohai/mixin/string.rb
+- lib/ohai/plugin_config.rb
 - lib/ohai/plugins/aix/cpu.rb
 - lib/ohai/plugins/aix/filesystem.rb
 - lib/ohai/plugins/aix/kernel.rb
@@ -396,6 +398,7 @@ files:
 - lib/ohai/plugins/sigar/network.rb
 - lib/ohai/plugins/sigar/network_route.rb
 - lib/ohai/plugins/sigar/platform.rb
+- lib/ohai/plugins/softlayer.rb
 - lib/ohai/plugins/solaris2/cpu.rb
 - lib/ohai/plugins/solaris2/dmi.rb
 - lib/ohai/plugins/solaris2/filesystem.rb
@@ -407,9 +410,11 @@ files:
 - lib/ohai/plugins/ssh_host_key.rb
 - lib/ohai/plugins/uptime.rb
 - lib/ohai/plugins/virtualization.rb
+- lib/ohai/plugins/vmware.rb
 - lib/ohai/plugins/windows/cpu.rb
 - lib/ohai/plugins/windows/drivers.rb
 - lib/ohai/plugins/windows/filesystem.rb
+- lib/ohai/plugins/windows/memory.rb
 - lib/ohai/plugins/windows/network.rb
 - lib/ohai/plugins/windows/platform.rb
 - lib/ohai/plugins/windows/virtualization.rb
@@ -458,10 +463,13 @@ files:
 - spec/unit/loader_spec.rb
 - spec/unit/mixin/command_spec.rb
 - spec/unit/mixin/ec2_metadata_spec.rb
+- spec/unit/mixin/softlayer_metadata_spec.rb
+- spec/unit/plugin_config_spec.rb
 - spec/unit/plugins/aix/cpu_spec.rb
 - spec/unit/plugins/aix/filesystem_spec.rb
 - spec/unit/plugins/aix/hostname_spec.rb
 - spec/unit/plugins/aix/kernel_spec.rb
+- spec/unit/plugins/aix/memory_spec.rb
 - spec/unit/plugins/aix/network_spec.rb
 - spec/unit/plugins/aix/platform_spec.rb
 - spec/unit/plugins/aix/uptime_spec.rb
@@ -512,6 +520,7 @@ files:
 - spec/unit/plugins/linux/kernel_spec.rb
 - spec/unit/plugins/linux/lsb_spec.rb
 - spec/unit/plugins/linux/mdadm_spec.rb
+- spec/unit/plugins/linux/memory_spec.rb
 - spec/unit/plugins/linux/network_spec.rb
 - spec/unit/plugins/linux/platform_spec.rb
 - spec/unit/plugins/linux/uptime_spec.rb
@@ -541,6 +550,7 @@ files:
 - spec/unit/plugins/ruby_spec.rb
 - spec/unit/plugins/rust_spec.rb
 - spec/unit/plugins/sigar/network_route_spec.rb
+- spec/unit/plugins/softlayer_spec.rb
 - spec/unit/plugins/solaris2/cpu_spec.rb
 - spec/unit/plugins/solaris2/dmi_spec.rb
 - spec/unit/plugins/solaris2/hostname_spec.rb
@@ -551,6 +561,8 @@ files:
 - spec/unit/plugins/solaris2/virtualization_spec.rb
 - spec/unit/plugins/solaris2/zpools_spec.rb
 - spec/unit/plugins/ssh_host_keys_spec.rb
+- spec/unit/plugins/vmware_spec.rb
+- spec/unit/plugins/windows/memory_spec.rb
 - spec/unit/plugins/windows/virtualization_spec.rb
 - spec/unit/provides_map_spec.rb
 - spec/unit/runner_spec.rb
@@ -572,13 +584,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON
 test_files: []
+has_rdoc: