facter 1.6.1 → 1.6.2

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

@@ -1,8 +1,8 @@
 #--###########################################################
-# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
-# Patrick May <patrick@hexane.org>                           #
-#                                                            #
-# Distributed under the MIT license.                         #
+# 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.
@@ -21,206 +21,206 @@ module Plist
 # 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
+  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
 
-    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_start(name, attributes)
+      @open.push PTag::mappings[name].new
+    end
 
-        def tag_end(name)
-            last = @open.pop
-            if @open.empty?
-                @result = last.to_ruby
-            else
-                @open.last.children.push last
-            end
-        end
+    def text( contents )
+      @open.last.text = contents if @open.last
     end
 
-    class StreamParser
-        def initialize( filename_or_xml, listener )
-            @filename_or_xml = filename_or_xml
-            @listener = listener
-        end
+    def tag_end(name)
+      last = @open.pop
+      if @open.empty?
+        @result = last.to_ruby
+      else
+        @open.last.children.push last
+      end
+    end
+  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
+  class StreamParser
+    def initialize( filename_or_xml, listener )
+      @filename_or_xml = filename_or_xml
+      @listener = listener
     end
 
-    class PTag
-        @@mappings = { }
-        def PTag::mappings
-            @@mappings
-        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
 
-        def PTag::inherited( sub_class )
-            key = sub_class.to_s.downcase
-            key.gsub!(/^plist::/, '' )
-            key.gsub!(/^p/, '')  unless key == "plist"
+  class PTag
+    @@mappings = { }
+    def PTag::mappings
+      @@mappings
+    end
 
-            @@mappings[key] = sub_class
-        end
+    def PTag::inherited( sub_class )
+      key = sub_class.to_s.downcase
+      key.gsub!(/^plist::/, '' )
+      key.gsub!(/^p/, '')  unless key == "plist"
 
-        attr_accessor :text, :children
-        def initialize
-            @children = Array.new
-        end
+      @@mappings[key] = sub_class
+    end
 
-        def to_ruby
-            raise "Unimplemented: " + self.class.to_s + "#to_ruby on #{self.inspect}"
-        end
+    attr_accessor :text, :children
+    def initialize
+      @children = Array.new
     end
 
-    class PList < PTag
-        def to_ruby
-            children.first.to_ruby if children.first
-        end
+    def to_ruby
+      raise "Unimplemented: " + self.class.to_s + "#to_ruby on #{self.inspect}"
     end
+  end
 
-    class PDict < PTag
-        def to_ruby
-            dict = Hash.new
-            key = nil
+  class PList < PTag
+    def to_ruby
+      children.first.to_ruby if children.first
+    end
+  end
 
-            children.each do |c|
-                if key.nil?
-                    key = c.to_ruby
-                else
-                    dict[key] = c.to_ruby
-                    key = nil
-                end
-            end
+  class PDict < PTag
+    def to_ruby
+      dict = Hash.new
+      key = nil
 
-            dict
+      children.each do |c|
+        if key.nil?
+          key = c.to_ruby
+        else
+          dict[key] = c.to_ruby
+          key = nil
         end
-    end
+      end
 
-    class PKey < PTag
-        def to_ruby
-            CGI::unescapeHTML(text || '')
-        end
+      dict
     end
+  end
 
-    class PString < PTag
-        def to_ruby
-            CGI::unescapeHTML(text || '')
-        end
+  class PKey < PTag
+    def to_ruby
+      CGI::unescapeHTML(text || '')
     end
+  end
 
-    class PArray < PTag
-        def to_ruby
-            children.collect do |c|
-                c.to_ruby
-            end
-        end
+  class PString < PTag
+    def to_ruby
+      CGI::unescapeHTML(text || '')
     end
+  end
 
-    class PInteger < PTag
-        def to_ruby
-            text.to_i
-        end
+  class PArray < PTag
+    def to_ruby
+      children.collect do |c|
+        c.to_ruby
+      end
     end
+  end
 
-    class PTrue < PTag
-        def to_ruby
-            true
-        end
+  class PInteger < PTag
+    def to_ruby
+      text.to_i
     end
+  end
 
-    class PFalse < PTag
-        def to_ruby
-            false
-        end
+  class PTrue < PTag
+    def to_ruby
+      true
     end
+  end
 
-    class PReal < PTag
-        def to_ruby
-            text.to_f
-        end
+  class PFalse < PTag
+    def to_ruby
+      false
     end
+  end
 
-    require 'date'
-    class PDate < PTag
-        def to_ruby
-            DateTime.parse(text)
-        end
+  class PReal < PTag
+    def to_ruby
+      text.to_f
     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
+  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 $

data/lib/facter/util/processor.rb

@@ -0,0 +1,88 @@
+module Facter::Util::Processor
+  def self.enum_cpuinfo
+    processor_num = -1
+    processor_list = []
+    cpuinfo = "/proc/cpuinfo"
+
+    if File.exists?(cpuinfo)
+      model = Facter.value(:architecture)
+      case model
+      when "x86_64", "amd64", "i386", /parisc/, "hppa", "ia64"
+        Thread::exclusive do
+          File.readlines(cpuinfo).each do |l|
+            if l =~ /processor\s+:\s+(\d+)/
+              processor_num = $1.to_i
+            elsif l =~ /model name\s+:\s+(.*)\s*$/
+              processor_list[processor_num] = $1 unless processor_num == -1
+              processor_num = -1
+            elsif l =~ /processor\s+(\d+):\s+(.*)/
+              processor_num = $1.to_i
+              processor_list[processor_num] = $2 unless processor_num == -1
+            end
+          end
+        end
+       
+      when "ppc64"
+        Thread::exclusive do
+          File.readlines(cpuinfo).each do |l|
+            if l =~ /processor\s+:\s+(\d+)/
+              processor_num = $1.to_i
+            elsif l =~ /cpu\s+:\s+(.*)\s*$/
+              processor_list[processor_num] = $1 unless processor_num == -1
+              processor_num = -1
+            end
+          end
+        end
+          
+      when /arm/
+        Thread::exclusive do
+          File.readlines(cpuinfo).each do |l|
+            if l =~ /Processor\s+:\s+(.+)/
+              processor_num += 1
+              processor_list[processor_num] = $1.chomp
+            elsif l =~ /processor\s+:\s+(\d+)\s*$/
+              proc_num = $1.to_i
+              if proc_num != 0
+                processor_num += 1
+                processor_list[processor_num] = processor_list[processor_num-1]
+              end
+            end
+          end
+        end
+
+      when /sparc/
+        Thread::exclusive do
+          File.readlines(cpuinfo).each do |l|
+            if l =~ /cpu\s+:\s+(.*)\s*$/
+              processor_num += 1
+              processor_list[processor_num] = $1
+            end
+          end
+        end
+      end
+    end
+    processor_list
+  end
+  
+  def self.enum_lsdev
+    processor_num = -1
+    processor_list = {}
+    Thread::exclusive do
+      procs = Facter::Util::Resolution.exec('lsdev -Cc processor')
+      if procs
+        procs.each_line do |proc|
+          if proc =~ /^proc(\d+)/
+            processor_num = $1.to_i
+            # Not retrieving the frequency since AIX 4.3.3 doesn't support the
+            # attribute and some people still use the OS.
+            proctype = Facter::Util::Resolution.exec('lsattr -El proc0 -a type')
+            if proctype =~ /^type\s+(\S+)\s+/
+              processor_list[processor_num] = $1
+            end
+          end
+        end
+      end
+    end
+    processor_list
+  end
+end