facter 1.5.2 → 1.5.3

data/lib/facter/util/macosx.rb

@@ -16,35 +16,48 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
 ##
 
-module Facter::Macosx
-  require 'thread'
-  require 'facter/util/plist'
-
-  # JJM I'd really like to dynamically generate these methods
-  # by looking at the _name key of the _items dict for each _dataType
-
-  def self.hardware_overview
-    # JJM Perhaps we should cache the XML data in a "class" level object.
-    top_level_plist = Plist::parse_xml %x{/usr/sbin/system_profiler -xml SPHardwareDataType}
-    system_hardware = top_level_plist[0]['_items'][0]
-    system_hardware.delete '_name'
-    system_hardware
-  end
-
-  # SPSoftwareDataType
-  def self.os_overview
-    top_level_plist = Plist::parse_xml %x{/usr/sbin/system_profiler -xml SPSoftwareDataType}
-    os_stuff = top_level_plist[0]['_items'][0]
-    os_stuff.delete '_name'
-    os_stuff
-  end
-
-  def self.sw_vers
-    ver = Hash.new
-    [ "productName", "productVersion", "buildVersion" ].each do |option|
-      ver["macosx_#{option}"] = %x{sw_vers -#{option}}.strip
+module Facter::Util::Macosx
+    require 'thread'
+    require 'facter/util/plist'
+    require 'facter/util/resolution'
+
+    # JJM I'd really like to dynamically generate these methods
+    # by looking at the _name key of the _items dict for each _dataType
+
+    def self.profiler_xml(data_field)
+        Facter::Util::Resolution.exec("/usr/sbin/system_profiler -xml #{data_field}")
+    end
+
+    def self.intern_xml(xml)
+        return nil unless xml
+        Plist::parse_xml(xml)
+    end
+
+    # Return an xml result, modified as we need it.
+    def self.profiler_data(data_field)
+        begin
+            return nil unless parsed_xml = intern_xml(profiler_xml(data_field))
+            return nil unless data = parsed_xml[0]['_items'][0]
+            data.delete '_name'
+            data
+        rescue
+            return nil
+        end
     end
-    ver
-  end
-end
 
+    def self.hardware_overview
+        profiler_data("SPHardwareDataType")
+    end
+
+    def self.os_overview
+        profiler_data("SPSoftwareDataType")
+    end
+
+    def self.sw_vers
+        ver = Hash.new
+        [ "productName", "productVersion", "buildVersion" ].each do |option|
+            ver["macosx_#{option}"] = %x{sw_vers -#{option}}.strip
+        end
+        ver
+    end
+end

data/lib/facter/util/manufacturer.rb

@@ -3,6 +3,7 @@
 
 module Facter::Manufacturer
 	def self.dmi_find_system_info(name)
+		splitstr="Handle"
 		case Facter.value(:kernel)
 			when 'Linux'
 				return nil unless FileTest.exists?("/usr/sbin/dmidecode")
@@ -16,16 +17,22 @@ module Facter::Manufacturer
 				return nil unless FileTest.exists?("/usr/pkg/sbin/dmidecode")
 
 				output=%x{/usr/pkg/sbin/dmidecode 2>/dev/null}
+			when 'SunOS'
+				return nil unless FileTest.exists?("/usr/sbin/smbios")
+				splitstr="ID    SIZE TYPE"
+				output=%x{/usr/sbin/smbios 2>/dev/null}
+
             else
                 return
 		end
 		name.each_pair do |key,v|
-			v.each do |value|
-				output.split("Handle").each do |line|
-				       if line =~ /#{key}/  and line =~ /#{value} ([-\w].*)\n*./
+			v.each do |v2|
+				v2.each_pair do |value,facterkey|
+					output.split(splitstr).each do |line|
+						if line =~ /#{key}/ and ( line =~ /#{value} 0x\d+ \(([-\w].*)\)\n*./ or line =~ /#{value} ([-\w].*)\n*./ )
                                                 result = $1
-						Facter.add(value.chomp(':').gsub(' ','')) do
-							confine :kernel => [ :linux, :freebsd, :netbsd, :openbsd ]
+							Facter.add(facterkey) do
+								confine :kernel => [ :linux, :freebsd, :netbsd, :openbsd, :sunos ]
 							setcode do
 							    result
 						        end
@@ -35,5 +42,5 @@ module Facter::Manufacturer
 		        end
 	        end
         end
+    end
 end
-

data/lib/facter/util/netmask.rb

@@ -1,36 +1,34 @@
 module Facter::NetMask
-
-def self.get_netmask
+    def self.get_netmask
         netmask = nil;
         ipregex = %r{(\d{1,3}\.){3}\d{1,3}}
 
         ops = nil
         case Facter.value(:kernel)
-                when 'Linux'
-                        ops = {
-                                :ifconfig => '/sbin/ifconfig',
-                                :regex => %r{\s+ inet\saddr: #{Facter.ipaddress} .*? Mask: (#{ipregex})}x,
-                                :munge => nil,
-                        }
-                when 'SunOS'
-                        ops = {
-                                :ifconfig => '/usr/sbin/ifconfig -a',
-                                :regex => %r{\s+ inet\s+? #{Facter.ipaddress} \+? mask (\w{8})}x,
-                                :munge => Proc.new { |mask| mask.scan(/../).collect do |byte| byte.to_i(16) end.join('.') }
-                        }
+        when 'Linux'
+            ops = {
+                :ifconfig => '/sbin/ifconfig',
+                :regex => %r{\s+ inet\saddr: #{Facter.ipaddress} .*? Mask: (#{ipregex})}x,
+                :munge => nil,
+            }
+        when 'SunOS'
+            ops = {
+                :ifconfig => '/usr/sbin/ifconfig -a',
+                :regex => %r{\s+ inet\s+? #{Facter.ipaddress} \+? mask (\w{8})}x,
+                :munge => Proc.new { |mask| mask.scan(/../).collect do |byte| byte.to_i(16) end.join('.') }
+            }
         end
 
         %x{#{ops[:ifconfig]}}.split(/\n/).collect do |line|
-                matches = line.match(ops[:regex])
-                if !matches.nil?
-                        if ops[:munge].nil?
-                                netmask = matches[1]
-                        else
-                                netmask = ops[:munge].call(matches[1])
-                        end
+            matches = line.match(ops[:regex])
+            if !matches.nil?
+                if ops[:munge].nil?
+                    netmask = matches[1]
+                else
+                    netmask = ops[:munge].call(matches[1])
                 end
+            end
         end
         netmask
-end
-
+    end
 end

data/lib/facter/util/plist.rb

@@ -18,7 +18,7 @@ require 'facter/util/plist/generator'
 require 'facter/util/plist/parser'
 
 module Plist
-  VERSION = '3.0.0'
+    VERSION = '3.0.0'
 end
 
 # $Id: plist.rb 1781 2006-10-16 01:01:35Z luke $

data/lib/facter/util/uptime.rb

@@ -0,0 +1,32 @@
+# A module to gather uptime facts
+#
+module Facter::Util::Uptime
+
+    def self.get_uptime_simple
+        time = Facter::Util::Resolution.exec('uptime')
+            if time =~ /up\s*(\d+\s\w+)/
+                $1
+            else
+                "unknown"
+            end
+    end
+
+    def self.get_uptime
+        uptime, idletime = File.open("/proc/uptime").gets.split(" ")
+        uptime_seconds = uptime.to_i
+    end
+
+    def self.get_uptime_period(seconds, label)
+        
+        case label
+        when 'days'
+            value = seconds / 86400
+        when 'hours'
+            value = seconds / 3600
+        when 'seconds'
+            seconds
+        end     
+   
+    end
+
+end   

data/lib/facter/virtual.rb

@@ -1,62 +1,75 @@
 Facter.add("virtual") do
-  confine :kernel => %w{Linux FreeBSD OpenBSD}
-  
-  ENV["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
-  
-  result = "physical"
-  
-  setcode do 
-
-    if FileTest.exists?("/proc/user_beancounters")
-      result = "openvz"
-    end
+    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS}
 
-    if FileTest.exists?("/proc/xen/capabilities") && FileTest.readable?("/proc/xen/capabilities")
-      txt = File.read("/proc/xen/capabilities")
-      if txt =~ /control_d/i
-        result = "xen0"
-      else
-        result = "xenu" 
-      end
-    end
+    result = "physical"
 
-    if result == "physical"
-      lspciexists = system "which lspci > /dev/null 2>&1"
-      if $?.exitstatus == 0
-        output = %x{lspci}
-        output.each {|p|
-          # --- look for the vmware video card to determine if it is virtual => vmware.
-          # ---     00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter
-          result = "vmware" if p =~ /VM[wW]are/
-        }
-      else
-        dmidecodeexists = system "which dmidecode > /dev/null 2>&1"
-        if $?.exitstatus == 0
-          outputd = %x{dmidecode}
-          outputd.each {|pd|
-            result = "vmware" if pd =~ /VMware|Parallels/
-          }
+    setcode do
+        if FileTest.exists?("/proc/user_beancounters")
+            # openvz. can be hardware node or virtual environment
+            # read the init process' status file, it has laxer permissions
+            # than /proc/user_beancounters (so this won't fail as non-root)
+            txt = File.read("/proc/1/status")
+            if txt =~ /^envID:[[:blank:]]+0$/mi
+                result = "openvzhn"
+            else
+                result = "openvzve"
+            end
         end
-      end
-    end
 
-    # VMware server 1.0.3 rpm places vmware-vmx in this place, other versions or platforms may not.
-    if FileTest.exists?("/usr/lib/vmware/bin/vmware-vmx")
-      result = "vmware_server"
-    end
+        if FileTest.exists?("/proc/xen/capabilities") && FileTest.readable?("/proc/xen/capabilities")
+            txt = File.read("/proc/xen/capabilities")
+            if txt =~ /control_d/i
+                result = "xen0"
+            else
+                result = "xenu"
+            end
+        end
 
-    mountexists = system "which mount > /dev/null 2>&1"
-    if $?.exitstatus == 0
-      output = %x{mount}
-      output.each {|p|
-        result = "vserver" if p =~ /\/dev\/hdv1/
-      }
-    end
+        if result == "physical"
+            path = %x{which lspci 2> /dev/null}.chomp
+            if path !~ /no lspci/
+                output = %x{#{path}}
+                output.each do |p|
+                    # --- look for the vmware video card to determine if it is virtual => vmware.
+                    # ---     00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter
+                    result = "vmware" if p =~ /VM[wW]are/
+                end
+            else
+                path = %x{which dmidecode 2> /dev/null}.chomp
+                if path !~ /no dmidecode/
+                    output = %x{#{path}}
+                    output.each do |pd|
+                        result = "vmware" if pd =~ /VMware|Parallels/
+                    end
+                else
+                    path = %x{which prtdiag 2> /dev/null}.chomp
+                    if path !~ /no prtdiag/
+                        output = %x{#{path}}
+                        output.each do |pd|
+                            result = "vmware" if pd =~ /VMware|Parallels/
+                        end
+                    end
+                end
+            end
+        end
 
-    if FileTest.directory?('/proc/virtual')
-      result = "vserver_host"
-    end
+        # VMware server 1.0.3 rpm places vmware-vmx in this place, other versions or platforms may not.
+        if FileTest.exists?("/usr/lib/vmware/bin/vmware-vmx")
+            result = "vmware_server"
+        end
+
+        mountexists = system "which mount > /dev/null 2>&1"
+        if $?.exitstatus == 0
+            output = %x{mount}
+            output.each do |p|
+                result = "vserver" if p =~ /\/dev\/hdv1/
+            end
+        end
+
+        if FileTest.directory?('/proc/virtual')
+            result = "vserver_host"
+        end
 
-    result
-  end
+        result
+    end
 end

data/spec/spec_helper.rb

@@ -3,16 +3,7 @@ dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{dir}/")
 $LOAD_PATH.unshift("#{dir}/../lib")
 
-# include any gems in vendor/gems
-Dir["#{dir}/../vendor/gems/**"].each do |path| 
-    libpath = File.join(path, "lib")
-    if File.directory?(libpath)
-        $LOAD_PATH.unshift(libpath)
-    else
-        $LOAD_PATH.unshift(path)
-    end
-end
-
+require 'rubygems'
 require 'mocha'
 require 'spec'
 require 'facter'

data/spec/unit/data/6.0-STABLE_FreeBSD_ifconfig

@@ -0,0 +1,12 @@
+fxp0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        options=b<RXCSUM,TXCSUM,VLAN_MTU>
+        inet x.x.58.26 netmask 0xfffffff8 broadcast x.x.58.31
+        inet x.x.58.27 netmask 0xffffffff broadcast x.x.58.27
+        inet x.x.58.28 netmask 0xffffffff broadcast x.x.58.28
+        inet x.x.58.29 netmask 0xffffffff broadcast x.x.58.29
+        inet x.x.58.30 netmask 0xffffffff broadcast x.x.58.30
+        ether 00:0e:0c:68:67:7c
+        media: Ethernet autoselect (100baseTX <full-duplex>)
+        status: active
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
+        inet 127.0.0.1 netmask 0xff000000 

data/spec/unit/data/Mac_OS_X_10.5.5_ifconfig

@@ -0,0 +1,26 @@
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
+	inet6 fe80::1%lo0 prefixlen 64 scopeid 0x1 
+	inet 127.0.0.1 netmask 0xff000000 
+	inet6 ::1 prefixlen 128 
+gif0: flags=8010<POINTOPOINT,MULTICAST> mtu 1280
+stf0: flags=0<> mtu 1280
+en0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 00:1b:63:ae:02:66 
+	media: autoselect status: inactive
+	supported media: autoselect 10baseT/UTP <half-duplex> 10baseT/UTP <full-duplex> 10baseT/UTP <full-duplex,hw-loopback> 10baseT/UTP <full-duplex,flow-control> 100baseTX <half-duplex> 100baseTX <full-duplex> 100baseTX <full-duplex,hw-loopback> 100baseTX <full-duplex,flow-control> 1000baseT <full-duplex> 1000baseT <full-duplex,hw-loopback> 1000baseT <full-duplex,flow-control> none
+fw0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 4078
+	lladdr 00:1e:52:ff:fe:31:1a:80 
+	media: autoselect <full-duplex> status: inactive
+	supported media: autoselect <full-duplex>
+en1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	inet6 fe80::21e:52ff:fe70:d7b6%en1 prefixlen 64 scopeid 0x6 
+	inet 192.168.0.4 netmask 0xffffff00 broadcast 192.168.0.255
+	ether 00:1e:52:70:d7:b6 
+	media: autoselect status: active
+	supported media: autoselect
+vmnet8: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	inet 172.16.15.1 netmask 0xffffff00 broadcast 172.16.15.255
+	ether 00:50:56:c0:00:08 
+vmnet1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	inet 192.168.89.1 netmask 0xffffff00 broadcast 192.168.89.255
+	ether 00:50:56:c0:00:01 

data/spec/unit/data/darwin_ifconfig_single_interface

@@ -0,0 +1,6 @@
+en1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	inet6 fe80::21c:b3ff:febe:81c9%en1 prefixlen 64 scopeid 0x6 
+	inet 10.0.0.101 netmask 0xffffff00 broadcast 10.0.0.255
+	ether 00:1c:b3:be:81:c9 
+	media: autoselect status: active
+	supported media: autoselect

data/spec/unit/facter.rb

@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Facter do
-    
+
     it "should have a version" do
         Facter.version.should =~ /^[0-9]+(\.[0-9]+)*$/
     end

data/spec/unit/interfaces.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'facter'
+
+describe "Per Interface IP facts" do
+    before do
+        Facter.loadfacts
+    end
+
+    it "should replace the ':' in an interface list with '_'" do
+        # So we look supported
+        Facter.fact(:kernel).stubs(:value).returns("SunOS")
+
+        Facter::Util::IP.expects(:get_interfaces).returns %w{eth0:1 eth1:2}
+        Facter.fact(:interfaces).value.should == %{eth0_1,eth1_2}
+    end
+end