facter 1.5 → 1.5.2

data/lib/facter/domain.rb

@@ -62,3 +62,17 @@ Facter.add(:domain) do
         end
     end
 end
+Facter.add(:domain) do
+    confine :kernel => :windows
+    setcode do
+        require 'win32ole'
+        domain = ""
+        wmi = WIN32OLE.connect("winmgmts://")
+        query = "select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True"
+        wmi.ExecQuery(query).each { |nic| 
+            domain = nic.DNSDomain
+            break 
+        }
+        domain
+    end
+end

data/lib/facter/hardwaremodel.rb

@@ -11,3 +11,11 @@ Facter.add(:hardwaremodel) do
         end
     end
 end
+
+Facter.add(:hardwaremodel) do
+    confine :operatingsystem => :windows
+    setcode do
+        require 'rbconfig'
+        Config::CONFIG['host_cpu']
+    end
+end

data/lib/facter/ipaddress.rb

@@ -1,4 +1,4 @@
-Facter.add(:ipaddress, :ldapname => "iphostnumber") do
+Facter.add(:ipaddress, :ldapname => "iphostnumber", :timeout => 2) do
     setcode do
         require 'resolv'
 
@@ -19,7 +19,7 @@ Facter.add(:ipaddress, :ldapname => "iphostnumber") do
     end
 end
 
-Facter.add(:ipaddress) do
+Facter.add(:ipaddress, :timeout => 2) do
     setcode do
         if hostname = Facter.value(:hostname)
             # we need Hostname to exist for this to work
@@ -149,3 +149,22 @@ Facter.add(:ipaddress) do
         ip
     end
 end
+
+Facter.add(:ipaddress) do
+    confine :kernel => %w{windows}
+    setcode do
+        ip = nil
+        output = %x{ipconfig}
+
+        output.split(/^\S/).each { |str|
+            if str =~ /IP Address.*: ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+                tmp = $1
+                unless tmp =~ /127\./
+                    ip = tmp
+                    break
+                end
+            end
+        }
+        ip
+    end
+end

data/lib/facter/ipmess.rb

@@ -15,61 +15,32 @@ Facter.add(:interfaces) do
 end
 
 case Facter.value(:kernel) 
- when 'SunOS', 'Linux'
+ when 'SunOS', 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD'
   Facter::IPAddress.get_interfaces.each do |interface|
-    mi = interface.gsub(':', '_')
+    mi = interface.gsub('/:|\./', '_')
 
     Facter.add("ipaddress_" + mi) do
-        confine :kernel => [ :sunos, :linux ]
+        confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :linux ]
         setcode do
             label = 'ipaddress'
-            Facter::IPAddress.get_interface_value_nonbsd(interface, label)
+            Facter::IPAddress.get_interface_value(interface, label)
         end
     end
 
     Facter.add("macaddress_" + mi) do
-        confine :kernel => [ :sunos, :linux ]
+        confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :linux ]
         setcode do
             label = 'macaddress'
-            Facter::IPAddress.get_interface_value_nonbsd(interface, label) 
+            Facter::IPAddress.get_interface_value(interface, label) 
         end
     end
 
     Facter.add("netmask_" + mi) do
-        confine :kernel => [ :sunos, :linux ]
+        confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :linux ]
         setcode do
             label = 'netmask'
-            Facter::IPAddress.get_interface_value_nonbsd(interface, label)
+            Facter::IPAddress.get_interface_value(interface, label)
         end
     end
  end
-
- when 'OpenBSD', 'NetBSD', 'FreeBSD'
-  Facter::IPAddress.get_interfaces.each do |interface|
-    mi = interface.gsub(':', '_')
-
-    Facter.add("ipaddress_" + mi) do
-        confine :kernel => [ :openbsd, :freebsd, :netbsd ]
-        setcode do
-            label = 'ipaddress'
-            Facter::IPAddress.get_interface_value_bsd(interface, label)
-        end
-    end
-
-    Facter.add("netmask_" + mi) do
-        confine :kernel => [ :openbsd, :freebsd, :netbsd ]
-        setcode do
-            label = 'netmask'
-            Facter::IPAddress.get_interface_value_bsd(interface, label)
-        end
-    end
- 
-    Facter.add("macaddress_" + mi) do
-        confine :kernel => [ :openbsd, :freebsd, :netbsd ]
-        setcode do
-            label = 'macaddress'
-            Facter::IPAddress.get_interface_value_bsd(interface, label)
-        end
-    end
-  end
 end

data/lib/facter/kernel.rb

@@ -1,3 +1,9 @@
 Facter.add(:kernel) do
-    setcode 'uname -s'
+    setcode do
+        require 'rbconfig'
+        case Config::CONFIG['host_os']
+          when /mswin/i then 'windows'
+          else Facter::Util::Resolution.exec("uname -s")
+        end
+    end
 end

data/lib/facter/kernelrelease.rb

@@ -2,7 +2,22 @@ Facter.add(:kernelrelease) do
     setcode 'uname -r'
 end
 
-Facter.add(:kernelrelease, :timeout => 5) do
+Facter.add(:kernelrelease) do
     confine :kernel => :aix
     setcode 'oslevel -s'
 end
+
+Facter.add(:kernelrelease) do
+    confine :kernel => %{windows}
+    setcode do
+        require 'win32ole'
+        version = ""
+        connection_string = "winmgmts://./root/cimv2"
+        wmi = WIN32OLE.connect(connection_string)
+        wmi.ExecQuery("SELECT Version from Win32_OperatingSystem").each { |ole|
+            version = "#{ole.Version}"
+            break
+        }
+        version
+    end
+end

data/lib/facter/kernelversion.rb

@@ -0,0 +1,5 @@
+Facter.add("kernelversion") do
+  setcode do
+   Facter['kernelrelease'].value.split('-')[0]
+  end	
+end        

data/lib/facter/lsb.rb

@@ -20,6 +20,7 @@
     "LSBDistCodeName" => %r{^Codename:\t(.*)$}
 }.each do |fact, pattern|
     Facter.add(fact) do
+        confine :kernel => :linux
         setcode do
             unless defined?(@@lsbdata) and defined?(@@lsbtime) and (Time.now.to_i - @@lsbtime.to_i < 5)
                 type = nil

data/lib/facter/macaddress.rb

@@ -1,5 +1,5 @@
 Facter.add(:macaddress) do
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo Ubuntu}
     setcode do
         ether = []
         output = %x{/sbin/ifconfig -a}
@@ -63,3 +63,17 @@ Facter.add(:macaddress) do
         ether[0]
     end
 end
+
+Facter.add(:macaddress) do
+    confine :kernel => %w(windows)
+    setcode do
+	ether = []
+	output = %x{ipconfig /all}
+	output.split(/\r\n/).each  do |str|
+	    if str =~  /.*Physical Address.*: (\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2})/
+		ether.push($1.gsub(/-/, ":"))
+	    end
+	end
+	ether[0]
+    end
+end

data/lib/facter/operatingsystem.rb

@@ -26,7 +26,12 @@ Facter.add(:operatingsystem) do
                 "RedHat"
             end
         elsif FileTest.exists?("/etc/SuSE-release")
-            "SuSE"
+            txt = File.read("/etc/SuSE-release")
+            if txt =~ /^SUSE LINUX Enterprise Server/i
+                "SLES"
+            else
+                "SuSE"
+            end
         end
     end
 end

data/lib/facter/operatingsystemrelease.rb

@@ -29,11 +29,11 @@ end
 Facter.add(:operatingsystemrelease) do
     confine :operatingsystem => %w{CentOS}
     setcode do
-      centosrelease = Facter::Util::Resolution.exec('cat /etc/redhat-release | sed -e \'s/CentOS release//g\' -e \'s/(Final)//g\'')
-        if centosrelease =~ /^5^/
+      centos_release = Facter::Util::Resolution.exec("sed -r -e 's/CentOS release //' -e 's/ \((Branch|Final)\)//' /etc/redhat-release")
+        if centos_release =~ /5/
           release = Facter::Util::Resolution.exec('rpm -q --qf \'%{VERSION}.%{RELEASE}\' centos-release | cut -d. -f1,2')
         else
-          release = Facter::Util::Resolution.exec('cat /etc/redhat-release | sed -e \'s/CentOS release//g\' -e \'s/(Final)//g\'')
+          release = centos_release
         end
     end
 end
@@ -41,10 +41,7 @@ end
 Facter.add(:operatingsystemrelease) do
     confine :operatingsystem => %w{Debian}
     setcode do
-        release = Facter::Util::Resolution.exec('cat /proc/version')
-            if release =~ /\(Debian (\d+.\d+).\d+-\d+\)/
-                $1
-            end
+        release = Facter::Util::Resolution.exec('cat /etc/debian_version')
      end
 end
 
@@ -58,6 +55,36 @@ Facter.add(:operatingsystemrelease) do
     end
 end
 
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{SLES}
+    setcode do
+        releasefile = Facter::Util::Resolution.exec('cat /etc/SuSE-release')
+        if releasefile =~ /^VERSION\s*=\s*(\d+)/
+            releasemajor = $1
+            if releasefile =~ /^PATCHLEVEL\s*=\s*(\d+)/
+                releaseminor = $1
+            else
+                releaseminor = 0
+            end
+            releasemajor + "." + releaseminor
+        else
+            "unknown"
+        end
+    end
+end
+
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{Solaris}
+    setcode do
+        full_release = File.readlines("/etc/release").to_s.match(/Solaris \w+ [\w\/]+ ([^_]+_[^_]+)/).to_a.last.chomp("wos")
+        if full_release =~ /^s(\d+)\w(_\w\d)+/
+            $1 + $2
+        else
+            full_release
+        end
+    end
+end
+
 Facter.add(:operatingsystemrelease) do
     setcode do Facter[:kernelrelease].value end
 end

data/lib/facter/puppetversion.rb

@@ -1,4 +1,4 @@
-Facter.add(:puppetversion, :timeout => 1.5) do
+Facter.add(:puppetversion) do
     setcode {
         begin
             require 'puppet'

data/lib/facter/util/ip.rb

@@ -4,13 +4,8 @@ module Facter::IPAddress
     
      int = nil
     
-     case Facter.value(:kernel)
-        when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD'
-           output = %x{/sbin/ifconfig -a}       
-        when 'SunOS'
-           output = %x{/usr/sbin/ifconfig -a} 
-     end
-    
+     output =  Facter::IPAddress.get_all_interface_output()
+
      # We get lots of warnings on platforms that don't get an output
      # made.
      if output
@@ -20,24 +15,43 @@ module Facter::IPAddress
      end
     
     end
+
+    def self.get_all_interface_output
+        case Facter.value(:kernel)
+            when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD'
+                output = %x{/sbin/ifconfig -a}
+            when 'SunOS'
+                output = %x{/usr/sbin/ifconfig -a}
+        end
+        output
+    end
+
+    def self.get_single_interface_output(interface)
+        output = ""
+        case Facter.value(:kernel)
+            when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD'
+                    output = %x{/sbin/ifconfig #{interface}}
+            when 'SunOS'
+            output = %x{/usr/sbin/ifconfig #{interface}}
+        end
+        output
+    end
+
+
+    def self.get_interface_value(interface, label)
     
-    def self.get_interface_value_nonbsd(interface, label)
-    
-    tmp1 = nil
+    tmp1 = []
 
     case Facter.value(:kernel)
       when 'Linux'
-       output_int = %x{/sbin/ifconfig #{interface}}
        addr = /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
        mac  = /(?:ether|HWaddr)\s+(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
        mask = /Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
      when 'OpenBSD', 'NetBSD', 'FreeBSD'
-       output_int = %x{/sbin/ifconfig #{interface}}
        addr = /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
        mac  = /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
        mask = /netmask\s+(\w{10})/
     when 'SunOS'
-       output_int = %x{/usr/sbin/ifconfig #{interface}}
        addr = /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
        mac  = /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/
        mask = /netmask\s+(\w{8})/
@@ -51,48 +65,24 @@ module Facter::IPAddress
       when 'netmask'
        regex = mask
     end 
+
+    output_int = get_single_interface_output(interface)
      
       if interface != "lo" && interface != "lo0"
         output_int.each { |s|
-           tmp1 = $1 if s =~ regex
+           if s =~ regex
+               value = $1
+               if label == 'netmask' && Facter.value(:kernel) == "SunOS"
+                   value = value.scan(/../).collect do |byte| byte.to_i(16) end.join('.') 
+               end
+               tmp1.push(value)
+           end
        }
       end
 
       if tmp1 
-        value = tmp1
+        value = tmp1.shift
       end
 
    end
-
-   def self.get_interface_value_bsd(interface, label)
-
-    tmp1 = []
-
-    int_hash = {}
-    output_int = %x{/sbin/ifconfig #{interface}}
-    addr = /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-    mac  = /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
-    mask = /netmask\s+(\w{10})/
-
-    case label
-      when 'ipaddress'
-       regex = addr
-      when 'macaddress'
-       regex = mac
-      when 'netmask'
-       regex = mask
-    end
-
-    if interface != "lo" && interface != "lo0"
-      output_int.each { |s|
-        tmp1.push($1) if s =~ regex
-      }
-    end
-
-    if tmp1
-       value = tmp1.shift
-    end
-
-   end
 end
-

data/lib/facter/util/manufacturer.rb

@@ -22,8 +22,8 @@ module Facter::Manufacturer
 		name.each_pair do |key,v|
 			v.each do |value|
 				output.split("Handle").each do |line|
-					if line =~ /#{key}/  and line =~ /#{value} (\w.*)\n*./
-						result = $1
+				       if line =~ /#{key}/  and line =~ /#{value} ([-\w].*)\n*./
+                                                result = $1
 						Facter.add(value.chomp(':').gsub(' ','')) do
 							confine :kernel => [ :linux, :freebsd, :netbsd, :openbsd ]
 							setcode do

data/lib/facter/util/resolution.rb

@@ -6,14 +6,19 @@
 require 'facter/util/confine'
 
 require 'timeout'
+require 'rbconfig'
 
 class Facter::Util::Resolution
     attr_accessor :interpreter, :code, :name, :timeout
 
     def self.have_which
         if ! defined?(@have_which) or @have_which.nil?
-            %x{which which 2>/dev/null}
-            @have_which = ($? == 0)
+            if Config::CONFIG['host_os'] =~ /mswin/
+                @have_which = false
+            else
+                %x{which which 2>/dev/null}
+                @have_which = ($? == 0)
+            end
         end
         @have_which
     end
@@ -62,7 +67,7 @@ class Facter::Util::Resolution
         @name = name
         @confines = []
         @value = nil
-        @timeout = 0.5
+        @timeout = 0
     end
 
     # Return the number of confines.
@@ -116,6 +121,11 @@ class Facter::Util::Resolution
             end
         rescue Timeout::Error => detail
             warn "Timed out seeking value for %s" % self.name
+
+            # This call avoids zombies -- basically, create a thread that will
+            # dezombify all of the child processes that we're ignoring because
+            # of the timeout.
+            Thread.new { Process.waitall }
             return nil
         end