facter 1.5.9 → 1.6.0

data/lib/facter/processor.rb

@@ -1,5 +1,18 @@
+# Fact: processor
+#
+# Purpose:
+#   Additional Facts about the machine's CPUs.
+#
+# Resolution:
+#   On Linux and kFreeBSD, parse '/proc/cpuinfo' for each processor.
+#   On AIX, parse the output of 'lsdev' for it's processor section.
+#   On OpenBSD, use 'uname -p' and the sysctl variable for 'hw.ncpu' for CPU
+#   count.
+#
+# Caveats:
+#
+
 # processor.rb
-# Additional Facts about the machine's CPUs
 #
 # Copyright (C) 2006 Mooter Media Ltd
 # Author: Matthew Palmer <matt@solutionsfirst.com.au>

data/lib/facter/ps.rb

@@ -1,3 +1,15 @@
+# Fact: ps
+#
+# Purpose: Internal fact for what to use to list all processes. Used by
+# Service{} type in Puppet.
+#
+# Resolution:
+#   Assumes "ps -ef" for all operating systems other than BSD derivatives, where
+#   it uses "ps auxwww"
+#
+# Caveats:
+#
+
 Facter.add(:ps) do
     setcode do 'ps -ef' end
 end

data/lib/facter/puppetversion.rb

@@ -1,3 +1,13 @@
+# Fact: puppetversion
+#
+# Purpose: Return the version of puppet installed.
+#
+# Resolution:
+#   Requres puppet via Ruby and returns it's version constant.
+#
+# Caveats:
+#
+
 Facter.add(:puppetversion) do
     setcode do
         begin

data/lib/facter/rubysitedir.rb

@@ -1,3 +1,13 @@
+# Fact: rubysitedir
+#
+# Purpose: Returns Ruby's site library directory.
+#
+# Resolution: Works out the version to major/minor (1.8, 1.9, etc), then joins
+# that with all the $: library paths.
+#
+# Caveats:
+#
+
 Facter.add :rubysitedir do
     setcode do
         version = RUBY_VERSION.to_s.sub(/\.\d+$/, '')

data/lib/facter/rubyversion.rb

@@ -1,3 +1,12 @@
+# Fact: rubyversion
+#
+# Purpose: Returns the version of Ruby facter is running under.
+#
+# Resolution: Returns RUBY_VERSION.
+#
+# Caveats:
+#
+
 Facter.add(:rubyversion) do
     setcode { RUBY_VERSION.to_s }
 end

data/lib/facter/selinux.rb

@@ -1,3 +1,12 @@
+# Fact: selinux
+#
+# Purpose:
+#
+# Resolution:
+#
+# Caveats:
+#
+
 # Fact for SElinux
 # Written by immerda admin team (admin(at)immerda.ch)
 

data/lib/facter/ssh.rb

@@ -1,17 +1,15 @@
+# Fact: ssh
+#
+# Purpose:
+#
+# Resolution:
+#
+# Caveats:
+#
+
 ## ssh.rb
 ## Facts related to SSH
 ##
-## 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
-##
 
 ["/etc/ssh","/usr/local/etc/ssh","/etc","/usr/local/etc"].each do |dir|
     {"SSHDSAKey" => "ssh_host_dsa_key.pub", "SSHRSAKey" => "ssh_host_rsa_key.pub"}.each do |name,file|

data/lib/facter/timezone.rb

@@ -1,3 +1,12 @@
+# Fact: timezone
+#
+# Purpose: Return the machine's time zone.
+#
+# Resolution: Uses's Ruby's Time module's Time.new call.
+#
+# Caveats:
+#
+
 Facter.add("timezone") do
      setcode do
          Time.new.zone

data/lib/facter/uptime.rb

@@ -1,3 +1,14 @@
+# Fact: uptime
+#
+# Purpose: return the system uptime in a human readable format.
+#
+# Resolution:
+#   Does basic maths on the "uptime_seconds" fact to return a count of
+#   days, hours and minutes of uptime
+#
+# Caveats:
+#
+
 require 'facter/util/uptime'
 
 Facter.add(:uptime) do

data/lib/facter/uptime_days.rb

@@ -1,3 +1,12 @@
+# Fact: uptime_days
+#
+# Purpose: Return purely number of days of uptime.
+#
+# Resolution: Divides uptime_hours fact by 24.
+#
+# Caveats:
+#
+
 Facter.add(:uptime_days) do
   setcode do
     hours = Facter.value(:uptime_hours)

data/lib/facter/uptime_hours.rb

@@ -1,3 +1,12 @@
+# Fact: uptime_hours
+#
+# Purpose: Return purely number of hours of uptime.
+#
+# Resolution: Divides uptime_seconds fact by 3600.
+#
+# Caveats:
+#
+
 Facter.add(:uptime_hours) do
   setcode do
     seconds = Facter.value(:uptime_seconds)

data/lib/facter/uptime_seconds.rb

@@ -1,3 +1,17 @@
+# Fact: uptime_seconds
+#
+# Purpose: Return purely number of seconds of uptime.
+#
+# Resolution:
+#   Using the 'facter/util/uptime.rb' module, try a verity of methods to acquire
+#   the uptime on Unix.
+#
+#   On Windows, the module calculates the uptime by the "LastBootupTime" Windows
+#   management value.
+#
+# Caveats:
+#
+
 require 'facter/util/uptime'
 
 Facter.add(:uptime_seconds) do

data/lib/facter/util/collection.rb

@@ -66,9 +66,13 @@ class Facter::Util::Collection
     def fact(name)
         name = canonize(name)
 
+        # Try to load the fact if necessary
         loader.load(name) unless @facts[name]
 
-        return @facts[name]
+        # Try HARDER
+        loader.load_all unless @facts[name]
+
+        @facts[name]
     end
 
     # Flush all cached values.

data/lib/facter/util/fact.rb

@@ -41,9 +41,7 @@ class Facter::Util::Fact
 
         # Immediately sort the resolutions, so that we always have
         # a sorted list for looking up values.
-        #  We always want to look them up in the order of number of
-        # confines, so the most restricted resolution always wins.
-        @resolves.sort! { |a, b| b.length <=> a.length }
+        @resolves.sort! { |a, b| b.weight <=> a.weight }
 
         return resolve
     end

data/lib/facter/util/loader.rb

@@ -90,6 +90,7 @@ class Facter::Util::Loader
             next if fact and env_name != fact
 
             Facter.add($1) do
+                has_weight 1_000_000
                 setcode { value }
             end
 

data/lib/facter/util/macosx.rb

@@ -4,17 +4,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
-##
 
 module Facter::Util::Macosx
     require 'thread'

data/lib/facter/util/memory.rb

@@ -1,17 +1,6 @@
 ## memory.rb
 ## Support module for memory related facts
 ##
-## 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'
@@ -75,7 +64,7 @@ module Facter::Memory
         memspecfree = 0
 
         vmstats = Facter::Util::Resolution.exec('vm_stat')
-        vmstats.each do |vmline|
+        vmstats.each_line do |vmline|
           case
             when vmline =~ /page\ssize\sof\s(\d+)\sbytes/
               pagesize = $1.to_i
@@ -94,4 +83,3 @@ module Facter::Memory
         end
     end
 end
-

data/lib/facter/util/resolution.rb

@@ -85,17 +85,26 @@ class Facter::Util::Resolution
         end
     end
 
+    def has_weight(weight)
+        @weight = weight
+    end
+
     # Create a new resolution mechanism.
     def initialize(name)
         @name = name
         @confines = []
         @value = nil
         @timeout = 0
+        @weight = nil
     end
 
-    # Return the number of confines.
-    def length
-        @confines.length
+    # Return the importance of this resolution.
+    def weight
+        if @weight
+            @weight
+        else
+            @confines.length
+        end
     end
 
     # We need this as a getter for 'timeout', because some versions

data/lib/facter/util/virtual.rb

@@ -1,6 +1,6 @@
 module Facter::Util::Virtual
     def self.openvz?
-        FileTest.directory?("/proc/vz")
+        FileTest.directory?("/proc/vz") and FileTest.exists?( '/proc/vz/veinfo' )
     end
 
     def self.openvz_type

data/lib/facter/virtual.rb

@@ -1,3 +1,30 @@
+# Fact: virtual
+#
+# Purpose: Determine if the system's hardware is real or virtualised.
+#
+# Resolution:
+#   Assumes physical unless proven otherwise.
+#
+#   On Darwin, use the macosx util module to acquire the SPDisplaysDataType,
+#   from that parse it to see if it's VMWare or Parallels pretending to be the
+#   display.
+#
+#   On Linux, BSD, Solaris and HPUX:
+#     Much of the logic here is obscured behind util/virtual.rb, which rather
+#     than document here, which would encourage drift, just refer to it.
+#   The Xen tests in here rely on /sys and /proc, and check for the presence and
+#   contents of files in there.
+#   If after all the other tests, it's still seen as physical, then it tries to
+#   parse the output of the "lspci", "dmidecode" and "prtdiag" and parses them
+#   for obvious signs of being under VMWare or Parallels.
+#   Finally it checks for the existence of vmware-vmx, which would hint it's
+#   VMWare.
+#
+# Caveats:
+#   Virtualbox detection isn't implemented. 
+#   Many checks rely purely on existence of files.
+#
+
 require 'facter/util/virtual'
 
 Facter.add("virtual") do
@@ -25,7 +52,7 @@ Facter.add("virtual") do
 
     setcode do
 
-        if Facter::Util::Virtual.zone? and Facter.value(:operatingsystem) == "Solaris"
+        if Facter.value(:operatingsystem) == "Solaris" and Facter::Util::Virtual.zone?
             result = "zone"
         end
 
@@ -77,6 +104,9 @@ Facter.add("virtual") do
                     # --- 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/
+                    # --- look for virtualbox video card to determine if it is virtual => virtualbox.
+                    # ---     00:02.0 VGA compatible controller: InnoTek Systemberatung GmbH VirtualBox Graphics Adapter
+                    result = "virtualbox" if p =~ /VirtualBox/
                     # --- look for pci vendor id used by Parallels video card
                     # ---   01:00.0 VGA compatible controller: Unknown device 1ab8:4005
                     result = "parallels" if p =~ /1ab8:|[Pp]arallels/
@@ -87,13 +117,18 @@ Facter.add("virtual") do
                     output.each_line do |pd|
                         result = "parallels" if pd =~ /Parallels/
                         result = "vmware" if pd =~ /VMware/
+                        result = "virtualbox" if pd =~ /VirtualBox/
                     end
-                else
-                    output = Facter::Util::Resolution.exec('prtdiag')
+                elsif Facter.value(:kernel) == 'SunOS'
+                    res = Facter::Util::Resolution.new('prtdiag')
+                    res.timeout = 6
+                    res.setcode('prtdiag')
+                    output = res.value
                     if not output.nil?
                         output.each_line do |pd|
                             result = "parallels" if pd =~ /Parallels/
                             result = "vmware" if pd =~ /VMware/
+							result = "virtualbox" if pd =~ /VirtualBox/
                         end
                     end
                 end
@@ -108,6 +143,17 @@ Facter.add("virtual") do
     end
 end
 
+# Fact: is_virtual
+#
+# Purpose: returning true or false for if a machine is virtualised or not.
+#
+# Resolution: The Xen domain 0 machine is virtualised to a degree, but is generally
+# not viewed as being a virtual machine. This checks that the machine is not
+# physical nor xen0, if that is the case, it is virtual.
+#
+# Caveats:
+#
+
 Facter.add("is_virtual") do
     confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX Darwin GNU/kFreeBSD}
 

data/lib/facter/vlans.rb

@@ -1,3 +1,13 @@
+# Fact: vlans
+#
+# Purpose: On Linux, return a list of all the VLANs on the system.
+#
+# Resolution: On Linux only, checks for and reads /proc/net/vlan/config and
+# parses it.
+#
+# Caveats:
+#
+
 require 'facter/util/vlans'
     
     Facter.add("vlans") do

data/lib/facter/xendomains.rb

@@ -1,3 +1,14 @@
+# Fact: xendomains
+#
+# Purpose: Return the list of Xen domains on the Dom0.
+#
+# Resolution:
+#   On a Xen Dom0 host, return a list of Xen domains using the 'util/xendomains'
+#   library.
+#
+# Caveats:
+#
+
 require 'facter/util/xendomains'
 
 Facter.add("xendomains") do