facter 2.1.0 → 2.2.0

data/lib/facter/ps.rb

@@ -1,11 +1,12 @@
 # Fact: ps
 #
-# Purpose: Internal fact for what to use to list all processes. Used by
-# Service{} type in Puppet.
+# Purpose: 
+#   Internal fact for what to use to list all processes. Used by
+#   the Service type in Puppet.
 #
 # Resolution:
-#   Assumes "ps -ef" for all operating systems other than BSD derivatives, where
-#   it uses "ps auxwww"
+#   Assumes `ps -ef` for all operating systems other than BSD derivatives, where
+#   it uses `ps auxwww`.
 #
 # Caveats:
 #

data/lib/facter/puppetversion.rb

@@ -3,7 +3,7 @@
 # Purpose: Return the version of puppet installed.
 #
 # Resolution:
-#   Requres puppet via Ruby and returns it's version constant.
+#   Requires puppet via Ruby and returns the value of its version constant.
 #
 # Caveats:
 #

data/lib/facter/rackspace.rb

@@ -0,0 +1,34 @@
+# Purpose: Determine information about Rackspace cloud instances
+#
+# Resolution:
+#   If this is a Rackspace Cloud instance, populates rsc_ facts
+#
+# Caveats:
+#   Depends on Xenstore
+#
+
+Facter.add(:is_rsc) do
+  setcode do
+    result = Facter::Util::Resolution.exec("/usr/bin/xenstore-read vm-data/provider_data/provider")
+    if result == "Rackspace"
+      "true"
+    end
+  end
+end
+
+Facter.add(:rsc_region) do
+  confine :is_rsc => "true"
+  setcode do
+    Facter::Util::Resolution.exec("/usr/bin/xenstore-read vm-data/provider_data/region")
+  end
+end
+
+Facter.add(:rsc_instance_id) do
+  confine :is_rsc => "true"
+  setcode do
+    result = Facter::Util::Resolution.exec("/usr/bin/xenstore-read name")
+    if result and (match = result.match(/instance-(.*)/))
+      match[1]
+    end
+  end
+end

data/lib/facter/rubysitedir.rb

@@ -2,6 +2,9 @@
 #
 # Purpose: Returns Ruby's site library directory.
 #
+# Resolution:
+#   Uses the RbConfig module.
+#
 
 require 'rbconfig'
 

data/lib/facter/rubyversion.rb

@@ -1,8 +1,8 @@
 # Fact: rubyversion
 #
-# Purpose: Returns the version of Ruby facter is running under.
+# Purpose: Returns the version of Ruby that facter is running under.
 #
-# Resolution: Returns RUBY_VERSION.
+# Resolution: Returns the value of the `RUBY_VERSION` constant.
 #
 # Caveats:
 #

data/lib/facter/selinux.rb

@@ -1,8 +1,60 @@
 # Fact: selinux
 #
 # Purpose:
+#   Determine whether SE Linux is enabled on the node.
 #
 # Resolution:
+#   Checks for the existence of the enforce file under the SE Linux mount
+#   point (e.g. `/selinux/enforce`) and returns true if `/proc/self/attr/current`
+#   does not contain the kernel.
+#
+# Caveats:
+#
+
+# Fact: selinux_config_mode
+#
+# Purpose:
+#   Returns the configured SE Linux mode (e.g., `enforcing`, `permissive`, or `disabled`).
+#
+# Resolution:
+#   Parses the output of `sestatus_cmd` and returns the value of the line beginning
+#   with `Mode from config file:`.
+#
+# Caveats:
+#
+
+# Fact: selinux_config_policy
+#
+# Purpose:
+#   Returns the configured SE Linux policy (e.g., `targeted`, `MLS`, or `minimum`).
+#
+# Resolution:
+#   Parses the output of `sestatus_cmd` and returns the value of the line beginning
+#   with `Policy from config file:`.
+#
+# Caveats:
+#
+
+# Fact: selinux_enforced
+#
+# Purpose:
+#   Returns whether SE Linux is enabled (`true`) or not (`false`).
+#
+# Resolution:
+#   Returns the value found in the `enforce` file under the SE Linux mount
+#   point (e.g. `/selinux/enforce`).
+#
+# Caveats:
+#
+
+# Fact: selinux_policyversion
+#
+# Purpose:
+#   Returns the current SE Linux policy version.
+#
+# Resolution:
+#   Reads the content of the `policyvers` file found under the SE Linux mount point,
+#   e.g. `/selinux/policyvers`.
 #
 # Caveats:
 #
@@ -36,8 +88,11 @@ Facter.add("selinux") 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"
+        begin
+          if (File.read("/proc/self/attr/current") != "kernel\0")
+            result = "true"
+          end
+        rescue
         end
       end
     end

data/lib/facter/ssh.rb

@@ -1,6 +1,7 @@
 # Fact: ssh
 #
 # Purpose:
+#   Gather facts related to SSH.
 #
 # Resolution:
 #

data/lib/facter/system_uptime.rb

@@ -0,0 +1,42 @@
+# Fact: system_uptime
+#
+# Purpose:
+#   Return the system uptime in a hash in the forms of
+#   seconds, hours, days and a general, human
+#   readable uptime.
+#
+# Resolution:
+#   Does basic math on the get_uptime_seconds utility
+#   to calculate seconds, hours and days.
+#
+# Caveats:
+#
+
+require 'facter/util/uptime'
+
+Facter.add(:system_uptime) do
+  setcode do
+    system_uptime = {}
+    if Facter.value(:kernel) == 'windows'
+      seconds = Facter::Util::Uptime.get_uptime_seconds_win
+    else
+      seconds = Facter::Util::Uptime.get_uptime_seconds_unix
+    end
+
+    if seconds
+      system_uptime['seconds'] = seconds
+      minutes                  = seconds / 60 % 60
+      system_uptime['hours']   = seconds / (60 * 60)
+      system_uptime['days']    = system_uptime['hours'] / 24
+
+      case system_uptime['days']
+      when 0 then system_uptime['uptime'] = "#{system_uptime['hours']}:#{"%02d" % minutes} hours"
+      when 1 then system_uptime['uptime'] = "1 day"
+      else system_uptime['uptime']        = "#{system_uptime['days']} days"
+      end
+    else
+      system_uptime['uptime']  = 'unknown'
+    end
+    system_uptime
+  end
+end

data/lib/facter/timezone.rb

@@ -2,7 +2,7 @@
 #
 # Purpose: Return the machine's time zone.
 #
-# Resolution: Uses's Ruby's Time module's Time.new call.
+# Resolution: Uses Ruby's Time module.
 #
 # Caveats:
 #

data/lib/facter/uptime.rb

@@ -1,34 +1,16 @@
 # Fact: uptime
 #
-# Purpose: return the system uptime in a human readable format.
+# Purpose: Return the system uptime in a human-readable format.
 #
 # Resolution:
-#   Does basic maths on the "uptime_seconds" fact to return a count of
-#   days, hours and minutes of uptime
+#   Uses the structured system_uptime fact, which does basic math
+#   on the number of seconds of uptime to return a count of days
+#   and hours of uptime.
 #
 # Caveats:
 #
 
-require 'facter/util/uptime'
-
 Facter.add(:uptime) do
-  setcode do
-    seconds = Facter.fact(:uptime_seconds).value
-
-    unless seconds
-      "unknown"
-    else
-      days    = seconds / (60 * 60 * 24)
-      hours   = seconds / (60 * 60) % 24
-      minutes = seconds / 60 % 60
-
-      case days
-      when 0 then "#{hours}:#{"%02d" % minutes} hours"
-      when 1 then '1 day'
-      else "#{days} days"
-      end
-    end
-
-  end
+  setcode { Facter.value(:system_uptime)['uptime'] }
 end
 

data/lib/facter/uptime_days.rb

@@ -1,15 +1,13 @@
 # Fact: uptime_days
 #
-# Purpose: Return purely number of days of uptime.
+# Purpose: Return just the number of days of uptime.
 #
-# Resolution: Divides uptime_hours fact by 24.
+# Resolution: Uses the "days" key of the system_uptime fact, which divides
+#   its own "hours" key by 24
 #
 # Caveats:
 #
 
 Facter.add(:uptime_days) do
-  setcode do
-    hours = Facter.value(:uptime_hours)
-    hours && hours / 24 # hours in day
-  end
+  setcode { Facter.value(:system_uptime)['days'] }
 end

data/lib/facter/uptime_hours.rb

@@ -1,15 +1,13 @@
 # Fact: uptime_hours
 #
-# Purpose: Return purely number of hours of uptime.
+# Purpose: Return just the number of hours of uptime.
 #
-# Resolution: Divides uptime_seconds fact by 3600.
+# Resolution: Uses the "hours" key of the system_uptime fact, which divides
+#   its own 'seconds' key by 3600.
 #
 # Caveats:
 #
 
 Facter.add(:uptime_hours) do
-  setcode do
-    seconds = Facter.value(:uptime_seconds)
-    seconds && seconds / (60 * 60) # seconds in hour
-  end
+  setcode { Facter.value(:system_uptime)['hours'] }
 end

data/lib/facter/uptime_seconds.rb

@@ -1,12 +1,13 @@
 # Fact: uptime_seconds
 #
-# Purpose: Return purely number of seconds of uptime.
+# Purpose: Return just the number of seconds of uptime.
 #
 # Resolution:
-#   Using the 'facter/util/uptime.rb' module, try a verity of methods to acquire
+#   Acquires the uptime in seconds via the 'seconds' key of the system_uptime fact,
+#   which uses the `facter/util/uptime.rb` module to try a variety of methods to acquire
 #   the uptime on Unix.
 #
-#   On Windows, the module calculates the uptime by the "LastBootupTime" Windows
+#   On Windows, the module calculates the uptime by the `LastBootupTime` Windows
 #   management value.
 #
 # Caveats:
@@ -15,10 +16,5 @@
 require 'facter/util/uptime'
 
 Facter.add(:uptime_seconds) do
-  setcode { Facter::Util::Uptime.get_uptime_seconds_unix }
-end
-
-Facter.add(:uptime_seconds) do
-  confine :kernel => :windows
-  setcode { Facter::Util::Uptime.get_uptime_seconds_win }
+  setcode { Facter.value(:system_uptime)['seconds'] }
 end

data/lib/facter/util/formatter.rb

@@ -22,7 +22,7 @@ module Facter
         # Print the value of a single fact, otherwise print a list sorted by fact
         # name and separated by "=>"
         if hash.length == 1
-          if value = hash.values.first
+          if !(value = hash.values.first).nil?
             output = value.is_a?(String) ? value : value.inspect
           end
         else

data/lib/facter/util/manufacturer.rb

@@ -60,7 +60,7 @@ module Facter::Manufacturer
 
   def self.prtdiag_sparc_find_system_info()
     # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86
-    output = Facter::Core::Execution.exec('/usr/sbin/prtdiag 2>/dev/null')
+    output = Facter::Core::Execution.exec('/usr/sbin/prtdiag 2>/dev/null | /usr/bin/head -n 10')
 
     # System Configuration:  Sun Microsystems  sun4u Sun SPARC Enterprise M3000 Server
     if output and output =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/

data/lib/facter/util/partitions.rb

@@ -1,8 +1,10 @@
 require 'facter/util/partitions/linux'
+require 'facter/util/partitions/openbsd'
 
 module Facter::Util::Partitions
   IMPLEMENTATIONS = {
-    'Linux' => Linux
+    'Linux'   => Linux,
+    'OpenBSD' => OpenBSD,
   }
 
   module NoImplementation

data/lib/facter/util/partitions/linux.rb

@@ -51,7 +51,7 @@ module Facter::Util::Partitions
 
     def self.filesystem(partition)
       if Facter::Core::Execution.which('blkid')
-        Facter::Core::Execution.exec("blkid #{File.join('/dev', partition)}").scan(/TYPE="(.+)"/).flatten.first
+        Facter::Core::Execution.exec("blkid #{File.join('/dev', partition)}").scan(/TYPE="([^"]*)"/).flatten.first
       end
     end
     

data/lib/facter/util/partitions/openbsd.rb

@@ -0,0 +1,35 @@
+module Facter::Util::Partitions
+  module OpenBSD
+    def self.list
+      Facter::Core::Execution.exec('df').scan(/\/dev\/(\S+)/).flatten
+    end
+
+    # On OpenBSD partitions don't have a UUID; disks have DUID but that's not
+    # compatible.
+    def self.uuid(partition)
+      nil
+    end
+
+    def self.mount(partition)
+      scan_mount(/\/dev\/#{partition}\son\s(\S+)/)
+    end
+
+    # Reported size is in 1K blocks
+    def self.size(partition)
+      scan_df(/\/dev\/#{partition}\s+(\S+)/)
+    end
+
+    def self.filesystem(partition)
+      scan_mount(/\/dev\/#{partition}\son\s\S+\stype\s(\S+)/)
+    end
+
+    private
+    def self.scan_mount(scan_regex)
+      Facter::Core::Execution.exec('mount').scan(scan_regex).flatten.first
+    end
+
+    def self.scan_df(scan_regex)
+      Facter::Core::Execution.exec('df -k').scan(scan_regex).flatten.first
+    end
+  end
+end

data/lib/facter/util/uptime.rb

@@ -28,7 +28,8 @@ module Facter::Util::Uptime
   end
 
   def self.uptime_sysctl
-    output = Facter::Core::Execution.execute("#{uptime_sysctl_cmd} 2>/dev/null", :on_fail => nil)
+    require 'facter/util/posix'
+    output = Facter::Util::POSIX.sysctl(uptime_sysctl_variable)
     if output
       compute_uptime(Time.at(output.match(/\d+/)[0].to_i))
     end
@@ -71,8 +72,8 @@ module Facter::Util::Uptime
     "/proc/uptime"
   end
 
-  def self.uptime_sysctl_cmd
-    'sysctl -n kern.boottime'
+  def self.uptime_sysctl_variable
+    'kern.boottime'
   end
 
   def self.uptime_executable_cmd

data/lib/facter/util/virtual.rb

@@ -95,8 +95,10 @@ module Facter::Util::Virtual
        File.read("/proc/cpuinfo")
      elsif ["FreeBSD", "OpenBSD"].include? Facter.value(:kernel)
        Facter::Util::POSIX.sysctl("hw.model")
+     elsif Facter.value(:kernel) == "SunOS" and FileTest.exists?("/usr/sbin/prtconf")
+       Facter::Core::Execution.exec("/usr/sbin/prtconf -v")
      end
-     (txt =~ /QEMU Virtual CPU/) ? true : false
+     (txt =~ /QEMU Virtual (CPU|Machine)/i) ? true : false
   end
 
   def self.virtualbox?

data/lib/facter/util/xendomains.rb

@@ -1,10 +1,19 @@
 # A module to gather running Xen Domains
 #
 module Facter::Util::Xendomains
+  XEN_COMMANDS = ['/usr/sbin/xl', '/usr/sbin/xm']
+
+  def self.xen_command
+    XEN_COMMANDS.find { |cmd| Facter::Util::Resolution.which(cmd) }
+  end
+
   def self.get_domains
-    if xm_list = Facter::Core::Execution.exec('/usr/sbin/xm list 2>/dev/null')
-      domains = xm_list.split("\n").reject { |line| line =~ /^(Name|Domain-0)/ }
-      domains.map { |line| line.split(/\s/)[0] }.join(',')
+    command = self.xen_command
+    if command
+      if domains_list = Facter::Util::Resolution.exec("#{command} list 2>/dev/null")
+        domains = domains_list.split("\n").reject { |line| line =~ /^(Name|Domain-0)/ }
+        domains.map { |line| line.split(/\s/)[0] }.join(',')
+      end
     end
   end
 end