facter 2.0.2-x86-mingw32 → 2.1.0-x86-mingw32

data/lib/facter/kernelmajversion.rb

@@ -4,6 +4,7 @@
 #
 # Resolution:
 #   Takes the first 2 elements of the kernel version as delimited by periods.
+#   Takes the first element of the kernel version on FreeBSD
 #
 # Caveats:
 #
@@ -13,3 +14,10 @@ Facter.add("kernelmajversion") do
     Facter.value(:kernelversion).split('.')[0..1].join('.')
   end
 end
+
+Facter.add("kernelmajversion") do
+  confine :kernel => :FreeBSD
+  setcode do
+    Facter.value(:kernelversion).split('.')[0]
+  end
+end

data/lib/facter/kernelrelease.rb

@@ -10,6 +10,7 @@
 #
 # Caveats:
 #
+require 'facter/util/posix'
 
 Facter.add(:kernelrelease) do
   setcode 'uname -r'
@@ -20,6 +21,13 @@ Facter.add(:kernelrelease) do
   setcode 'oslevel -s'
 end
 
+Facter.add("kernelrelease") do
+  confine :kernel => :openbsd
+  setcode do
+    Facter::Util::POSIX.sysctl("kern.version").split(' ')[1]
+  end
+end
+
 Facter.add(:kernelrelease) do
   confine :kernel => "hp-ux"
   setcode do

data/lib/facter/memory.rb

@@ -82,15 +82,21 @@ end
   end
 end
 
-if Facter.value(:kernel) == "Darwin"
-  Facter.add("SwapEncrypted") do
-    confine :kernel => :Darwin
-    setcode do
-      swap = Facter::Core::Execution.exec('sysctl vm.swapusage')
-      encrypted = false
-      if swap =~ /\(encrypted\)/ then encrypted = true; end
-      encrypted
-    end
+Facter.add("SwapEncrypted") do
+  confine :kernel => :openbsd
+  setcode do
+    sysctl_encrypted = Facter::Util::POSIX.sysctl("vm.swapencrypt.enable").to_i
+    !(sysctl_encrypted.zero?)
+  end
+end
+
+Facter.add("SwapEncrypted") do
+  confine :kernel => :Darwin
+  setcode do
+    swap = Facter::Util::POSIX.sysctl('vm.swapusage')
+    encrypted = false
+    if swap =~ /\(encrypted\)/ then encrypted = true; end
+    encrypted
   end
 end
 
@@ -143,8 +149,8 @@ end
 Facter.add("swapsize_mb") do
   confine :kernel => :dragonfly
   setcode do
-    page_size = Facter::Core::Execution.exec("/sbin/sysctl -n hw.pagesize").to_f
-    swaptotal = Facter::Core::Execution.exec("/sbin/sysctl -n vm.swap_size").to_f * page_size
+    page_size = Facter::Util::POSIX.sysctl("hw.pagesize").to_f
+    swaptotal = Facter::Util::POSIX.sysctl("vm.swap_size").to_f * page_size
     "%.2f" % [(swaptotal.to_f / 1024.0) / 1024.0]
   end
 end
@@ -152,10 +158,10 @@ end
 Facter.add("swapfree_mb") do
   confine :kernel => :dragonfly
   setcode do
-    page_size = Facter::Core::Execution.exec("/sbin/sysctl -n hw.pagesize").to_f
-    swaptotal = Facter::Core::Execution.exec("/sbin/sysctl -n vm.swap_size").to_f * page_size
-    swap_anon_use = Facter::Core::Execution.exec("/sbin/sysctl -n vm.swap_anon_use").to_f * page_size
-    swap_cache_use = Facter::Core::Execution.exec("/sbin/sysctl -n vm.swap_cache_use").to_f * page_size
+    page_size = Facter::Util::POSIX.sysctl("hw.pagesize").to_f
+    swaptotal = Facter::Util::POSIX.sysctl("vm.swap_size").to_f * page_size
+    swap_anon_use = Facter::Util::POSIX.sysctl("vm.swap_anon_use").to_f * page_size
+    swap_cache_use = Facter::Util::POSIX.sysctl("vm.swap_cache_use").to_f * page_size
     swapfree = swaptotal - swap_anon_use - swap_cache_use
     "%.2f" % [(swapfree.to_f / 1024.0) / 1024.0]
   end

data/lib/facter/netmask.rb

@@ -16,7 +16,7 @@
 require 'facter/util/netmask'
 
 Facter.add("netmask") do
-  confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd", :dragonfly ]
+  confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd", :dragonfly, :AIX ]
   setcode do
     Facter::NetMask.get_netmask
   end

data/lib/facter/operatingsystem.rb

@@ -11,6 +11,8 @@
 # Caveats:
 #
 
+require 'facter/util/operatingsystem'
+
 Facter.add(:operatingsystem) do
   confine :kernel => :sunos
   setcode do
@@ -31,11 +33,27 @@ Facter.add(:operatingsystem) do
   end
 end
 
+Facter.add(:operatingsystem) do
+  # Cumulus Linux is a variant of Debian so this resolution needs to come
+  # before the Debian resolution.
+  has_weight(10)
+  confine :kernel => :linux
+
+  setcode do
+    release_info = Facter::Util::Operatingsystem.os_release
+    if release_info['NAME'] == "Cumulus Linux"
+      'CumulusLinux'
+    end
+  end
+end
+
 Facter.add(:operatingsystem) do
   confine :kernel => :linux
   setcode do
     if Facter.value(:lsbdistid) == "Ubuntu"
        "Ubuntu"
+    elsif Facter.value(:lsbdistid) == "LinuxMint"
+       "LinuxMint"
     elsif FileTest.exists?("/etc/debian_version")
       "Debian"
     elsif FileTest.exists?("/etc/openwrt_release")
@@ -44,6 +62,8 @@ Facter.add(:operatingsystem) do
       "Gentoo"
     elsif FileTest.exists?("/etc/fedora-release")
       "Fedora"
+    elsif FileTest.exists?("/etc/mageia-release")
+      "Mageia"
     elsif FileTest.exists?("/etc/mandriva-release")
       "Mandriva"
     elsif FileTest.exists?("/etc/mandrake-release")

data/lib/facter/operatingsystemmajrelease.rb

@@ -29,7 +29,8 @@ Facter.add(:operatingsystemmajrelease) do
     :OVS,
     :RedHat,
     :Scientific,
-    :SLC
+    :SLC,
+    :CumulusLinux
   ]
   setcode do
     Facter.value('operatingsystemrelease').split('.').first

data/lib/facter/operatingsystemrelease.rb

@@ -17,6 +17,7 @@
 # Caveats:
 #
 
+require 'facter/util/operatingsystem'
 require 'facter/util/file_read'
 
 Facter.add(:operatingsystemrelease) do
@@ -71,6 +72,24 @@ Facter.add(:operatingsystemrelease) do
   end
 end
 
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => 'LinuxMint'
+  setcode do
+    if release = Facter::Util::FileRead.read('/etc/linuxmint/info')
+      if match = release.match(/RELEASE\=(\d+)/)
+        match[1]
+      end
+    end
+  end
+end
+
+Facter.add(:operatingsystemrelease) do
+confine :operatingsystem => 'CumulusLinux'
+  setcode do
+    Facter::Util::Operatingsystem.os_release['VERSION_ID']
+  end
+end
+
 Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => %w{SLES SLED OpenSuSE}
   setcode do

data/lib/facter/osfamily.rb

@@ -18,7 +18,7 @@ Facter.add(:osfamily) do
     case Facter.value(:operatingsystem)
     when "RedHat", "Fedora", "CentOS", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM", "OracleLinux", "OVS", "OEL", "Amazon", "XenServer"
       "RedHat"
-    when "Ubuntu", "Debian"
+    when "LinuxMint", "Ubuntu", "Debian", "CumulusLinux"
       "Debian"
     when "SLES", "SLED", "OpenSuSE", "SuSE"
       "Suse"
@@ -28,6 +28,8 @@ Facter.add(:osfamily) do
       "Gentoo"
     when "Archlinux"
       "Archlinux"
+    when "Mageia", "Mandriva", "Mandrake"
+      "Mandrake"
     else
       Facter.value("kernel")
     end

data/lib/facter/partitions.rb

@@ -0,0 +1,35 @@
+# Fact: partitions
+#
+# Purpose:
+#   Return the details of the disk partitions
+#
+# Resolution:
+#   Parse the contents of /sys/block/<device>/size to receive the size (multiplying by 512 to correct for blocks-to-bytes)
+#
+# Caveats:
+#   Only supports Linux 2.6+ at this time, due to the reliance on sysfs
+#
+# Author: Chris Portman <chris@portman.net.au>
+
+require 'facter'
+require 'facter/util/partitions'
+
+Facter.add(:partitions) do
+  confine do
+    Facter::Util::Partitions.available? ? true : nil
+  end
+
+  setcode do
+    partitions = {}
+    Facter::Util::Partitions.list.each do |part|
+      details = {}
+      details['uuid']       = Facter::Util::Partitions.uuid(part)
+      details['size']       = Facter::Util::Partitions.size(part)
+      details['mount']      = Facter::Util::Partitions.mount(part)
+      details['filesystem'] = Facter::Util::Partitions.filesystem(part)
+      details.reject! {|k,v| v.nil? || v.to_s.empty? }
+      partitions[part] = details
+    end
+    partitions
+  end
+end

data/lib/facter/physicalprocessorcount.rb

@@ -9,6 +9,8 @@
 #
 # Caveats:
 #
+require 'facter/util/posix'
+
 Facter.add('physicalprocessorcount') do
   confine :kernel => :linux
 
@@ -80,3 +82,10 @@ Facter.add('physicalprocessorcount') do
     end
   end
 end
+
+Facter.add('physicalprocessorcount') do
+  confine :kernel => :openbsd
+  setcode do
+    Facter::Util::POSIX.sysctl("hw.ncpufound")
+  end
+end

data/lib/facter/processor.rb

@@ -7,8 +7,8 @@
 #   On Linux and kFreeBSD, parse '/proc/cpuinfo' for each processor.
 #   On AIX, parse the output of 'lsdev' for its processor section.
 #   On Solaris, parse the output of 'kstat' for each processor.
-#   On OpenBSD, use 'uname -p' and the sysctl variable for 'hw.ncpu' for CPU
-#   count.
+#   On OpenBSD, use the sysctl variables 'hw.model' and 'hw.ncpu'
+#   for the CPU model and the CPU count respectively.
 #
 # Caveats:
 #
@@ -21,6 +21,7 @@
 
 require 'thread'
 require 'facter/util/processor'
+require 'facter/util/posix'
 
 # We have to enumerate these outside a Facter.add block to get the processorN
 # descriptions iteratively (but we need them inside the Facter.add block above
@@ -88,34 +89,29 @@ Facter.add("ProcessorCount") do
   end
 end
 
-Facter.add("Processor") do
-  confine :kernel => :openbsd
-  setcode "uname -p"
-end
-
 Facter.add("ProcessorCount") do
   confine :kernel => :Darwin
-  setcode "sysctl -n hw.ncpu"
+  setcode do
+    Facter::Util::POSIX.sysctl("hw.ncpu")
+  end
 end
 
 if Facter.value(:kernel) == "windows"
   processor_list = []
 
-  Thread::exclusive do
-    require 'facter/util/wmi'
+  require 'facter/util/wmi'
 
-    # get each physical processor
-    Facter::Util::WMI.execquery("select * from Win32_Processor").each do |proc|
-      # not supported before 2008
-      if proc.respond_to?(:NumberOfLogicalProcessors)
-        processor_num = proc.NumberOfLogicalProcessors
-      else
-        processor_num = 1
-      end
+  # get each physical processor
+  Facter::Util::WMI.execquery("select * from Win32_Processor").each do |proc|
+    # not supported before 2008
+    if proc.respond_to?(:NumberOfLogicalProcessors)
+      processor_num = proc.NumberOfLogicalProcessors
+    else
+      processor_num = 1
+    end
 
-      processor_num.times do |i|
-        processor_list << proc.Name.squeeze(" ")
-      end
+    processor_num.times do |i|
+      processor_list << proc.Name.squeeze(" ")
     end
   end
 
@@ -137,13 +133,17 @@ if Facter.value(:kernel) == "windows"
 end
 
 Facter.add("Processor") do
-  confine :kernel => [:dragonfly,:freebsd]
-  setcode "sysctl -n hw.model"
+  confine :kernel => [:dragonfly,:freebsd,:openbsd]
+  setcode do
+    Facter::Util::POSIX.sysctl("hw.model")
+  end
 end
 
 Facter.add("ProcessorCount") do
   confine :kernel => [:dragonfly,:freebsd,:openbsd]
-  setcode "sysctl -n hw.ncpu"
+  setcode do
+    Facter::Util::POSIX.sysctl("hw.ncpu")
+  end
 end
 
 Facter.add("ProcessorCount") do
@@ -153,7 +153,7 @@ Facter.add("ProcessorCount") do
     (major_version, minor_version) = kernelrelease.split(".").map { |str| str.to_i }
     result = nil
 
-    if (major_version > 5) or (major_version == 5 and minor_version >= 8) then
+    if (major_version < 5) or (major_version == 5 and minor_version < 8) then
       if kstat = Facter::Core::Execution.exec("/usr/bin/kstat cpu_info")
         result = kstat.scan(/\bcore_id\b\s+\d+/).uniq.length
       end

data/lib/facter/util/config.rb

@@ -45,8 +45,10 @@ module Facter::Util::Config
       else
         @external_facts_dirs = [File.join(windows_dir, 'PuppetLabs', 'facter', 'facts.d')]
       end
+    elsif ENV['HOME']
+      @external_facts_dirs = [File.expand_path(File.join(ENV['HOME'], ".facter", "facts.d"))]
     else
-      @external_facts_dirs = [File.expand_path(File.join("~", ".facter", "facts.d"))]
+      @external_facts_dirs = []
     end
   end
 

data/lib/facter/util/dhcp_servers.rb

@@ -0,0 +1,43 @@
+require 'facter/util/file_read'
+
+module Facter::Util::DHCPServers
+  def self.gateway_device
+    interface = nil
+    if routes = Facter::Util::FileRead.read('/proc/net/route')
+      routes.each_line do |line|
+        device, destination = line.split(' ')
+        if destination == '00000000'
+          interface = device
+          break
+        end
+      end
+    end
+    interface
+  end
+
+  def self.devices
+    if Facter::Core::Execution.which('nmcli')
+      Facter::Core::Execution.exec("nmcli d").split("\n").select {|d| d =~ /\sconnected/i }.collect{ |line| line.split[0] }
+    else
+      []
+    end
+  end
+
+  def self.device_dhcp_server(device)
+    if Facter::Core::Execution.which('nmcli')
+      version = self.nmcli_version
+      # If the version is >= 0.9.9, use show instead of list
+      if version && version[0] > 0 || version[1] > 9 || (version[1] == 9 && version[2] >= 9)
+        Facter::Core::Execution.exec("nmcli -f all d show #{device}").scan(/dhcp_server_identifier.*?(\d+\.\d+\.\d+\.\d+)$/).flatten.first
+      else
+        Facter::Core::Execution.exec("nmcli -f all d list iface #{device}").scan(/dhcp_server_identifier.*?(\d+\.\d+\.\d+\.\d+)$/).flatten.first
+      end
+    end
+  end
+
+  def self.nmcli_version
+    if version = Facter::Core::Execution.exec("nmcli --version")
+      version.scan(/version\s(\d+)\.?(\d+)?\.?(\d+)?\.?(\d+)?/).flatten.map(&:to_i)
+    end
+  end
+end

data/lib/facter/util/ec2.rb

@@ -11,6 +11,7 @@ module Facter::Util::EC2
     # The +wait_sec+ parameter provides you with an adjustable timeout.
     #
     def can_connect?(wait_sec=2)
+      Facter.warnonce("#{self}.#{__method__} is deprecated; see the Facter::EC2 classes instead")
       url = "http://169.254.169.254:80/"
       Timeout::timeout(wait_sec) {open(url)}
       return true
@@ -23,6 +24,7 @@ module Facter::Util::EC2
     # Test if this host has a mac address used by Eucalyptus clouds, which
     # normally is +d0:0d+.
     def has_euca_mac?
+      Facter.warnonce("#{self}.#{__method__} is deprecated; see the Facter::EC2 classes instead")
       !!(Facter.value(:macaddress) =~ %r{^[dD]0:0[dD]:})
     end
 
@@ -30,12 +32,14 @@ module Facter::Util::EC2
     # normally starts with FA:16:3E (older versions of OpenStack
     # may generate mac addresses starting with 02:16:3E)
     def has_openstack_mac?
+      Facter.warnonce("#{self}.#{__method__} is deprecated; see the Facter::EC2 classes instead")
       !!(Facter.value(:macaddress) =~ %r{^(02|[fF][aA]):16:3[eE]})
     end
 
     # Test if the host has an arp entry in its cache that matches the EC2 arp,
     # which is normally +fe:ff:ff:ff:ff:ff+.
     def has_ec2_arp?
+      Facter.warnonce("#{self}.#{__method__} is deprecated; see the Facter::EC2 classes instead")
       kernel = Facter.value(:kernel)
 
       mac_address_re = case kernel
@@ -73,6 +77,7 @@ module Facter::Util::EC2
   #
   # @return [String] containing the response body or `nil`
   def self.userdata(version="latest")
+    Facter.warnonce("#{self}.#{__method__} is deprecated; see the Facter::EC2 classes instead")
     uri = "http://169.254.169.254/#{version}/user-data/"
     begin
       read_uri(uri)