facter 1.3.8 → 1.5

data/lib/facter/kernel.rb

@@ -0,0 +1,3 @@
+Facter.add(:kernel) do
+    setcode 'uname -s'
+end

data/lib/facter/kernelrelease.rb

@@ -0,0 +1,8 @@
+Facter.add(:kernelrelease) do
+    setcode 'uname -r'
+end
+
+Facter.add(:kernelrelease, :timeout => 5) do
+    confine :kernel => :aix
+    setcode 'oslevel -s'
+end

data/lib/facter/lsb.rb

@@ -0,0 +1,37 @@
+## lsb.rb
+## Facts related to Linux Standard Base (LSB)
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License
+## as published by the Free Software Foundation (version 2 of the License)
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
+##
+
+{   "LSBRelease" => %r{^LSB Version:\t(.*)$},
+    "LSBDistId" => %r{^Distributor ID:\t(.*)$},
+    "LSBDistRelease" => %r{^Release:\t(.*)$},
+    "LSBDistDescription" => %r{^Description:\t(.*)$},
+    "LSBDistCodeName" => %r{^Codename:\t(.*)$}
+}.each do |fact, pattern|
+    Facter.add(fact) do
+        setcode do
+            unless defined?(@@lsbdata) and defined?(@@lsbtime) and (Time.now.to_i - @@lsbtime.to_i < 5)
+                type = nil
+                @@lsbtime = Time.now
+                @@lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null')
+            end
+                    
+            if pattern.match(@@lsbdata)
+                $1
+            else
+                nil
+            end
+        end
+    end
+end

data/lib/facter/lsbmajdistrelease.rb

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

data/lib/facter/macaddress.rb

@@ -0,0 +1,65 @@
+Facter.add(:macaddress) do
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo}
+    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})/
+                    }
+        ether[0]
+    end
+end
+
+Facter.add(:macaddress) do
+    confine :operatingsystem => %w{FreeBSD OpenBSD}
+    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
+                    }
+        ether[0]
+    end
+end
+
+Facter.add(:macaddress) do
+    confine :kernel => :darwin
+    setcode do
+        ether = nil
+        output = %x{/sbin/ifconfig}
+
+        output.split(/^\S/).each { |str|
+            if str =~ /10baseT/ # we're wired
+                str =~ /ether (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
+                ether = $1
+            end
+        }
+
+        ether
+    end
+end
+
+Facter.add(:macaddress) do
+    confine :kernel => %w{AIX}
+    setcode do
+        ether = []
+        ip = nil
+        output = %x{/usr/sbin/ifconfig -a}
+        output.each { |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
+                               }
+                end
+            end
+        }
+        ether[0]
+    end
+end

data/lib/facter/macosx.rb

@@ -10,11 +10,11 @@
 # as published by the Free Software Foundation (version 2 of the License)
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA    02110-1301 USA
 
 # Jeff McCune
 # There's a lot more information coming out of system_profiler -xml
@@ -22,63 +22,33 @@
 # at this point in time.
 # In particular, Installed Software might be an interesting addition.
 
-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
-    end
-    ver
-  end
-end
+require 'facter/util/macosx'
 
-if Facter.kernel == "Darwin"
-  Facter::Macosx.hardware_overview.each do |fact, value|
-    Facter.add("sp_#{fact}") do
-      confine :kernel => :darwin
-      setcode do
-        value
-      end
+if Facter.value(:kernel) == "Darwin"
+    Facter::Macosx.hardware_overview.each do |fact, value|
+        Facter.add("sp_#{fact}") do
+            confine :kernel => :darwin
+            setcode do
+                value.to_s
+            end
+        end
     end
-  end
 
-  Facter::Macosx.os_overview.each do |fact, value|
-    Facter.add("sp_#{fact}") do
-      confine :kernel => :darwin
-      setcode do
-        value
-      end
+    Facter::Macosx.os_overview.each do |fact, value|
+        Facter.add("sp_#{fact}") do
+            confine :kernel => :darwin
+            setcode do
+                value.to_s
+            end
+        end
     end
-  end
 
-  Facter::Macosx.sw_vers.each do |fact, value|
-    Facter.add(fact) do
-      confine :kernel => :darwin
-      setcode do
-        value
-      end
+    Facter::Macosx.sw_vers.each do |fact, value|
+        Facter.add(fact) do
+            confine :kernel => :darwin
+            setcode do
+                value
+            end
+        end
     end
-  end
 end

data/lib/facter/manufacturer.rb

@@ -1,48 +1,10 @@
-# Info about the manufacturer
-#           
-    
-module Facter::Manufacturer
-    def self.dmi_find_system_info(name)
-        return nil unless FileTest.exists?("/usr/sbin/dmidecode")
+# manufacturer.rb
+# Facts related to hardware manufacturer
+#
+#
 
-        # Do not run the command more than every five seconds.
-        unless defined?(@data) and defined?(@time) and (Time.now.to_i - @time.to_i < 5)
-            @data = {}
-            type = nil
-            @time = Time.now
-            # It's *much* easier to just parse the whole darn file than
-            # to just match a chunk of it.
-            %x{/usr/sbin/dmidecode 2>/dev/null}.split("\n").each do |line|
-                case line
-                when /^(\S.+)$/
-                    type = $1.chomp
-                    @data[type] ||= {}
-                when /^\s+(\S.+): (\S.*)$/
-                    unless type
-                        next
-                    end
-                    @data[type][$1] = $2
-                end
-            end
-        end
+require 'facter/util/manufacturer'
 
-        if data = @data["System Information"]
-            data[name]
-        else
-            nil
-        end
-    end
-end         
-        
-# Add the facts to Facter
+query = { 'System Information' =>  [ 'Manufacturer:', 'Product Name:' , 'Serial Number:'], 'Chassis Information' => 'Type:'}
 
-{:SerialNumber => "Serial Number",
- :Manufacturer => "Manufacturer",
- :ProductName=> "Product Name"}.each do |fact, name|
-    Facter.add(fact) do
-        confine :kernel => :linux
-        setcode do
-            Facter::Manufacturer.dmi_find_system_info(name)
-        end
-    end  
-end
+Facter::Manufacturer.dmi_find_system_info(query) 

data/lib/facter/memory.rb

@@ -1,68 +1,45 @@
-#
 # memory.rb
 # Additional Facts for memory/swap usage
 #
 # Copyright (C) 2006 Mooter Media Ltd
 # Author: Matthew Palmer <matt@solutionsfirst.com.au>
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation (version 2 of the License)
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
-
-module Facter::Memory
-    require 'thread'
+#
+require 'facter/util/memory'
 
-    def self.meminfo_number(tag)
-        memsize = ""
-        Thread::exclusive do
-            size, scale = [0, ""]
-            File.readlines("/proc/meminfo").each do |l|
-                size, scale = [$1.to_f, $2] if l =~ /^#{tag}:\s+(\d+)\s+(\S+)/
-                # MemoryFree == memfree + cached + buffers
-                #  (assume scales are all the same as memfree)
-                if tag == "MemFree" &&
-                    l =~ /^(?:Buffers|Cached):\s+(\d+)\s+(?:\S+)/
-                    size += $1.to_f
-                end
-            end
-            memsize = scale_number(size, scale)
+{:MemorySize => "MemTotal",
+ :MemoryFree => "MemFree",
+ :SwapSize   => "SwapTotal",
+ :SwapFree   => "SwapFree"}.each do |fact, name|
+    Facter.add(fact) do
+        confine :kernel => :linux
+        setcode do
+            Facter::Memory.meminfo_number(name)
         end
-            
-        memsize
     end
+end
 
-    def self.scale_number(size, multiplier)
-        suffixes = ['', 'kB', 'MB', 'GB', 'TB']
-
-        s = suffixes.shift
-        while s != multiplier
-            s = suffixes.shift
+if Facter.value(:kernel) == "AIX"
+    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/
+            swaptotal += $1.to_i
+            swapfree  += $2.to_i
         end
+    end
 
-        while size > 1024.0
-            size /= 1024.0
-            s = suffixes.shift
+    Facter.add("SwapSize") do
+        confine :kernel => :aix
+        setcode do
+            Facter::Memory.scale_number(swaptotal.to_f,"MB")
         end
-                    
-        return "%.2f %s" % [size, s]
     end
-end
 
-{:MemorySize => "MemTotal",
- :MemoryFree => "MemFree",
- :SwapSize   => "SwapTotal",
- :SwapFree   => "SwapFree"}.each do |fact, name|
-    Facter.add(fact) do
-        confine :kernel => :linux
+    Facter.add("SwapFree") do
+        confine :kernel => :aix
         setcode do
-            Facter::Memory.meminfo_number(name)
+            Facter::Memory.scale_number(swapfree.to_f,"MB")
         end
     end
 end

data/lib/facter/netmask.rb

@@ -0,0 +1,17 @@
+# netmask.rb
+# Find the netmask of the primary ipaddress
+# Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
+# Copyright (C) 2007 Mark 'phips' Phillips
+#
+# idea and originial source by Mark 'phips' Phillips
+#
+
+require 'facter/util/netmask'
+
+Facter.add("netmask") do
+	confine :kernel => [ :sunos, :linux ]
+	setcode do
+		Facter::NetMask.get_netmask
+	end
+end
+

data/lib/facter/operatingsystem.rb

@@ -0,0 +1,37 @@
+Facter.add(:operatingsystem) do
+    confine :kernel => :sunos
+    setcode do "Solaris" end
+end
+
+Facter.add(:operatingsystem) do
+    confine :kernel => :linux
+    setcode do
+        if Facter.value(:lsbdistid) == "Ubuntu"
+           "Ubuntu"
+        elsif FileTest.exists?("/etc/debian_version")
+            "Debian"
+        elsif FileTest.exists?("/etc/gentoo-release")
+            "Gentoo"
+        elsif FileTest.exists?("/etc/fedora-release")
+            "Fedora"
+        elsif FileTest.exists?("/etc/mandriva-release")
+            "Mandriva"
+        elsif FileTest.exists?("/etc/mandrake-release")
+            "Mandrake"
+        elsif FileTest.exists?("/etc/redhat-release")
+            txt = File.read("/etc/redhat-release")
+            if txt =~ /centos/i
+                "CentOS"
+            else
+                "RedHat"
+            end
+        elsif FileTest.exists?("/etc/SuSE-release")
+            "SuSE"
+        end
+    end
+end
+
+Facter.add(:operatingsystem) do
+    # Default to just returning the kernel as the operating system
+    setcode do Facter[:kernel].value end
+end

data/lib/facter/operatingsystemrelease.rb

@@ -0,0 +1,63 @@
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => :fedora
+    setcode do
+        File::open("/etc/fedora-release", "r") do |f|
+            line = f.readline.chomp
+            if line =~ /\(Rawhide\)$/
+                "Rawhide"
+            elsif line =~ /release (\d+)/
+                $1
+            end
+        end
+    end
+end
+
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{RedHat}
+    setcode do
+        File::open("/etc/redhat-release", "r") do |f|
+            line = f.readline.chomp
+            if line =~ /\(Rawhide\)$/
+                "Rawhide"
+            elsif line =~ /release (\d+)/
+                $1
+            end
+        end
+    end
+end
+
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{CentOS}
+    setcode do
+      centosrelease = Facter::Util::Resolution.exec('cat /etc/redhat-release | sed -e \'s/CentOS release//g\' -e \'s/(Final)//g\'')
+        if centosrelease =~ /^5^/
+          release = Facter::Util::Resolution.exec('rpm -q --qf \'%{VERSION}.%{RELEASE}\' centos-release | cut -d. -f1,2')
+        else
+          release = Facter::Util::Resolution.exec('cat /etc/redhat-release | sed -e \'s/CentOS release//g\' -e \'s/(Final)//g\'')
+        end
+    end
+end
+
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{Debian}
+    setcode do
+        release = Facter::Util::Resolution.exec('cat /proc/version')
+            if release =~ /\(Debian (\d+.\d+).\d+-\d+\)/
+                $1
+            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
+    end
+end
+
+Facter.add(:operatingsystemrelease) do
+    setcode do Facter[:kernelrelease].value end
+end