facter 1.6.18 → 1.7.0.rc1

data/lib/facter/util/cfpropertylist/lib/rbLibXMLParser.rb

@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+
+require 'libxml'
+
+module Facter::Util::CFPropertyList
+  # XML parser
+  class XML < XMLParserInterface
+    # read a XML file
+    # opts::
+    # * :file - The filename of the file to load
+    # * :data - The data to parse
+    def load(opts)
+      if(opts.has_key?(:file)) then
+        doc = LibXML::XML::Document.file(opts[:file],:options => LibXML::XML::Parser::Options::NOBLANKS|LibXML::XML::Parser::Options::NOENT)
+      else
+        doc = LibXML::XML::Document.string(opts[:data],:options => LibXML::XML::Parser::Options::NOBLANKS|LibXML::XML::Parser::Options::NOENT)
+      end
+
+      root = doc.root.first
+      return import_xml(root)
+    end
+
+    # serialize Facter::Util::CFPropertyList object to XML
+    # opts = {}:: Specify options: :formatted - Use indention and line breaks
+    def to_str(opts={})
+      doc = LibXML::XML::Document.new
+
+      doc.root = LibXML::XML::Node.new('plist')
+      doc.encoding = LibXML::XML::Encoding::UTF_8
+
+      doc.root['version'] = '1.0'
+      doc.root << opts[:root].to_xml(self)
+
+      # ugly hack, but there's no other possibility I know
+      str = doc.to_s(:indent => opts[:formatted])
+      str1 = String.new
+      first = false
+      str.each_line do |line|
+        str1 << line
+        unless(first) then
+          str1 << "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n" if line =~ /^\s*<\?xml/
+        end
+
+        first = true
+      end
+
+      str1.force_encoding('UTF-8') if str1.respond_to?(:force_encoding)
+      return str1
+    end
+
+    def new_node(name)
+      LibXML::XML::Node.new(name)
+    end
+
+    def new_text(val)
+      LibXML::XML::Node.new_text(val)
+    end
+
+    def append_node(parent, child)
+      parent << child
+    end
+
+    protected
+
+    # get the value of a DOM node
+    def get_value(n)
+      content = if n.children?
+        n.first.content
+      else
+        n.content
+      end
+
+      content.force_encoding('UTF-8') if content.respond_to?(:force_encoding)
+      content
+    end
+
+    # import the XML values
+    def import_xml(node)
+      ret = nil
+
+      case node.name
+      when 'dict'
+        hsh = Hash.new
+        key = nil
+
+        if node.children? then
+          node.children.each do |n|
+            next if n.text? # avoid a bug of libxml
+            next if n.comment?
+
+            if n.name == "key" then
+              key = get_value(n)
+            else
+              raise CFFormatError.new("Format error!") if key.nil?
+              hsh[key] = import_xml(n)
+              key = nil
+            end
+          end
+        end
+
+        ret = CFDictionary.new(hsh)
+
+      when 'array'
+        ary = Array.new
+
+        if node.children? then
+          node.children.each do |n|
+            ary.push import_xml(n)
+          end
+        end
+
+        ret = CFArray.new(ary)
+
+      when 'true'
+        ret = CFBoolean.new(true)
+      when 'false'
+        ret = CFBoolean.new(false)
+      when 'real'
+        ret = CFReal.new(get_value(node).to_f)
+      when 'integer'
+        ret = CFInteger.new(get_value(node).to_i)
+      when 'string'
+        ret = CFString.new(get_value(node))
+      when 'data'
+        ret = CFData.new(get_value(node))
+      when 'date'
+        ret = CFDate.new(CFDate.parse_date(get_value(node)))
+      end
+
+      return ret
+    end
+  end
+end
+
+# eof

data/lib/facter/util/cfpropertylist/lib/rbNokogiriParser.rb

@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+
+require 'nokogiri'
+
+module Facter::Util::CFPropertyList
+  # XML parser
+  class XML < ParserInterface
+    # read a XML file
+    # opts::
+    # * :file - The filename of the file to load
+    # * :data - The data to parse
+    def load(opts)
+      if(opts.has_key?(:file)) then
+        File.open(opts[:file], "rb") { |fd| doc = Nokogiri::XML::Document.parse(fd, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS|Nokogiri::XML::ParseOptions::NOENT) }
+      else
+        doc = Nokogiri::XML::Document.parse(opts[:data], nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS|Nokogiri::XML::ParseOptions::NOENT)
+      end
+
+      root = doc.root.children.first
+      return import_xml(root)
+    end
+
+    # serialize Facter::Util::CFPropertyList object to XML
+    # opts = {}:: Specify options: :formatted - Use indention and line breaks
+    def to_str(opts={})
+      doc = Nokogiri::XML::Document.new
+      @doc = doc
+
+      doc.root = doc.create_element 'plist', :version => '1.0'
+      doc.encoding = 'UTF-8'
+
+      doc.root << opts[:root].to_xml(self)
+
+      # ugly hack, but there's no other possibility I know
+      s_opts = Nokogiri::XML::Node::SaveOptions::AS_XML
+      s_opts |= Nokogiri::XML::Node::SaveOptions::FORMAT if opts[:formatted]
+
+      str = doc.serialize(:save_with => s_opts)
+      str1 = String.new
+      first = false
+      str.each_line do |line|
+        str1 << line
+        unless(first) then
+          str1 << "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n" if line =~ /^\s*<\?xml/
+        end
+
+        first = true
+      end
+
+      str1.force_encoding('UTF-8') if str1.respond_to?(:force_encoding)
+      return str1
+    end
+
+    def new_node(name)
+      @doc.create_element name
+    end
+
+    def new_text(val)
+      @doc.create_text_node val
+    end
+
+    def append_node(parent, child)
+      parent << child
+    end
+
+    protected
+
+    # get the value of a DOM node
+    def get_value(n)
+      content = if n.children.empty?
+        n.content
+      else
+        n.children.first.content
+      end
+
+      content.force_encoding('UTF-8') if content.respond_to?(:force_encoding)
+      content
+    end
+
+    # import the XML values
+    def import_xml(node)
+      ret = nil
+
+      case node.name
+      when 'dict'
+        hsh = Hash.new
+        key = nil
+        children = node.children
+
+        unless children.empty? then
+          children.each do |n|
+            next if n.text? # avoid a bug of libxml
+            next if n.comment?
+
+            if n.name == "key" then
+              key = get_value(n)
+            else
+              raise CFFormatError.new("Format error!") if key.nil?
+              hsh[key] = import_xml(n)
+              key = nil
+            end
+          end
+        end
+
+        ret = CFDictionary.new(hsh)
+
+      when 'array'
+        ary = Array.new
+        children = node.children
+
+        unless children.empty? then
+          children.each do |n|
+            ary.push import_xml(n)
+          end
+        end
+
+        ret = CFArray.new(ary)
+
+      when 'true'
+        ret = CFBoolean.new(true)
+      when 'false'
+        ret = CFBoolean.new(false)
+      when 'real'
+        ret = CFReal.new(get_value(node).to_f)
+      when 'integer'
+        ret = CFInteger.new(get_value(node).to_i)
+      when 'string'
+        ret = CFString.new(get_value(node))
+      when 'data'
+        ret = CFData.new(get_value(node))
+      when 'date'
+        ret = CFDate.new(CFDate.parse_date(get_value(node)))
+      end
+
+      return ret
+    end
+  end
+end
+
+# eof

data/lib/facter/util/cfpropertylist/lib/rbREXMLParser.rb

@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+
+require 'rexml/document'
+
+module Facter::Util::CFPropertyList
+  # XML parser
+  class XML < ParserInterface
+    # read a XML file
+    # opts::
+    # * :file - The filename of the file to load
+    # * :data - The data to parse
+    def load(opts)
+      if(opts.has_key?(:file)) then
+        File.open(opts[:file], "rb") { |fd| doc = REXML::Document.new(fd) }
+      else
+        doc = REXML::Document.new(opts[:data])
+      end
+
+      root = doc.root.elements[1]
+      return import_xml(root)
+    end
+
+    # serialize Facter::Util::CFPropertyList object to XML
+    # opts = {}:: Specify options: :formatted - Use indention and line breaks
+    def to_str(opts={})
+      doc = REXML::Document.new
+      @doc = doc
+
+      doc.context[:attribute_quote] = :quote
+
+      doc.add_element 'plist', {'version' => '1.0'}
+      doc.root << opts[:root].to_xml(self)
+
+      formatter = if opts[:formatted] then
+        f = REXML::Formatters::Pretty.new(2)
+        f.compact = true
+        f
+      else
+        REXML::Formatters::Default.new
+      end
+
+      str = formatter.write(doc.root, "")
+      str1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n" + str + "\n"
+      str1.force_encoding('UTF-8') if str1.respond_to?(:force_encoding)
+
+      return str1
+    end
+
+    def new_node(name)
+      #LibXML::XML::Node.new(name)
+      REXML::Element.new(name)
+    end
+
+    def new_text(val)
+      val
+    end
+
+    def append_node(parent, child)
+      if child.is_a?(String) then
+        parent.add_text child
+      else
+        parent.elements << child
+      end
+      parent
+    end
+
+    protected
+
+    # get the value of a DOM node
+    def get_value(n)
+      content = n.text
+
+      content.force_encoding('UTF-8') if content.respond_to?(:force_encoding)
+      content
+    end
+
+    # import the XML values
+    def import_xml(node)
+      ret = nil
+
+      case node.name
+      when 'dict'
+        hsh = Hash.new
+        key = nil
+
+        if node.has_elements? then
+          node.elements.each do |n|
+            #print n.name + "\n"
+            next if n.name == '#text' # avoid a bug of libxml
+            next if n.name == '#comment'
+
+            if n.name == "key" then
+              key = get_value(n)
+            else
+              raise CFFormatError.new("Format error!") if key.nil?
+              hsh[key] = import_xml(n)
+              key = nil
+            end
+          end
+        end
+
+        ret = CFDictionary.new(hsh)
+
+      when 'array'
+        ary = Array.new
+
+        if node.has_elements? then
+          node.elements.each do |n|
+            ary.push import_xml(n)
+          end
+        end
+
+        ret = CFArray.new(ary)
+
+      when 'true'
+        ret = CFBoolean.new(true)
+      when 'false'
+        ret = CFBoolean.new(false)
+      when 'real'
+        ret = CFReal.new(get_value(node).to_f)
+      when 'integer'
+        ret = CFInteger.new(get_value(node).to_i)
+      when 'string'
+        ret = CFString.new(get_value(node))
+      when 'data'
+        ret = CFData.new(get_value(node))
+      when 'date'
+        ret = CFDate.new(CFDate.parse_date(get_value(node)))
+      end
+
+      return ret
+    end
+  end
+end
+
+# eof

data/lib/facter/util/collection.rb

@@ -5,6 +5,13 @@ require 'facter/util/loader'
 # Manage which facts exist and how we access them.  Largely just a wrapper
 # around a hash of facts.
 class Facter::Util::Collection
+
+  def initialize(internal_loader, external_loader)
+    @facts = Hash.new
+    @internal_loader = internal_loader
+    @external_loader = external_loader
+  end
+
   # Return a fact object by name.  If you use this, you still have to call
   # 'value' on it to retrieve the actual value.
   def [](name)
@@ -31,7 +38,14 @@ class Facter::Util::Collection
       end
     end
 
-    if block_given? and resolve = fact.add(&block)
+    if block_given?
+      resolve = fact.add(&block)
+    else
+      resolve = fact.add
+    end
+
+    # Set any resolve-appropriate options
+    if resolve
       # If the resolve was actually added, set any resolve-appropriate options
       options.each do |opt, value|
         method = opt.to_s + "="
@@ -53,6 +67,7 @@ class Facter::Util::Collection
 
   # Iterate across all of the facts.
   def each
+    load_all
     @facts.each do |name, fact|
       value = fact.value
       unless value.nil?
@@ -66,10 +81,14 @@ class Facter::Util::Collection
     name = canonize(name)
 
     # Try to load the fact if necessary
-    loader.load(name) unless @facts[name]
+    load(name) unless @facts[name]
 
     # Try HARDER
-    loader.load_all unless @facts[name]
+    internal_loader.load_all unless @facts[name]
+
+    if @facts.empty?
+      Facter.warnonce("No facts loaded from #{internal_loader.search_path.join(File::PATH_SEPARATOR)}")
+    end
 
     @facts[name]
   end
@@ -79,26 +98,29 @@ class Facter::Util::Collection
     @facts.each { |name, fact| fact.flush }
   end
 
-  def initialize
-    @facts = Hash.new
-  end
-
   # Return a list of all of the facts.
   def list
+    load_all
     return @facts.keys
   end
 
+  def load(name)
+    internal_loader.load(name)
+    external_loader.load(self)
+  end
+
   # Load all known facts.
   def load_all
-    loader.load_all
+    internal_loader.load_all
+    external_loader.load(self)
   end
 
-  # The thing that loads facts if we don't have them.
-  def loader
-    unless defined?(@loader)
-      @loader = Facter::Util::Loader.new
-    end
-    @loader
+  def internal_loader
+    @internal_loader
+  end
+
+  def external_loader
+    @external_loader
   end
 
   # Return a hash of all of our facts.