ohai 0.3.6 → 0.4.0

data/lib/ohai/plugins/solaris2/network.rb

@@ -124,18 +124,31 @@ iface.keys.each do |ifn|
   iaddr = nil
   if iface[ifn][:encapsulation].eql?("Ethernet")
     iface[ifn][:addresses].keys.each do |addr|
-      if [ifn][:addresses][addr]["family"].eql?("inet")
+      if iface[ifn][:addresses][addr]["family"].eql?("inet")
         iaddr = addr
         break
       end
     end
-    iface[ifn][:arp].keys.each do |addr|
-      if addr.eql?(iaddr)
-        iface[ifn][:addresses][iface[ifn][:arp][iaddr]] = { "family" => "lladdr" }
-        break
+    if iface[ifn][:arp]
+      iface[ifn][:arp].keys.each do |addr|
+        if addr.eql?(iaddr)
+          iface[ifn][:addresses][iface[ifn][:arp][iaddr]] = { "family" => "lladdr" }
+          break
+        end
       end
     end
   end
 end
 
 network[:interfaces] = iface
+
+popen4("route get default") do |pid, stdin, stdout, stderr|
+  stdin.close
+  route_get = stdout.string
+  matches = /interface: (\S+)/.match(route_get)
+  if matches
+    Ohai::Log.debug("found gateway device: #{$1}")
+    network[:default_interface] = matches[1]
+  end
+end
+

data/lib/ohai/system.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.
@@ -37,46 +37,45 @@ end
 module Ohai
   class System
     attr_accessor :data, :seen_plugins
-    
+
     include Ohai::Mixin::FromFile
     include Ohai::Mixin::Command
-    
+
     def initialize
       @data = Mash.new
       @seen_plugins = Hash.new
       @providers = Mash.new
       @plugin_path = ""
-      Ohai::Log.level(Ohai::Config.log_level) 
     end
-    
+
     def [](key)
       @data[key]
     end
-    
+
     def []=(key, value)
       @data[key] = value
     end
-    
+
     def each(&block)
       @data.each do |key, value|
         block.call(key, value)
       end
     end
-    
+
     def attribute?(name)
-      @data.has_key?(name) 
+      @data.has_key?(name)
     end
-    
+
     def set(name, *value)
       set_attribute(name, *value)
     end
-    
+
     def from(cmd)
       status, stdout, stderr = run_command(:command => cmd)
-      return "" if stdout.nil?
+      return "" if stdout.nil? || stdout.empty?
       stdout.chomp!.strip
     end
-    
+
     def provides(*paths)
       paths.each do |path|
         parts = path.split('/')
@@ -92,34 +91,34 @@ module Ohai
         h[:_providers] << @plugin_path
       end
     end
-    
+
     # Set the value equal to the stdout of the command, plus run through a regex - the first piece of match data is the value.
     def from_with_regex(cmd, *regex_list)
       regex_list.flatten.each do |regex|
         status, stdout, stderr = run_command(:command => cmd)
-        return "" if stdout.nil?
+        return "" if stdout.nil? || stdout.empty?
         stdout.chomp!.strip
         md = stdout.match(regex)
         return md[1]
       end
     end
-    
+
     def set_attribute(name, *value)
       @data[name] = *value
       @data[name]
     end
-    
+
     def get_attribute(name)
       @data[name]
     end
-    
+
     def all_plugins
       require_plugin('os')
-      
+
       Ohai::Config[:plugin_path].each do |path|
-        [ 
-          Dir[File.join(path, '*')], 
-          Dir[File.join(path, @data[:os], '**', '*')] 
+        [
+          Dir[File.join(path, '*')],
+          Dir[File.join(path, @data[:os], '**', '*')]
         ].flatten.each do |file|
           file_regex = Regexp.new("#{path}#{File::SEPARATOR}(.+).rb$")
           md = file_regex.match(file)
@@ -146,7 +145,7 @@ module Ohai
       end
       refreshments.flatten.uniq
     end
-    
+
     def refresh_plugins(path = '/')
       parts = path.split('/')
       if parts.length == 0
@@ -162,24 +161,24 @@ module Ohai
 
       refreshments = collect_providers(h)
       Ohai::Log.debug("Refreshing plugins: #{refreshments.join(", ")}")
-      
+
       refreshments.each do |r|
         @seen_plugins.delete(r) if @seen_plugins.has_key?(r)
       end
       refreshments.each do |r|
-        require_plugin(r) unless @seen_plugins.has_key?(r)        
+        require_plugin(r) unless @seen_plugins.has_key?(r)
       end
     end
-    
+
     def require_plugin(plugin_name, force=false)
       unless force
         return true if @seen_plugins[plugin_name]
       end
-      
+
       @plugin_path = plugin_name
-      
+
       filename = "#{plugin_name.gsub("::", File::SEPARATOR)}.rb"
-            
+
       Ohai::Config[:plugin_path].each do |path|
         check_path = File.expand_path(File.join(path, filename))
         begin
@@ -194,26 +193,35 @@ module Ohai
         end
       end
     end
-    
+
     # Sneaky!  Lets us stub out require_plugin when testing plugins, but still
     # call the real require_plugin to kick the whole thing off.
     alias :_require_plugin :require_plugin
-    
-    # Serialize this object as a hash 
+
+    # Serialize this object as a hash
     def to_json(*a)
       output = @data.clone
       output["json_class"] = self.class.name
       output.to_json(*a)
     end
-    
-    # Pretty Print this object as JSON 
+
+    # Pretty Print this object as JSON
     def json_pretty_print
       JSON.pretty_generate(@data)
     end
-    
+
     def attributes_print(a)
-      JSON.pretty_generate(@data[a])
+      raise ArgumentError, "I cannot find an attribute named #{a}!" unless @data.has_key?(a)
+      case a
+      when Hash,Mash,Array
+        JSON.pretty_generate(@data[a])
+      when String
+        JSON.pretty_generate(@data[a].to_a)
+      else
+        raise ArgumentError, "I can only generate JSON for Hashes, Mashes, Arrays and Strings. You fed me a #{@data[a].class}!"
+      end
     end
+
     # Create an Ohai::System from JSON
     def self.json_create(o)
       ohai = new
@@ -222,16 +230,16 @@ module Ohai
       end
       ohai
     end
-    
+
     def method_missing(name, *args)
-      return get_attribute(name) if args.length == 0 
-      
+      return get_attribute(name) if args.length == 0
+
       set_attribute(name, *args)
     end
-    
+
     private
       def load_plugin_file
-        
+
       end
   end
 end

data/spec/ohai/plugins/cloud_spec.rb

@@ -0,0 +1,87 @@
+#
+# Author:: Cary Penniman (<cary@rightscale.com>)
+# 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 cloud" do
+  before(:each) do
+    @ohai = Ohai::System.new
+    @ohai.stub!(:require_plugin).and_return(true)
+  end
+
+  describe "no cloud" do
+    it "should NOT populate the cloud data" do
+      @ohai[:ec2] = nil
+      @ohai[:rackspace] = nil
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud].should be_nil
+    end
+  end
+  
+  describe "with EC2" do
+    before(:each) do
+      @ohai[:ec2] = Mash.new()
+    end  
+    
+    it "should populate cloud public ip" do
+      @ohai[:ec2]['public_ipv4'] = "174.129.150.8"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:public_ips][0].should == @ohai[:ec2]['public_ipv4']
+    end
+
+    it "should populate cloud private ip" do
+      @ohai[:ec2]['local_ipv4'] = "10.252.42.149"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:private_ips][0].should == @ohai[:ec2]['local_ipv4']
+    end
+    
+    it "should populate cloud provider" do
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:provider].should == "ec2"
+    end
+  end
+  
+  describe "with rackspace" do
+    before(:each) do
+      @ohai[:rackspace] = Mash.new()
+    end  
+    
+    it "should populate cloud public ip" do
+      @ohai[:rackspace]['public_ip'] = "174.129.150.8"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:public_ips][0].should == @ohai[:rackspace][:public_ip]
+    end
+        
+    it "should populate cloud private ip" do
+      @ohai[:rackspace]['private_ip'] = "10.252.42.149"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:private_ips][0].should == @ohai[:rackspace][:private_ip]
+    end
+    
+     it "should populate first cloud public ip" do
+      @ohai[:rackspace]['public_ip'] = "174.129.150.8"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:public_ips].first.should == @ohai[:rackspace][:public_ip]
+    end
+        
+    it "should populate cloud provider" do
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:provider].should == "rackspace"
+    end
+  end
+  
+end

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

@@ -29,6 +29,9 @@ 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/SuSE-release").and_return(false)
+    File.stub!(:exists?).with("/etc/arch-release").and_return(false)
+    File.stub!(:exists?).with("/etc/fedora-release").and_return(false)
   end
   
   it "should require the lsb plugin" do
@@ -77,5 +80,69 @@ describe Ohai::System, "Linux plugin platform" do
 
   end
 
-      
-end  
+  describe "on arch" do
+    before(:each) do
+      @ohai.lsb = nil
+      File.should_receive(:exists?).with("/etc/arch-release").and_return(true)
+    end
+
+    it "should set platform to arch" do
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "arch"
+    end
+  end
+
+  describe "on redhat breeds" do
+    before(:each) do
+      @ohai.lsb = nil
+      File.should_receive(:exists?).with("/etc/redhat-release").and_return(true)
+    end
+
+    it "should check for the existance of redhat-release" do
+      @ohai._require_plugin("linux::platform")
+    end
+          
+    it "should read the platform as centos and version as 5.3" do
+      File.should_receive(:read).with("/etc/redhat-release").and_return("CentOS release 5.3")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "centos"
+    end
+
+    it "may be that someone munged Red Hat to be RedHat" do
+      File.should_receive(:read).with("/etc/redhat-release").and_return("RedHat release 5.3")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "redhat"
+      @ohai[:platform_version].should == "5.3"
+    end
+
+    it "should read the platform as redhat and version as 5.3" do
+      File.should_receive(:read).with("/etc/redhat-release").and_return("Red Hat release 5.3")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "redhat"
+      @ohai[:platform_version].should == "5.3"
+    end
+  
+    it "should read the platform as fedora and version as 13 (rawhide)" do
+      File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 13 (Rawhide)")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "fedora"
+      @ohai[:platform_version].should == "13 (rawhide)"
+    end
+    
+    it "should read the platform as fedora and version as 10" do
+      File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 10")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "fedora"
+      @ohai[:platform_version].should == "10"
+    end
+
+    it "should read the platform as fedora and version as 13 using to_i" do
+      File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 13 (Rawhide)")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "fedora"
+      @ohai[:platform_version].to_i.should == 13
+    end
+  end
+
+end
+

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

@@ -96,9 +96,17 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "should set virtualpc guest if dmidecode detects Microsoft Virtual Machine" do
-      @stdout.stub!(:each).
-        and_yield("Manufacturer: Microsoft").
-        and_yield(" Product Name: Virtual Machine")
+      ms_vpc_dmidecode=<<-MSVPC
+System Information
+	Manufacturer: Microsoft Corporation
+	Product Name: Virtual Machine
+	Version: VS2005R2
+	Serial Number: 1688-7189-5337-7903-2297-1012-52
+	UUID: D29974A4-BE51-044C-BDC6-EFBC4B87A8E9
+	Wake-up Type: Power Switch
+MSVPC
+      @stdout.stub!(:string).and_return(ms_vpc_dmidecode) 
+       
       @ohai.stub!(:popen4).with("dmidecode").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       @ohai._require_plugin("linux::virtualization")
       @ohai[:virtualization][:emulator].should == "virtualpc"
@@ -106,9 +114,18 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "should set vmware guest if dmidecode detects VMware Virtual Platform" do
-      @stdout.stub!(:each).
-        and_yield("Manufacturer: VMware").
-        and_yield("Product Name: VMware Virtual Platform")
+      vmware_dmidecode=<<-VMWARE
+System Information
+	Manufacturer: VMware, Inc.
+	Product Name: VMware Virtual Platform
+	Version: None
+	Serial Number: VMware-50 3f f7 14 42 d1 f1 da-3b 46 27 d0 29 b4 74 1d
+	UUID: a86cc405-e1b9-447b-ad05-6f8db39d876a
+	Wake-up Type: Power Switch
+	SKU Number: Not Specified
+	Family: Not Specified
+VMWARE
+      @stdout.stub!(:string).and_return(vmware_dmidecode)
       @ohai.stub!(:popen4).with("dmidecode").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       @ohai._require_plugin("linux::virtualization")
       @ohai[:virtualization][:emulator].should == "vmware"