facter 1.3.7 → 1.3.8

data/CHANGELOG

@@ -1,3 +1,19 @@
+1.3.8:
+    Fixed Rdoc::usage bug on CentOS 5 - closed Puppet #753 and Facter #40
+
+    Added support to return multiple interfaces and their IP addresses and 
+    MAC addressess as facts. Returns interface_interfacename and 
+    macaddress_interfacename.  Existing ipaddress and macaddress facts are 
+    unchanged and still returned.  Currently Linux only.  Closes #6.
+ 
+    Added macaddress fact support for FreeBSD and OpenBSD - closes #37
+
+    Added hardwareisa support for *BSD platforms - closed #38
+
+    Facter now detects the Mandriva distribution - closes #39
+
+    Facter now correctly detects ipaddress on NetBSD - closes #42
+
 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

data/Rakefile

@@ -24,8 +24,8 @@ project = Rake::RedLabProject.new("facter") do |p|
         'etc/*'
     ]
 
-    p.epmhosts = %w{culain}
-    p.rpmhost = "fedora1"
+    #p.epmhosts = %w{culain}
+    #p.rpmhost = "fedora1"
     #p.sunpkghost = "sol10b"
 end
 
@@ -43,4 +43,4 @@ if project.has?(:epm)
         task.rubylibs = FileList.new('lib/**/*')          
     end
 end
-# $Id: Rakefile 188 2007-01-19 22:36:53Z luke $
+# $Id$

data/bin/facter

@@ -6,7 +6,7 @@
 #
 # = Usage
 #
-#   facter [-d|--debug] [-h|--help] [-v|--version] [fact] [fact] [...]
+#   facter [-d|--debug] [-h|--help] [-v|--version] [-y|--yaml] [fact] [fact] [...]
 #
 # = Description
 #
@@ -27,6 +27,9 @@
 # version::
 #   Print the version and exit.
 #
+# yaml::
+#   Emit facts in YAML format.
+#
 # = Example
 #
 #   facter kernel
@@ -46,6 +49,7 @@ require 'facter'
 $haveusage = true
 
 begin
+    require 'rdoc/ri/ri_paths'
     require 'rdoc/usage'
 rescue Exception
     $haveusage = false

data/lib/facter.rb

@@ -21,7 +21,7 @@ class Facter
     include Comparable
     include Enumerable
 
-    FACTERVERSION = '1.3.7'
+    FACTERVERSION = '1.3.8'
 	# = Facter
     # Functions as a hash of 'facts' you might care about about your
     # system, such as mac address, IP address, Video card, etc.
@@ -229,7 +229,7 @@ class Facter
 
         @value = nil
 
-        @ldapname = name
+        @ldapname = name.to_s
     end
 
     # Add a new resolution mechanism.  This requires a block, which will then
@@ -473,7 +473,7 @@ class Facter
         # Set the name by which this parameter is known in LDAP.  The default
         # is just the fact name.
         def setldapname(name)
-            @fact.ldapname = name
+            @fact.ldapname = name.to_s
         end
 
         # Is this resolution mechanism suitable on the system in question?
@@ -618,16 +618,20 @@ class Facter
             setcode 'uname -r'
         end
 
-        {   "LSBRelease" => "^LSB Version:\t(.*)$",
-            "LSBDistId" => "^Distributor ID:\t(.*)$",
-            "LSBDistRelease" => "^Release:\t(.*)$",
-            "LSBDistDescription" => "^Description:\t(.*)$",
-            "LSBDistCodeName" => "^Codename:\t(.*)$"
+        {   "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
-                    output = Resolution.exec('lsb_release -a 2>/dev/null')
-                    if output =~ /#{pattern}/
+                    unless defined?(@@lsbdata) and defined?(@@lsbtime) and (Time.now.to_i - @@lsbtime.to_i < 5)
+                        type = nil
+                        @@lsbtime = Time.now
+                        @@lsbdata = Resolution.exec('lsb_release -a 2>/dev/null')
+                    end
+                    if pattern.match(@@lsbdata)
                         $1
                     else
                         nil
@@ -636,15 +640,6 @@ class Facter
             end
         end
 
-        Facter.add(:operatingsystem) do
-            # Default to just returning the kernel as the operating system
-            setcode do Facter[:kernel].value end
-        end
-
-        Facter.add(:operatingsystemrelease) do
-            setcode do Facter[:kernelrelease].value end
-        end
-
         Facter.add(:operatingsystem) do
             confine :kernel => :sunos
             setcode do "Solaris" end
@@ -659,6 +654,8 @@ class Facter
                     "Gentoo"
                 elsif FileTest.exists?("/etc/fedora-release")
                     "Fedora"
+	        elsif FileTest.exists?("/etc/mandriva-release")
+                    "Mandriva"
                 elsif FileTest.exists?("/etc/redhat-release")
                     txt = File.read("/etc/redhat-release")
                     if txt =~ /centos/i
@@ -672,6 +669,43 @@ class Facter
             end
         end
 
+        Facter.add(:operatingsystem) do
+            # Default to just returning the kernel as the operating system
+            setcode do Facter[:kernel].value end
+        end
+
+        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 => :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
+            setcode do Facter[:kernelrelease].value end
+        end
+
         Facter.add(:hardwaremodel) do
             setcode 'uname -m'
         end
@@ -865,7 +899,9 @@ class Facter
                         filepath = File.join(dir,file)
                         if FileTest.file?(filepath)
                             begin
-                                value = File.open(filepath).read.chomp.split(/\s+/)[1]
+                                File.open(filepath) { |f|
+                                    value = f.read.chomp.split(/\s+/)[1]
+                                }
                             rescue
                                 value = nil
                             end
@@ -883,7 +919,7 @@ class Facter
 
         Facter.add(:hardwareisa) do
             setcode 'uname -p', '/bin/sh'
-            confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo}
+            confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo FreeBSD OpenBSD NetBSD}
         end
 
         Facter.add(:macaddress) do
@@ -898,6 +934,20 @@ class Facter
             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
@@ -935,7 +985,7 @@ class Facter
             end
         end
         Facter.add(:ipaddress) do
-            confine :kernel => %w{FreeBSD NetBSD OpenBSD solaris}
+            confine :kernel => %w{FreeBSD OpenBSD solaris}
             setcode do
                 ip = nil
                 output = %x{/sbin/ifconfig}
@@ -953,6 +1003,25 @@ class Facter
                 ip
             end
         end
+        Facter.add(:ipaddress) do
+            confine :kernel => %w{NetBSD}
+            setcode do
+                ip = nil
+                output = %x{/sbin/ifconfig -a}
+
+                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
@@ -1071,4 +1140,4 @@ class Facter
     Facter.loadfacts
 end
 
-# $Id: facter.rb 202 2007-03-21 16:44:44Z luke $
+# $Id$

data/lib/facter/ipmess.rb

@@ -0,0 +1,85 @@
+#
+# ipmess.rb
+# Try to get additional Facts about the machine's network interfaces on Linux
+#
+# Original concept Copyright (C) 2007 psychedelys <psychedelys@gmail.com>
+# Update and *BSD support (C) 2007 James Turnbull <james@lovedthanlost.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
+#
+
+if Facter.kernel == "Linux"
+
+       output = %x{/sbin/ifconfig -a}
+       int = nil
+        output.scan(/^(\w+)(\d+)/) { |str|
+         output_int = %x{/sbin/ifconfig #{str}}
+         int = "#{str}"
+         tmp1 = nil
+         tmp2 = nil
+         test = {}
+          output_int.each { |s|
+           int = "#{str}"
+           tmp1 = $1 if s =~ /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+           tmp2 = $1 if s =~ /(?:ether|HWaddr) (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
+           if tmp1 != nil && tmp2 != nil && int != "lo"
+              test["ipaddress_" + int] = tmp1
+              test["macaddress_" + int] = tmp2
+              int = nil
+              tmp1 = nil
+              tmp2 = nil
+           end
+        }
+        test.each{|name,fact|
+                Facter.add(name) do
+                      confine :kernel => :linux
+                      setcode do
+                            fact
+                      end
+                end
+        }
+       }
+end
+
+if Facter.kernel == "FreeBSD" || Facter.kernel == "OpenBSD" || Facter.kernel == "NetBSD"
+
+       output = %x{/sbin/ifconfig -a}
+        int = nil
+        output.scan(/^(\w+)(\d+):/) { |str|
+         output_int = %x{/sbin/ifconfig #{str}}
+         int = "#{str}"
+         tmp1 = nil
+         tmp2 = nil
+         test = {}
+          output_int.each { |s|
+           int = "#{str}"
+           tmp1 = $1 if s =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+           tmp2 = $1 if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
+            if tmp1 != nil && tmp2 != nil && int != "lo"
+              test["ipaddress_" + int] = tmp1
+              test["macaddress_" + int] = tmp2
+              int = nil
+              tmp1 = nil
+              tmp2 = nil
+            end
+           } 
+           test.each{|name,fact|
+                Facter.add(name) do
+                      confine :kernel => :linux
+                      setcode do
+                            fact
+                      end
+                end
+           }
+        }
+end
+

data/lib/facter/macosx.rb

@@ -0,0 +1,84 @@
+#
+# macosx.rb
+# Additional Facts coming from Mac OS X system_profiler command
+#
+# 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
+# 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
+
+if Facter.kernel == "Darwin"
+  Facter::Macosx.hardware_overview.each do |fact, value|
+    Facter.add("sp_#{fact}") do
+      confine :kernel => :darwin
+      setcode do
+        value
+      end
+    end
+  end
+
+  Facter::Macosx.os_overview.each do |fact, value|
+    Facter.add("sp_#{fact}") do
+      confine :kernel => :darwin
+      setcode do
+        value
+      end
+    end
+  end
+
+  Facter::Macosx.sw_vers.each do |fact, value|
+    Facter.add(fact) do
+      confine :kernel => :darwin
+      setcode do
+        value
+      end
+    end
+  end
+end

data/lib/facter/manufacturer.rb

@@ -0,0 +1,48 @@
+# Info about the manufacturer
+#           
+    
+module Facter::Manufacturer
+    def self.dmi_find_system_info(name)
+        return nil unless FileTest.exists?("/usr/sbin/dmidecode")
+
+        # 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
+
+        if data = @data["System Information"]
+            data[name]
+        else
+            nil
+        end
+    end
+end         
+        
+# Add the facts to Facter
+
+{: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

data/lib/facter/util/plist.rb

@@ -0,0 +1,24 @@
+#--
+##############################################################
+# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
+# Patrick May <patrick@hexane.org>                           #
+#                                                            #
+# Distributed under the MIT license.                         #
+##############################################################
+#++
+# = Plist
+#
+# This is the main file for plist.  Everything interesting happens in Plist and Plist::Emit.
+
+require 'base64'
+require 'cgi'
+require 'stringio'
+
+require 'facter/util/plist/generator'
+require 'facter/util/plist/parser'
+
+module Plist
+  VERSION = '3.0.0'
+end
+
+# $Id: plist.rb 1781 2006-10-16 01:01:35Z luke $

data/lib/facter/util/plist/generator.rb

@@ -0,0 +1,226 @@
+#--###########################################################
+# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
+# Patrick May <patrick@hexane.org>                           #
+#                                                            #
+# Distributed under the MIT license.                         #
+##############################################################
+#++
+# See Plist::Emit.
+module Plist
+  # === Create a plist
+  # You can dump an object to a plist in one of two ways:
+  #
+  # * <tt>Plist::Emit.dump(obj)</tt>
+  # * <tt>obj.to_plist</tt>
+  #   * This requires that you mixin the <tt>Plist::Emit</tt> module, which is already done for +Array+ and +Hash+.
+  #
+  # The following Ruby classes are converted into native plist types:
+  #   Array, Bignum, Date, DateTime, Fixnum, Float, Hash, Integer, String, Symbol, Time, true, false
+  # * +Array+ and +Hash+ are both recursive; their elements will be converted into plist nodes inside the <array> and <dict> containers (respectively).
+  # * +IO+ (and its descendants) and +StringIO+ objects are read from and their contents placed in a <data> element.
+  # * User classes may implement +to_plist_node+ to dictate how they should be serialized; otherwise the object will be passed to <tt>Marshal.dump</tt> and the result placed in a <data> element.
+  #
+  # For detailed usage instructions, refer to USAGE[link:files/docs/USAGE.html] and the methods documented below.
+  module Emit
+    # Helper method for injecting into classes.  Calls <tt>Plist::Emit.dump</tt> with +self+.
+    def to_plist(envelope = true)
+      return Plist::Emit.dump(self, envelope)
+    end
+
+    # Helper method for injecting into classes.  Calls <tt>Plist::Emit.save_plist</tt> with +self+.
+    def save_plist(filename)
+      Plist::Emit.save_plist(self, filename)
+    end
+
+    # The following Ruby classes are converted into native plist types:
+    #   Array, Bignum, Date, DateTime, Fixnum, Float, Hash, Integer, String, Symbol, Time
+    #
+    # Write us (via RubyForge) if you think another class can be coerced safely into one of the expected plist classes.
+    #
+    # +IO+ and +StringIO+ objects are encoded and placed in <data> elements; other objects are <tt>Marshal.dump</tt>'ed unless they implement +to_plist_node+.
+    #
+    # The +envelope+ parameters dictates whether or not the resultant plist fragment is wrapped in the normal XML/plist header and footer.  Set it to false if you only want the fragment.
+    def self.dump(obj, envelope = true)
+      output = plist_node(obj)
+
+      output = wrap(output) if envelope
+
+      return output
+    end
+
+    # Writes the serialized object's plist to the specified filename.
+    def self.save_plist(obj, filename)
+      File.open(filename, 'wb') do |f|
+        f.write(obj.to_plist)
+      end
+    end
+
+    private
+    def self.plist_node(element)
+      output = ''
+
+      if element.respond_to? :to_plist_node
+        output << element.to_plist_node
+      else
+        case element
+        when Array
+          if element.empty?
+            output << "<array/>\n"
+          else
+            output << tag('array') {
+              element.collect {|e| plist_node(e)}
+            }
+          end
+        when Hash
+          if element.empty?
+            output << "<dict/>\n"
+          else
+            inner_tags = []
+
+            element.keys.sort.each do |k|
+              v = element[k]
+              inner_tags << tag('key', CGI::escapeHTML(k.to_s))
+              inner_tags << plist_node(v)
+            end
+
+            output << tag('dict') {
+              inner_tags
+            }
+          end
+        when true, false
+          output << "<#{element}/>\n"
+        when Time
+          output << tag('date', element.utc.strftime('%Y-%m-%dT%H:%M:%SZ'))
+        when Date # also catches DateTime
+          output << tag('date', element.strftime('%Y-%m-%dT%H:%M:%SZ'))
+        when String, Symbol, Fixnum, Bignum, Integer, Float
+          output << tag(element_type(element), CGI::escapeHTML(element.to_s))
+        when IO, StringIO
+          element.rewind
+          contents = element.read
+          # note that apple plists are wrapped at a different length then
+          # what ruby's base64 wraps by default.
+          # I used #encode64 instead of #b64encode (which allows a length arg)
+          # because b64encode is b0rked and ignores the length arg.
+          data = "\n"
+          Base64::encode64(contents).gsub(/\s+/, '').scan(/.{1,68}/o) { data << $& << "\n" }
+          output << tag('data', data)
+        else
+          output << comment( 'The <data> element below contains a Ruby object which has been serialized with Marshal.dump.' )
+          data = "\n"
+          Base64::encode64(Marshal.dump(element)).gsub(/\s+/, '').scan(/.{1,68}/o) { data << $& << "\n" }
+          output << tag('data', data )
+        end
+      end
+
+      return output
+    end
+
+    def self.comment(content)
+      return "<!-- #{content} -->\n"
+    end
+
+    def self.tag(type, contents = '', &block)
+      out = nil
+
+      if block_given?
+        out = IndentedString.new
+        out << "<#{type}>"
+        out.raise_indent
+
+        out << block.call
+
+        out.lower_indent
+        out << "</#{type}>"
+      else
+        out = "<#{type}>#{contents.to_s}</#{type}>\n"
+      end
+
+      return out.to_s
+    end
+
+    def self.wrap(contents)
+      output = ''
+
+      output << '<?xml version="1.0" encoding="UTF-8"?>' + "\n"
+      output << '<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">' + "\n"
+      output << '<plist version="1.0">' + "\n"
+
+      output << contents
+
+      output << '</plist>' + "\n"
+
+      return output
+    end
+
+    def self.element_type(item)
+      return case item
+        when String, Symbol:          'string'
+        when Fixnum, Bignum, Integer: 'integer'
+        when Float:                   'real'
+        else
+          raise "Don't know about this data type... something must be wrong!"
+      end
+    end
+    private
+    class IndentedString #:nodoc:
+      attr_accessor :indent_string
+
+      @@indent_level = 0
+
+      def initialize(str = "\t")
+        @indent_string = str
+        @contents = ''
+      end
+
+      def to_s
+        return @contents
+      end
+
+      def raise_indent
+        @@indent_level += 1
+      end
+
+      def lower_indent
+        @@indent_level -= 1 if @@indent_level > 0
+      end
+
+      def <<(val)
+        if val.is_a? Array
+          val.each do |f|
+            self << f
+          end
+        else
+          # if it's already indented, don't bother indenting further
+          unless val =~ /\A#{@indent_string}/
+            indent = @indent_string * @@indent_level
+
+            @contents << val.gsub(/^/, indent)
+          else
+            @contents << val
+          end
+
+          # it already has a newline, don't add another
+          @contents << "\n" unless val =~ /\n$/
+        end
+      end
+    end
+  end
+end
+
+# we need to add this so sorting hash keys works properly
+class Symbol #:nodoc:
+  def <=> (other)
+    self.to_s <=> other.to_s
+  end
+end
+
+class Array #:nodoc:
+  include Plist::Emit
+end
+
+class Hash #:nodoc:
+  include Plist::Emit
+end
+
+# $Id: generator.rb 1781 2006-10-16 01:01:35Z luke $

data/lib/facter/util/plist/parser.rb

@@ -0,0 +1,227 @@
+#--###########################################################
+# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
+# Patrick May <patrick@hexane.org>                           #
+#                                                            #
+# Distributed under the MIT license.                         #
+##############################################################
+#++
+# Plist parses Mac OS X xml property list files into ruby data structures.
+#
+# === Load a plist file
+# This is the main point of the library:
+#
+#   r = Plist::parse_xml( filename_or_xml )
+module Plist
+# Note that I don't use these two elements much:
+#
+#  + Date elements are returned as DateTime objects.
+#  + Data elements are implemented as Tempfiles
+#
+# Plist::parse_xml will blow up if it encounters a data element.
+# If you encounter such an error, or if you have a Date element which
+# can't be parsed into a Time object, please send your plist file to
+# plist@hexane.org so that I can implement the proper support.
+  def Plist::parse_xml( filename_or_xml )
+    listener = Listener.new
+    #parser = REXML::Parsers::StreamParser.new(File.new(filename), listener)
+    parser = StreamParser.new(filename_or_xml, listener)
+    parser.parse
+    listener.result
+  end
+
+  class Listener
+    #include REXML::StreamListener
+
+    attr_accessor :result, :open
+
+    def initialize
+      @result = nil
+      @open   = Array.new
+    end
+
+
+    def tag_start(name, attributes)
+      @open.push PTag::mappings[name].new
+    end
+
+    def text( contents )
+      @open.last.text = contents if @open.last
+    end
+
+    def tag_end(name)
+      last = @open.pop
+      if @open.empty?
+        @result = last.to_ruby
+      else
+        @open.last.children.push last
+      end
+    end
+  end
+
+  class StreamParser
+    def initialize( filename_or_xml, listener )
+      @filename_or_xml = filename_or_xml
+      @listener = listener
+    end
+
+    TEXT       = /([^<]+)/
+    XMLDECL_PATTERN = /<\?xml\s+(.*?)\?>*/um
+    DOCTYPE_PATTERN = /\s*<!DOCTYPE\s+(.*?)(\[|>)/um
+    COMMENT_START = /\A<!--/u
+    COMMENT_END = /.*?-->/um
+
+
+    def parse
+      plist_tags = PTag::mappings.keys.join('|')
+      start_tag  = /<(#{plist_tags})([^>]*)>/i
+      end_tag    = /<\/(#{plist_tags})[^>]*>/i
+
+      require 'strscan'
+
+      contents = (
+        if (File.exists? @filename_or_xml)
+          File.open(@filename_or_xml) {|f| f.read}
+        else
+          @filename_or_xml
+        end
+      )
+
+      @scanner = StringScanner.new( contents )
+      until @scanner.eos?
+        if @scanner.scan(COMMENT_START)
+          @scanner.scan(COMMENT_END)
+        elsif @scanner.scan(XMLDECL_PATTERN)
+        elsif @scanner.scan(DOCTYPE_PATTERN)
+        elsif @scanner.scan(start_tag)
+          @listener.tag_start(@scanner[1], nil)
+          if (@scanner[2] =~ /\/$/)
+            @listener.tag_end(@scanner[1])
+          end
+        elsif @scanner.scan(TEXT)
+          @listener.text(@scanner[1])
+        elsif @scanner.scan(end_tag)
+          @listener.tag_end(@scanner[1])
+        else
+          raise "Unimplemented element"
+        end
+      end
+    end
+  end
+
+  class PTag
+    @@mappings = { }
+    def PTag::mappings
+      @@mappings
+    end
+
+    def PTag::inherited( sub_class )
+      key = sub_class.to_s.downcase
+      key.gsub!(/^plist::/, '' )
+      key.gsub!(/^p/, '')  unless key == "plist"
+
+      @@mappings[key] = sub_class
+    end
+
+    attr_accessor :text, :children
+    def initialize
+      @children = Array.new
+    end
+
+    def to_ruby
+      raise "Unimplemented: " + self.class.to_s + "#to_ruby on #{self.inspect}"
+    end
+  end
+
+  class PList < PTag
+    def to_ruby
+      children.first.to_ruby if children.first
+    end
+  end
+
+  class PDict < PTag
+    def to_ruby
+      dict = Hash.new
+      key = nil
+
+      children.each do |c|
+        if key.nil?
+          key = c.to_ruby
+        else
+          dict[key] = c.to_ruby
+          key = nil
+        end
+      end
+
+      dict
+    end
+  end
+
+  class PKey < PTag
+    def to_ruby
+      CGI::unescapeHTML(text || '')
+    end
+  end
+
+  class PString < PTag
+    def to_ruby
+      CGI::unescapeHTML(text || '')
+    end
+  end
+
+  class PArray < PTag
+    def to_ruby
+      children.collect do |c|
+        c.to_ruby
+      end
+    end
+  end
+
+  class PInteger < PTag
+    def to_ruby
+      text.to_i
+    end
+  end
+
+  class PTrue < PTag
+    def to_ruby
+      true
+    end
+  end
+
+  class PFalse < PTag
+    def to_ruby
+      false
+    end
+  end
+
+  class PReal < PTag
+    def to_ruby
+      text.to_f
+    end
+  end
+
+  require 'date'
+  class PDate < PTag
+    def to_ruby
+      DateTime.parse(text)
+    end
+  end
+
+  require 'base64'
+  class PData < PTag
+    def to_ruby
+      data = Base64.decode64(text.gsub(/\s+/, ''))
+
+      begin
+        return Marshal.load(data)
+      rescue Exception => e
+        io = StringIO.new
+        io.write data
+        io.rewind
+        return io
+      end
+    end
+  end
+end
+
+# $Id: parser.rb 1781 2006-10-16 01:01:35Z luke $

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.4
 specification_version: 1
 name: facter
 version: !ruby/object:Gem::Version 
-  version: 1.3.7
-date: 2007-03-21 00:00:00 -05:00
+  version: 1.3.8
+date: 2007-09-24 00:00:00 +02:00
 summary: Facter collects Operating system facts.
 require_paths: 
 - lib
@@ -25,21 +25,28 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - 
 files: 
 - install.rb
+- COPYING
 - TODO
-- LICENSE
+- INSTALL
 - Rakefile
 - README
+- LICENSE
 - CHANGELOG
-- INSTALL
-- COPYING
 - bin/facter
 - lib/facter.rb
 - lib/facter/processor.rb
 - lib/facter/memory.rb
+- lib/facter/util/plist.rb
+- lib/facter/util/plist/parser.rb
+- lib/facter/util/plist/generator.rb
+- lib/facter/macosx.rb
+- lib/facter/manufacturer.rb
+- lib/facter/ipmess.rb
 - etc/facter.conf
 test_files: []