facter 1.6.0 → 1.6.1

data/lib/facter.rb

@@ -24,7 +24,7 @@ module Facter
     include Comparable
     include Enumerable
 
-    FACTERVERSION = '1.6.0'
+    FACTERVERSION = '1.6.1'
     # = Facter
     # Functions as a hash of 'facts' you might care about about your
     # system, such as mac address, IP address, Video card, etc.
@@ -46,6 +46,7 @@ module Facter
     RESET = ""
     @@debug = 0
     @@timing = 0
+    @@messages = {}
 
     # module methods
 
@@ -158,6 +159,12 @@ module Facter
         Facter.reset
     end
 
+    # Clear all messages. Used only in testing. Can't add to self.clear
+    # because we don't want to warn multiple times for items that are warnonce'd
+    def self.clear_messages
+        @@messages.clear
+    end
+
     # Set debugging on or off.
     def self.debugging(bit)
         if bit
@@ -208,6 +215,14 @@ module Facter
         end
     end
 
+    # Warn once.
+    def self.warnonce(msg)
+        if msg and not msg.empty? and @@messages[msg].nil?
+            @@messages[msg] = true
+            Kernel.warn(msg)
+        end
+    end
+
     # Remove them all.
     def self.reset
         @collection = nil

data/lib/facter/arp.rb

@@ -3,7 +3,7 @@ require 'facter/util/ip'
 Facter.add(:arp) do
   confine :kernel => :linux
   setcode do
-    output = Facter::Util::Resolution.exec('arp -a')
+    output = Facter::Util::Resolution.exec('arp -an')
     if not output.nil?
       arp = ""
       output.each_line do |s|

data/lib/facter/augeasversion.rb

@@ -0,0 +1,29 @@
+# Fact: augeasversion
+#
+# Purpose: Report the version of the Augeas library
+#
+# Resolution:
+#   Loads ruby-augeas and reports the value of /augeas/version, the version of
+#   the underlying Augeas library.
+#
+# Caveats:
+#   The library version may not indicate the presence of certain lenses, 
+#   depending on the system packages updated, nor the version of ruby-augeas
+#   which may affect support for the Puppet Augeas provider.
+#   Versions prior to 0.3.6 cannot be interrogated for their version.
+#
+
+Facter.add(:augeasversion) do
+  setcode do
+    begin
+      require 'augeas'
+      aug = Augeas::open('/', nil, Augeas::NO_MODL_AUTOLOAD)
+      ver = aug.get('/augeas/version')
+      aug.close
+      ver
+    rescue Exception
+      Facter.debug('ruby-augeas not available')
+    end
+  end
+end
+

data/lib/facter/domain.rb

@@ -23,13 +23,15 @@ Facter.add(:domain) do
         # Get the domain from various sources; the order of these
         # steps is important
 
-        Facter.value(:hostname)
-        next $domain if defined? $domain and ! $domain.nil?
+        if name = Facter::Util::Resolution.exec('hostname') and 
+            name =~ /.*?\.(.+$)/
 
-        domain = Facter::Util::Resolution.exec('dnsdomainname')
-        next domain if domain =~ /.+\..+/
+            $1
+        elsif domain = Facter::Util::Resolution.exec('dnsdomainname') and 
+            domain =~ /.+\..+/
 
-        if FileTest.exists?("/etc/resolv.conf")
+            domain
+        elsif FileTest.exists?("/etc/resolv.conf")
             domain = nil
             search = nil
             File.open("/etc/resolv.conf") { |file|
@@ -44,18 +46,15 @@ Facter.add(:domain) do
             next domain if domain
             next search if search
         end
-        nil
     end
 end
 
 Facter.add(:domain) do
     confine :kernel => :windows
     setcode do
-        require 'win32ole'
+        require 'facter/util/wmi'
         domain = ""
-        wmi = WIN32OLE.connect("winmgmts://")
-        query = "select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True"
-        wmi.ExecQuery(query).each { |nic|
+        Facter::Util::WMI.execquery("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").each { |nic|
             domain = nic.DNSDomain
             break
         }

data/lib/facter/hardwareisa.rb

@@ -11,6 +11,6 @@
 #
 
 Facter.add(:hardwareisa) do
-    setcode 'uname -p', '/bin/sh'
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD OEL OVS GNU/kFreeBSD}
+    setcode 'uname -p'
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD OEL OracleLinux OVS GNU/kFreeBSD}
 end

data/lib/facter/hostname.rb

@@ -14,25 +14,20 @@
 Facter.add(:hostname, :ldapname => "cn") do
     setcode do
         hostname = nil
-        name = Facter::Util::Resolution.exec('hostname') or nil
-        if name
-            if name =~ /^([\w-]+)\.(.+)$/
+        if name = Facter::Util::Resolution.exec('hostname')
+            if name =~ /(.*?)\./
                 hostname = $1
-                # the Domain class uses this
-                $domain = $2
             else
                 hostname = name
             end
-            hostname
-        else
-            nil
         end
+        hostname
     end
 end
 
 Facter.add(:hostname) do
     confine :kernel => :darwin, :kernelrelease => "R7"
     setcode do
-        %x{/usr/sbin/scutil --get LocalHostName}
+        Facter::Util::Resolution.exec('/usr/sbin/scutil --get LocalHostName')
     end
 end

data/lib/facter/ipaddress6.rb

@@ -61,3 +61,12 @@ Facter.add(:ipaddress6) do
     get_address_after_token(output, 'inet6', true)
   end
 end
+
+Facter.add(:ipaddress6) do
+  confine :kernel => :windows
+  setcode do
+    output = Facter::Util::Resolution.exec("#{ENV['SYSTEMROOT']}/system32/netsh interface ipv6 show address level=verbose")
+
+    get_address_after_token(output, 'Address', true)
+  end
+end

data/lib/facter/kernel.rb

@@ -11,9 +11,9 @@
 
 Facter.add(:kernel) do
     setcode do
-        require 'rbconfig'
-        case Config::CONFIG['host_os']
-        when /mswin|win32|dos|cygwin|mingw/i
+        require 'facter/util/config'
+
+        if Facter::Util::Config.is_windows?
             'windows'
         else
             Facter::Util::Resolution.exec("uname -s")

data/lib/facter/kernelrelease.rb

@@ -23,11 +23,9 @@ end
 Facter.add(:kernelrelease) do
     confine :kernel => %{windows}
     setcode do
-        require 'win32ole'
+        require 'facter/util/wmi'
         version = ""
-        connection_string = "winmgmts://./root/cimv2"
-        wmi = WIN32OLE.connect(connection_string)
-        wmi.ExecQuery("SELECT Version from Win32_OperatingSystem").each do |ole|
+        Facter::Util::WMI.execquery("SELECT Version from Win32_OperatingSystem").each do |ole|
             version = "#{ole.Version}"
             break
         end

data/lib/facter/lsbmajdistrelease.rb

@@ -15,7 +15,7 @@
 require 'facter'
 
 Facter.add("lsbmajdistrelease") do
-    confine :operatingsystem => %w{Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo OEL OVS GNU/kFreeBSD}
+    confine :operatingsystem => %w{Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo OEL OracleLinux OVS GNU/kFreeBSD}
     setcode do
         if /(\d*)\./i =~ Facter.value(:lsbdistrelease)
             result=$1

data/lib/facter/macaddress.rb

@@ -10,14 +10,14 @@
 require 'facter/util/macaddress'
 
 Facter.add(:macaddress) do
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo Ubuntu OEL OVS GNU/kFreeBSD}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Gentoo Ubuntu OEL OracleLinux OVS GNU/kFreeBSD}
     setcode do
         ether = []
-        output = %x{/sbin/ifconfig -a}
+        output = Facter::Util::Resolution.exec("/sbin/ifconfig -a")
         output.each_line do |s|
             ether.push($1) if s =~ /(?:ether|HWaddr) (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
         end
-        ether[0]
+        Facter::Util::Macaddress.standardize(ether[0])
     end
 end
 
@@ -29,7 +29,7 @@ Facter.add(:macaddress) do
         output.each_line do |s|
             ether.push($1) if s =~ /(?:SPLA)\s+(\w{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2})/
         end
-        ether[0]
+        Facter::Util::Macaddress.standardize(ether[0])
     end
 end
 
@@ -37,13 +37,13 @@ Facter.add(:macaddress) do
     confine :operatingsystem => %w{FreeBSD OpenBSD}
     setcode do
     ether = []
-        output = %x{/sbin/ifconfig}
+        output = Facter::Util::Resolution.exec("/sbin/ifconfig")
         output.each_line do |s|
             if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
                 ether.push($1)
             end
         end
-        ether[0]
+        Facter::Util::Macaddress.standardize(ether[0])
     end
 end
 
@@ -71,33 +71,13 @@ Facter.add(:macaddress) do
                 end
             end
         end
-        ether[0]
+        Facter::Util::Macaddress.standardize(ether[0])
     end
 end
 
 Facter.add(:macaddress) do
-    confine :kernel => %w(windows)
-    setcode do
-        require 'win32ole'
-        require 'socket'
-
-        ether = nil
-        host = Socket.gethostname
-        connect_string = "winmgmts://#{host}/root/cimv2"
-
-        wmi = WIN32OLE.connect(connect_string)
-
-        query = %Q{
-          select *
-          from Win32_NetworkAdapterConfiguration
-          where IPEnabled = True
-        }
-
-        wmi.ExecQuery(query).each{ |nic|
-          ether = nic.MacAddress
-          break
-        }
-        
-        ether
-    end
+  confine :kernel => %w(windows)
+  setcode do
+    Facter::Util::Macaddress::Windows.macaddress
+  end
 end

data/lib/facter/manufacturer.rb

@@ -25,6 +25,11 @@ if Facter.value(:kernel) == "OpenBSD"
         'hw.serialno' => 'serialnumber'
     }
 
+    Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
+elsif Facter.value(:kernel) == "Darwin" 
+    mfg_keys = {
+        'hw.model'   => 'productname'
+    }
     Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
 elsif Facter.value(:kernel) == "SunOS" and Facter.value(:hardwareisa) == "sparc"
     Facter::Manufacturer.prtdiag_sparc_find_system_info()

data/lib/facter/memory.rb

@@ -70,7 +70,7 @@ end
 if Facter.value(:kernel) == "AIX" and Facter.value(:id) == "root"
     swap = Facter::Util::Resolution.exec('swap -l')
     swapfree, swaptotal = 0, 0
-    swap.each do |dev|
+    swap.each_line do |dev|
       if dev =~ /^\/\S+\s.*\s+(\S+)MB\s+(\S+)MB/
         swaptotal += $1.to_i
         swapfree  += $2.to_i
@@ -95,7 +95,7 @@ end
 if Facter.value(:kernel) == "OpenBSD"
     swap = Facter::Util::Resolution.exec('swapctl -l | sed 1d')
     swapfree, swaptotal = 0, 0
-    swap.each do |dev|
+    swap.each_line do |dev|
         if dev =~ /^\S+\s+(\S+)\s+\S+\s+(\S+)\s+.*$/
             swaptotal += $1.to_i
             swapfree  += $2.to_i
@@ -167,7 +167,7 @@ end
 if Facter.value(:kernel) == "SunOS"
     swap = Facter::Util::Resolution.exec('/usr/sbin/swap -l')
     swapfree, swaptotal = 0, 0
-    swap.each do |dev|
+    swap.each_line do |dev|
         if dev =~ /^\/\S+\s.*\s+(\d+)\s+(\d+)$/
             swaptotal += $1.to_i / 2
             swapfree  += $2.to_i / 2
@@ -191,7 +191,7 @@ if Facter.value(:kernel) == "SunOS"
     # Total memory size available from prtconf
     pconf = Facter::Util::Resolution.exec('/usr/sbin/prtconf')
     phymem = ""
-    pconf.each do |line|
+    pconf.each_line do |line|
         if line =~ /^Memory size:\s+(\d+) Megabytes/
             phymem = $1
         end
@@ -206,3 +206,31 @@ if Facter.value(:kernel) == "SunOS"
 
     Facter::Memory.vmstat_find_free_memory()
 end
+
+if Facter.value(:kernel) == "windows"
+  require 'facter/util/wmi'
+
+  Facter.add("MemoryFree") do
+    confine :kernel => :windows
+    setcode do
+      mem = 0
+      Facter::Util::WMI.execquery("select FreePhysicalMemory from Win32_OperatingSystem").each do |os|
+        mem = os.FreePhysicalMemory
+        break
+      end
+      Facter::Memory.scale_number(mem.to_f, "kB")
+    end
+  end
+
+  Facter.add("MemoryTotal") do
+    confine :kernel => :windows
+    setcode do
+      mem = 0
+      Facter::Util::WMI.execquery("select TotalPhysicalMemory from Win32_ComputerSystem").each do |comp|
+        mem = comp.TotalPhysicalMemory
+        break
+      end
+      Facter::Memory.scale_number(mem.to_f, "")
+    end
+  end
+end

data/lib/facter/operatingsystem.rb

@@ -37,6 +37,8 @@ Facter.add(:operatingsystem) do
             "MeeGo"
         elsif FileTest.exists?("/etc/arch-release")
             "Archlinux"
+        elsif FileTest.exists?("/etc/oracle-release")
+            "OracleLinux"
         elsif FileTest.exists?("/etc/enterprise-release")
             if FileTest.exists?("/etc/ovs-release")
                 "OVS"
@@ -51,6 +53,8 @@ Facter.add(:operatingsystem) do
             txt = File.read("/etc/redhat-release")
             if txt =~ /centos/i
                 "CentOS"
+            elsif txt =~ /CERN/
+                "SLC"
             elsif txt =~ /scientific/i 
                 "Scientific"
             else
@@ -73,6 +77,8 @@ Facter.add(:operatingsystem) do
             "Slamd64"
         elsif FileTest.exists?("/etc/slackware-version")
             "Slackware"
+        elsif FileTest.exists?("/etc/alpine-release")
+            "Alpine"
         end
     end
 end

data/lib/facter/operatingsystemrelease.rb

@@ -16,15 +16,17 @@
 #
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat MeeGo}
+    confine :operatingsystem => %w{CentOS Fedora oel ovs OracleLinux RedHat MeeGo Scientific SLC}
     setcode do
         case Facter.value(:operatingsystem)
-        when "CentOS", "RedHat"
+        when "CentOS", "RedHat", "Scientific", "SLC"
             releasefile = "/etc/redhat-release"
         when "Fedora"
             releasefile = "/etc/fedora-release"
         when "MeeGo"
             releasefile = "/etc/meego-release"
+        when "OracleLinux"
+            releasefile = "/etc/oracle-release"
         when "OEL", "oel"
             releasefile = "/etc/enterprise-release"
         when "OVS", "ovs"
@@ -122,6 +124,13 @@ Facter.add(:operatingsystemrelease) do
     end
 end
 
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => :Alpine
+  setcode do
+    File.read('/etc/alpine-release')
+  end
+end
+
 Facter.add(:operatingsystemrelease) do
     setcode do Facter[:kernelrelease].value end
 end

data/lib/facter/physicalprocessorcount.rb

@@ -54,3 +54,11 @@ Facter.add('physicalprocessorcount') do
     end
   end
 end
+
+Facter.add('physicalprocessorcount') do
+  confine :kernel => :windows
+  setcode do
+    require 'facter/util/wmi'
+    Facter::Util::WMI.execquery("select Name from Win32_Processor").Count
+  end
+end