ohai 7.0.4 → 7.2.0.alpha.0

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

@@ -28,6 +28,7 @@ describe Ohai::System, "Linux plugin platform" do
     File.stub(:exists?).with("/etc/debian_version").and_return(false)
     File.stub(:exists?).with("/etc/redhat-release").and_return(false)
     File.stub(:exists?).with("/etc/gentoo-release").and_return(false)
+    File.stub(:exists?).with("/etc/exherbo-release").and_return(false)
     File.stub(:exists?).with("/etc/SuSE-release").and_return(false)
     File.stub(:exists?).with("/etc/arch-release").and_return(false)
     File.stub(:exists?).with("/etc/system-release").and_return(false)
@@ -184,6 +185,19 @@ describe Ohai::System, "Linux plugin platform" do
     end
   end
 
+  describe "on exherbo" do
+    before(:each) do
+      @plugin.lsb = nil
+      File.should_receive(:exists?).with("/etc/exherbo-release").and_return(true)
+    end
+
+    it "should set platform and platform_family to exherbo" do
+      @plugin.run
+      @plugin[:platform].should == "exherbo"
+      @plugin[:platform_family].should == "exherbo"
+    end
+  end
+
   describe "on redhat breeds" do
     describe "with lsb_release results" do
       it "should set the platform to redhat and platform_family to rhel even if the LSB name is something absurd but redhat like" do

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

@@ -42,6 +42,7 @@ describe Ohai::System, "Linux virtualization platform" do
       @plugin.run
       @plugin[:virtualization][:system].should == "xen"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:xen].should == "guest"
     end
 
     it "should set xen host if /proc/xen/capabilities contains control_d " do
@@ -51,6 +52,7 @@ describe Ohai::System, "Linux virtualization platform" do
       @plugin.run
       @plugin[:virtualization][:system].should == "xen"
       @plugin[:virtualization][:role].should == "host"
+      @plugin[:virtualization][:systems][:xen].should == "host"
     end
 
     it "should set xen guest if /proc/xen/capabilities exists but is empty" do
@@ -60,12 +62,13 @@ describe Ohai::System, "Linux virtualization platform" do
       @plugin.run
       @plugin[:virtualization][:system].should == "xen"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:xen].should == "guest"
     end
 
     it "should not set virtualization if xen isn't there" do
       File.should_receive(:exists?).at_least(:once).and_return(false)
       @plugin.run
-      @plugin[:virtualization].should == {}
+      @plugin[:virtualization].should == {'systems' => {}}
     end
   end
 
@@ -76,6 +79,7 @@ describe Ohai::System, "Linux virtualization platform" do
       @plugin.run
       @plugin[:virtualization][:system].should == "kvm"
       @plugin[:virtualization][:role].should == "host"
+      @plugin[:virtualization][:systems][:kvm].should == "host"
     end
 
     it "should set kvm guest if /proc/cpuinfo contains QEMU Virtual CPU" do
@@ -84,6 +88,7 @@ describe Ohai::System, "Linux virtualization platform" do
       @plugin.run
       @plugin[:virtualization][:system].should == "kvm"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:kvm].should == "guest"
     end
 
     it "should set kvm guest if /proc/cpuinfo contains Common KVM processor" do
@@ -92,6 +97,7 @@ describe Ohai::System, "Linux virtualization platform" do
       @plugin.run
       @plugin[:virtualization][:system].should == "kvm"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:kvm].should == "guest"
     end
 
     it "should set kvm guest if /proc/cpuinfo contains Common 32-bit KVM processor" do
@@ -100,12 +106,13 @@ describe Ohai::System, "Linux virtualization platform" do
       @plugin.run
       @plugin[:virtualization][:system].should == "kvm"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:kvm].should == "guest"
     end
 
     it "should not set virtualization if kvm isn't there" do
       File.should_receive(:exists?).at_least(:once).and_return(false)
       @plugin.run
-      @plugin[:virtualization].should == {}
+      @plugin[:virtualization].should == {'systems' => {}}
     end
   end
 
@@ -116,6 +123,7 @@ describe Ohai::System, "Linux virtualization platform" do
       @plugin.run
       @plugin[:virtualization][:system].should == "vbox"
       @plugin[:virtualization][:role].should == "host"
+      @plugin[:virtualization][:systems][:vbox].should == "host"
     end
 
     it "should set vbox gues if /proc/modules contains vboxguest" do
@@ -124,12 +132,13 @@ describe Ohai::System, "Linux virtualization platform" do
       @plugin.run
       @plugin[:virtualization][:system].should == "vbox"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:vbox].should == "guest"
     end
 
     it "should not set virtualization if vbox isn't there" do
       File.should_receive(:exists?).at_least(:once).and_return(false)
       @plugin.run
-      @plugin[:virtualization].should == {}
+      @plugin[:virtualization].should == {'systems' => {}}
     end
   end
 
@@ -152,6 +161,7 @@ MSVPC
       @plugin.run
       @plugin[:virtualization][:system].should == "virtualpc"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:virtualpc].should == "guest"
     end
 
     it "should set vmware guest if dmidecode detects VMware Virtual Platform" do
@@ -170,6 +180,7 @@ VMWARE
       @plugin.run
       @plugin[:virtualization][:system].should == "vmware"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:vmware].should == "guest"
     end
 
     it "should set vbox guest if dmidecode detects Oracle Corporation" do
@@ -190,12 +201,13 @@ VBOX
       @plugin.run
       @plugin[:virtualization][:system].should == "vbox"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:vbox].should == "guest"
     end
 
     it "should run dmidecode and not set virtualization if nothing is detected" do
       @plugin.stub(:shell_out).with("dmidecode").and_return(mock_shell_out(0, "", ""))
       @plugin.run
-      @plugin[:virtualization].should == {}
+      @plugin[:virtualization].should == {'systems' => {}}
     end
   end
 
@@ -206,6 +218,7 @@ VBOX
       @plugin.run
       @plugin[:virtualization][:system].should == "linux-vserver"
       @plugin[:virtualization][:role].should == "host"
+      @plugin[:virtualization][:systems]['linux-vserver'].should == "host"
     end
 
     it "should set Linux-VServer host if /proc/self/status contains VxID: 0" do
@@ -214,6 +227,7 @@ VBOX
       @plugin.run
       @plugin[:virtualization][:system].should == "linux-vserver"
       @plugin[:virtualization][:role].should == "host"
+      @plugin[:virtualization][:systems]['linux-vserver'].should == "host"
     end
 
     it "should set Linux-VServer guest if /proc/self/status contains s_context > 0" do
@@ -222,6 +236,7 @@ VBOX
       @plugin.run
       @plugin[:virtualization][:system].should == "linux-vserver"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems]['linux-vserver'].should == "guest"
     end
 
     it "should set Linux-VServer guest if /proc/self/status contains VxID > 0" do
@@ -230,12 +245,13 @@ VBOX
       @plugin.run
       @plugin[:virtualization][:system].should == "linux-vserver"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems]['linux-vserver'].should == "guest"
     end
 
     it "should not set virtualization if Linux-VServer isn't there" do
       File.should_receive(:exists?).at_least(:once).and_return(false)
       @plugin.run
-      @plugin[:virtualization].should == {}
+      @plugin[:virtualization].should == {'systems' => {}}
     end
   end
 
@@ -245,6 +261,7 @@ VBOX
       @plugin.run
       @plugin[:virtualization][:system].should == "openvz"
       @plugin[:virtualization][:role].should == "host"
+      @plugin[:virtualization][:systems][:openvz].should == "host"
     end
 
     it "should set openvz guest if /proc/bc/0 doesn't exist and /proc/vz exists" do
@@ -253,13 +270,14 @@ VBOX
       @plugin.run
       @plugin[:virtualization][:system].should == "openvz"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:openvz].should == "guest"
     end
 
     it "should not set virtualization if openvz isn't there" do
       File.should_receive(:exists?).with("/proc/bc/0").and_return(false)
       File.should_receive(:exists?).with("/proc/vz").and_return(false)
       @plugin.run
-      @plugin[:virtualization].should == {}
+      @plugin[:virtualization].should == {'systems' => {}}
     end
   end
 
@@ -280,6 +298,7 @@ CGROUP
       @plugin.run
       @plugin[:virtualization][:system].should == "lxc"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:lxc].should == "guest"
     end
 
     it "should set lxc guest if /proc/self/cgroup exist and there are /lxc/<name> mounts" do
@@ -298,6 +317,7 @@ CGROUP
       @plugin.run
       @plugin[:virtualization][:system].should == "lxc"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:lxc].should == "guest"
     end
 
     it "should set lxc guest if /proc/self/cgroup exist and there are /docker/<name> mounts" do
@@ -318,6 +338,7 @@ CGROUP
       @plugin.run
       @plugin[:virtualization][:system].should == "lxc"
       @plugin[:virtualization][:role].should == "guest"
+      @plugin[:virtualization][:systems][:lxc].should == "guest"
     end
 
     it "should set not set anything if /proc/self/cgroup exist and the cgroup is named arbitrarily, it isn't necessarily lxc." do
@@ -334,11 +355,12 @@ CGROUP
       File.should_receive(:exists?).with("/proc/self/cgroup").and_return(true)
       File.stub(:read).with("/proc/self/cgroup").and_return(self_cgroup)
       @plugin.run
-      @plugin[:virtualization].should == {}
+      @plugin[:virtualization].should == {'systems' => {}}
     end
 
-    it "should set lxc host if /proc/self/cgroup only has / mounts" do
-      self_cgroup=<<-CGROUP
+    context "/proc/self/cgroup only has / mounts" do
+      before(:each) do
+        self_cgroup=<<-CGROUP
 8:blkio:/
 7:net_cls:/
 6:freezer:/
@@ -348,22 +370,47 @@ CGROUP
 2:cpu:/
 1:cpuset:/
 CGROUP
-      File.should_receive(:exists?).with("/proc/self/cgroup").and_return(true)
-      File.stub(:read).with("/proc/self/cgroup").and_return(self_cgroup)
-      @plugin.run
-      @plugin[:virtualization][:system].should == "lxc"
-      @plugin[:virtualization][:role].should == "host"
+        File.should_receive(:exists?).with("/proc/self/cgroup").and_return(true)
+        File.stub(:read).with("/proc/self/cgroup").and_return(self_cgroup)
+      end
+    
+      it "sets lxc host if lxc-version exists" do
+        @plugin.stub(:lxc_version_exists?).and_return("/usr/bin/lxc-version")
+        @plugin.run
+        @plugin[:virtualization][:system].should == "lxc"
+        @plugin[:virtualization][:role].should == "host"
+        @plugin[:virtualization][:systems][:lxc].should == "host"
+      end
+
+      it "does not set the old virtualization attributes if they are already set" do
+        @plugin.stub(:lxc_version_exists?).and_return("/usr/bin/lxc-version")
+        @plugin[:virtualization] = Mash.new
+        @plugin[:virtualization][:system] = "the cloud"
+        @plugin[:virtualization][:role] = "cumulonimbus"
+        @plugin.run
+        @plugin[:virtualization][:system].should_not == "lxc"
+        @plugin[:virtualization][:role].should_not == "host"
+      end
+
+      it "does not set lxc host if lxc-version does not exist" do
+        @plugin.stub(:lxc_version_exists?).and_return(false)
+        @plugin.run
+        @plugin[:virtualization][:system].should be_nil
+        @plugin[:virtualization][:role].should be_nil
+        @plugin[:virtualization].should == {'systems' => {}}
+      end
+
     end
 
     it "should not set virtualization if /proc/self/cgroup isn't there" do
       File.should_receive(:exists?).with("/proc/self/cgroup").and_return(false)
       @plugin.run
-      @plugin[:virtualization].should == {}
+      @plugin[:virtualization].should == {'systems' => {}}
     end
   end
 
   it "should not set virtualization if no tests match" do
     @plugin.run
-    @plugin[:virtualization].should == {}
+    @plugin[:virtualization].should == {'systems' => {}}
   end
 end

data/spec/unit/plugins/passwd_spec.rb

@@ -16,6 +16,13 @@ describe Ohai::System, "plugin etc" do
     @plugin[:etc][:passwd]['www'].should == Mash.new(:shell => '/bin/false', :gecos => 'Serving the web since 1970', :gid => 800, :uid => 800, :dir => '/var/www')
   end
 
+  it "should ignore duplicate users" do
+    Etc.should_receive(:passwd).and_yield(PasswdEntry.new("root", 1, 1, '/root', '/bin/zsh', 'BOFH')).
+      and_yield(PasswdEntry.new('root', 1, 1, '/', '/bin/false', 'I do not belong'))
+    @plugin.run
+    @plugin[:etc][:passwd]['root'].should == Mash.new(:shell => '/bin/zsh', :gecos => 'BOFH', :gid => 1, :uid => 1, :dir => '/root')
+  end
+
   it "should set the current user" do
     Etc.should_receive(:getlogin).and_return('chef')
     @plugin.run

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

@@ -65,4 +65,44 @@ UNAME_X
 
   end
 
+  describe "on Solaris 11" do
+    before(:each) do
+      @uname_x = <<-UNAME_X
+System = SunOS
+Node = node.example.com
+Release = 5.11
+KernelID = 11.1
+Machine = i86pc
+BusType = <unknown>
+Serial = <unknown>
+Users = <unknown>
+OEM# = 0
+Origin# = 1
+NumCPU = 1
+UNAME_X
+
+      File.stub(:exists?).with("/sbin/uname").and_return(true)
+      @plugin.stub(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, ""))
+
+      @release = StringIO.new("                             Oracle Solaris 11.1 X86\n")
+      File.stub(:open).with("/etc/release").and_yield(@release)
+    end
+
+    it "should run uname and set platform and build" do
+      @plugin.run
+      @plugin[:platform_build].should == "11.1"
+    end
+
+    it "should set the platform" do
+      @plugin.run
+      @plugin[:platform].should == "solaris2"
+    end
+
+    it "should set the platform_version" do
+      @plugin.run
+      @plugin[:platform_version].should == "5.11"
+    end
+
+  end
+
 end

data/spec/unit/util/file_helper_spec.rb

@@ -0,0 +1,45 @@
+# Author:: Bryan McLellan <btm@loftninjas.org>
+#
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+#
+# 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'
+require 'ohai/util/file_helper'
+
+class FileHelperMock
+  include Ohai::Util::FileHelper
+end
+
+
+describe "Ohai::Util::FileHelper" do
+  let(:file_helper) { FileHelperMock.new }
+
+  before(:each) do
+    File.stub(:executable?).and_return(false)
+  end
+
+  describe "which" do
+    it "returns the path to an executable that is in the path" do
+      File.stub(:executable?).with('/usr/bin/skyhawk').and_return(true)
+
+      expect(file_helper.which('skyhawk')).to eql "/usr/bin/skyhawk"
+    end
+
+    it "returns false if the executable is not in the path" do
+      expect(file_helper.which('the_cake')).to be_false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 7.2.0.alpha.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wmi-lite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +228,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - bin/ohai
 - docs/man/man1/ohai.1
@@ -282,6 +296,7 @@ files:
 - lib/ohai/plugins/linux/cpu.rb
 - lib/ohai/plugins/linux/filesystem.rb
 - lib/ohai/plugins/linux/lsb.rb
+- lib/ohai/plugins/linux/mdadm.rb
 - lib/ohai/plugins/linux/memory.rb
 - lib/ohai/plugins/linux/network.rb
 - lib/ohai/plugins/linux/platform.rb
@@ -340,6 +355,7 @@ files:
 - lib/ohai/provides_map.rb
 - lib/ohai/runner.rb
 - lib/ohai/system.rb
+- lib/ohai/util/file_helper.rb
 - lib/ohai/version.rb
 - spec/data/plugins/___lib64___libc.so.6.output
 - spec/data/plugins/___lib___libc.so.6.output
@@ -397,6 +413,7 @@ files:
 - spec/unit/plugins/erlang_spec.rb
 - spec/unit/plugins/eucalyptus_spec.rb
 - spec/unit/plugins/fail_spec.rb
+- spec/unit/plugins/freebsd/cpu_spec.rb
 - spec/unit/plugins/freebsd/hostname_spec.rb
 - spec/unit/plugins/freebsd/kernel_spec.rb
 - spec/unit/plugins/freebsd/os_spec.rb
@@ -415,6 +432,7 @@ files:
 - spec/unit/plugins/linux/hostname_spec.rb
 - 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/network_spec.rb
 - spec/unit/plugins/linux/platform_spec.rb
 - spec/unit/plugins/linux/uptime_spec.rb
@@ -453,6 +471,7 @@ files:
 - spec/unit/provides_map_spec.rb
 - spec/unit/runner_spec.rb
 - spec/unit/system_spec.rb
+- spec/unit/util/file_helper_spec.rb
 homepage: http://wiki.opscode.com/display/chef/Ohai
 licenses: []
 metadata: {}
@@ -467,9 +486,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2