facter 1.6.0 → 1.6.1

data/lib/facter/processor.rb

@@ -104,3 +104,41 @@ if Facter.value(:kernel) == "OpenBSD"
         end
     end
 end
+
+if Facter.value(:kernel) == "windows"
+  processor_list = []
+
+  Thread::exclusive do
+    require 'facter/util/wmi'
+
+    # get each physical processor
+    Facter::Util::WMI.execquery("select * from Win32_Processor").each do |proc|
+      # not supported before 2008
+      begin
+        processor_num = proc.NumberOfLogicalProcessors
+      rescue RuntimeError => e
+        processor_num = 1
+      end
+
+      processor_num.times do |i|
+        processor_list << proc.Name.squeeze(" ")
+      end
+    end
+  end
+
+  processor_list.each_with_index do |name, i|
+    Facter.add("Processor#{i}") do
+      confine :kernel => :windows
+      setcode do
+        name
+      end
+    end
+  end
+
+  Facter.add("ProcessorCount") do
+    confine :kernel => :windows
+    setcode do
+      processor_list.length.to_s
+    end
+  end
+end

data/lib/facter/ps.rb

@@ -18,3 +18,8 @@ Facter.add(:ps) do
     confine :operatingsystem => %w{FreeBSD NetBSD OpenBSD Darwin}
     setcode do 'ps auxwww' end
 end
+
+Facter.add(:ps) do
+  confine :operatingsystem => :windows
+  setcode do 'tasklist.exe' end
+end

data/lib/facter/selinux.rb

@@ -10,69 +10,84 @@
 # Fact for SElinux
 # Written by immerda admin team (admin(at)immerda.ch)
 
-Facter.add("selinux") do
-    confine :kernel => :linux
+sestatus_cmd = '/usr/sbin/sestatus'
+
+# This supports the fact that the selinux mount point is not always in the 
+# same location -- the selinux mount point is operating system specific.
+def selinux_mount_point
+  if FileTest.exists?('/proc/self/mountinfo')
+    File.open('/proc/self/mountinfo') do |f|
+      f.grep(/selinuxfs/) do |line|
+        line.split[4]
+      end
+    end
+  else
+    "/selinux"
+  end
+end
 
-    setcode do
-        result = "false"
-        if FileTest.exists?("/selinux/enforce")
-            if FileTest.exists?("/proc/self/attr/current")
-                if (File.read("/proc/self/attr/current") != "kernel\0")
-                    result = "true"
-                end
-            end
+Facter.add("selinux") do
+  confine :kernel => :linux
+  setcode do
+    result = "false" 
+    if FileTest.exists?("#{selinux_mount_point}/enforce")
+      if FileTest.exists?("/proc/self/attr/current")
+        if (File.read("/proc/self/attr/current") != "kernel\0")
+          result = "true"
         end
-        result
+      end
     end
+    result
+  end
 end
 
 Facter.add("selinux_enforced") do
-    confine :selinux => :true
-
-    setcode do
-        result = "false"
-        if FileTest.exists?("/selinux/enforce") and File.read("/selinux/enforce") =~ /1/i
-            result = "true"
-        end
-        result
+  confine :selinux => :true
+  setcode do
+    result = "false"
+    if FileTest.exists?("#{selinux_mount_point}/enforce") and
+       File.read("#{selinux_mount_point}/enforce") =~ /1/i
+      result = "true"
     end
+    result
+  end
 end
 
 Facter.add("selinux_policyversion") do
-    confine :selinux => :true
-    setcode do
-        File.read("/selinux/policyvers")
-    end
+  confine :selinux => :true
+  setcode do
+    File.read("#{selinux_mount_point}/policyvers")
+  end
 end
 
 Facter.add("selinux_current_mode") do
-    confine :selinux => :true
-    setcode do
-	result = 'unknown'
-        mode = Facter::Util::Resolution.exec('/usr/sbin/sestatus')
-        mode.each_line { |l| result = $1 if l =~ /^Current mode\:\s+(\w+)$/i }
-        result.chomp
-    end
+  confine :selinux => :true
+  setcode do
+    result = 'unknown'
+    mode = Facter::Util::Resolution.exec(sestatus_cmd)
+    mode.each_line { |l| result = $1 if l =~ /^Current mode\:\s+(\w+)$/i }
+    result.chomp
+  end
 end
 
 Facter.add("selinux_config_mode") do
-    confine :selinux => :true
-    setcode do
-        result = 'unknown'
-        mode = Facter::Util::Resolution.exec('/usr/sbin/sestatus')
-        mode.each_line { |l| result = $1 if l =~ /^Mode from config file\:\s+(\w+)$/i }
-        result.chomp
-    end
+  confine :selinux => :true
+  setcode do
+    result = 'unknown'
+    mode = Facter::Util::Resolution.exec(sestatus_cmd)
+    mode.each_line { |l| result = $1 if l =~ /^Mode from config file\:\s+(\w+)$/i }
+    result.chomp
+  end
 end
 
 Facter.add("selinux_config_policy") do
-    confine :selinux => :true
-    setcode do
-        result = 'unknown'
-        mode = Facter::Util::Resolution.exec('/usr/sbin/sestatus')
-        mode.each_line { |l| result = $1 if l =~ /^Policy from config file\:\s+(\w+)$/i }
-        result.chomp
-    end
+  confine :selinux => :true
+  setcode do
+    result = 'unknown'
+    mode = Facter::Util::Resolution.exec(sestatus_cmd)
+    mode.each_line { |l| result = $1 if l =~ /^Policy from config file\:\s+(\w+)$/i }
+    result.chomp
+  end
 end
 
 # This is a legacy fact which returns the old selinux_mode fact value to prevent 
@@ -80,8 +95,8 @@ end
 # See ticket #6677.
 
 Facter.add("selinux_mode") do
-    confine :selinux => :true
-    setcode do
-        Facter.value(:selinux_config_policy)
-    end
+  confine :selinux => :true
+  setcode do
+    Facter.value(:selinux_config_policy)
+  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 OEL OVS GNU/kFreeBSD}
+    setcode 'hostid'
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo AIX OEL OracleLinux OVS GNU/kFreeBSD}
 end

data/lib/facter/util/config.rb

@@ -0,0 +1,9 @@
+# A module to return config related data
+#
+module Facter::Util::Config
+  require 'rbconfig'
+
+  def self.is_windows?
+    Config::CONFIG['host_os'] =~ /mswin|win32|dos|mingw|cygwin/i
+  end
+end

data/lib/facter/util/ip.rb

@@ -27,12 +27,17 @@ module Facter::Util::IP
             :ipaddress  => /\s+inet (\S+)\s.*/,
             :macaddress => /(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
             :netmask    => /.*\s+netmask (\S+)\s.*/
+        },
+        :windows => {
+            :ipaddress  => /\s+IP Address:\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+            :ipaddress6 => /Address ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+            :netmask    => /\s+Subnet Prefix:\s+\S+\s+\(mask ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\)/
         }
     }
 
-    # Convert an interface name into purely alpha characters.
+    # Convert an interface name into purely alphanumeric characters.
     def self.alphafy(interface)
-        interface.gsub(/[-:.]/, '_')
+        interface.gsub(/[^a-z0-9_]/i, '_')
     end
 
     def self.convert_from_hex?(kernel)
@@ -55,6 +60,10 @@ module Facter::Util::IP
     def self.get_interfaces
         return [] unless output = Facter::Util::IP.get_all_interface_output()
 
+        # windows interface names contain spaces and are quoted and can appear multiple
+        # times as ipv4 and ipv6
+        return output.scan(/\s* connected\s*(\S.*)/).flatten.uniq if Facter.value(:kernel) == 'windows'
+
         # 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
@@ -70,6 +79,9 @@ module Facter::Util::IP
             output = %x{/usr/sbin/ifconfig -a}
         when 'HP-UX'
             output = %x{/bin/netstat -in | sed -e 1d}
+        when 'windows'
+          output = %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ip show interface|
+          output += %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ipv6 show interface|
         end
         output
     end
@@ -91,6 +103,17 @@ module Facter::Util::IP
         output
     end
 
+    def self.get_output_for_interface_and_label(interface, label)
+        return get_single_interface_output(interface) unless Facter.value(:kernel) == 'windows'
+
+        if label == 'ipaddress6'
+          output = %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ipv6 show address \"#{interface}\"|
+        else
+          output = %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ip show address \"#{interface}\"|
+        end
+        output
+    end
+
     def self.get_bonding_master(interface)
         if Facter.value(:kernel) != 'Linux'
             return nil
@@ -139,7 +162,7 @@ module Facter::Util::IP
             hwaddrre = /^Slave Interface: #{interface}\n[^\n].+?\nPermanent HW addr: (([0-9a-fA-F]{2}:?)*)$/m
             value = hwaddrre.match(bondinfo.to_s)[1].upcase
         else
-            output_int = get_single_interface_output(interface)
+            output_int = get_output_for_interface_and_label(interface, label)
 
             output_int.each_line do |s|
                 if s =~ regex

data/lib/facter/util/loader.rb

@@ -2,6 +2,11 @@ require 'facter'
 
 # Load facts on demand.
 class Facter::Util::Loader
+
+    def initialize
+      @loaded = []
+    end
+
     # Load all resolutions for a single fact.
     def load(fact)
         # Now load from the search path
@@ -68,10 +73,16 @@ class Facter::Util::Loader
     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

data/lib/facter/util/macaddress.rb

@@ -2,6 +2,10 @@
 #
 module Facter::Util::Macaddress
 
+  def self.standardize(macaddress)
+    macaddress.split(":").map{|x| "0#{x}"[-2..-1]}.join(":")
+  end
+
   module Darwin
     def self.macaddress
       iface = default_interface
@@ -25,4 +29,20 @@ module Facter::Util::Macaddress
       '/sbin/ifconfig'
     end
   end
+
+  module Windows
+    def macaddress
+      require 'facter/util/wmi'
+
+      query = "select MACAddress from Win32_NetworkAdapterConfiguration where IPEnabled = True"
+
+      ether = nil
+      Facter::Util::WMI.execquery(query).each do |nic|
+        ether = nic.MacAddress
+        break
+      end
+      ether
+    end
+    module_function :macaddress
+  end
 end

data/lib/facter/util/manufacturer.rb

@@ -53,9 +53,9 @@ module Facter::Manufacturer
     def self.sysctl_find_system_info(name)
         name.each do |sysctlkey,facterkey|
             Facter.add(facterkey) do
-                confine :kernel => :openbsd
+                confine :kernel => [:openbsd, :darwin]
                 setcode do
-                    Facter::Util::Resolution.exec("sysctl -n " + sysctlkey)
+                    Facter::Util::Resolution.exec("sysctl -n #{sysctlkey} 2>/dev/null")
                 end
             end
         end
@@ -79,12 +79,18 @@ module Facter::Manufacturer
                 end
             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 'win32ole'
+        require 'facter/util/wmi'
         value = ""
-        wmi = WIN32OLE.connect("winmgmts://")
+        wmi = Facter::Util::WMI.connect()
         name.each do |facterkey, win32key|
             query = wmi.ExecQuery("select * from Win32_#{win32key.last}")
             Facter.add(facterkey) do
@@ -96,5 +102,4 @@ module Facter::Manufacturer
             end
         end
     end
-
 end

data/lib/facter/util/resolution.rb

@@ -4,16 +4,14 @@
 # confinements specified must all be true for the resolution to be
 # suitable.
 require 'facter/util/confine'
+require 'facter/util/config'
 
 require 'timeout'
-require 'rbconfig'
 
 class Facter::Util::Resolution
     attr_accessor :interpreter, :code, :name, :timeout
 
-    WINDOWS = Config::CONFIG['host_os'] =~ /mswin|win32|dos|mingw|cygwin/i
-
-    INTERPRETER = WINDOWS ? 'cmd.exe' : '/bin/sh'
+    INTERPRETER = Facter::Util::Config.is_windows? ? "cmd.exe" : "/bin/sh"
 
     def self.have_which
         if ! defined?(@have_which) or @have_which.nil?
@@ -32,8 +30,8 @@ class Facter::Util::Resolution
     # Returns nil if the program can't be found, or if there is a problem
     # executing the code.
     #
-    def self.exec(code, interpreter = INTERPRETER)
-        raise ArgumentError, "invalid interpreter" unless interpreter == INTERPRETER
+    def self.exec(code, interpreter = nil)
+        Facter.warnonce "The interpreter parameter to 'exec' is deprecated and will be removed in a future version." if interpreter
 
         # Try to guess whether the specified code can be executed by looking at the
         # first word. If it cannot be found on the PATH defer on resolving the fact
@@ -45,7 +43,7 @@ class Facter::Util::Resolution
         # Windows' %x{} throws Errno::ENOENT when the command is not found, so we 
         # can skip the check there. This is good, since builtins cannot be found 
         # elsewhere.
-        if have_which and !WINDOWS
+        if have_which and !Facter::Util::Config.is_windows?
             path = nil
             binary = code.split.first
             if code =~ /^\//
@@ -116,6 +114,7 @@ class Facter::Util::Resolution
 
     # Set our code for returning a value.
     def setcode(string = nil, interp = nil, &block)
+        Facter.warnonce "The interpreter parameter to 'setcode' is deprecated and will be removed in a future version." if interp
         if string
             @code = string
             @interpreter = interp || INTERPRETER
@@ -127,6 +126,16 @@ class Facter::Util::Resolution
         end
     end
 
+    def interpreter
+      Facter.warnonce "The 'Facter::Util::Resolution.interpreter' method is deprecated and will be removed in a future version."
+      @interpreter
+    end
+
+    def interpreter=(interp)
+      Facter.warnonce "The 'Facter::Util::Resolution.interpreter=' method is deprecated and will be removed in a future version."
+      @interpreter = interp
+    end
+
     # Is this resolution mechanism suitable on the system in question?
     def suitable?
         unless defined? @suitable
@@ -143,7 +152,7 @@ class Facter::Util::Resolution
     # How we get a value for our resolution mechanism.
     def value
         result = nil
-        return result if @code == nil and @interpreter == nil
+        return result if @code == nil
 
         starttime = Time.now.to_f
 
@@ -152,7 +161,7 @@ class Facter::Util::Resolution
                 if @code.is_a?(Proc)
                     result = @code.call()
                 else
-                    result = Facter::Util::Resolution.exec(@code,@interpreter)
+                    result = Facter::Util::Resolution.exec(@code)
                 end
             end
         rescue Timeout::Error => detail