facter 1.5.7 → 1.5.8

data/lib/facter/architecture.rb

@@ -1,12 +1,12 @@
 Facter.add(:architecture) do
-    confine :kernel => :linux
+    confine :kernel => [:linux, :"gnu/kfreebsd"]
     setcode do
         model = Facter.value(:hardwaremodel)
         case model
         # most linuxen use "x86_64"
         when "x86_64"
             case Facter.value(:operatingsystem)
-            when "Debian", "Gentoo"
+            when "Debian", "Gentoo", "GNU/kFreeBSD"
                 "amd64"
             else
                 model
@@ -23,3 +23,11 @@ Facter.add(:architecture) do
         end
     end
 end
+
+Facter.add(:architecture) do
+    confine :kernel => :openbsd
+    setcode do
+        architecture = Facter.value(:hardwaremodel)
+    end
+end
+

data/lib/facter/domain.rb

@@ -9,9 +9,6 @@ Facter.add(:domain) do
         domain = Facter::Util::Resolution.exec('dnsdomainname')
         next domain if domain =~ /.+\..+/
 
-        domain = Facter::Util::Resolution.exec('domainname')
-        next domain if domain =~ /.+\..+/
-
         if FileTest.exists?("/etc/resolv.conf")
             domain = nil
             search = nil

data/lib/facter/ipaddress.rb

@@ -7,7 +7,7 @@ Facter.add(:ipaddress) do
         output.split(/^\S/).each { |str|
             if str =~ /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
                 tmp = $1
-                unless tmp =~ /127\./
+                unless tmp =~ /^127\./
                     ip = tmp
                     break
                 end
@@ -27,7 +27,7 @@ Facter.add(:ipaddress) do
         output.split(/^\S/).each { |str|
             if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
                 tmp = $1
-                unless tmp =~ /127\./
+                unless tmp =~ /^127\./
                     ip = tmp
                     break
                 end
@@ -47,7 +47,7 @@ Facter.add(:ipaddress) do
         output.split(/^\S/).each { |str|
             if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
                 tmp = $1
-                unless tmp =~ /127\./
+                unless tmp =~ /^127\./
                     ip = tmp
                     break
                 end
@@ -78,7 +78,7 @@ Facter.add(:ipaddress) do
         output.split(/^\S/).each { |str|
             if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
                 tmp = $1
-                unless tmp =~ /127\./
+                unless tmp =~ /^127\./
                     ip = tmp
                     break
                 end
@@ -98,7 +98,7 @@ Facter.add(:ipaddress) do
         output.split(/^\S/).each { |str|
             if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
                 tmp = $1
-                unless tmp =~ /127\./
+                unless tmp =~ /^127\./
                     ip = tmp
                     break
                 end
@@ -112,29 +112,26 @@ end
 Facter.add(:ipaddress) do
     confine :kernel => %w{windows}
     setcode do
-        ip = nil
-        output = %x{ipconfig}
-
-        output.split(/^\S/).each { |str|
-            if str =~ /IP Address.*: ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-                tmp = $1
-                unless tmp =~ /127\./
-                    ip = tmp
-                    break
-                end
-            end
-        }
-        ip
+        require 'socket'
+        IPSocket.getaddress(Socket.gethostname)
     end
 end
 
 Facter.add(:ipaddress, :ldapname => "iphostnumber", :timeout => 2) do
     setcode do
-        require 'resolv'
-
+        if Facter.value(:kernel) == 'windows'
+            require 'win32/resolv'
+        else
+            require 'resolv'
+        end
+        
         begin
             if hostname = Facter.value(:hostname)
-                ip = Resolv.getaddress(hostname)
+                if Facter.value(:kernel) == 'windows'
+                    ip = Win32::Resolv.get_resolv_info.last[0]
+                else
+                    ip = Resolv.getaddress(hostname)                
+                end
                 unless ip == "127.0.0.1"
                     ip
                 end

data/lib/facter/kernel.rb

@@ -2,8 +2,10 @@ Facter.add(:kernel) do
     setcode do
         require 'rbconfig'
         case Config::CONFIG['host_os']
-        when /mswin/i; 'windows'
-        else Facter::Util::Resolution.exec("uname -s")
+        when /mswin|win32|dos|cygwin|mingw/i
+            'windows'
+        else
+            Facter::Util::Resolution.exec("uname -s")
         end
     end
 end

data/lib/facter/macaddress.rb

@@ -67,13 +67,26 @@ 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]
+        require 'win32ole'
+        require 'socket'
+
+        ether = nil
+        host = Socket.gethostname
+        connect_string = "winmgmts://#{host}/root/cimv2"
+
+        wmi = WIN32OLE.connect(connect_string)
+
+        query = %Q{
+          select *
+          from Win32_NetworkAdapterConfiguration
+          where IPEnabled = True
+        }
+
+        wmi.ExecQuery(query).each{ |nic|
+          ether = nic.MacAddress
+          break
+        }
+        
+        ether
     end
 end

data/lib/facter/memory.rb

@@ -20,27 +20,68 @@ require 'facter/util/memory'
     end
 end
 
-if Facter.value(:kernel) == "AIX"
+if Facter.value(:kernel) == "AIX" and Facter.value(:id) == "root"
     swap = Facter::Util::Resolution.exec('swap -l')
     swapfree, swaptotal = 0, 0
     swap.each do |dev|
-        if dev =~ /^\/\S+\s.*\s+(\S+)MB\s+(\S+)MB/
+      if dev =~ /^\/\S+\s.*\s+(\S+)MB\s+(\S+)MB/
+        swaptotal += $1.to_i
+        swapfree  += $2.to_i
+      end 
+    end 
+ 
+    Facter.add("SwapSize") do
+        confine :kernel => :aix
+        setcode do
+            Facter::Memory.scale_number(swaptotal.to_f,"MB")
+        end
+    end
+
+    Facter.add("SwapFree") do
+        confine :kernel => :aix
+        setcode do
+            Facter::Memory.scale_number(swapfree.to_f,"MB")
+        end
+    end
+end
+
+if Facter.value(:kernel) == "OpenBSD"
+    swap = Facter::Util::Resolution.exec('swapctl -l | sed 1d')
+    swapfree, swaptotal = 0, 0
+    swap.each do |dev|
+        if dev =~ /^\S+\s+(\S+)\s+\S+\s+(\S+)\s+.*$/
             swaptotal += $1.to_i
             swapfree  += $2.to_i
         end
     end
 
     Facter.add("SwapSize") do
-        confine :kernel => :aix
+        confine :kernel => :openbsd
         setcode do
-            Facter::Memory.scale_number(swaptotal.to_f,"MB")
+            Facter::Memory.scale_number(swaptotal.to_f,"kB")
         end
     end
 
     Facter.add("SwapFree") do
-        confine :kernel => :aix
+        confine :kernel => :openbsd
         setcode do
-            Facter::Memory.scale_number(swapfree.to_f,"MB")
+            Facter::Memory.scale_number(swapfree.to_f,"kB")
+        end
+    end
+
+    Facter.add("MemoryFree") do
+        confine :kernel => :openbsd
+        memfree = Facter::Util::Resolution.exec("vmstat | tail -n 1 | awk '{ print $5 }'")
+        setcode do
+            Facter::Memory.scale_number(memfree.to_f,"kB")
+        end
+    end
+
+    Facter.add("MemoryTotal") do
+        confine :kernel => :openbsd
+        memtotal = Facter::Util::Resolution.exec("sysctl hw.physmem | cut -d'=' -f2")
+        setcode do
+            Facter::Memory.scale_number(memtotal.to_f,"")
         end
     end
 end

data/lib/facter/operatingsystem.rb

@@ -20,6 +20,8 @@ Facter.add(:operatingsystem) do
             "Mandriva"
         elsif FileTest.exists?("/etc/mandrake-release")
             "Mandrake"
+        elsif FileTest.exists?("/etc/meego-release")
+            "MeeGo"
         elsif FileTest.exists?("/etc/arch-release")
             "Archlinux"
         elsif FileTest.exists?("/etc/enterprise-release")
@@ -48,6 +50,8 @@ Facter.add(:operatingsystem) do
             else
                 "SuSE"
             end
+	elsif FileTest.exists?("/etc/slackware-version")
+	    "Slackware"
         end
     end
 end

data/lib/facter/operatingsystemrelease.rb

@@ -1,14 +1,16 @@
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat}
+    confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat MeeGo}
     setcode do
         case Facter.value(:operatingsystem)
         when "CentOS", "RedHat"
             releasefile = "/etc/redhat-release"
         when "Fedora"
             releasefile = "/etc/fedora-release"
-        when "oel"
+        when "MeeGo"
+            releasefile = "/etc/meego-release"
+        when "OEL", "oel"
             releasefile = "/etc/enterprise-release"
-        when "ovs"
+        when "OVS", "ovs"
             releasefile = "/etc/ovs-release"
         end
         File::open(releasefile, "r") do |f|
@@ -59,6 +61,16 @@ Facter.add(:operatingsystemrelease) do
     end
 end
 
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{Slackware}
+    setcode do
+        release = Facter::Util::Resolution.exec('cat /etc/slackware-version')
+        if release =~ /Slackware ([0-9.]+)/
+            $1
+        end
+    end
+end
+
 Facter.add(:operatingsystemrelease) do
     setcode do Facter[:kernelrelease].value end
 end

data/lib/facter/processor.rb

@@ -72,3 +72,19 @@ if Facter.value(:kernel) == "AIX"
         end
     end
 end
+
+if Facter.value(:kernel) == "OpenBSD"
+    Facter.add("Processor") do
+        confine :kernel => :openbsd
+        setcode do
+            Facter::Util::Resolution.exec("uname -p")
+        end
+    end
+    
+    Facter.add("ProcessorCount") do
+        confine :kernel => :openbsd 
+        setcode do
+            Facter::Util::Resolution.exec("sysctl hw.ncpu | cut -d'=' -f2")
+        end
+    end
+end

data/lib/facter/uptime.rb

@@ -1,20 +1,23 @@
 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
+  setcode do
+    seconds = Facter.fact(:uptime_seconds).value
 
-if FileTest.exists?("/proc/uptime")
-    uptime = Facter::Util::Uptime.get_uptime
+    unless seconds
+      "unknown"
+    else
+      days    = seconds / (60 * 60 * 24)
+      hours   = seconds / (60 * 60) % 24
+      minutes = seconds / 60 % 60
 
-    %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 
+      case days
+      when 0 then "#{hours}:#{"%02d" % minutes} hours"
+      when 1 then '1 day'
+      else "#{days} days"
+      end
+    end
+
+  end
 end
+

data/lib/facter/uptime_days.rb

@@ -0,0 +1,7 @@
+Facter.add(:uptime_days) do
+  setcode do
+    hours = Facter.value(:uptime_hours)
+    hours && hours / 24 # hours in day
+  end
+end
+

data/lib/facter/uptime_hours.rb

@@ -0,0 +1,7 @@
+Facter.add(:uptime_hours) do
+  setcode do
+    seconds = Facter.value(:uptime_seconds)
+    seconds && seconds / (60 * 60) # seconds in hour
+  end
+end
+

data/lib/facter/uptime_seconds.rb

@@ -0,0 +1,10 @@
+require 'facter/util/uptime'
+
+Facter.add(:uptime_seconds) do
+  setcode { Facter::Util::Uptime.get_uptime_seconds_unix }
+end
+
+Facter.add(:uptime_seconds) do
+  confine :kernel => :windows
+  setcode { Facter::Util::Uptime.get_uptime_seconds_win }
+end

data/lib/facter/util/ip.rb

@@ -16,19 +16,24 @@ module Facter::Util::IP
             :netmask    => /netmask\s+0x(\w{8})/
         },
         :sunos => {
-            :ipaddress => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+            :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+(\w{8})/
+        },
+        :"hp-ux" => {
+            :ipaddress  => /\s+inet (\S+)\s.*/,
+            :macaddress => /(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
+            :netmask    => /.*\s+netmask (\S+)\s.*/
         }
     }
 
     # Convert an interface name into purely alpha characters.
     def self.alphafy(interface)
-        interface.gsub(/[:.]/, '_')
+        interface.gsub(/[-:.]/, '_')
     end
 
     def self.convert_from_hex?(kernel)
-        kernels_to_convert = [:sunos, :openbsd, :netbsd, :freebsd, :darwin]
+        kernels_to_convert = [:sunos, :openbsd, :netbsd, :freebsd, :darwin, :"hp-ux"]
         kernels_to_convert.include?(kernel)
     end
 
@@ -51,7 +56,7 @@ module Facter::Util::IP
         # at the end of interfaces.  So, we have to trim those trailing
         # characters.  I tried making the regex better but supporting all
         # platforms with a single regex is probably a bit too much.
-        output.scan(/^\w+[.:]?\d+[.:]?\d*[.:]?\w*/).collect { |i| i.sub(/:$/, '') }.uniq
+        output.scan(/^[-\w]+[.:]?\d+[.:]?\d*[.:]?\w*/).collect { |i| i.sub(/:$/, '') }.uniq
     end
 
     def self.get_all_interface_output
@@ -60,6 +65,8 @@ module Facter::Util::IP
             output = %x{/sbin/ifconfig -a}
         when 'SunOS'
             output = %x{/usr/sbin/ifconfig -a}
+        when 'HP-UX'
+            output = %x{/bin/netstat -i}
         end
         output
     end
@@ -71,6 +78,12 @@ module Facter::Util::IP
             output = %x{/sbin/ifconfig #{interface}}
         when 'SunOS'
             output = %x{/usr/sbin/ifconfig #{interface}}
+        when 'HP-UX'
+           mac = ""
+           ifc = %x{/usr/sbin/ifconfig #{interface}}
+           %x{/usr/sbin/lanscan}.scan(/(\dx\S+).*UP\s+(\w+\d+)/).each {|i| mac = i[0] if i.include?(interface) }
+           mac = mac.sub(/0x(\S+)/,'\1').scan(/../).join(":")
+           output = ifc + "\n" + mac
         end
         output
     end
@@ -101,7 +114,6 @@ module Facter::Util::IP
         device
     end
 
-
     def self.get_interface_value(interface, label)
         tmp1 = []