facter 1.3.3 → 1.3.7

data/CHANGELOG

@@ -1,7 +1,30 @@
+1.3.7:
+    A couple of small bugfixes, including fixing Facter.flush so it correctly
+    flushes cached values, and the mac address fact only returns one
+    value, not all of them.
+
+    Converted all of the fact names to symbols, rather than the somewhat
+    random case used previously.  When the facts are converted to a hash,
+    they still convert the fact name to a string.
+
+1.3.6:
+    A bugfix release, including fixes for #29, and #30.  Also fixed
+    the SSH keys so they only have the key, not the type or description.
+
+1.3.5:
+    A bugfix release.
+
+1.3.4:
+    Added many new facts, including LSB facts.
+
+    Fixed a few small bugs, notably the error you could get when asking
+    for a non-existent fact.
+
 1.3.3:
     Added thread exclusivity to memory and processor facts.
 
-    Added the ability to retrieve facts by pulling them out of the shell environment.
+    Added the ability to retrieve facts by pulling them out of the shell
+    environment.
 
 1.3.2:
     Temporarily disabled memory and processor facts since they might cause hangs.

data/COPYING

@@ -456,49 +456,3 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

data/README

@@ -6,4 +6,5 @@ processors, etc.
 It currently cannot collect very much information, but it is architected to be
 both OS and OS version specific.
 
-See bin/facter or http://madstop.com/svn/enhost for an example of the interface.
+See bin/facter or http://reductivelabs.com/project/enhost for an example of the
+interface.

data/Rakefile

@@ -26,7 +26,7 @@ project = Rake::RedLabProject.new("facter") do |p|
 
     p.epmhosts = %w{culain}
     p.rpmhost = "fedora1"
-    p.sunpkghost = "sol10b"
+    #p.sunpkghost = "sol10b"
 end
 
 project.mkgemtask do |gem|
@@ -43,4 +43,4 @@ if project.has?(:epm)
         task.rubylibs = FileList.new('lib/**/*')          
     end
 end
-# $Id: Rakefile 148 2006-06-27 05:34:07Z luke $
+# $Id: Rakefile 188 2007-01-19 22:36:53Z luke $

data/bin/facter

@@ -47,7 +47,7 @@ $haveusage = true
 
 begin
     require 'rdoc/usage'
-rescue LoadError
+rescue Exception
     $haveusage = false
 end
 
@@ -59,14 +59,21 @@ result = GetoptLong.new(
     [ "--version",         "-v",     GetoptLong::NO_ARGUMENT ],
     [ "--help",		"-h",            GetoptLong::NO_ARGUMENT ],
     [ "--debug",	"-d",            GetoptLong::NO_ARGUMENT ],
+    [ "--yaml",	"-y",                GetoptLong::NO_ARGUMENT ],
     [ "--config",    "-c",           GetoptLong::REQUIRED_ARGUMENT ]
 )
 
+options = {
+    :yaml => false
+}
+
 result.each { |opt,arg|
     case opt
         when "--version"
             puts "%s" % Facter.version
             exit
+        when "--yaml"
+			options[:yaml] = true
         when "--debug"
 			Facter.debugging(1)
         when "--help"
@@ -105,7 +112,7 @@ if names.empty?
 else
     names.each { |name|
         begin
-            facts[name] = Facter[name].value
+            facts[name] = Facter.value(name)
         rescue => error
             STDERR.puts "Could not retrieve %s: #{error}" % name
             exit 10
@@ -113,9 +120,17 @@ else
     }
 end
 
-facts.each { |name,value|
+if options[:yaml]
+    require 'yaml'
+    puts YAML.dump(facts)
+    exit(0)
+end
+
+facts.sort { |a, b| a[0].to_s <=> b[0].to_s }.each { |name,value|
     if facts.length == 1
-        puts value
+        unless value.nil?
+            puts value
+        end
     else
         puts "%s => %s" % [name,value]
     end

data/lib/facter.rb

@@ -1,4 +1,3 @@
-# $Id: facter.rb 153 2006-06-28 17:38:18Z luke $
 #--
 # Copyright 2006 Luke Kanies <luke@madstop.com>
 # 
@@ -22,7 +21,7 @@ class Facter
     include Comparable
     include Enumerable
 
-    FACTERVERSION = '1.3.3'
+    FACTERVERSION = '1.3.7'
 	# = Facter
     # Functions as a hash of 'facts' you might care about about your
     # system, such as mac address, IP address, Video card, etc.
@@ -37,7 +36,14 @@ class Facter
     #
 
 
-    @@facts = {}
+    @@facts = Hash.new { |hash, key|
+        key = key.to_s.downcase.intern
+        if hash.include?(key)
+            hash[key]
+        else
+            nil
+        end
+    }
     GREEN = ""
     RESET = ""
     @@debug = 0
@@ -47,12 +53,12 @@ class Facter
 	# module methods
 
     # Return the version of the library.
-    def Facter.version
+    def self.version
         return FACTERVERSION
     end
 
     # Add some debugging
-    def Facter.debug(string)
+    def self.debug(string)
         if string.nil?
             return
         end
@@ -63,22 +69,17 @@ class Facter
 
     # Return a fact object by name.  If you use this, you still have to call
     # 'value' on it to retrieve the actual value.
-    def Facter.[](name)
-        name = name.to_s.downcase
+    def self.[](name)
         @@facts[name]
     end
 
     # Add a resolution mechanism for a named fact.  This does not distinguish
     # between adding a new fact and adding a new way to resolve a fact.
-    def Facter.add(name, &block)
+    def self.add(name, &block)
         fact = nil
-        dcname = name.to_s.downcase
 
-        if @@facts.include?(dcname)
-            fact = @@facts[dcname]
-        else
-            Facter.new(dcname)
-            fact = @@facts[dcname]
+        unless fact = @@facts[name]
+            fact = Facter.new(name)
         end
 
         unless block
@@ -98,7 +99,7 @@ class Facter
                 if fact.suitable?
                     value = fact.value
                     unless value.nil?
-                        yield name, fact.value
+                        yield name.to_s, fact.value
                     end
                 end
             }
@@ -113,7 +114,7 @@ class Facter
                 name = name.to_s.sub(/\?$/,'')
             end
 
-            if fact = self[name]
+            if fact = @@facts[name]
                 if question
                     value = fact.value.downcase
                     args.each do |arg|
@@ -135,14 +136,13 @@ class Facter
     end
 
     # Clear all facts.  Mostly used for testing.
-    def Facter.clear
-        Facter.reset
+    def self.clear
         Facter.flush
-        @@facts.clear
+        Facter.reset
     end
 
 	# Set debugging on or off.
-	def Facter.debugging(bit)
+	def self.debugging(bit)
 		if bit
             case bit
             when TrueClass: @@debug = 1
@@ -168,38 +168,37 @@ class Facter
 	end
 
     # Flush all cached values.
-    def Facter.flush
-        @@facts.each { |fact| fact.flush }
+    def self.flush
+        @@facts.each { |name, fact| fact.flush }
     end
 
     # Return a list of all of the facts.
-    def Facter.list
+    def self.list
         return @@facts.keys
     end
 
     # Remove them all.
-    def Facter.reset
-        @@facts.each { |name,fact|
-            @@facts.delete(name)
-        }
+    def self.reset
+        @@facts.clear
     end
 
     # Return a hash of all of our facts.
-    def Facter.to_hash(*tags)
+    def self.to_hash(*tags)
         @@facts.inject({}) do |h, ary|
             if ary[1].suitable? and (tags.empty? or ary[1].tagged?(*tags))
                 value = ary[1].value
                 if value
-                    h[ary[0]] = value
+                    # For backwards compatibility, convert the fact name to a string.
+                    h[ary[0].to_s] = value
                 end
             end
             h
         end
     end
 
-    def Facter.value(name)
-        if @@facts.include?(name.to_s.downcase)
-            @@facts[name.to_s.downcase].value
+    def self.value(name)
+        if fact = @@facts[name]
+            fact.value
         else
             nil
         end
@@ -217,9 +216,9 @@ class Facter
 
     # Create a new fact, with no resolution mechanisms.
     def initialize(name)
-        @name = name.downcase if name.is_a? String
+        @name = name.to_s.downcase.intern
         if @@facts.include?(@name)
-            raise ArgumentError, "A fact named %s already exists" % name
+            raise ArgumentError, "A fact named %s already exists" % @name
         else
             @@facts[@name] = self
         end
@@ -385,26 +384,37 @@ class Facter
     class Resolution
         attr_accessor :interpreter, :code, :name, :fact
 
+        def Resolution.have_which
+            if @have_which.nil?
+                %x{which which 2>/dev/null}
+                @have_which = ($? == 0)
+            end
+            @have_which
+        end
+
         # Execute a chunk of code.
         def Resolution.exec(code, interpreter = "/bin/sh")
             if interpreter == "/bin/sh"
                 binary = code.split(/\s+/).shift
 
-                path = nil
-                if binary !~ /^\//
-                    path = %x{which #{binary} 2>/dev/null}.chomp
-                    if path == ""
-                        # we don't have the binary necessary
+                if have_which
+                    path = nil
+                    if binary !~ /^\//
+                        path = %x{which #{binary} 2>/dev/null}.chomp
+                        if path == ""
+                            # we don't have the binary necessary
+                            return nil
+                        end
+                    else
+                        path = binary
+                    end
+
+                    unless FileTest.exists?(path)
+                        # our binary does not exist
                         return nil
                     end
-                else
-                    path = binary
                 end
 
-                unless FileTest.exists?(path)
-                    # our binary does not exist
-                    return nil
-                end
                 out = nil
                 begin
                     out = %x{#{code}}.chomp
@@ -571,16 +581,16 @@ class Facter
     end
 
     # Load all of the default facts
-    def Facter.loadfacts
-        Facter.add("FacterVersion") do
+    def self.loadfacts
+        Facter.add(:facterversion) do
             setcode { FACTERVERSION.to_s }
         end
 
-        Facter.add("RubyVersion") do
+        Facter.add(:rubyversion) do
             setcode { RUBY_VERSION.to_s }
         end
 
-        Facter.add("PuppetVersion") do
+        Facter.add(:puppetversion) do
             setcode {
                 begin
                     require 'puppet'
@@ -600,31 +610,47 @@ class Facter
             end
         end
 
-        Facter.add("Kernel") do
+        Facter.add(:kernel) do
             setcode 'uname -s'
         end
 
-        Facter.add("KernelRelease") do
+        Facter.add(:kernelrelease) do
             setcode 'uname -r'
         end
 
-        Facter.add("OperatingSystem") do
+        {   "LSBRelease" => "^LSB Version:\t(.*)$",
+            "LSBDistId" => "^Distributor ID:\t(.*)$",
+            "LSBDistRelease" => "^Release:\t(.*)$",
+            "LSBDistDescription" => "^Description:\t(.*)$",
+            "LSBDistCodeName" => "^Codename:\t(.*)$"
+        }.each do |fact, pattern|
+            Facter.add(fact) do
+                setcode do
+                    output = Resolution.exec('lsb_release -a 2>/dev/null')
+                    if output =~ /#{pattern}/
+                        $1
+                    else
+                        nil
+                    end
+                end
+            end
+        end
+
+        Facter.add(:operatingsystem) do
             # Default to just returning the kernel as the operating system
-            setcode do Facter["Kernel"].value end
+            setcode do Facter[:kernel].value end
         end
 
-        Facter.add("OperatingSystemRelease") do
-            setcode do Facter["KernelRelease"].value end
+        Facter.add(:operatingsystemrelease) do
+            setcode do Facter[:kernelrelease].value end
         end
 
-        Facter.add("OperatingSystem") do
-            #obj.os = "Linux"
+        Facter.add(:operatingsystem) do
             confine :kernel => :sunos
             setcode do "Solaris" end
         end
 
-        Facter.add("OperatingSystem") do
-            #obj.os = "Linux"
+        Facter.add(:operatingsystem) do
             confine :kernel => :linux
             setcode do
                 if FileTest.exists?("/etc/debian_version")
@@ -646,16 +672,18 @@ class Facter
             end
         end
 
-        Facter.add("HardwareModel") do
+        Facter.add(:hardwaremodel) do
             setcode 'uname -m'
         end
 
-        Facter.add("Architecture") do
-            confine :operatingsystem => :debian
+        Facter.add(:architecture) do
+            confine :kernel => :linux
             setcode do
                 model = Facter.hardwaremodel
                 case model
-                when 'x86_64': "amd64" 
+                # most linuxen use "x86_64"
+                when 'x86_64':
+                    Facter.operatingsystem == "Debian" ? "amd64" : model;
                 when /(i[3456]86|pentium)/: "i386"
                 else
                     model
@@ -663,13 +691,15 @@ class Facter
             end
         end
 
-        Facter.add("CfKey") do
+        Facter.add(:Cfkey) do
             setcode do
                 value = nil
                 ["/usr/local/etc/cfkey.pub",
                     "/etc/cfkey.pub",
                     "/var/cfng/keys/localhost.pub",
-                    "/var/cfengine/ppkeys/localhost.pub"
+                    "/var/cfengine/ppkeys/localhost.pub",
+                    "/var/lib/cfengine/ppkeys/localhost.pub",
+                    "/var/lib/cfengine2/ppkeys/localhost.pub"
                 ].each { |file|
                     if FileTest.file?(file)
                         File.open(file) { |openfile|
@@ -689,8 +719,12 @@ class Facter
             end
         end
 
-        Facter.add("Domain") do
+        Facter.add(:domain) do
             setcode do
+                # First force the hostname to be checked
+                Facter.hostname
+
+                # Now check to see if it set the domain
                 if defined? $domain and ! $domain.nil?
                     $domain
                 else
@@ -699,7 +733,7 @@ class Facter
             end
         end
         # Look for the DNS domain name command first.
-        Facter.add("Domain") do
+        Facter.add(:domain) do
             setcode do
                 domain = Resolution.exec('dnsdomainname') or nil
                 # make sure it's a real domain
@@ -710,7 +744,7 @@ class Facter
                 end
             end
         end
-        Facter.add("Domain") do
+        Facter.add(:domain) do
             setcode do
                 domain = Resolution.exec('domainname') or nil
                 # make sure it's a real domain
@@ -721,7 +755,7 @@ class Facter
                 end
             end
         end
-        Facter.add("Domain") do
+        Facter.add(:domain) do
             setcode do
                 value = nil
                 if FileTest.exists?("/etc/resolv.conf")
@@ -749,7 +783,7 @@ class Facter
                 end
             end
         end
-        Facter.add("Hostname") do
+        Facter.add(:hostname) do
             setldapname "cn"
             setcode do
                 hostname = nil
@@ -769,13 +803,25 @@ class Facter
             end
         end
 
-        Facter.add("IPAddress") do
+        Facter.add(:fqdn) do
+            setcode do
+                host = Facter.value(:hostname)
+                domain = Facter.value(:domain)
+                if host and domain
+                    [host, domain].join(".")
+                else
+                    nil
+                end
+            end
+        end
+
+        Facter.add(:ipaddress) do
             setldapname "iphostnumber"
             setcode do
                 require 'resolv'
 
                 begin
-                    if hostname = Facter["hostname"].value
+                    if hostname = Facter.hostname
                         ip = Resolv.getaddress(hostname)
                         unless ip == "127.0.0.1"
                             ip
@@ -790,12 +836,13 @@ class Facter
                 end
             end
         end
-        Facter.add("IPAddress") do
+        Facter.add(:ipaddress) do
             setcode do
-                if hostname = Facter["hostname"].value
+                if hostname = Facter.hostname
                     # we need Hostname to exist for this to work
-                    if list = Resolution.exec("host #{hostname}").chomp.split(/\s/)
-
+                    host = nil
+                    if host = Resolution.exec("host #{hostname}")
+                        host = host.chomp.split(/\s/)
                         if defined? list[-1] and
                                 list[-1] =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
                             list[-1]
@@ -818,7 +865,7 @@ class Facter
                         filepath = File.join(dir,file)
                         if FileTest.file?(filepath)
                             begin
-                                value = File.open(filepath).read.chomp
+                                value = File.open(filepath).read.chomp.split(/\s+/)[1]
                             rescue
                                 value = nil
                             end
@@ -829,30 +876,29 @@ class Facter
             } # end of hash each
         } # end of dir each
 
-        Facter.add("UniqueId") do
+        Facter.add(:uniqueid) do
             setcode 'hostid',  '/bin/sh'
-            confine :operatingsystem => :solaris
+            confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo}
         end
 
-        Facter.add("HardwareISA") do
+        Facter.add(:hardwareisa) do
             setcode 'uname -p', '/bin/sh'
-            confine :operatingsystem => :solaris
+            confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo}
         end
 
-        Facter.add("MacAddress") do
-            confine :operatingsystem => :solaris
+        Facter.add(:macaddress) do
+            confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo}
             setcode do
-                ether = nil
+                ether = []
                 output = %x{/sbin/ifconfig -a}
-
-                output =~ /ether (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
-                ether = $1
-
-                ether
+                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
+        Facter.add(:macaddress) do
             confine :kernel => :darwin
             setcode do
                 ether = nil
@@ -868,12 +914,62 @@ class Facter
                 ether
             end
         end
-        Facter.add("IPAddress") do
-            confine :kernel => :darwin
+
+         Facter.add(:ipaddress) do
+            confine :kernel => :linux
             setcode do
                 ip = nil
                 output = %x{/sbin/ifconfig}
 
+                output.split(/^\S/).each { |str|
+                    if str =~ /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+                        tmp = $1
+                        unless tmp =~ /127\./
+                            ip = tmp
+                            break
+                        end
+                    end
+                }
+
+                ip
+            end
+        end
+        Facter.add(:ipaddress) do
+            confine :kernel => %w{FreeBSD NetBSD OpenBSD solaris}
+            setcode do
+                ip = nil
+                output = %x{/sbin/ifconfig}
+
+                output.split(/^\S/).each { |str|
+                    if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+                        tmp = $1
+                        unless tmp =~ /127\./
+                            ip = tmp
+                            break
+                        end
+                    end
+                }
+
+                ip
+            end
+        end
+        Facter.add(:ipaddress) do
+            confine :kernel => %w{darwin}
+            setcode do
+                ip = nil
+                iface = ""
+                output = %x{/usr/sbin/netstat -rn}
+                if output =~ /^default\s*\S*\s*\S*\s*\S*\s*\S*\s*(\S*).*/
+                  iface = $1
+                else
+                  warn "Could not find a default route. Using first non-loopback interface"
+                end
+                if(iface != "")
+                  output = %x{/sbin/ifconfig #{iface}}                  
+                else
+                  output = %x{/sbin/ifconfig}
+                end
+
                 output.split(/^\S/).each { |str|
                     if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
                         tmp = $1
@@ -887,19 +983,19 @@ class Facter
                 ip
             end
         end
-        Facter.add("Hostname") do
+        Facter.add(:hostname) do
             confine :kernel => :darwin, :kernelrelease => "R7"
             setcode do
                 %x{/usr/sbin/scutil --get LocalHostName}
             end
         end
-        Facter.add("IPHostnumber") do
+        Facter.add(:iphostnumber) do
             confine :kernel => :darwin, :kernelrelease => "R6"
             setcode do
                 %x{/usr/sbin/scutil --get LocalHostName}
             end
         end
-        Facter.add("IPHostnumber") do
+        Facter.add(:iphostnumber) do
             confine :kernel => :darwin, :kernelrelease => "R6"
             setcode do
                 ether = nil
@@ -912,40 +1008,55 @@ class Facter
             end
         end
 
-        Facter.add("ps") do
+        Facter.add(:ps) do
             setcode do 'ps -ef' end
         end
 
-        Facter.add("ps") do
+        Facter.add(:ps) do
             confine :operatingsystem => %w{FreeBSD NetBSD OpenBSD Darwin}
             setcode do 'ps -auxwww' end
         end
 
-        Facter.add("id") do
-            confine :operatingsystem => :linux
+        Facter.add(:id) do
+            #confine :kernel => %w{Solaris Linux}
+            confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo}
             setcode "whoami"
         end
 
         locals = []
 
-        # Now see if we can find any other facts
+        # Now find all our loadable facts
+        factdirs = [] # All the places to check for facts
+        
+        # See if we can find any other facts in the regular Ruby lib
+        # paths
         $:.each do |dir|
             fdir = File.join(dir, "facter")
             if FileTest.exists?(fdir) and FileTest.directory?(fdir)
-                Dir.glob("#{fdir}/*.rb").each do |file|
-                    # Load here, rather than require, because otherwise
-                    # the facts won't get reloaded if someone calls
-                    # "loadfacts".  Really only important in testing, but,
-                    # well, it's important in testing.
-                    begin
-                        load file
-                    rescue => detail
-                        warn "Could not load %s: %s" %
-                            [file, detail]
-                    end
+                factdirs.push(fdir)
+            end
+        end
+        # Also check anything in 'FACTERLIB'
+        if ENV['FACTERLIB']
+            ENV['FACTERLIB'].split(":").each do |fdir|
+                factdirs.push(fdir)
+            end
+        end
+        factdirs.each do |fdir|
+            Dir.glob("#{fdir}/*.rb").each do |file|
+                # Load here, rather than require, because otherwise
+                # the facts won't get reloaded if someone calls
+                # "loadfacts".  Really only important in testing, but,
+                # well, it's important in testing.
+                begin
+                    load file
+                rescue => detail
+                    warn "Could not load %s: %s" %
+                        [file, detail]
                 end
             end
         end
+        
 
         # Now try to get facts from the environment
         ENV.each do |name, value|
@@ -959,3 +1070,5 @@ class Facter
 
     Facter.loadfacts
 end
+
+# $Id: facter.rb 202 2007-03-21 16:44:44Z luke $

data/lib/facter/memory.rb

@@ -22,11 +22,17 @@ module Facter::Memory
     def self.meminfo_number(tag)
         memsize = ""
         Thread::exclusive do
+            size, scale = [0, ""]
             File.readlines("/proc/meminfo").each do |l|
-                if l =~ /^#{tag}:\s+(\d+)\s+(\S+)/
-                    memsize = scale_number($1.to_f, $2)
+                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)
         end
             
         memsize

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: facter
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
-date: 2006-06-28 00:00:00 -05:00
+  version: 1.3.7
+date: 2007-03-21 00:00:00 -05:00
 summary: Facter collects Operating system facts.
 require_paths: 
 - lib