facter 1.5.2 → 1.5.3

data/lib/facter/kernelversion.rb

@@ -1,5 +1,5 @@
 Facter.add("kernelversion") do
-  setcode do
-   Facter['kernelrelease'].value.split('-')[0]
-  end	
-end        
+    setcode do
+        Facter['kernelrelease'].value.split('-')[0]
+    end
+end

data/lib/facter/lsb.rb

@@ -27,7 +27,7 @@
                 @@lsbtime = Time.now
                 @@lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null')
             end
-                    
+
             if pattern.match(@@lsbdata)
                 $1
             else

data/lib/facter/lsbmajdistrelease.rb

@@ -3,7 +3,7 @@
 require 'facter'
 
 Facter.add("lsbmajdistrelease") do
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo}
     setcode do
         if /(\d*)\./i =~ Facter.value(:lsbdistrelease)
             result=$1

data/lib/facter/macaddress.rb

@@ -1,11 +1,11 @@
 Facter.add(:macaddress) do
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo Ubuntu}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo Ubuntu}
     setcode do
         ether = []
         output = %x{/sbin/ifconfig -a}
-        output.each {|s|
-                     ether.push($1) if s =~ /(?:ether|HWaddr) (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
-                    }
+        output.each do |s|
+            ether.push($1) if s =~ /(?:ether|HWaddr) (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
+        end
         ether[0]
     end
 end
@@ -15,11 +15,11 @@ Facter.add(:macaddress) do
     setcode do
     ether = []
         output = %x{/sbin/ifconfig}
-        output.each {|s|
-                     if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
-                          ether.push($1)
-                     end
-                    }
+        output.each do |s|
+            if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
+                ether.push($1)
+            end
+        end
         ether[0]
     end
 end
@@ -30,12 +30,12 @@ Facter.add(:macaddress) do
         ether = nil
         output = %x{/sbin/ifconfig}
 
-        output.split(/^\S/).each { |str|
+        output.split(/^\S/).each do |str|
             if str =~ /10baseT/ # we're wired
                 str =~ /ether (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
                 ether = $1
             end
-        }
+        end
 
         ether
     end
@@ -47,19 +47,19 @@ Facter.add(:macaddress) do
         ether = []
         ip = nil
         output = %x{/usr/sbin/ifconfig -a}
-        output.each { |str|
+        output.each do |str|
             if str =~ /([a-z]+\d+): flags=/
                 devname = $1
                 unless devname =~ /lo0/
-                   output2 = %x{/usr/bin/entstat #{devname}}
-                   output2.each { |str2|
-                               if str2 =~ /^Hardware Address: (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
-                                  ether.push($1)
-                               end
-                               }
+                    output2 = %x{/usr/bin/entstat #{devname}}
+                    output2.each do |str2|
+                        if str2 =~ /^Hardware Address: (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
+                            ether.push($1)
+                        end
+                    end
                 end
             end
-        }
+        end
         ether[0]
     end
 end
@@ -67,13 +67,13 @@ end
 Facter.add(:macaddress) do
     confine :kernel => %w(windows)
     setcode do
-	ether = []
-	output = %x{ipconfig /all}
-	output.split(/\r\n/).each  do |str|
-	    if str =~  /.*Physical Address.*: (\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2})/
-		ether.push($1.gsub(/-/, ":"))
-	    end
-	end
-	ether[0]
+        ether = []
+        output = %x{ipconfig /all}
+        output.split(/\r\n/).each  do |str|
+            if str =~  /.*Physical Address.*: (\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2})/
+                ether.push($1.gsub(/-/, ":"))
+            end
+        end
+        ether[0]
     end
 end

data/lib/facter/macosx.rb

@@ -25,7 +25,7 @@
 require 'facter/util/macosx'
 
 if Facter.value(:kernel) == "Darwin"
-    Facter::Macosx.hardware_overview.each do |fact, value|
+    Facter::Util::Macosx.hardware_overview.each do |fact, value|
         Facter.add("sp_#{fact}") do
             confine :kernel => :darwin
             setcode do
@@ -34,7 +34,7 @@ if Facter.value(:kernel) == "Darwin"
         end
     end
 
-    Facter::Macosx.os_overview.each do |fact, value|
+    Facter::Util::Macosx.os_overview.each do |fact, value|
         Facter.add("sp_#{fact}") do
             confine :kernel => :darwin
             setcode do
@@ -43,7 +43,7 @@ if Facter.value(:kernel) == "Darwin"
         end
     end
 
-    Facter::Macosx.sw_vers.each do |fact, value|
+    Facter::Util::Macosx.sw_vers.each do |fact, value|
         Facter.add(fact) do
             confine :kernel => :darwin
             setcode do

data/lib/facter/manufacturer.rb

@@ -5,6 +5,15 @@
 
 require 'facter/util/manufacturer'
 
-query = { 'System Information' =>  [ 'Manufacturer:', 'Product Name:' , 'Serial Number:'], 'Chassis Information' => 'Type:'}
+query = {
+	'[Ss]ystem [Ii]nformation' => [
+		{ 'Manufacturer:' => 'manufacturer' },
+		{ 'Product(?: Name)?:' => 'productname' },
+		{ 'Serial Number:' => 'serialnumber' }
+	],
+	'(Chassis Information|system enclosure or chassis)' => [
+		{ '(?:Chassis )?Type:' => 'type' }
+	]
+}
 
-Facter::Manufacturer.dmi_find_system_info(query) 
+Facter::Manufacturer.dmi_find_system_info(query)

data/lib/facter/network.rb

@@ -0,0 +1,10 @@
+require 'facter/util/ip'
+
+Facter::Util::IP.get_interfaces.each do |interface|
+
+        Facter.add("network_" + Facter::Util::IP.alphafy(interface)) do
+            setcode do
+                Facter::Util::IP.get_network_value(interface)
+            end 
+        end 
+end

data/lib/facter/operatingsystem.rb

@@ -18,6 +18,8 @@ Facter.add(:operatingsystem) do
             "Mandriva"
         elsif FileTest.exists?("/etc/mandrake-release")
             "Mandrake"
+	elsif FileTest.exists?("/etc/arch-release")
+	    "Archlinux"
         elsif FileTest.exists?("/etc/redhat-release")
             txt = File.read("/etc/redhat-release")
             if txt =~ /centos/i
@@ -29,6 +31,8 @@ Facter.add(:operatingsystem) do
             txt = File.read("/etc/SuSE-release")
             if txt =~ /^SUSE LINUX Enterprise Server/i
                 "SLES"
+	    elsif txt =~ /^openSUSE/i
+		"OpenSuSE"
             else
                 "SuSE"
             end

data/lib/facter/operatingsystemrelease.rb

@@ -29,11 +29,11 @@ end
 Facter.add(:operatingsystemrelease) do
     confine :operatingsystem => %w{CentOS}
     setcode do
-      centos_release = Facter::Util::Resolution.exec("sed -r -e 's/CentOS release //' -e 's/ \((Branch|Final)\)//' /etc/redhat-release")
+        centos_release = Facter::Util::Resolution.exec("sed -r -e 's/CentOS release //' -e 's/ \((Branch|Final)\)//' /etc/redhat-release")
         if centos_release =~ /5/
-          release = Facter::Util::Resolution.exec('rpm -q --qf \'%{VERSION}.%{RELEASE}\' centos-release | cut -d. -f1,2')
+            release = Facter::Util::Resolution.exec('rpm -q --qf \'%{VERSION}.%{RELEASE}\' centos-release | cut -d. -f1,2')
         else
-          release = centos_release
+            release = centos_release
         end
     end
 end
@@ -42,29 +42,31 @@ Facter.add(:operatingsystemrelease) do
     confine :operatingsystem => %w{Debian}
     setcode do
         release = Facter::Util::Resolution.exec('cat /etc/debian_version')
-     end
+    end
 end
 
 Facter.add(:operatingsystemrelease) do
     confine :operatingsystem => %w{Ubuntu}
     setcode do
         release = Facter::Util::Resolution.exec('cat /etc/issue')
-            if release =~ /Ubuntu (\d+.\d+)/
-                $1
-            end
+        if release =~ /Ubuntu (\d+.\d+)/
+            $1
+        end
     end
 end
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{SLES}
+    confine :operatingsystem => %w{SLES OpenSuSE}
     setcode do
         releasefile = Facter::Util::Resolution.exec('cat /etc/SuSE-release')
         if releasefile =~ /^VERSION\s*=\s*(\d+)/
             releasemajor = $1
             if releasefile =~ /^PATCHLEVEL\s*=\s*(\d+)/
                 releaseminor = $1
+	    elsif releasefile =~ /^VERSION\s=.*.(\d+)/
+		releaseminor = $1
             else
-                releaseminor = 0
+                releaseminor = "0"
             end
             releasemajor + "." + releaseminor
         else
@@ -76,12 +78,7 @@ end
 Facter.add(:operatingsystemrelease) do
     confine :operatingsystem => %w{Solaris}
     setcode do
-        full_release = File.readlines("/etc/release").to_s.match(/Solaris \w+ [\w\/]+ ([^_]+_[^_]+)/).to_a.last.chomp("wos")
-        if full_release =~ /^s(\d+)\w(_\w\d)+/
-            $1 + $2
-        else
-            full_release
-        end
+        release = Facter::Util::Resolution.exec('uname -v')
     end
 end
 

data/lib/facter/processor.rb

@@ -46,7 +46,7 @@ if Facter.value(:kernel) == "AIX"
         procs.each do |proc|
             if proc =~ /^proc(\d+)/
                 processor_num = $1.to_i
-                # Not retrieving the frequency since AIX 4.3.3 doesn't support the 
+                # Not retrieving the frequency since AIX 4.3.3 doesn't support the
                 # attribute and some people still use the OS.
                 proctype = Facter::Util::Resolution.exec('lsattr -El proc0 -a type')
                 if proctype =~ /^type\s+(\S+)\s+/

data/lib/facter/puppetversion.rb

@@ -1,10 +1,10 @@
 Facter.add(:puppetversion) do
-    setcode {
+    setcode do
         begin
             require 'puppet'
             Puppet::PUPPETVERSION.to_s
         rescue LoadError
             nil
         end
-    }
+    end
 end

data/lib/facter/uniqueid.rb

@@ -1,4 +1,4 @@
 Facter.add(:uniqueid) do
     setcode 'hostid',  '/bin/sh'
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo AIX}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX}
 end

data/lib/facter/uptime.rb

@@ -0,0 +1,20 @@
+require 'facter/util/uptime'
+
+Facter.add(:uptime) do
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX}
+    setcode do
+        Facter::Util::Uptime.get_uptime_simple
+    end
+end
+
+if FileTest.exists?("/proc/uptime")
+    uptime = Facter::Util::Uptime.get_uptime
+
+    %w{days hours seconds}.each do |label|
+        Facter.add("uptime_" + label) do
+                setcode do
+                    Facter::Util::Uptime.get_uptime_period(uptime, label)
+                end 
+        end 
+    end 
+end

data/lib/facter/util/fact.rb

@@ -102,7 +102,7 @@ class Facter::Util::Fact
     def searching
         if searching?
             Facter.debug "Caught recursion on %s" % @name
-            
+
             # return a cached value if we've got it
             if @value
                 return @value

data/lib/facter/util/ip.rb

@@ -1,27 +1,69 @@
-module Facter::IPAddress
-    
+# A base module for collecting IP-related
+# information from all kinds of platforms.
+module Facter::Util::IP
+    # A map of all the different regexes that work for
+    # a given platform or set of platforms.
+    REGEX_MAP = {
+        :linux => {
+            :ipaddress => /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+            :macaddress  => /(?:ether|HWaddr)\s+(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
+            :netmask => /Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+        },
+        :bsd => {
+            :aliases => [:openbsd, :netbsd, :freebsd, :darwin],
+            :ipaddress => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+            :macaddress  => /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/,
+            :netmask => /netmask\s+0x(\w{8})/
+        },
+        :sunos => {
+            :addr => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+            :macaddress  => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
+            :netmask => /netmask\s+(\w{8})/
+        }
+    }
+
+    # Convert an interface name into purely alpha characters.
+    def self.alphafy(interface)
+        interface.gsub(/[:.]/, '_')
+    end
+
+    def self.convert_from_hex?(kernel)
+        kernels_to_convert = [:sunos, :openbsd, :netbsd, :freebsd, :darwin]
+        kernels_to_convert.include?(kernel)
+    end
+
+    def self.supported_platforms
+        REGEX_MAP.inject([]) do |result, tmp|
+            key, map = tmp
+            if map[:aliases]
+                result += map[:aliases]
+            else
+                result << key
+            end
+            result
+        end
+    end
+
     def self.get_interfaces
-    
-     int = nil
-    
-     output =  Facter::IPAddress.get_all_interface_output()
-
-     # We get lots of warnings on platforms that don't get an output
-     # made.
-     if output
-         int = output.scan(/^\w+[.:]?\d+/)
-     else
-         []
-     end
-    
+        int = nil
+
+        output =  Facter::Util::IP.get_all_interface_output()
+
+        # We get lots of warnings on platforms that don't get an output
+        # made.
+        if output
+            int = output.scan(/^\w+[.:]?\d+/)
+        else
+            []
+        end
     end
 
     def self.get_all_interface_output
         case Facter.value(:kernel)
-            when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD'
-                output = %x{/sbin/ifconfig -a}
-            when 'SunOS'
-                output = %x{/usr/sbin/ifconfig -a}
+        when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin'
+            output = %x{/sbin/ifconfig -a}
+        when 'SunOS'
+            output = %x{/usr/sbin/ifconfig -a}
         end
         output
     end
@@ -29,60 +71,86 @@ module Facter::IPAddress
     def self.get_single_interface_output(interface)
         output = ""
         case Facter.value(:kernel)
-            when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD'
-                    output = %x{/sbin/ifconfig #{interface}}
-            when 'SunOS'
+        when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin'
+            output = %x{/sbin/ifconfig #{interface}}
+        when 'SunOS'
             output = %x{/usr/sbin/ifconfig #{interface}}
         end
         output
     end
 
+    def self.get_bonding_master(interface)
+        if Facter.value(:kernel) != 'Linux'
+            return nil
+        end
+        # We need ip instead of ifconfig because it will show us
+        # the bonding master device.
+        if not FileTest.executable?("/sbin/ip")
+            return nil
+        end
+        regex = /SLAVE[,>].* (bond[0-9]+)/
+            ethbond = regex.match(%x{/sbin/ip link show #{interface}})
+        if ethbond
+            device = ethbond[1]
+        else
+            device = nil
+        end
+        device
+    end
+
 
     def self.get_interface_value(interface, label)
-    
-    tmp1 = []
-
-    case Facter.value(:kernel)
-      when 'Linux'
-       addr = /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-       mac  = /(?:ether|HWaddr)\s+(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
-       mask = /Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-     when 'OpenBSD', 'NetBSD', 'FreeBSD'
-       addr = /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-       mac  = /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
-       mask = /netmask\s+(\w{10})/
-    when 'SunOS'
-       addr = /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-       mac  = /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/
-       mask = /netmask\s+(\w{8})/
+        tmp1 = []
+
+        kernel = Facter.value(:kernel).downcase.to_sym
+
+        # If it's not directly in the map or aliased in the map, then we don't know how to deal with it.
+        unless map = REGEX_MAP[kernel] || REGEX_MAP.values.find { |tmp| tmp[:aliases] and tmp[:aliases].include?(kernel) }
+            return []
+        end
+
+        # Pull the correct regex out of the map.
+        regex = map[label.to_sym]
+
+        # Linux changes the MAC address reported via ifconfig when an ethernet interface
+        # becomes a slave of a bonding device to the master MAC address.
+        # We have to dig a bit to get the original/real MAC address of the interface.
+        bonddev = get_bonding_master(interface)
+        if label == 'macaddress' and bonddev
+            bondinfo = IO.readlines("/proc/net/bonding/#{bonddev}")
+            hwaddrre = /^Slave Interface: #{interface}\n[^\n].+?\nPermanent HW addr: (([0-9a-fA-F]{2}:?)*)$/m
+            value = hwaddrre.match(bondinfo.to_s)[1].upcase
+        else
+            output_int = get_single_interface_output(interface)
+
+            if interface != "lo" && interface != "lo0"
+                output_int.each do |s|
+                    if s =~ regex
+                        value = $1
+                        if label == 'netmask' && convert_from_hex?(kernel)
+                            value = value.scan(/../).collect do |byte| byte.to_i(16) end.join('.')
+                        end
+                        tmp1.push(value)
+                    end
+                end
+            end
+
+            if tmp1
+                value = tmp1.shift
+            end
+        end
     end
+  
+    def self.get_network_value(interface)
+        require 'ipaddr'
 
-    case label
-      when 'ipaddress'
-       regex = addr
-      when 'macaddress'
-       regex = mac
-      when 'netmask'
-       regex = mask
-    end 
-
-    output_int = get_single_interface_output(interface)
-     
-      if interface != "lo" && interface != "lo0"
-        output_int.each { |s|
-           if s =~ regex
-               value = $1
-               if label == 'netmask' && Facter.value(:kernel) == "SunOS"
-                   value = value.scan(/../).collect do |byte| byte.to_i(16) end.join('.') 
-               end
-               tmp1.push(value)
-           end
-       }
-      end
-
-      if tmp1 
-        value = tmp1.shift
-      end
-
-   end
+        ipaddress = get_interface_value(interface, "ipaddress")
+        netmask = get_interface_value(interface, "netmask")
+        
+        if ipaddress && netmask
+            ip = IPAddr.new(ipaddress, Socket::AF_INET)
+            subnet = IPAddr.new(netmask, Socket::AF_INET)
+            network = ip.mask(subnet.to_s)
+        end
+    end
 end