facter 1.5.4 → 1.5.5

data/lib/facter/timezone.rb

@@ -1,5 +1,5 @@
 Facter.add("timezone") do
-     setcode do 
+     setcode do
          Time.new.zone
      end
 end

data/lib/facter/uniqueid.rb

@@ -1,4 +1,4 @@
 Facter.add(:uniqueid) do
-    setcode 'hostid',  '/bin/sh'
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX}
+    setcode 'hostid', '/bin/sh'
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX OEL OVS}
 end

data/lib/facter/uptime.rb

@@ -12,9 +12,9 @@ if FileTest.exists?("/proc/uptime")
 
     %w{days hours seconds}.each do |label|
         Facter.add("uptime_" + label) do
-                setcode do
-                    Facter::Util::Uptime.get_uptime_period(uptime, label)
-                end 
+            setcode do
+                Facter::Util::Uptime.get_uptime_period(uptime, label)
+            end 
         end 
     end 
 end

data/lib/facter/util/confine.rb

@@ -1,22 +1,20 @@
 # A restricting tag for fact resolution mechanisms.  The tag must be true
 # for the resolution mechanism to be suitable.
+
+require 'facter/util/values'
+
 class Facter::Util::Confine
     attr_accessor :fact, :values
 
+    include Facter::Util::Values
+
     # Add the restriction.  Requires the fact name, an operator, and the value
     # we're comparing to.
     def initialize(fact, *values)
         raise ArgumentError, "The fact name must be provided" unless fact
         raise ArgumentError, "One or more values must be provided" if values.empty?
-        fact = fact.to_s if fact.is_a? Symbol
         @fact = fact
-        @values = values.collect do |value|
-            if value.is_a? String
-                value
-            else
-                value.to_s
-            end
-        end
+        @values = values
     end
 
     def to_s
@@ -29,13 +27,15 @@ class Facter::Util::Confine
             Facter.debug "No fact for %s" % @fact
             return false
         end
-        value = fact.value
+        value = convert(fact.value)
 
         return false if value.nil?
 
-        @values.each { |v|
-            return true if value.downcase == v.downcase
-        }
+        @values.each do |v|
+            v = convert(v)
+            next unless v.class == value.class
+            return true if value == v
+        end
         return false
     end
 end

data/lib/facter/util/ip.rb

@@ -5,20 +5,20 @@ module Facter::Util::IP
     # a given platform or set of platforms.
     REGEX_MAP = {
         :linux => {
-            :ipaddress => /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-            :macaddress  => /(?:ether|HWaddr)\s+(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
-            :netmask => /Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+            :ipaddress  => /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+            :macaddress => /(?:ether|HWaddr)\s+(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
+            :netmask    => /Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
         },
-        :bsd => {
-            :aliases => [:openbsd, :netbsd, :freebsd, :darwin],
-            :ipaddress => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-            :macaddress  => /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/,
-            :netmask => /netmask\s+0x(\w{8})/
+        :bsd   => {
+            :aliases    => [:openbsd, :netbsd, :freebsd, :darwin],
+            :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+            :macaddress => /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/,
+            :netmask    => /netmask\s+0x(\w{8})/
         },
         :sunos => {
-            :addr => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-            :macaddress  => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
-            :netmask => /netmask\s+(\w{8})/
+            :ipaddress => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+            :macaddress => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
+            :netmask    => /netmask\s+(\w{8})/
         }
     }
 
@@ -45,17 +45,13 @@ module Facter::Util::IP
     end
 
     def self.get_interfaces
-        int = nil
-
-        output =  Facter::Util::IP.get_all_interface_output()
+        return [] unless output = Facter::Util::IP.get_all_interface_output()
 
-        # We get lots of warnings on platforms that don't get an output
-        # made.
-        if output
-            int = output.scan(/^\w+[.:]?\d+/)
-        else
-            []
-        end
+        # Our regex appears to be stupid, in that it leaves colons sitting
+        # at the end of interfaces.  So, we have to trim those trailing
+        # characters.  I tried making the regex better but supporting all
+        # platforms with a single regex is probably a bit too much.
+        output.scan(/^\w+[.:]?\d+[.:]?\d*[.:]?\w*/).collect { |i| i.sub(/:$/, '') }
     end
 
     def self.get_all_interface_output
@@ -124,7 +120,7 @@ module Facter::Util::IP
             output_int = get_single_interface_output(interface)
 
             if interface != /^lo[0:]?\d?/
-                output_int.each do |s|
+                output_int.each_line do |s|
                     if s =~ regex
                         value = $1
                         if label == 'netmask' && convert_from_hex?(kernel)

data/lib/facter/util/macosx.rb

@@ -58,6 +58,11 @@ module Facter::Util::Macosx
         [ "productName", "productVersion", "buildVersion" ].each do |option|
             ver["macosx_#{option}"] = %x{sw_vers -#{option}}.strip
         end
+        productversion = ver["macosx_productVersion"]
+        if not productversion.nil?
+            ver["macosx_productversion_major"] = productversion.scan(/(\d+\.\d+)/)[0][0]
+            ver["macosx_productversion_minor"] = productversion.scan(/(\d+)\.(\d+)\.(\d+)/)[0].last
+        end
         ver
     end
 end

data/lib/facter/util/manufacturer.rb

@@ -2,45 +2,45 @@
 # Support methods for manufacturer specific facts
 
 module Facter::Manufacturer
-	def self.dmi_find_system_info(name)
-		splitstr="Handle"
-		case Facter.value(:kernel)
-			when 'Linux'
-				return nil unless FileTest.exists?("/usr/sbin/dmidecode")
-		
-				output=%x{/usr/sbin/dmidecode 2>/dev/null}
-			when 'OpenBSD', 'FreeBSD'
-				return nil unless FileTest.exists?("/usr/local/sbin/dmidecode")
-		
-				output=%x{/usr/local/sbin/dmidecode 2>/dev/null}
-			when 'NetBSD'
-				return nil unless FileTest.exists?("/usr/pkg/sbin/dmidecode")
+    def self.dmi_find_system_info(name)
+        splitstr="Handle"
+        case Facter.value(:kernel)
+        when 'Linux'
+            return nil unless FileTest.exists?("/usr/sbin/dmidecode")
 
-				output=%x{/usr/pkg/sbin/dmidecode 2>/dev/null}
-			when 'SunOS'
-				return nil unless FileTest.exists?("/usr/sbin/smbios")
-				splitstr="ID    SIZE TYPE"
-				output=%x{/usr/sbin/smbios 2>/dev/null}
+            output=%x{/usr/sbin/dmidecode 2>/dev/null}
+        when 'OpenBSD', 'FreeBSD'
+            return nil unless FileTest.exists?("/usr/local/sbin/dmidecode")
 
-            else
-                return
-		end
-		name.each_pair do |key,v|
-			v.each do |v2|
-				v2.each_pair do |value,facterkey|
-					output.split(splitstr).each do |line|
-						if line =~ /#{key}/ and ( line =~ /#{value} 0x\d+ \(([-\w].*)\)\n*./ or line =~ /#{value} ([-\w].*)\n*./ )
-                                                result = $1
-							Facter.add(facterkey) do
-								confine :kernel => [ :linux, :freebsd, :netbsd, :openbsd, :sunos ]
-							setcode do
-							    result
-						        end
-					        end
-				        end
-			        end
-		        end
-	        end
+            output=%x{/usr/local/sbin/dmidecode 2>/dev/null}
+        when 'NetBSD'
+            return nil unless FileTest.exists?("/usr/pkg/sbin/dmidecode")
+
+            output=%x{/usr/pkg/sbin/dmidecode 2>/dev/null}
+        when 'SunOS'
+            return nil unless FileTest.exists?("/usr/sbin/smbios")
+            splitstr="ID    SIZE TYPE"
+            output=%x{/usr/sbin/smbios 2>/dev/null}
+
+        else
+            return
+        end
+        name.each_pair do |key,v|
+            v.each do |v2|
+                v2.each_pair do |value,facterkey|
+                    output.split(splitstr).each do |line|
+                        if line =~ /#{key}/ and ( line =~ /#{value} 0x\d+ \(([-\w].*)\)\n*./ or line =~ /#{value} ([-\w].*)\n*./ )
+                            result = $1
+                            Facter.add(facterkey) do
+                                confine :kernel => [ :linux, :freebsd, :netbsd, :openbsd, :sunos ]
+                                setcode do
+                                    result
+                                end
+                            end
+                        end
+                    end
+                end
+            end
         end
     end
 end

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

@@ -7,220 +7,222 @@
 #++
 # 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
+    # === Create a plist
+    # You can dump an object to a plist in one of two ways:
     #
-    # Write us (via RubyForge) if you think another class can be coerced safely into one of the expected plist classes.
+    # * <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+.
     #
-    # +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 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.
     #
-    # 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)
+    # 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
 
-      output = wrap(output) if envelope
+        # 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
 
-      return output
-    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)
 
-    # 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
+            output = wrap(output) if envelope
 
-    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)
+            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
 
-            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 )
+            return output
         end
-      end
 
-      return output
-    end
+        def self.comment(content)
+            return "<!-- #{content} -->\n"
+        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
 
-    def self.tag(type, contents = '', &block)
-      out = nil
+                out << block.call
 
-      if block_given?
-        out = IndentedString.new
-        out << "<#{type}>"
-        out.raise_indent
+                out.lower_indent
+                out << "</#{type}>"
+            else
+                out = "<#{type}>#{contents.to_s}</#{type}>\n"
+            end
 
-        out << block.call
+            return out.to_s
+        end
 
-        out.lower_indent
-        out << "</#{type}>"
-      else
-        out = "<#{type}>#{contents.to_s}</#{type}>\n"
-      end
+        def self.wrap(contents)
+            output = ''
 
-      return out.to_s
-    end
+            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"
 
-    def self.wrap(contents)
-      output = ''
+            return output
+        end
 
-      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"
+        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
 
-      output << contents
+        private
 
-      output << '</plist>' + "\n"
+        class IndentedString #:nodoc:
+            attr_accessor :indent_string
 
-      return output
-    end
+            @@indent_level = 0
 
-    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$/
+            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
-  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
+    def <=> (other)
+        self.to_s <=> other.to_s
+    end
 end
 
 class Array #:nodoc:
-  include Plist::Emit
+    include Plist::Emit
 end
 
 class Hash #:nodoc:
-  include Plist::Emit
+    include Plist::Emit
 end
 
 # $Id: generator.rb 1781 2006-10-16 01:01:35Z luke $