facter 1.5.4 → 1.5.5

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

@@ -21,207 +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
-  end
-
-  class Listener
-    #include REXML::StreamListener
-
-    attr_accessor :result, :open
-
-    def initialize
-      @result = nil
-      @open   = Array.new
+    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
 
-    def tag_start(name, attributes)
-      @open.push PTag::mappings[name].new
-    end
+        attr_accessor :result, :open
 
-    def text( contents )
-      @open.last.text = contents if @open.last
-    end
+        def initialize
+            @result = nil
+            @open   = Array.new
+        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
+        def tag_start(name, attributes)
+            @open.push PTag::mappings[name].new
+        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 text( contents )
+            @open.last.text = contents if @open.last
+        end
 
-  class PTag
-    @@mappings = { }
-    def PTag::mappings
-      @@mappings
+        def tag_end(name)
+            last = @open.pop
+            if @open.empty?
+                @result = last.to_ruby
+            else
+                @open.last.children.push last
+            end
+        end
     end
 
-    def PTag::inherited( sub_class )
-      key = sub_class.to_s.downcase
-      key.gsub!(/^plist::/, '' )
-      key.gsub!(/^p/, '')  unless key == "plist"
+    class StreamParser
+        def initialize( filename_or_xml, listener )
+            @filename_or_xml = filename_or_xml
+            @listener = listener
+        end
 
-      @@mappings[key] = sub_class
+        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
 
-    attr_accessor :text, :children
-    def initialize
-      @children = Array.new
-    end
+    class PTag
+        @@mappings = { }
+        def PTag::mappings
+            @@mappings
+        end
 
-    def to_ruby
-      raise "Unimplemented: " + self.class.to_s + "#to_ruby on #{self.inspect}"
+        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
-  end
 
-  class PList < PTag
-    def to_ruby
-      children.first.to_ruby if children.first
+    class PList < PTag
+        def to_ruby
+            children.first.to_ruby if children.first
+        end
     end
-  end
 
-  class PDict < PTag
-    def to_ruby
-      dict = Hash.new
-      key = nil
+    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
+            children.each do |c|
+                if key.nil?
+                    key = c.to_ruby
+                else
+                    dict[key] = c.to_ruby
+                    key = nil
+                end
+            end
 
-      dict
+            dict
+        end
     end
-  end
 
-  class PKey < PTag
-    def to_ruby
-      CGI::unescapeHTML(text || '')
+    class PKey < PTag
+        def to_ruby
+            CGI::unescapeHTML(text || '')
+        end
     end
-  end
 
-  class PString < PTag
-    def to_ruby
-      CGI::unescapeHTML(text || '')
+    class PString < PTag
+        def to_ruby
+            CGI::unescapeHTML(text || '')
+        end
     end
-  end
 
-  class PArray < PTag
-    def to_ruby
-      children.collect do |c|
-        c.to_ruby
-      end
+    class PArray < PTag
+        def to_ruby
+            children.collect do |c|
+                c.to_ruby
+            end
+        end
     end
-  end
 
-  class PInteger < PTag
-    def to_ruby
-      text.to_i
+    class PInteger < PTag
+        def to_ruby
+            text.to_i
+        end
     end
-  end
 
-  class PTrue < PTag
-    def to_ruby
-      true
+    class PTrue < PTag
+        def to_ruby
+            true
+        end
     end
-  end
 
-  class PFalse < PTag
-    def to_ruby
-      false
+    class PFalse < PTag
+        def to_ruby
+            false
+        end
     end
-  end
 
-  class PReal < PTag
-    def to_ruby
-      text.to_f
+    class PReal < PTag
+        def to_ruby
+            text.to_f
+        end
     end
-  end
 
-  require 'date'
-  class PDate < PTag
-    def to_ruby
-      DateTime.parse(text)
+    require 'date'
+    class PDate < PTag
+        def to_ruby
+            DateTime.parse(text)
+        end
     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
+
+    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
 end
 
 # $Id: parser.rb 1781 2006-10-16 01:01:35Z luke $

data/lib/facter/util/resolution.rb

@@ -16,7 +16,7 @@ class Facter::Util::Resolution
             if Config::CONFIG['host_os'] =~ /mswin/
                 @have_which = false
             else
-                %x{which which 2>/dev/null}
+                %x{which which >/dev/null 2>&1}
                 @have_which = ($? == 0)
             end
         end
@@ -33,7 +33,7 @@ class Facter::Util::Resolution
             if binary !~ /^\//
                 path = %x{which #{binary} 2>/dev/null}.chomp
                 # we don't have the binary necessary
-                return nil if path == ""
+                return nil if path == "" or path.match(/Command not found\./)
             else
                 path = binary
             end

data/lib/facter/util/uptime.rb

@@ -1,25 +1,25 @@
 # A module to gather uptime facts
 #
 module Facter::Util::Uptime
-
     def self.get_uptime_simple
         time = Facter::Util::Resolution.exec('uptime')
-            if time =~ /up\s*(\d+\s\w+)/
-                $1
-            elsif time =~ /up\s*(\d+:\d+)/
-                $1 + " hours"
-            else
-                "unknown"
-            end
+        if time =~ /up\s*(\d+\s\w+)/
+            $1
+        elsif time =~ /up\s*(\d+:\d+)/
+            $1 + " hours"
+        else
+            "unknown"
+        end
     end
 
     def self.get_uptime
-        uptime, idletime = File.open("/proc/uptime").gets.split(" ")
+        r = IO.popen("/bin/cat /proc/uptime")
+        uptime, idletime = r.readline.split(" ")        
+        r.close
         uptime_seconds = uptime.to_i
     end
 
     def self.get_uptime_period(seconds, label)
-        
         case label
         when 'days'
             value = seconds / 86400
@@ -28,7 +28,5 @@ module Facter::Util::Uptime
         when 'seconds'
             seconds
         end     
-   
     end
-
 end   

data/lib/facter/util/values.rb

@@ -0,0 +1,14 @@
+# A util module for facter containing helper methods
+module Facter
+    module Util
+        module Values
+            module_function
+
+            def convert(value)
+                value = value.to_s if value.is_a?(Symbol)
+                value = value.downcase if value.is_a?(String)
+                value
+            end    
+        end
+    end
+end

data/lib/facter/virtual.rb

@@ -4,48 +4,67 @@ Facter.add("virtual") do
     result = "physical"
 
     setcode do
-        if FileTest.exists?("/proc/user_beancounters")
-            # openvz. can be hardware node or virtual environment
-            # read the init process' status file, it has laxer permissions
-            # than /proc/user_beancounters (so this won't fail as non-root)
-            txt = File.read("/proc/1/status")
-            if txt =~ /^envID:[[:blank:]]+0$/mi
+    require 'thread'
+
+        if FileTest.exists?("/sbin/zonename")
+            z = %x{"/sbin/zonename"}.chomp
+            if z != 'global'
+                result = zone 
+            end
+        end
+
+        if FileTest.exists?("/proc/vz/veinfo")
+            if FileTest.exists?("/proc/vz/version")
                 result = "openvzhn"
             else
                 result = "openvzve"
             end
         end
 
-        if FileTest.exists?("/proc/xen/capabilities") && FileTest.readable?("/proc/xen/capabilities")
+        if FileTest.exists?("/proc/self/status")
+            txt = File.read("/proc/self/status")
+            if txt =~ /^(s_context|VxID):[[:blank:]]*[1-9]/
+                result = "vserver"
+            end
+        end
+
+        if FileTest.exists?("/proc/virtual")
+            result = "vserver_host"
+        end
+
+        # new Xen domains have this in dom0 not domu :(
+        if FileTest.exists?("/proc/sys/xen/independent_wallclock")
+            result = "xenu" 
+        end
+        if FileTest.exists?("/sys/bus/xen")
+            result = "xenu" 
+        end
+        
+        if FileTest.exists?("/proc/xen/capabilities")
             txt = File.read("/proc/xen/capabilities")
             if txt =~ /control_d/i
-                result = "xen0"
-            else
-                result = "xenu"
+                result = "xen0" 
             end
         end
-
+ 
         if result == "physical"
-            path = %x{which lspci 2> /dev/null}.chomp
-            if path !~ /no lspci/
-                output = %x{#{path}}
-                output.each do |p|
+            output = Facter::Util::Resolution.exec('lspci')
+            if not output.nil?
+                output.each_line do |p|
                     # --- look for the vmware video card to determine if it is virtual => vmware.
                     # ---     00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter
                     result = "vmware" if p =~ /VM[wW]are/
                 end
             else
-                path = %x{which dmidecode 2> /dev/null}.chomp
-                if path !~ /no dmidecode/
-                    output = %x{#{path}}
-                    output.each do |pd|
+                output = Facter::Util::Resolution.exec('dmidecode')
+                if not output.nil?
+                    output.each_line do |pd|
                         result = "vmware" if pd =~ /VMware|Parallels/
                     end
                 else
-                    path = %x{which prtdiag 2> /dev/null}.chomp
-                    if path !~ /no prtdiag/
-                        output = %x{#{path}}
-                        output.each do |pd|
+                    output = Facter::Util::Resolution.exec('prtdiag')
+                    if not output.nil?
+                        output.each_line do |pd|
                             result = "vmware" if pd =~ /VMware|Parallels/
                         end
                     end
@@ -58,18 +77,19 @@ Facter.add("virtual") do
             result = "vmware_server"
         end
 
-        mountexists = system "which mount > /dev/null 2>&1"
-        if $?.exitstatus == 0
-            output = %x{mount}
-            output.each do |p|
-                result = "vserver" if p =~ /\/dev\/hdv1/
-            end
-        end
+        result
+    end
+end
+  
+Facter.add("is_virtual") do
+    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS}
 
-        if FileTest.directory?('/proc/virtual')
-            result = "vserver_host"
+    setcode do
+        case Facter.value(:virtual)
+        when "xenu", "openvzve", "vmware" 
+            true
+        else 
+            false
         end
-
-        result
     end
 end