facter 1.7.6 → 2.0.1.rc1

data/lib/facter/macosx.rb

@@ -24,9 +24,9 @@
 # at this point in time.
 # In particular, Installed Software might be an interesting addition.
 
-require 'facter/util/macosx'
-
 if Facter.value(:kernel) == "Darwin"
+  require 'facter/util/macosx'
+
   Facter::Util::Macosx.hardware_overview.each do |fact, value|
     Facter.add("sp_#{fact}") do
       confine :kernel => :darwin

data/lib/facter/memory.rb

@@ -86,7 +86,7 @@ if Facter.value(:kernel) == "Darwin"
   Facter.add("SwapEncrypted") do
     confine :kernel => :Darwin
     setcode do
-      swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
+      swap = Facter::Core::Execution.exec('sysctl vm.swapusage')
       encrypted = false
       if swap =~ /\(encrypted\)/ then encrypted = true; end
       encrypted
@@ -99,7 +99,7 @@ if Facter.value(:kernel) == "SunOS"
   Facter.add("memorysize_mb") do
     confine :kernel => :sunos
     # Total memory size available from prtconf
-    pconf = Facter::Util::Resolution.exec('/usr/sbin/prtconf 2>/dev/null')
+    pconf = Facter::Core::Execution.exec('/usr/sbin/prtconf 2>/dev/null')
     phymem = ""
     pconf.each_line do |line|
       if line =~ /^Memory size:\s+(\d+) Megabytes/
@@ -143,8 +143,8 @@ end
 Facter.add("swapsize_mb") do
   confine :kernel => :dragonfly
   setcode do
-    page_size = Facter::Util::Resolution.exec("/sbin/sysctl -n hw.pagesize").to_f
-    swaptotal = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_size").to_f * page_size
+    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
     "%.2f" % [(swaptotal.to_f / 1024.0) / 1024.0]
   end
 end
@@ -152,22 +152,11 @@ end
 Facter.add("swapfree_mb") do
   confine :kernel => :dragonfly
   setcode do
-    page_size = Facter::Util::Resolution.exec("/sbin/sysctl -n hw.pagesize").to_f
-    swaptotal = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_size").to_f * page_size
-    swap_anon_use = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_anon_use").to_f * page_size
-    swap_cache_use = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_cache_use").to_f * page_size
+    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
     swapfree = swaptotal - swap_anon_use - swap_cache_use
     "%.2f" % [(swapfree.to_f / 1024.0) / 1024.0]
   end
 end
-
-# http://projects.puppetlabs.com/issues/11436
-#
-# Unifying naming for the amount of physical memory in a given host.
-# This fact is DEPRECATED and will be removed in Facter 2.0 per
-# http://projects.puppetlabs.com/issues/11466
-Facter.add("MemoryTotal") do
-  setcode do
-    Facter.value("memorysize")
-  end
-end

data/lib/facter/operatingsystem.rb

@@ -16,7 +16,7 @@ Facter.add(:operatingsystem) do
   setcode do
     # Use uname -v because /etc/release can change in zones under SmartOS.
     # It's apparently not trustworthy enough to rely on for this fact.
-    output = Facter::Util::Resolution.exec('uname -v')
+    output = Facter::Core::Execution.exec('uname -v')
     if output =~ /^joyent_/
       "SmartOS"
     elsif output =~ /^oi_/

data/lib/facter/operatingsystemrelease.rb

@@ -141,7 +141,7 @@ end
 Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => %w{VMwareESX}
   setcode do
-    release = Facter::Util::Resolution.exec('vmware -v')
+    release = Facter::Core::Execution.exec('vmware -v')
     if match = /VMware ESX .*?(\d.*)/.match(release)
       match[1]
     end
@@ -188,6 +188,39 @@ Facter.add(:operatingsystemrelease) do
   end
 end
 
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => :windows
+  setcode do
+    require 'facter/util/wmi'
+    result = nil
+    Facter::Util::WMI.execquery("SELECT version, producttype FROM Win32_OperatingSystem").each do |os|
+      result =
+        case os.version
+        when /^6\.2/
+          os.producttype == 1 ? "8" : "2012"
+        when /^6\.1/
+          os.producttype == 1 ? "7" : "2008 R2"
+        when /^6\.0/
+          os.producttype == 1 ? "Vista" : "2008"
+        when /^5\.2/
+          if os.producttype == 1
+            "XP"
+          else
+            begin
+              os.othertypedescription == "R2" ? "2003 R2" : "2003"
+            rescue NoMethodError
+              "2003"
+            end
+          end
+        else
+          Facter[:kernelrelease].value
+        end
+      break
+    end
+    result
+  end
+end
+
 Facter.add(:operatingsystemrelease) do
   setcode do Facter[:kernelrelease].value end
 end

data/lib/facter/physicalprocessorcount.rb

@@ -39,7 +39,7 @@ Facter.add('physicalprocessorcount') do
       lookup_pattern = "#{sysfs_cpu_directory}" +
         "/cpu*/topology/physical_package_id"
 
-      Dir.glob(lookup_pattern).collect { |f| Facter::Util::Resolution.exec("cat #{f}")}.uniq.size
+      Dir.glob(lookup_pattern).collect { |f| Facter::Core::Execution.exec("cat #{f}")}.uniq.size.to_s
 
     else
       #
@@ -48,9 +48,9 @@ Facter.add('physicalprocessorcount') do
       # We assume that /proc/cpuinfo has what we need and is so then we need
       # to make sure that we only count unique entries ...
       #
-      str = Facter::Util::Resolution.exec("grep 'physical.\\+:' /proc/cpuinfo")
+      str = Facter::Core::Execution.exec("grep 'physical.\\+:' /proc/cpuinfo")
 
-      if str then str.scan(/\d+/).uniq.size; end
+      if str then str.scan(/\d+/).uniq.size.to_s; end
     end
   end
 end
@@ -59,7 +59,7 @@ Facter.add('physicalprocessorcount') do
   confine :kernel => :windows
   setcode do
     require 'facter/util/wmi'
-    Facter::Util::WMI.execquery("select Name from Win32_Processor").Count
+    Facter::Util::WMI.execquery("select Name from Win32_Processor").Count.to_s
   end
 end
 
@@ -75,9 +75,9 @@ Facter.add('physicalprocessorcount') do
     cmd = "/usr/sbin/psrinfo"
     result = nil
     if (major_version > 5) or (major_version == 5 and minor_version >= 8) then
-      result = Facter::Util::Resolution.exec("#{cmd} -p")
+      result = Facter::Core::Execution.exec("#{cmd} -p")
     else
-      output = Facter::Util::Resolution.exec(cmd)
+      output = Facter::Core::Execution.exec(cmd)
       result = output.split("\n").length.to_s
     end
   end

data/lib/facter/processor.rb

@@ -22,8 +22,9 @@
 require 'thread'
 require 'facter/util/processor'
 
-## 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 for tests on processorcount to work)
+# 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
+# for tests on processorcount to work)
 processor_list = case Facter::Util::Processor.kernel_fact_value
 when "AIX"
   Facter::Util::Processor.aix_processor_list
@@ -90,21 +91,21 @@ end
 Facter.add("Processor") do
   confine :kernel => :openbsd
   setcode do
-    Facter::Util::Resolution.exec("uname -p")
+    Facter::Core::Execution.exec("uname -p")
   end
 end
 
 Facter.add("ProcessorCount") do
   confine :kernel => :openbsd
   setcode do
-    Facter::Util::Resolution.exec("sysctl -n hw.ncpu")
+    Facter::Core::Execution.exec("sysctl -n hw.ncpu")
   end
 end
 
 Facter.add("ProcessorCount") do
   confine :kernel => :Darwin
   setcode do
-    Facter::Util::Resolution.exec("sysctl -n hw.ncpu")
+    Facter::Core::Execution.exec("sysctl -n hw.ncpu")
   end
 end
 
@@ -149,14 +150,14 @@ end
 Facter.add("Processor") do
   confine :kernel => [:dragonfly,:freebsd]
   setcode do
-    Facter::Util::Resolution.exec("sysctl -n hw.model")
+    Facter::Core::Execution.exec("sysctl -n hw.model")
   end
 end
 
 Facter.add("ProcessorCount") do
   confine :kernel => [:dragonfly,:freebsd]
   setcode do
-    Facter::Util::Resolution.exec("sysctl -n hw.ncpu")
+    Facter::Core::Execution.exec("sysctl -n hw.ncpu")
   end
 end
 
@@ -168,15 +169,15 @@ Facter.add("ProcessorCount") do
     result = nil
 
     if (major_version > 5) or (major_version == 5 and minor_version >= 8) then
-      if kstat = Facter::Util::Resolution.exec("/usr/bin/kstat cpu_info")
+      if kstat = Facter::Core::Execution.exec("/usr/bin/kstat cpu_info")
         result = kstat.scan(/\bcore_id\b\s+\d+/).uniq.length
       end
     else
-      if output = Facter::Util::Resolution.exec("/usr/sbin/psrinfo") then
+      if output = Facter::Core::Execution.exec("/usr/sbin/psrinfo") then
         result = output.split("\n").length
       end
     end
 
-    result
+    result.to_s
   end
 end

data/lib/facter/selinux.rb

@@ -22,7 +22,7 @@ def selinux_mount_point
     # a hang. Reading from other parts of /proc does not seem to cause this problem.
     # The work around is to read the file in another process.
     # -- andy Fri Aug 31 2012
-    selinux_line = Facter::Util::Resolution.exec('cat /proc/self/mounts').lines.find { |line| line =~ /selinuxfs/ }
+    selinux_line = Facter::Core::Execution.exec('cat /proc/self/mounts').each_line.find { |line| line =~ /selinuxfs/ }
     if selinux_line
       path = selinux_line.split[1]
     end
@@ -72,7 +72,7 @@ Facter.add("selinux_current_mode") do
   confine :selinux => :true
   setcode do
     result = 'unknown'
-    mode = Facter::Util::Resolution.exec(sestatus_cmd)
+    mode = Facter::Core::Execution.exec(sestatus_cmd)
     mode.each_line { |l| result = $1 if l =~ /^Current mode\:\s+(\w+)$/i }
     result.chomp
   end
@@ -82,7 +82,7 @@ Facter.add("selinux_config_mode") do
   confine :selinux => :true
   setcode do
     result = 'unknown'
-    mode = Facter::Util::Resolution.exec(sestatus_cmd)
+    mode = Facter::Core::Execution.exec(sestatus_cmd)
     mode.each_line { |l| result = $1 if l =~ /^Mode from config file\:\s+(\w+)$/i }
     result.chomp
   end
@@ -92,19 +92,8 @@ Facter.add("selinux_config_policy") do
   confine :selinux => :true
   setcode do
     result = 'unknown'
-    mode = Facter::Util::Resolution.exec(sestatus_cmd)
+    mode = Facter::Core::Execution.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
-# breakages of existing manifests. It should be removed at the next major release.
-# See ticket #6677.
-
-Facter.add("selinux_mode") do
-  confine :selinux => :true
-  setcode do
-    Facter.value(:selinux_config_policy)
-  end
-end

data/lib/facter/ssh.rb

@@ -11,8 +11,11 @@
 ## Facts related to SSH
 ##
 
-{"SSHDSAKey" => { :file => "ssh_host_dsa_key.pub", :sshfprrtype => 2 } , "SSHRSAKey" => { :file => "ssh_host_rsa_key.pub", :sshfprrtype => 1 }, "SSHECDSAKey" => { :file => "ssh_host_ecdsa_key.pub", :sshfprrtype => 3 } }.each do |name,key|
-  
+{"SSHDSAKey" => { :file => "ssh_host_dsa_key.pub", :sshfprrtype => 2 },
+ "SSHRSAKey" => { :file => "ssh_host_rsa_key.pub", :sshfprrtype => 1 },
+ "SSHECDSAKey" => { :file => "ssh_host_ecdsa_key.pub", :sshfprrtype => 3 },
+ "SSHED25519Key" => { :file => "ssh_host_ed25519_key.pub", :sshfprrtype => 4 } }.each do |name,key|
+
   Facter.add(name) do
     setcode do
       value = nil

data/lib/facter/util/architecture.rb

@@ -2,11 +2,11 @@
 
 module Facter::Util::Architecture
   ##
-  # lsattr is intended to directly delegate to Facter::Util::Resolution.exec in
+  # lsattr is intended to directly delegate to Facter::Core::Execution.exec in
   # an effort to make the processorX facts easier to test.  See also the
   # {lsdev} method.
   def self.lsattr(command="lsattr -El proc0 -a type")
-    Facter::Util::Resolution.exec(command)
+    Facter::Core::Execution.exec(command)
   end
 
   ##

data/lib/facter/util/collection.rb

@@ -4,6 +4,8 @@ require 'facter/util/loader'
 
 # Manage which facts exist and how we access them.  Largely just a wrapper
 # around a hash of facts.
+#
+# @api private
 class Facter::Util::Collection
 
   def initialize(internal_loader, external_loader)
@@ -12,53 +14,40 @@ class Facter::Util::Collection
     @external_loader = external_loader
   end
 
-  # Return a fact object by name.  If you use this, you still have to call
-  # 'value' on it to retrieve the actual value.
+  # Return a fact object by name.
   def [](name)
     value(name)
   end
 
-  # Add a resolution mechanism for a named fact.  This does not distinguish
-  # between adding a new fact and adding a new way to resolve a fact.
-  def add(name, options = {}, &block)
-    name = canonicalize(name)
-
-    unless fact = @facts[name]
-      fact = Facter::Util::Fact.new(name)
-
-      @facts[name] = fact
-    end
-
-    # Set any fact-appropriate options.
-    options.each do |opt, value|
-      method = opt.to_s + "="
-      if fact.respond_to?(method)
-        fact.send(method, value)
-        options.delete(opt)
-      end
-    end
+  # Define a new fact or extend an existing fact.
+  #
+  # @param name [Symbol] The name of the fact to define
+  # @param options [Hash] A hash of options to set on the fact
+  #
+  # @return [Facter::Util::Fact] The fact that was defined
+  def define_fact(name, options = {}, &block)
+    fact = create_or_return_fact(name, options)
 
     if block_given?
-      resolve = fact.add(&block)
-    else
-      resolve = fact.add
+      fact.instance_eval(&block)
     end
 
-    # Set any resolve-appropriate options
-    if resolve
-      # If the resolve was actually added, set any resolve-appropriate options
-      options.each do |opt, value|
-        method = opt.to_s + "="
-        if resolve.respond_to?(method)
-          resolve.send(method, value)
-          options.delete(opt)
-        end
-      end
-    end
+    fact
+  rescue => e
+    Facter.log_exception(e, "Unable to add fact #{name}: #{e}")
+  end
 
-    unless options.empty?
-      raise ArgumentError, "Invalid facter option(s) %s" % options.keys.collect { |k| k.to_s }.join(",")
-    end
+  # Add a resolution mechanism for a named fact.  This does not distinguish
+  # between adding a new fact and adding a new way to resolve a fact.
+  #
+  # @param name [Symbol] The name of the fact to define
+  # @param options [Hash] A hash of options to set on the fact and resolution
+  #
+  # @return [Facter::Util::Fact] The fact that was defined
+  def add(name, options = {}, &block)
+    fact = create_or_return_fact(name, options)
+
+    fact.add(options, &block)
 
     return fact
   end
@@ -144,6 +133,21 @@ class Facter::Util::Collection
 
   private
 
+  def create_or_return_fact(name, options)
+    name = canonicalize(name)
+
+    fact = @facts[name]
+
+    if fact.nil?
+      fact = Facter::Util::Fact.new(name, options)
+      @facts[name] = fact
+    else
+      fact.extract_ldapname_option!(options)
+    end
+
+    fact
+  end
+
   def canonicalize(name)
     name.to_s.downcase.to_sym
   end

data/lib/facter/util/config.rb

@@ -29,23 +29,33 @@ module Facter::Util::Config
     end
   end
 
+  def self.external_facts_dirs=(dir)
+    @external_facts_dirs = dir
+  end
+
   def self.external_facts_dirs
+    @external_facts_dirs
+  end
+
+  def self.setup_default_ext_facts_dirs
     if Facter::Util::Root.root?
       windows_dir = windows_data_dir
       if windows_dir.nil? then
-        ["/etc/facter/facts.d", "/etc/puppetlabs/facter/facts.d"]
+        @external_facts_dirs = ["/etc/facter/facts.d", "/etc/puppetlabs/facter/facts.d"]
       else
-        [File.join(windows_dir, 'PuppetLabs', 'facter', 'facts.d')]
+        @external_facts_dirs = [File.join(windows_dir, 'PuppetLabs', 'facter', 'facts.d')]
       end
     else
-      [File.expand_path(File.join("~", ".facter", "facts.d"))]
+      @external_facts_dirs = [File.expand_path(File.join("~", ".facter", "facts.d"))]
     end
   end
-end
 
-if Facter::Util::Config.is_windows?
-  require 'win32/dir'
-  require 'facter/util/windows_root'
-else
-  require 'facter/util/unix_root'
+  if Facter::Util::Config.is_windows?
+    require 'win32/dir'
+    require 'facter/util/windows_root'
+  else
+    require 'facter/util/unix_root'
+  end
+
+  setup_default_ext_facts_dirs
 end