ohai 6.24.2 → 7.0.0.rc.0

data/spec/unit/plugins/java_spec.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Benjamin Black (<bb@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Theodore Nordsieck (<theo@opscode.com>)
+# Copyright:: Copyright (c) 2009-2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,104 +21,149 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin java (Java5 Client VM)" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:languages] = Mash.new
-    @status = 0
-    @stdout = ""
-    @stderr = "java version \"1.5.0_16\"\nJava(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_16-b06-284)\nJava HotSpot(TM) Client VM (build 1.5.0_16-133, mixed mode, sharing)"
-    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([@status, @stdout, @stderr])
+    @plugin = get_plugin("java")
+    @plugin[:languages] = Mash.new
+  end
+
+  shared_examples_for "when the JRE is installed" do
+    before do
+      @stderr = "java version \"1.5.0_16\"\nJava(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_16-b06-284)\nJava HotSpot(TM) Client VM (build 1.5.0_16-133, mixed mode, sharing)"
+      @plugin.stub(:shell_out).with("java -version").and_return(mock_shell_out(0, "", @stderr))
+    end
+
+    it "should run java -version" do
+      @plugin.should_receive(:shell_out).with("java -version").and_return(mock_shell_out(0, "", @stderr))
+      @plugin.run
+    end
+
+    it "should set java[:version]" do
+      @plugin.run
+      @plugin[:languages][:java][:version].should eql("1.5.0_16")
+    end
+
+    it "should set java[:runtime][:name] to runtime name" do
+      @plugin.run
+      @plugin[:languages][:java][:runtime][:name].should eql("Java(TM) 2 Runtime Environment, Standard Edition")
+    end
+
+    it "should set java[:runtime][:build] to runtime build" do
+      @plugin.run
+      @plugin[:languages][:java][:runtime][:build].should eql("1.5.0_16-b06-284")
+    end
+
+    it "should set java[:hotspot][:name] to hotspot name" do
+      @plugin.run
+      @plugin[:languages][:java][:hotspot][:name].should eql("Java HotSpot(TM) Client VM")
+    end
+
+    it "should set java[:hotspot][:build] to hotspot build" do
+      @plugin.run
+      @plugin[:languages][:java][:hotspot][:build].should eql("1.5.0_16-133, mixed mode, sharing")
+    end
+
+    it "should not set the languages[:java] tree up if java command fails" do
+      @stderr = "Some error output here"
+      @plugin.stub(:shell_out).with("java -version").and_return(mock_shell_out(1, "", @stderr))
+      @plugin.run
+      @plugin[:languages].should_not have_key(:java)
+    end
+  end
+
+  shared_examples_for "when the Server JRE is installed" do
+
+    before(:each) do
+      @stderr = "java version \"1.6.0_22\"\nJava(TM) 2 Runtime Environment (build 1.6.0_22-b04)\nJava HotSpot(TM) Server VM (build 17.1-b03, mixed mode)"
+      @plugin.stub(:shell_out).with("java -version").and_return(mock_shell_out(0, "", @stderr))
+    end
+
+    it "should run java -version" do
+      @plugin.should_receive(:shell_out).with("java -version").and_return(mock_shell_out(0, "", @stderr))
+      @plugin.run
+    end
+
+    it "should set java[:version]" do
+      @plugin.run
+      @plugin[:languages][:java][:version].should eql("1.6.0_22")
+    end
+
+    it "should set java[:runtime][:name] to runtime name" do
+      @plugin.run
+      @plugin[:languages][:java][:runtime][:name].should eql("Java(TM) 2 Runtime Environment")
+    end
+
+    it "should set java[:runtime][:build] to runtime build" do
+      @plugin.run
+      @plugin[:languages][:java][:runtime][:build].should eql("1.6.0_22-b04")
+    end
+
+    it "should set java[:hotspot][:name] to hotspot name" do
+      @plugin.run
+      @plugin[:languages][:java][:hotspot][:name].should eql("Java HotSpot(TM) Server VM")
+    end
+
+    it "should set java[:hotspot][:build] to hotspot build" do
+      @plugin.run
+      @plugin[:languages][:java][:hotspot][:build].should eql("17.1-b03, mixed mode")
+    end
+
+    it "should not set the languages[:java] tree up if java command fails" do
+      @stderr = "Some error output here"
+      @plugin.stub(:shell_out).with("java -version").and_return(mock_shell_out(0, "", @stderr))
+      @plugin.run
+      @plugin[:languages].should_not have_key(:java)
+    end
+  end
+
+  context "when not on Mac OS X" do
+    before do
+      stub_const("RUBY_PLATFORM", "x86_64-linux")
+    end
+
+    context "and the client JRE is installed" do
+      include_examples "when the JRE is installed"
+    end
+    context "and the server JRE is installed" do
+      include_examples "when the Server JRE is installed"
+    end
+  end
+
+  context "when on Mac OS X with Java installed" do
+    before do
+      stub_const("RUBY_PLATFORM", "x86_64-darwin12.3.0")
+    end
+
+    it "detects that it is on a darwin platform" do
+      @plugin.should be_on_darwin
+    end
+
+    context "and real Java is installed" do
+      before do
+        java_home_status = double(Process::Status, :success? => true)
+        java_home_cmd = double(Mixlib::ShellOut, :status => java_home_status)
+        @plugin.should_receive(:shell_out).with("/usr/libexec/java_home").and_return(java_home_cmd)
+      end
+
+      context "and the client JRE is installed" do
+        include_examples "when the JRE is installed"
+      end
+      context "and the server JRE is installed" do
+        include_examples "when the Server JRE is installed"
+      end
+    end
+
+    context "and the JVM stubs are installed" do
+      before do
+        java_home_status = double(Process::Status, :success? => false)
+        java_home_cmd = double(Mixlib::ShellOut, :status => java_home_status)
+        @plugin.should_receive(:shell_out).with("/usr/libexec/java_home").and_return(java_home_cmd)
+      end
+
+      it "does not attempt to get java info" do
+        @plugin.should_not_receive(:shell_out).with("java -version")
+        @plugin.run
+        @plugin[:languages].should_not have_key(:java)
+      end
+    end
   end
 
-  it "should run java -mx64m -version" do
-    @ohai.should_receive(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([0, "", "java version \"1.5.0_16\"\nJava(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_16-b06-284)\nJava HotSpot(TM) Client VM (build 1.5.0_16-133, mixed mode, sharing)"])
-    @ohai._require_plugin("java")
-  end
-
-  it "should set java[:version]" do
-    @ohai._require_plugin("java")
-    @ohai.languages[:java][:version].should eql("1.5.0_16")
-  end
-
-  it "should set java[:runtime][:name] to runtime name" do
-    @ohai._require_plugin("java")
-    @ohai.languages[:java][:runtime][:name].should eql("Java(TM) 2 Runtime Environment, Standard Edition")
-  end
-
-  it "should set java[:runtime][:build] to runtime build" do
-    @ohai._require_plugin("java")
-    @ohai.languages[:java][:runtime][:build].should eql("1.5.0_16-b06-284")
-  end
-
-  it "should set java[:hotspot][:name] to hotspot name" do
-    @ohai._require_plugin("java")
-    @ohai.languages[:java][:hotspot][:name].should eql("Java HotSpot(TM) Client VM")
-  end
-
-  it "should set java[:hotspot][:build] to hotspot build" do
-    @ohai._require_plugin("java")
-    @ohai.languages[:java][:hotspot][:build].should eql("1.5.0_16-133, mixed mode, sharing")
-  end
-
-  it "should not set the languages[:java] tree up if java command fails" do
-    @status = 1
-    @stdout = ""
-    @stderr = "Some error output here"
-    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([@status, @stdout, @stderr])
-    @ohai._require_plugin("java")
-    @ohai.languages.should_not have_key(:java)
-  end
 end
-
-describe Ohai::System, "plugin java (Java6 Server VM)" do
-  before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:languages] = Mash.new
-    @status = 0
-    @stdout = ""
-    @stderr = "java version \"1.6.0_22\"\nJava(TM) 2 Runtime Environment (build 1.6.0_22-b04)\nJava HotSpot(TM) Server VM (build 17.1-b03, mixed mode)"
-    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([@status, @stdout, @stderr])
-  end
-
-  it "should run java -mx64m -version" do
-    @ohai.should_receive(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([0, "", "java version \"1.6.0_22\"\nJava(TM) 2 Runtime Environment (build 1.6.0_22-b04)\nJava HotSpot(TM) Server VM (build 17.1-b03, mixed mode)"])
-    @ohai._require_plugin("java")
-  end
-
-  it "should set java[:version]" do
-    @ohai._require_plugin("java")
-    @ohai.languages[:java][:version].should eql("1.6.0_22")
-  end
-
-  it "should set java[:runtime][:name] to runtime name" do
-    @ohai._require_plugin("java")
-    @ohai.languages[:java][:runtime][:name].should eql("Java(TM) 2 Runtime Environment")
-  end
-
-  it "should set java[:runtime][:build] to runtime build" do
-    @ohai._require_plugin("java")
-    @ohai.languages[:java][:runtime][:build].should eql("1.6.0_22-b04")
-  end
-
-  it "should set java[:hotspot][:name] to hotspot name" do
-    @ohai._require_plugin("java")
-    @ohai.languages[:java][:hotspot][:name].should eql("Java HotSpot(TM) Server VM")
-  end
-
-  it "should set java[:hotspot][:build] to hotspot build" do
-    @ohai._require_plugin("java")
-    @ohai.languages[:java][:hotspot][:build].should eql("17.1-b03, mixed mode")
-  end
-
-  it "should not set the languages[:java] tree up if java command fails" do
-    @status = 1
-    @stdout = ""
-    @stderr = "Some error output here"
-    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([@status, @stdout, @stderr])
-    @ohai._require_plugin("java")
-    @ohai.languages.should_not have_key(:java)
-  end
-end
-
-

data/spec/unit/plugins/kernel_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -21,23 +21,59 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin kernel" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:languages] = Mash.new
-    @ohai[:languages][:ruby] = Mash.new
-    @ohai.stub!(:from).with("uname -s").and_return("Darwin")
-    @ohai.stub!(:from).with("uname -r").and_return("9.5.0")
-    @ohai.stub!(:from).with("uname -v").and_return("Darwin Kernel Version 9.5.0: Wed Sep  3 11:29:43 PDT 2008; root:xnu-1228.7.58~1\/RELEASE_I386")
-    @ohai.stub!(:from).with("uname -m").and_return("i386")
-    @ohai.stub!(:from).with("uname -o").and_return("Linux")
+    @plugin = get_plugin("kernel")
+    @plugin.stub(:collect_os).and_return(:default) # for debugging
+    @plugin.stub(:shell_out).with("uname -s").and_return(mock_shell_out(0, "Darwin\n", ""))
+    @plugin.stub(:shell_out).with("uname -r").and_return(mock_shell_out(0, "9.5.0\n", ""))
+    @plugin.stub(:shell_out).with("uname -v").and_return(mock_shell_out(0, "Darwin Kernel Version 9.5.0: Wed Sep  3 11:29:43 PDT 2008; root:xnu-1228.7.58~1\/RELEASE_I386\n", ""))
+    @plugin.stub(:shell_out).with("uname -m").and_return(mock_shell_out(0, "i386\n", ""))
+    @plugin.stub(:shell_out).with("uname -o").and_return(mock_shell_out(0, "Linux\n", ""))
   end
 
-  it_should_check_from_mash("kernel", "name", "uname -s", "Darwin")
+  it_should_check_from_mash("kernel", "name", "uname -s", [0, "Darwin\n", ""])
+  it_should_check_from_mash("kernel", "release", "uname -r", [0, "9.5.0\n", ""])
+  it_should_check_from_mash("kernel", "version", "uname -v", [0, "Darwin Kernel Version 9.5.0: Wed Sep  3 11:29:43 PDT 2008; root:xnu-1228.7.58~1\/RELEASE_I386\n", ""])
+  it_should_check_from_mash("kernel", "machine", "uname -m", [0, "i386\n", ""])
+
+  describe "when running on windows", :windows_only do
+    before do
+      require 'ruby-wmi'
+
+      @ohai_system = Ohai::System.new
+      @plugin = get_plugin("kernel", @ohai_system)
 
-  it_should_check_from_mash("kernel", "release", "uname -r", "9.5.0")
+      caption = double("WIN32OLE", :name => "caption")
+      version = double("WIN32OLE", :name => "version")
+      build_number = double("WIN32OLE", :name => "BuildNumber")
+      csd_version  = double("WIN32OLE", :name => "CsdVersion")
+      os_type = double("WIN32OLE", :name => "OsType")
+      os_properties = [ caption, version, build_number, csd_version, os_type ]
 
-  it_should_check_from_mash("kernel", "version", "uname -v", "Darwin Kernel Version 9.5.0: Wed Sep  3 11:29:43 PDT 2008; root:xnu-1228.7.58~1\/RELEASE_I386")
+      os =  double("WIN32OLE",
+                     :properties_ => os_properties,
+                     :caption => "Microsoft Windows 7 Ultimate",
+                     :version => "6.1.7601",
+                     :BuildNumber => "7601",
+                     :CsdVersion => "Service Pack 1",
+                     :OsType => 18)
+      WMI::Win32_OperatingSystem.should_receive(:find).with(:first).and_return(os)
 
-  it_should_check_from_mash("kernel", "machine", "uname -m", "i386")
+      cs = double("WIN32OLE",
+                  :properties_ => [ double("WIN32OLE", :name => "SystemType") ],
+                  :SystemType => "x64-based PC")
+      WMI::Win32_ComputerSystem.should_receive(:find).with(:first).and_return(cs)
+
+      WMI::Win32_PnPSignedDriver.should_receive(:find).with(:all).and_return([ ])
+
+      @plugin.run
+    end
+    it "should set the corrent system information" do
+      @ohai_system.data[:kernel][:name].should == "Microsoft Windows 7 Ultimate"
+      @ohai_system.data[:kernel][:release].should == "6.1.7601"
+      @ohai_system.data[:kernel][:version].should == "6.1.7601 Service Pack 1 Build 7601"
+      @ohai_system.data[:kernel][:os].should == "WINNT"
+      @ohai_system.data[:kernel][:machine].should == "x86_64"
+    end
+  end
 
 end

data/spec/unit/plugins/linode_spec.rb

@@ -22,9 +22,8 @@ describe Ohai::System, "plugin linode" do
   let(:hint_path_win) { 'C:\chef\ohai\hints/linode.json' }
 
   before do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:network] = {
+    @plugin = get_plugin("linode")
+    @plugin[:network] = {
       "interfaces"=> {
         "eth0"=> {
           "addresses"=> {
@@ -49,32 +48,32 @@ describe Ohai::System, "plugin linode" do
 
   shared_examples_for "!linode"  do
     it "does not create the linode mash" do
-      @ohai._require_plugin("linode")
-      @ohai[:linode].should be_nil
+      @plugin.run
+      @plugin[:linode].should be_nil
     end
   end
 
   shared_examples_for "linode" do
     it "creates a linode mash" do
-      @ohai._require_plugin("linode")
-      @ohai[:linode].should_not be_nil
+      @plugin.run
+      @plugin[:linode].should_not be_nil
     end
 
     it "has all required attributes" do
-      @ohai._require_plugin("linode")
-      @ohai[:linode][:public_ip].should_not be_nil
+      @plugin.run
+      @plugin[:linode][:public_ip].should_not be_nil
     end
 
     it "has correct values for all attributes" do
-      @ohai._require_plugin("linode")
-      @ohai[:linode][:public_ip].should == "1.2.3.4"
+      @plugin.run
+      @plugin[:linode][:public_ip].should == "1.2.3.4"
     end
 
   end
 
   context "without linode kernel" do
     before do
-      @ohai[:kernel] = { "release" => "3.5.2-x86_64" }
+      @plugin[:kernel] = { "release" => "3.5.2-x86_64" }
     end
 
     it_should_behave_like "!linode"
@@ -82,7 +81,7 @@ describe Ohai::System, "plugin linode" do
 
   context "with linode kernel" do
     before do
-      @ohai[:kernel] = { "release" => "3.5.2-x86_64-linode24" }
+      @plugin[:kernel] = { "release" => "3.5.2-x86_64-linode24" }
     end
 
     it_should_behave_like "linode"
@@ -91,7 +90,7 @@ describe Ohai::System, "plugin linode" do
     # http://library.linode.com/networking/configuring-static-ip-interfaces
     context "with configured private ip address as suggested by linode" do
       before do
-        @ohai[:network][:interfaces]["eth0:1"] = {
+        @plugin[:network][:interfaces]["eth0:1"] = {
           "addresses" => {
             "5.6.7.8"=> {
               "broadcast"=> "10.176.191.255",
@@ -111,9 +110,9 @@ describe Ohai::System, "plugin linode" do
       end
 
       it "detects and sets the private ip" do
-        @ohai._require_plugin("linode")
-        @ohai[:linode][:private_ip].should_not be_nil
-        @ohai[:linode][:private_ip].should == "5.6.7.8"
+        @plugin.run
+        @plugin[:linode][:private_ip].should_not be_nil
+        @plugin[:linode][:private_ip].should == "5.6.7.8"
       end
     end
 
@@ -121,10 +120,10 @@ describe Ohai::System, "plugin linode" do
 
   describe "with linode cloud file" do
     before do
-      File.stub!(:exist?).with(hint_path_nix).and_return(true)
-      File.stub!(:read).with(hint_path_nix).and_return('')
-      File.stub!(:exist?).with(hint_path_win).and_return(true)
-      File.stub!(:read).with(hint_path_win).and_return('')
+      File.stub(:exist?).with(hint_path_nix).and_return(true)
+      File.stub(:read).with(hint_path_nix).and_return('')
+      File.stub(:exist?).with(hint_path_win).and_return(true)
+      File.stub(:read).with(hint_path_win).and_return('')
     end
 
     it_should_behave_like "linode"
@@ -132,22 +131,25 @@ describe Ohai::System, "plugin linode" do
 
   describe "without cloud file" do
     before do
-      File.stub!(:exist?).with(hint_path_nix).and_return(false)
-      File.stub!(:exist?).with(hint_path_win).and_return(false)
+      File.stub(:exist?).with(hint_path_nix).and_return(false)
+      File.stub(:exist?).with(hint_path_win).and_return(false)
     end
 
     it_should_behave_like "!linode"
   end
 
   context "with ec2 cloud file" do
-    let(:hint_path_nix) { '/etc/chef/ohai/hints/ec2.json' }
-    let(:hint_path_win) { 'C:\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
-      File.stub!(:exist?).with(hint_path_nix).and_return(true)
-      File.stub!(:read).with(hint_path_nix).and_return('')
-      File.stub!(:exist?).with(hint_path_win).and_return(true)
-      File.stub!(:read).with(hint_path_win).and_return('')
+      File.stub(:exist?).with(hint_path_nix).and_return(false)
+      File.stub(:exist?).with(hint_path_win).and_return(false)
+
+      File.stub(:exist?).with(ec2_hint_path_nix).and_return(true)
+      File.stub(:read).with(ec2_hint_path_nix).and_return('')
+      File.stub(:exist?).with(ec2_hint_path_win).and_return(true)
+      File.stub(:read).with(ec2_hint_path_win).and_return('')
     end
 
     it_should_behave_like "!linode"