facter 1.6.1 → 1.6.2

data/lib/facter/util/loader.rb

@@ -3,110 +3,110 @@ require 'facter'
 # Load facts on demand.
 class Facter::Util::Loader
 
-    def initialize
-      @loaded = []
+  def initialize
+    @loaded = []
+  end
+
+  # Load all resolutions for a single fact.
+  def load(fact)
+    # Now load from the search path
+    shortname = fact.to_s.downcase
+    load_env(shortname)
+
+    filename = shortname + ".rb"
+    search_path.each do |dir|
+      # Load individual files
+      file = File.join(dir, filename)
+
+      load_file(file) if FileTest.exist?(file)
+
+      # And load any directories matching the name
+      factdir = File.join(dir, shortname)
+      load_dir(factdir) if FileTest.directory?(factdir)
     end
+  end
 
-    # Load all resolutions for a single fact.
-    def load(fact)
-        # Now load from the search path
-        shortname = fact.to_s.downcase
-        load_env(shortname)
+  # Load all facts from all directories.
+  def load_all
+    return if defined?(@loaded_all)
 
-        filename = shortname + ".rb"
-        search_path.each do |dir|
-            # Load individual files
-            file = File.join(dir, filename)
+    load_env
 
-            load_file(file) if FileTest.exist?(file)
+    search_path.each do |dir|
+      next unless FileTest.directory?(dir)
 
-            # And load any directories matching the name
-            factdir = File.join(dir, shortname)
-            load_dir(factdir) if FileTest.directory?(factdir)
+      Dir.entries(dir).sort.each do |file|
+        path = File.join(dir, file)
+        if File.directory?(path)
+          load_dir(path)
+        elsif file =~ /\.rb$/
+          load_file(File.join(dir, file))
         end
+      end
     end
 
-    # Load all facts from all directories.
-    def load_all
-        return if defined?(@loaded_all)
+    @loaded_all = true
+  end
 
-        load_env
-
-        search_path.each do |dir|
-            next unless FileTest.directory?(dir)
-
-            Dir.entries(dir).sort.each do |file|
-                path = File.join(dir, file)
-                if File.directory?(path)
-                    load_dir(path)
-                elsif file =~ /\.rb$/
-                    load_file(File.join(dir, file))
-                end
-            end
-        end
-
-        @loaded_all = true
+  # The list of directories we're going to search through for facts.
+  def search_path
+    result = []
+    result += $LOAD_PATH.collect { |d| File.join(d, "facter") }
+    if ENV.include?("FACTERLIB")
+      result += ENV["FACTERLIB"].split(":")
     end
 
-    # The list of directories we're going to search through for facts.
-    def search_path
-        result = []
-        result += $LOAD_PATH.collect { |d| File.join(d, "facter") }
-        if ENV.include?("FACTERLIB")
-            result += ENV["FACTERLIB"].split(":")
-        end
-
-        # This allows others to register additional paths we should search.
-        result += Facter.search_path
+    # This allows others to register additional paths we should search.
+    result += Facter.search_path
 
-        result
-    end
+    result
+  end
 
-    private
+  private
 
-    def load_dir(dir)
-        return if dir =~ /\/\.+$/ or dir =~ /\/util$/ or dir =~ /\/lib$/
+  def load_dir(dir)
+    return if dir =~ /\/\.+$/ or dir =~ /\/util$/ or dir =~ /\/lib$/
 
-        Dir.entries(dir).find_all { |f| f =~ /\.rb$/ }.sort.each do |file|
-            load_file(File.join(dir, file))
-        end
+    Dir.entries(dir).find_all { |f| f =~ /\.rb$/ }.sort.each do |file|
+      load_file(File.join(dir, file))
     end
-
-    def load_file(file)
-        return if @loaded.include? file
-        # We have to specify Kernel.load, because we have a load method.
-        begin
-            # Store the file path so we don't try to reload it
-            @loaded << file
-            Kernel.load(file)
-        rescue ScriptError => detail
-            # Don't store the path if the file can't be loaded
-            # in case it's loadable later on.
-            @loaded.delete(file)
-            warn "Error loading fact #{file} #{detail}"
-        end
+  end
+
+  def load_file(file)
+    return if @loaded.include? file
+    # We have to specify Kernel.load, because we have a load method.
+    begin
+      # Store the file path so we don't try to reload it
+      @loaded << file
+      Kernel.load(file)
+    rescue ScriptError => detail
+      # Don't store the path if the file can't be loaded
+      # in case it's loadable later on.
+      @loaded.delete(file)
+      warn "Error loading fact #{file} #{detail}"
     end
-
-    # Load facts from the environment.  If no name is provided,
-    # all will be loaded.
-    def load_env(fact = nil)
-        # Load from the environment, if possible
-        ENV.each do |name, value|
-            # Skip anything that doesn't match our regex.
-            next unless name =~ /^facter_?(\w+)$/i
-            env_name = $1
-
-            # If a fact name was specified, skip anything that doesn't
-            # match it.
-            next if fact and env_name != fact
-
-            Facter.add($1) do
-                has_weight 1_000_000
-                setcode { value }
-            end
-
-            # Short-cut, if we are only looking for one value.
-            break if fact
-        end
+  end
+
+  # Load facts from the environment.  If no name is provided,
+  # all will be loaded.
+  def load_env(fact = nil)
+    # Load from the environment, if possible
+    ENV.each do |name, value|
+      # Skip anything that doesn't match our regex.
+      next unless name =~ /^facter_?(\w+)$/i
+      env_name = $1
+
+      # If a fact name was specified, skip anything that doesn't
+      # match it.
+      next if fact and env_name != fact
+
+      Facter.add($1) do
+        has_weight 1_000_000
+        setcode { value }
+      end
+
+      # Short-cut, if we are only looking for one value.
+      break if fact
     end
+  end
 end

data/lib/facter/util/macosx.rb

@@ -6,56 +6,56 @@
 ##
 
 module Facter::Util::Macosx
-    require 'thread'
-    require 'facter/util/plist'
-    require 'facter/util/resolution'
-
-    # 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.profiler_xml(data_field)
-        Facter::Util::Resolution.exec("/usr/sbin/system_profiler -xml #{data_field}")
+  require 'thread'
+  require 'facter/util/plist'
+  require 'facter/util/resolution'
+
+  # 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.profiler_xml(data_field)
+    Facter::Util::Resolution.exec("/usr/sbin/system_profiler -xml #{data_field}")
+  end
+
+  def self.intern_xml(xml)
+    return nil unless xml
+    Plist::parse_xml(xml)
+  end
+
+  # Return an xml result, modified as we need it.
+  def self.profiler_data(data_field)
+    begin
+      return nil unless parsed_xml = intern_xml(profiler_xml(data_field))
+      return nil unless data = parsed_xml[0]['_items'][0]
+      data.delete '_name'
+      data
+    rescue
+      return nil
     end
+  end
 
-    def self.intern_xml(xml)
-        return nil unless xml
-        Plist::parse_xml(xml)
-    end
+  def self.hardware_overview
+    profiler_data("SPHardwareDataType")
+  end
 
-    # Return an xml result, modified as we need it.
-    def self.profiler_data(data_field)
-        begin
-            return nil unless parsed_xml = intern_xml(profiler_xml(data_field))
-            return nil unless data = parsed_xml[0]['_items'][0]
-            data.delete '_name'
-            data
-        rescue
-            return nil
-        end
-    end
+  def self.os_overview
+    profiler_data("SPSoftwareDataType")
+  end
 
-    def self.hardware_overview
-        profiler_data("SPHardwareDataType")
+  def self.sw_vers
+    ver = Hash.new
+    [ "productName", "productVersion", "buildVersion" ].each do |option|
+      ver["macosx_#{option}"] = Facter::Util::Resolution.exec("/usr/bin/sw_vers -#{option}").strip
     end
-
-    def self.os_overview
-        profiler_data("SPSoftwareDataType")
-    end
-
-    def self.sw_vers
-        ver = Hash.new
-        [ "productName", "productVersion", "buildVersion" ].each do |option|
-            ver["macosx_#{option}"] = Facter::Util::Resolution.exec("/usr/bin/sw_vers -#{option}").strip
-        end
-        productversion = ver["macosx_productVersion"]
-        if not productversion.nil?
-            versions = productversion.scan(/(\d+)\.(\d+)\.*(\d*)/)[0]
-            ver["macosx_productversion_major"] = "#{versions[0]}.#{versions[1]}"
-            if versions[2].empty?  # 10.x should be treated as 10.x.0
-                versions[2] = "0"
-            end
-            ver["macosx_productversion_minor"] = versions[2]
-        end
-        ver
+    productversion = ver["macosx_productVersion"]
+    if not productversion.nil?
+      versions = productversion.scan(/(\d+)\.(\d+)\.*(\d*)/)[0]
+      ver["macosx_productversion_major"] = "#{versions[0]}.#{versions[1]}"
+      if versions[2].empty?  # 10.x should be treated as 10.x.0
+        versions[2] = "0"
+      end
+      ver["macosx_productversion_minor"] = versions[2]
     end
+    ver
+  end
 end

data/lib/facter/util/manufacturer.rb

@@ -3,103 +3,103 @@
 
 module Facter::Manufacturer
 
-    def self.get_dmi_table()
-        case Facter.value(:kernel)
-        when 'Linux', 'GNU/kFreeBSD'
-            return nil unless FileTest.exists?("/usr/sbin/dmidecode")
+  def self.get_dmi_table()
+    case Facter.value(:kernel)
+    when 'Linux', 'GNU/kFreeBSD'
+      return nil unless FileTest.exists?("/usr/sbin/dmidecode")
 
-            output=%x{/usr/sbin/dmidecode 2>/dev/null}
-        when 'FreeBSD'
-            return nil unless FileTest.exists?("/usr/local/sbin/dmidecode")
+      output=%x{/usr/sbin/dmidecode 2>/dev/null}
+    when '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")
+      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")
+      output=%x{/usr/pkg/sbin/dmidecode 2>/dev/null}
+    when 'SunOS'
+      return nil unless FileTest.exists?("/usr/sbin/smbios")
 
-            output=%x{/usr/sbin/smbios 2>/dev/null}
-        else
-            output=nil
-        end
-        return output
+      output=%x{/usr/sbin/smbios 2>/dev/null}
+    else
+      output=nil
     end
+    return output
+  end
 
-    def self.dmi_find_system_info(name)
-        splitstr=  Facter.value(:kernel) ==  'SunOS' ? "ID    SIZE TYPE" : /^Handle/
-        output = self.get_dmi_table()
-        return if output.nil?
-        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 =~ /\n\s+#{value} (.+)\n/
-                            result = $1.strip
-                            Facter.add(facterkey) do
-                                confine :kernel => [ :linux, :freebsd, :netbsd, :sunos, :"gnu/kfreebsd" ]
-                                setcode do
-                                    result
-                                end
-                            end
-                        end
-                    end
+  def self.dmi_find_system_info(name)
+    splitstr=  Facter.value(:kernel) ==  'SunOS' ? "ID  SIZE TYPE" : /^Handle/
+    output = self.get_dmi_table()
+    return if output.nil?
+    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 =~ /\n\s+#{value} (.+)\n/
+              result = $1.strip
+              Facter.add(facterkey) do
+                confine :kernel => [ :linux, :freebsd, :netbsd, :sunos, :"gnu/kfreebsd" ]
+                setcode do
+                  result
                 end
+              end
             end
+          end
         end
+      end
     end
+  end
 
-    def self.sysctl_find_system_info(name)
-        name.each do |sysctlkey,facterkey|
-            Facter.add(facterkey) do
-                confine :kernel => [:openbsd, :darwin]
-                setcode do
-                    Facter::Util::Resolution.exec("sysctl -n #{sysctlkey} 2>/dev/null")
-                end
-            end
+  def self.sysctl_find_system_info(name)
+    name.each do |sysctlkey,facterkey|
+      Facter.add(facterkey) do
+        confine :kernel => [:openbsd, :darwin]
+        setcode do
+          Facter::Util::Resolution.exec("sysctl -n #{sysctlkey} 2>/dev/null")
         end
+      end
     end
+  end
 
-    def self.prtdiag_sparc_find_system_info()
-        # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86
-        output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag')
+  def self.prtdiag_sparc_find_system_info()
+    # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86
+    output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag')
 
-        # System Configuration:  Sun Microsystems  sun4u Sun SPARC Enterprise M3000 Server
-        sysconfig = output.split("\n")[0]
-        if sysconfig =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/ then
-            Facter.add('manufacturer') do
-                setcode do
-                    $1
-                end
-            end
-            Facter.add('productname') do
-                setcode do
-                    $3
-                end
-            end
+    # System Configuration:  Sun Microsystems  sun4u Sun SPARC Enterprise M3000 Server
+    sysconfig = output.split("\n")[0]
+    if sysconfig =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/ then
+      Facter.add('manufacturer') do
+        setcode do
+          $1
         end
-
-        Facter.add('serialnumber') do
-          setcode do
-            Facter::Util::Resolution.exec("/usr/sbin/sneep")
-          end
+      end
+      Facter.add('productname') do
+        setcode do
+          $3
         end
+      end
     end
 
-    def self.win32_find_system_info(name)
-        require 'facter/util/wmi'
-        value = ""
-        wmi = Facter::Util::WMI.connect()
-        name.each do |facterkey, win32key|
-            query = wmi.ExecQuery("select * from Win32_#{win32key.last}")
-            Facter.add(facterkey) do
-                confine :kernel => :windows
-                setcode do
-                    query.each { |x| value = x.__send__( (win32key.first).to_sym) }
-                    value
-                end
-            end
+    Facter.add('serialnumber') do
+      setcode do
+        Facter::Util::Resolution.exec("/usr/sbin/sneep")
+      end
+    end
+  end
+
+  def self.win32_find_system_info(name)
+    require 'facter/util/wmi'
+    value = ""
+    wmi = Facter::Util::WMI.connect()
+    name.each do |facterkey, win32key|
+      query = wmi.ExecQuery("select * from Win32_#{win32key.last}")
+      Facter.add(facterkey) do
+        confine :kernel => :windows
+        setcode do
+          query.each { |x| value = x.__send__( (win32key.first).to_sym) }
+          value
         end
+      end
     end
+  end
 end