facter 1.5.9 → 1.6.0

data/lib/facter/iphostnumber.rb

@@ -1,3 +1,14 @@
+# Fact: iphostnumber
+#
+# Purpose: On selected versions of Darwin, returns the host's IP address.
+#
+# Resolution:
+#   Uses either the scutil program to get the localhost name, or parses output
+#   of ifconfig for a MAC address.
+#
+# Caveats:
+#
+
 Facter.add(:iphostnumber) do
     confine :kernel => :darwin, :kernelrelease => "R6"
     setcode do

data/lib/facter/kernel.rb

@@ -1,3 +1,14 @@
+# Fact: kernel
+#
+# Purpose: Returns the operating system's name.
+#
+# Resolution:
+#   Uses Ruby's rbconfig to find host_os, if that is a Windows derivative, the
+#   returns 'windows', otherwise returns "uname -s" verbatim.
+#
+# Caveats:
+#
+
 Facter.add(:kernel) do
     setcode do
         require 'rbconfig'

data/lib/facter/kernelmajversion.rb

@@ -1,3 +1,13 @@
+# Fact: kernelmajversion
+#
+# Purpose: Return the operating system's release number's major value.
+#
+# Resolution:
+#   Takes the first 2 elements of the kernel version as delimited by periods.
+#
+# Caveats:
+#
+
 Facter.add("kernelmajversion") do
     setcode do
         Facter.value(:kernelversion).split('.')[0..1].join('.')

data/lib/facter/kernelrelease.rb

@@ -1,3 +1,16 @@
+# Fact: kernelrelease
+#
+# Purpose: Return the operating system's release number.
+#
+# Resolution:
+#   On AIX returns the output from the "oslevel -s" system command.
+#   On Windows based systems, uses the win32ole gem to query Windows Management
+#   for the 'Win32_OperatingSystem' value.
+#   Otherwise uses the output of "uname -r" system command.
+#
+# Caveats:
+#
+
 Facter.add(:kernelrelease) do
     setcode 'uname -r'
 end

data/lib/facter/kernelversion.rb

@@ -1,3 +1,15 @@
+# Fact: kernelversion
+#
+# Purpose: Return the operating system's kernel version.
+#
+# Resolution:
+#   On Solaris and SunOS based machines, returns the output of "uname -v".
+#   Otherwise returns the 'kernerlversion' fact up to the first '-'. This may be
+#   the entire 'kernelversion' fact in many cases.
+#
+# Caveats:
+#
+
 Facter.add("kernelversion") do
     setcode do
         Facter['kernelrelease'].value.split('-')[0]

data/lib/facter/lsb.rb

@@ -1,17 +1,18 @@
+# Fact: lsb
+#
+# Purpose: Return Linux Standard Base information for the host.
+#
+# Resolution:
+#   Uses the lsb_release system command and parses the output with a series of
+#   regular expressions.
+#
+# Caveats:
+#   Only works on Linux (and the kfreebsd derivative) systems.
+#   Requires the lsb_release program, which may not be installed by default.
+#   Also is as only as accurate as that program outputs.
+
 ## 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(.*)$},

data/lib/facter/lsbmajdistrelease.rb

@@ -1,3 +1,15 @@
+# Fact: lsbmajdistrelease
+#
+# Purpose: Returns the major version of the operation system version as gleaned
+# from the lsbdistrelease fact.
+#
+# Resolution:
+#   Parses the lsbdistrelease fact for numbers followed by a period and
+#   returns those, or just the lsbdistrelease fact if none were found.
+#
+# Caveats:
+#
+
 # lsbmajdistrelease.rb
 #
 require 'facter'

data/lib/facter/macaddress.rb

@@ -1,3 +1,12 @@
+# Fact: macaddress
+#
+# Purpose: 
+#
+# Resolution:
+#
+# Caveats:
+#
+
 require 'facter/util/macaddress'
 
 Facter.add(:macaddress) do
@@ -12,6 +21,18 @@ Facter.add(:macaddress) do
     end
 end
 
+Facter.add(:macaddress) do
+    confine :operatingsystem => "Solaris"
+    setcode do
+        ether = []
+        output = Facter::Util::Resolution.exec("/usr/bin/netstat -np")
+        output.each_line do |s|
+            ether.push($1) if s =~ /(?:SPLA)\s+(\w{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2})/
+        end
+        ether[0]
+    end
+end
+
 Facter.add(:macaddress) do
     confine :operatingsystem => %w{FreeBSD OpenBSD}
     setcode do

data/lib/facter/macosx.rb

@@ -1,3 +1,16 @@
+# Fact: macosx
+#
+# Purpose:
+#   Returns a number of Mac specific facts, from system profiler and
+#   sw_vers.
+#
+# Resolution:
+#   Uses util/macosx.rb to do the fact reconnaissance, then outputs them
+#   preceded by 'sp_'
+#
+# Caveats:
+#
+
 #
 # macosx.rb
 # Additional Facts coming from Mac OS X system_profiler command
@@ -5,17 +18,6 @@
 # Copyright (C) 2007 Jeff McCune
 # Author: Jeff McCune <jeff.mccune@northstarlabs.net>
 #
-# 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
-
 # Jeff McCune
 # There's a lot more information coming out of system_profiler -xml
 # We could add quite a bit more, but I didn't want to overload facter

data/lib/facter/manufacturer.rb

@@ -1,3 +1,16 @@
+# Fact: manufacturer
+#
+# Purpose: Return the hardware manufacturer information about the hardware.
+#
+# Resolution:
+#   On OpenBSD, queries sysctl values, via a util class.
+#   On SunOS Sparc, uses prtdiag via a util class.
+#   On Windows, queries the system via a util class.
+#   Uses the 'util/manufacturer.rb' for fallback parsing.
+#
+# Caveats:
+#
+
 # manufacturer.rb
 # Facts related to hardware manufacturer
 #

data/lib/facter/memory.rb

@@ -1,3 +1,20 @@
+# Fact: memory
+#
+# Purpose: Return information about memory and swap usage.
+#
+# Resolution:
+#   On Linuxes, uses Facter::Memory.meminfo_number from
+#   'facter/util/memory.rb'
+#   On AIX, parses "swap -l" for swap values only.
+#   On OpenBSD, it parses "swapctl -l" for swap values, vmstat via a module for
+#   free memory, and "sysctl hw.physmem" for maximum memory.
+#   On Solaris, use "swap -l" for swap values, and parsing prtconf for maximum
+#   memory, and again, the vmstat module for free memory.
+#
+# Caveats:
+#   Some BSD platforms aren't covered at all. AIX is missing memory values.
+#
+
 # memory.rb
 # Additional Facts for memory/swap usage
 #
@@ -23,30 +40,30 @@ end
 Facter.add("SwapSize") do
     confine :kernel => :Darwin
     setcode do
-	swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
-	swaptotal = 0
-	if swap =~ /total = (\S+)/ then swaptotal = $1; end
-	swaptotal
+    swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
+    swaptotal = 0
+    if swap =~ /total = (\S+)/ then swaptotal = $1; end
+      swaptotal
     end
 end
 
 Facter.add("SwapFree") do
     confine :kernel => :Darwin
     setcode do
-	swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
-	swapfree = 0
-	if swap =~ /free = (\S+)/ then swapfree = $1; end
-	swapfree
+    swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
+    swapfree = 0
+    if swap =~ /free = (\S+)/ then swapfree = $1; end
+      swapfree
     end
 end
 
 Facter.add("SwapEncrypted") do
     confine :kernel => :Darwin
     setcode do
-	swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
-	encrypted = false
-	if swap =~ /\(encrypted\)/ then encrypted = true; end
-	encrypted
+    swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
+    encrypted = false
+    if swap =~ /\(encrypted\)/ then encrypted = true; end
+      encrypted
     end
 end
 
@@ -57,9 +74,9 @@ if Facter.value(:kernel) == "AIX" and Facter.value(:id) == "root"
       if dev =~ /^\/\S+\s.*\s+(\S+)MB\s+(\S+)MB/
         swaptotal += $1.to_i
         swapfree  += $2.to_i
-      end 
-    end 
- 
+      end
+    end
+
     Facter.add("SwapSize") do
         confine :kernel => :aix
         setcode do
@@ -154,9 +171,9 @@ if Facter.value(:kernel) == "SunOS"
         if dev =~ /^\/\S+\s.*\s+(\d+)\s+(\d+)$/
             swaptotal += $1.to_i / 2
             swapfree  += $2.to_i / 2
-        end 
-    end 
- 
+        end
+    end
+
     Facter.add("SwapSize") do
         confine :kernel => :sunos
         setcode do

data/lib/facter/netmask.rb

@@ -1,3 +1,12 @@
+# Fact: netmask
+#
+# Purpose: Returns the netmask for the main interfaces.
+#
+# Resolution: Uses the facter/util/netmask library routines.
+#
+# Caveats:
+#
+
 # netmask.rb
 # Find the netmask of the primary ipaddress
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>

data/lib/facter/network.rb

@@ -1,3 +1,15 @@
+# Fact: network
+#
+# Purpose:
+# Get IP, network and netmask information for available network
+# interfacs.
+#
+# Resolution:
+#  Uses 'facter/util/ip' to enumerate interfaces and return their information.
+#
+# Caveats:
+#
+
 require 'facter/util/ip'
 
 Facter::Util::IP.get_interfaces.each do |interface|

data/lib/facter/operatingsystem.rb

@@ -1,3 +1,16 @@
+# Fact: operatingsystem
+#
+# Purpose: Return the name of the operating system.
+#
+# Resolution:
+#   If the kernel is a Linux kernel, check for the existence of a selection of
+#   files in /etc/ to find the specific flavour.
+#   On SunOS based kernels, return Solaris.
+#   On systems other than Linux, use the kernel value.
+#
+# Caveats:
+#
+
 require 'facter/lsb'
 
 Facter.add(:operatingsystem) do

data/lib/facter/operatingsystemrelease.rb

@@ -1,3 +1,20 @@
+# Fact: operatingsystemrelease
+#
+# Purpose: Returns the release of the operating system.
+#
+# Resolution:
+#   On RedHat derivatives, returns their '/etc/<variant>-release' file.
+#   On Debian, returns '/etc/debian_version'.
+#   On Ubuntu, parses '/etc/issue' for the release version.
+#   On Suse, derivatives, parses '/etc/SuSE-release' for a selection of version
+#   information.
+#   On Slackware, parses '/etc/slackware-version'.
+#   
+#   On all remaining systems, returns the 'kernelrelease' value.
+#
+# Caveats:
+#
+
 Facter.add(:operatingsystemrelease) do
     confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat MeeGo}
     setcode do

data/lib/facter/path.rb

@@ -1,3 +1,12 @@
+# Fact: path
+#
+# Purpose: Returns the $PATH variable.
+#
+# Resolution: Gets $PATH from the environment.
+#
+# Caveats:
+#
+
 Facter.add(:path) do
     setcode do
         ENV['PATH']

data/lib/facter/physicalprocessorcount.rb

@@ -1,7 +1,56 @@
-Facter.add("physicalprocessorcount") do
-    confine :kernel => :linux
+# Fact: physicalprocessorcount
+#
+# Purpose: Return the number of physical processors.
+#
+# Resolution:
+#
+#   Attempts to use sysfs to get the physical IDs of the processors. Falls
+#   back to /proc/cpuinfo and "physical id" if sysfs is not available.
+#
+# Caveats:
+#
+Facter.add('physicalprocessorcount') do
+  confine :kernel => :linux
 
-    setcode do
-        ppcount = Facter::Util::Resolution.exec('grep "physical id" /proc/cpuinfo|cut -d: -f 2|sort -u|wc -l')
+  setcode do
+    sysfs_cpu_directory = '/sys/devices/system/cpu' # This should always be there ...
+
+    if File.exists?(sysfs_cpu_directory)
+      #
+      # We assume that the sysfs file system has the correct number of entries
+      # under the "/sys/device/system/cpu" directory and if so then we process
+      # content of the file "physical_package_id" located inside the "topology"
+      # directory in each of the per-CPU sub-directories.
+      #
+      # As per Linux Kernel documentation and the file "cputopology.txt" located
+      # inside the "/usr/src/linux/Documentation" directory we can find following
+      # short explanation:
+      #
+      # (...)
+      #
+      # 1) /sys/devices/system/cpu/cpuX/topology/physical_package_id:
+      #
+      #         physical package id of cpuX. Typically corresponds to a physical
+      #         socket number, but the actual value is architecture and platform
+      #         dependent.
+      #
+      # (...)
+      #
+      lookup_pattern = "#{sysfs_cpu_directory}" +
+        "/cpu*/topology/physical_package_id"
+
+      Dir.glob(lookup_pattern).collect { |f| Facter::Util::Resolution.exec("cat #{f}")}.uniq.size
+
+    else
+      #
+      # Try to count number of CPUs using the proc file system next ...
+      #
+      # We assume that /proc/cpuinfo has what we need and is so then we need
+      # to make sure that we only count unique entries ...
+      #
+      str = Facter::Util::Resolution.exec("grep 'physical.\\+:' /proc/cpuinfo")
+
+      if str then str.scan(/\d+/).uniq.size; end
     end
+  end
 end