ohai 0.5.0 → 0.5.2

data/lib/ohai/plugins/rackspace.rb

@@ -16,14 +16,24 @@
 
 provides "rackspace"
 
+require_plugin "kernel"
 require_plugin "network"
 
+# Checks for matching rackspace kernel name
+#
+# === Return
+# true:: If kernel name matches
+# false:: Otherwise
+def has_rackspace_kernel?
+  kernel[:release].split('-').last.eql?("rscloud")
+end
+
 # Checks for matching rackspace arp mac
 #
 # === Return
-# true:: If mac address matches 
+# true:: If mac address matches
 # false:: Otherwise
-def has_rackspace_mac?  
+def has_rackspace_mac?
   network[:interfaces].values.each do |iface|
     unless iface[:arp].nil?
       return true if iface[:arp].value?("00:00:0c:07:ac:01")
@@ -37,8 +47,8 @@ end
 # === Return
 # true:: If the rackspace cloud can be identified
 # false:: Otherwise
-def looks_like_rackspace?  
-  has_rackspace_mac?
+def looks_like_rackspace?
+  has_rackspace_mac? || has_rackspace_kernel?
 end
 
 # Names rackspace ip address

data/lib/ohai/system.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require 'rubygems'
 require 'extlib'
 require 'ohai/log'
 require 'ohai/mixin/from_file'
@@ -102,9 +101,9 @@ module Ohai
         return md[1]
       end
     end
-
-    def set_attribute(name, *value)
-      @data[name] = *value
+    
+    def set_attribute(name, *values)
+      @data[name] = Array18(*values)
       @data[name]
     end
 
@@ -129,7 +128,10 @@ module Ohai
         end
       end
       # Catch any errant children who need to be reaped
-      Process.waitall
+      begin
+        true while Process.wait(-1, Process::WNOHANG)
+      rescue Errno::ECHILD
+      end
       true
     end
 
@@ -197,7 +199,7 @@ module Ohai
         rescue IOError => e
           Ohai::Log.debug("No #{plugin_name} at #{check_path}")
         rescue Exception,Errno::ENOENT => e
-          Ohai::Log.debug("Plugin #{plugin_name} threw exception #{e.inspect}")
+          Ohai::Log.debug("Plugin #{plugin_name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
         end
       end
     end
@@ -246,8 +248,11 @@ module Ohai
     end
 
     private
-      def load_plugin_file
-
-      end
+    
+    def Array18(*args)
+      return nil if args.empty?
+      return args.first if args.length == 1
+      return *args
+    end
   end
 end

data/spec/ohai/mixin/command_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::Mixin::Command, "popen4" do
 

data/spec/ohai/mixin/from_file_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "from_file" do
   before(:each) do

data/spec/ohai/plugins/chef_spec.rb

@@ -0,0 +1,38 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tollef Fog Heen <tfheen@err.no>
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2010 Tollef Fog Heen <tfheen@err.no>
+# 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.
+#
+
+begin
+  require 'chef'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+
+describe Ohai::System, "plugin chef" do
+  before(:each) do
+    @ohai = Ohai::System.new
+    @ohai.stub!(:require_plugin).and_return(true)
+  end
+  
+  it "should set chef[:version] to the current chef version" do
+    @ohai._require_plugin("chef")
+    @ohai[:chef][:version].should == Chef::VERSION
+  end
+end
+rescue LoadError
+  # the chef module is not available, ignoring.
+end

data/spec/ohai/plugins/cloud_spec.rb

@@ -15,7 +15,9 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin cloud" do
   before(:each) do

data/spec/ohai/plugins/darwin/hostname_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Darwin hostname plugin" do
   before(:each) do

data/spec/ohai/plugins/darwin/kernel_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Darwin kernel plugin" do
   before(:each) do

data/spec/ohai/plugins/darwin/platform_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__),  '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Darwin plugin platform" do
   before(:each) do

data/spec/ohai/plugins/dmi_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin dmi" do
   before(:each) do

data/spec/ohai/plugins/ec2_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 require 'open-uri'
 
 describe Ohai::System, "plugin ec2" do

data/spec/ohai/plugins/erlang_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin erlang" do
 

data/spec/ohai/plugins/freebsd/hostname_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "FreeBSD hostname plugin" do
   before(:each) do

data/spec/ohai/plugins/freebsd/kernel_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "FreeBSD kernel plugin" do
   before(:each) do

data/spec/ohai/plugins/freebsd/platform_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__),  '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "FreeBSD plugin platform" do
   before(:each) do

data/spec/ohai/plugins/groovy_spec.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2009 VMware, 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 File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+
+describe Ohai::System, "plugin groovy" do
+
+  before(:each) do
+    @ohai = Ohai::System.new
+    @ohai[:languages] = Mash.new
+    @ohai.stub!(:require_plugin).and_return(true)
+    @status = 0
+    @stdout = "Groovy Version: 1.6.3 JVM: 1.6.0_0\n"
+    @stderr = ""
+    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"groovy -v"}).and_return([@status, @stdout, @stderr])
+  end
+
+  it "should get the groovy version from running groovy -v" do
+    @ohai.should_receive(:run_command).with({:no_status_check=>true, :command=>"groovy -v"}).and_return([0, "Groovy Version: 1.6.3 JVM: 1.6.0_0\n", ""])
+    @ohai._require_plugin("groovy")
+  end
+
+  it "should set languages[:groovy][:version]" do
+    @ohai._require_plugin("groovy")
+    @ohai.languages[:groovy][:version].should eql("1.6.3")
+  end
+
+  it "should not set the languages[:groovy] tree up if groovy command fails" do
+    @status = 1
+    @stdout = "Groovy Version: 1.6.3 JVM: 1.6.0_0\n"
+    @stderr = ""
+    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"groovy -v"}).and_return([@status, @stdout, @stderr])
+    @ohai._require_plugin("groovy")
+    @ohai.languages.should_not have_key(:groovy)
+  end
+
+end

data/spec/ohai/plugins/hostname_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "hostname plugin" do
   before(:each) do

data/spec/ohai/plugins/java_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin java" do
   before(:each) do

data/spec/ohai/plugins/kernel_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin kernel" do
   before(:each) do

data/spec/ohai/plugins/linux/cpu_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux cpu plugin" do
   before(:each) do

data/spec/ohai/plugins/linux/hostname_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux hostname plugin" do
   before(:each) do

data/spec/ohai/plugins/linux/kernel_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux kernel plugin" do
   before(:each) do

data/spec/ohai/plugins/linux/lsb_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux lsb plugin" do
   before(:each) do

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

@@ -17,7 +17,8 @@
 #
 
 
-require File.join(File.dirname(__FILE__),  '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux plugin platform" do
   before(:each) do
@@ -144,5 +145,35 @@ describe Ohai::System, "Linux plugin platform" do
     end
   end
 
+  describe "on suse" do
+    before(:each) do
+      @ohai.lsb = nil
+      File.should_receive(:exists?).with("/etc/SuSE-release").and_return(true)
+    end
+
+    it "should check for the existance of SuSE-release" do
+      @ohai._require_plugin("linux::platform")
+    end
+
+    it "should set platform to suse" do
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "suse"
+    end
+
+    it "should read the version as 10.1 for bogus SLES 10" do
+      File.should_receive(:read).with("/etc/SuSE-release").and_return("SUSE Linux Enterprise Server 10 (i586)\nVERSION = 10\nPATCHLEVEL = 1\n")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "suse"
+      @ohai[:platform_version].should == "10.1"
+    end
+
+    it "should read the version as 11.2" do
+      File.should_receive(:read).with("/etc/SuSE-release").and_return("SUSE Linux Enterprise Server 11.2 (i586)\nVERSION = 11\nPATCHLEVEL = 2\n")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "suse"
+      @ohai[:platform_version].should == "11.2"
+    end
+  end
+
 end
 

data/spec/ohai/plugins/linux/uptime_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux plugin uptime" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux virtualization platform" do
   before(:each) do

data/spec/ohai/plugins/lua_spec.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2009 VMware, 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 File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+
+describe Ohai::System, "plugin lua" do
+
+  before(:each) do
+    @ohai = Ohai::System.new
+    @ohai[:languages] = Mash.new
+    @ohai.stub!(:require_plugin).and_return(true)
+    @status = 0
+    @stdout = ""
+    @stderr = "Lua 5.1.2  Copyright (C) 1994-2008 Lua.org, PUC-Rio\n"
+    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"lua -v"}).and_return([@status, @stdout, @stderr])
+  end
+
+  it "should get the lua version from running lua -v" do
+    @ohai.should_receive(:run_command).with({:no_status_check=>true, :command=>"lua -v"}).and_return([0, "", "Lua 5.1.2  Copyright (C) 1994-2008 Lua.org, PUC-Rio\n"])
+    @ohai._require_plugin("lua")
+  end
+
+  it "should set languages[:lua][:version]" do
+    @ohai._require_plugin("lua")
+    @ohai.languages[:lua][:version].should eql("5.1.2")
+  end
+
+  it "should not set the languages[:lua] tree up if lua command fails" do
+    @status = 1
+    @stdout = ""
+    @stderr = "Lua 5.1.2  Copyright (C) 1994-2008 Lua.org, PUC-Rio\n"
+    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"lua -v"}).and_return([@status, @stdout, @stderr])
+    @ohai._require_plugin("lua")
+    @ohai.languages.should_not have_key(:lua)
+  end
+
+end