facter 1.6.13 → 1.6.14.rc1

data/Rakefile

@@ -55,12 +55,8 @@ task :default do
   sh %{rake -T}
 end
 
-# Aliases for spec
-task :tests   => [:test]
-task :specs   => [:test]
-
 desc "Run all specs"
-RSpec::Core::RakeTask.new(:test) do |t|
+RSpec::Core::RakeTask.new do |t|
   t.pattern ='spec/{unit,integration}/**/*_spec.rb'
   t.fail_on_error = true
 end

data/bin/facter

@@ -55,6 +55,17 @@
 # Copyright (c) 2011 Puppet Labs, Inc
 # Licensed under the Apache 2.0 license
 
+# Bundler and rubygems maintain a set of directories from which to
+# load gems. If Bundler is loaded, let it determine what can be
+# loaded. If it's not loaded, then use rubygems. But do this before
+# loading any facter code, so that our gem loading system is sane.
+if not defined? ::Bundler
+  begin
+    require 'rubygems'
+  rescue LoadError
+  end
+end
+
 require 'facter/application'
 
 Facter::Application.run(ARGV)

data/ext/redhat/facter.spec.erb

@@ -10,21 +10,22 @@
 %global realversion <%= @version %>
 %global rpmversion <%= @rpmversion %>
 
-Summary: Ruby module for collecting simple facts about a host operating system
-Name: facter
-Version: %{rpmversion}
-Release: <%= @rpmrelease -%>%{?dist}
-Epoch: 1
-License: ASL 2.0
-Group: System Environment/Base
-URL: http://www.puppetlabs.com/puppet/related-projects/%{name}
-# Note this URL will only be valid at official tags from Puppet Labs
-Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires: ruby >= 1.8.5
-Requires: which
+Summary:        Ruby module for collecting simple facts about a host operating system
+Name:           facter
+Version:        %{rpmversion}
+Release:        <%= @rpmrelease -%>%{?dist}
+Epoch:          1
+Vendor:         %{?_host_vendor}
+License:        ASL 2.0
+Group:          System Environment/Base
+URL:            http://www.puppetlabs.com/puppet/related-projects/%{name}
+# Note this     URL will only be valid at official tags from Puppet Labs
+Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:       ruby >= 1.8.5
+Requires:       which
 # dmidecode and pciutils are not available on all arches
 %ifarch %ix86 x86_64 ia64
 Requires:       dmidecode

data/lib/facter/application.rb

@@ -35,7 +35,6 @@ module Facter
       # Print the facts as JSON and exit
       if options[:json]
         begin
-          require 'rubygems'
           require 'json'
           puts JSON.dump(facts)
           exit(0)

data/lib/facter/hardwareisa.rb

@@ -4,12 +4,17 @@
 #   Returns hardware processor type.
 #
 # Resolution:
-#   On Solaris, Linux and the BSDs simply uses the output of "uname -p"
+#   On Solaris, AIX, Linux and the BSDs simply uses the output of "uname -p"
+#   On HP-UX, "uname -m" gives us the same information.
 #
 # Caveats:
 #   Some linuxes return unknown to uname -p with relative ease.
 #
 
 Facter.add(:hardwareisa) do
-  setcode 'uname -p'
+  if Facter.value(:kernel) == 'HP-UX'
+    setcode 'uname -m'
+  else
+    setcode 'uname -p'
+  end
 end

data/lib/facter/physicalprocessorcount.rb

@@ -67,6 +67,18 @@ Facter.add('physicalprocessorcount') do
   confine :kernel => :sunos
 
   setcode do
-    Facter::Util::Resolution.exec("/usr/sbin/psrinfo -p")
+    # (#16526) The -p flag was not added until Solaris 8.  Our intent is to
+    # split the kernel release fact value on the dot, take the second element,
+    # and disable the -p flag for values < 8 when.
+    kernelrelease = Facter.value(:kernelrelease)
+    (major_version, minor_version) = kernelrelease.split(".").map { |str| str.to_i }
+    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")
+    else
+      output = Facter::Util::Resolution.exec(cmd)
+      result = output.split("\n").length.to_s
+    end
   end
 end

data/lib/facter/processor.rb

@@ -22,6 +22,26 @@
 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)
+processor_list = case Facter::Util::Processor.kernel_fact_value
+when "AIX"
+  Facter::Util::Processor.aix_processor_list
+when "SunOS"
+  Facter::Util::Processor.enum_kstat
+else
+  Facter::Util::Processor.enum_cpuinfo
+end
+
+processor_list.each_with_index do |desc, i|
+  Facter.add("Processor#{i}") do
+    confine :kernel => [ :aix, :sunos, :linux, :"gnu/kfreebsd" ]
+    setcode do
+      desc
+    end
+  end
+end
+
 Facter.add("ProcessorCount") do
   confine :kernel => [ :linux, :"gnu/kfreebsd" ]
   setcode do
@@ -51,7 +71,7 @@ end
 Facter.add("ProcessorCount") do
   confine :kernel => :aix
   setcode do
-    processor_list = Facter::Util::Processor.enum_lsdev
+    processor_list = Facter::Util::Processor.aix_processor_list
 
     processor_list.length.to_s
   end
@@ -78,41 +98,6 @@ Facter.add("ProcessorCount") do
   end
 end
 
-## 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 = Facter::Util::Processor.enum_cpuinfo
-processor_list_aix = Facter::Util::Processor.enum_lsdev
-processor_list_sunos = Facter::Util::Processor.enum_kstat
-
-if processor_list.length != 0
-  processor_list.each_with_index do |desc, i|
-    Facter.add("Processor#{i}") do
-      confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-      setcode do
-        desc
-      end
-    end
-  end
-elsif processor_list_aix.length != 0
-  processor_list_aix.each_with_index do |desc, i|
-    Facter.add("Processor#{i}") do
-      confine :kernel => [ :aix ]
-      setcode do
-        desc
-      end
-    end
-  end
-elsif processor_list_sunos.length != 0
-  processor_list_sunos.each_with_index do |desc, i|
-    Facter.add("Processor#{i}") do
-      confine :kernel => [ :sunos ]
-      setcode do
-        desc
-      end
-    end
-  end
-end
-
 if Facter.value(:kernel) == "windows"
   processor_list = []
 
@@ -165,10 +150,23 @@ Facter.add("ProcessorCount") do
   end
 end
 
-Facter.add("processorcount") do
+Facter.add("ProcessorCount") do
   confine :kernel => :sunos
   setcode do
-    kstat = Facter::Util::Resolution.exec("/usr/bin/kstat cpu_info")
-    kstat.scan(/\bcore_id\b\s+\d+/).uniq.length
+    kernelrelease = Facter.value(:kernelrelease)
+    (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 kstat = Facter::Util::Resolution.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
+        result = output.split("\n").length
+      end
+    end
+
+    result
   end
 end

data/lib/facter/util/ip.rb

@@ -87,9 +87,9 @@ module Facter::Util::IP
   end
 
   def self.get_infiniband_macaddress(interface)
-    if File::exist?("/sys/class/net/#{interface}/address") then
+    if File.exists?("/sys/class/net/#{interface}/address") then
       ib_mac_address = `cat /sys/class/net/#{interface}/address`.chomp
-    elsif File::exist?("/sbin/ip") then
+    elsif File.exists?("/sbin/ip") then
       ip_output = %x{/sbin/ip link show #{interface}}
       ib_mac_address = ip_output.scan(%r{infiniband\s+((\w{1,2}:){5,}\w{1,2})})
     else

data/lib/facter/util/monkey_patches.rb

@@ -2,6 +2,38 @@
 # version 1.8.5. This allows us to use RbConfig in place of the older Config in
 # our code and still be compatible with at least Ruby 1.8.1.
 require 'rbconfig'
+require 'enumerator'
+
 unless defined? ::RbConfig
   ::RbConfig = ::Config
 end
+
+module Facter
+  module Util
+    module MonkeyPatches
+      module Lines
+        def lines(separator = $/)
+          if block_given?
+            self.each_line(separator) {|line| yield line }
+            return self
+          else
+            return enum_for(:each_line, separator)
+          end
+        end
+      end
+    end
+  end
+end
+
+public
+class String
+  unless method_defined? :lines
+    include Facter::Util::MonkeyPatches::Lines
+  end
+end
+
+class IO
+  unless method_defined? :lines
+    include Facter::Util::MonkeyPatches::Lines
+  end
+end

data/lib/facter/util/processor.rb

@@ -1,4 +1,75 @@
-module Facter::Util::Processor
+module Facter
+module Util
+module Processor
+  ##
+  # aix_processor_list is intended to generate a list of values for the
+  # processorX facts.  The behavior is as follows from
+  # [#11609](http://projects.puppetlabs.com/issues/11609)
+  #
+  # 1. Take a list of all the processor identifiers for the platform,
+  #    represented as system-native identifiers in strings.
+  # 2. Sort the list
+  # 3. Assign an incrementing from 0 integer index to each identifier.
+  # 4. Store the value of the system identifier in the processorX fact where X
+  #    is the incrementing index.
+  #
+  # Returns an Array, sorted, containing the values for the facts.
+  def self.aix_processor_list
+    return_value = []
+    aix_proc_id_list = []
+
+    if output = lsdev then
+      output.split("\n").each do |line|
+        if match = line.match(/proc\d+/)
+          aix_proc_id_list << match[0]
+        end
+      end
+    end
+
+    # Generalized alphanumeric sort to put "proc12" behind "proc4"
+    padding = 8
+    aix_proc_id_list = aix_proc_id_list.sort do |a,b|
+      a,b = [a,b].map do |s|
+        s.gsub(/\d+/) { |m| "0"*(padding - m.size) + m }
+      end
+      a<=>b
+    end
+
+    aix_proc_id_list.each do |proc_id|
+      if output = lsattr("lsattr -El #{proc_id} -a type")
+        if match = output.match(/type\s+([^\s]+)\s+Processor/i)
+          return_value << match[1]
+        end
+      end
+    end
+
+    return_value
+  end
+
+  ##
+  # lsdev is intended to directly delegate to Facter::Util::Resolution.exec in an
+  # effort to make the processorX facts easier to test by stubbing only the
+  # behaviors we need to stub to get the output of the system command.
+  def self.lsdev(command="lsdev -Cc processor")
+    Facter::Util::Resolution.exec(command)
+  end
+
+  ##
+  # lsattr is intended to directly delegate to Facter::Util::Resolution.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)
+  end
+
+  ##
+  # kernel_fact_value is intended to directly delegate to Facter.value(:kernel)
+  # to make it easier to stub the kernel fact without affecting the entire
+  # system.
+  def self.kernel_fact_value
+    Facter.value(:kernel)
+  end
+
   def self.enum_cpuinfo
     processor_num = -1
     processor_list = []
@@ -64,28 +135,6 @@ module Facter::Util::Processor
     processor_list
   end
 
-  def self.enum_lsdev
-    processor_num = -1
-    processor_list = {}
-    Thread::exclusive do
-      procs = Facter::Util::Resolution.exec('lsdev -Cc processor')
-      if procs
-        procs.each_line do |proc|
-          if proc =~ /^proc(\d+)/
-            processor_num = $1.to_i
-            # Not retrieving the frequency since AIX 4.3.3 doesn't support the
-            # attribute and some people still use the OS.
-            proctype = Facter::Util::Resolution.exec('lsattr -El proc0 -a type')
-            if proctype =~ /^type\s+(\S+)\s+/
-              processor_list[processor_num] = $1
-            end
-          end
-        end
-      end
-    end
-    processor_list
-  end
-
   def self.enum_kstat
     processor_num = -1
     processor_list = []
@@ -105,3 +154,5 @@ module Facter::Util::Processor
     processor_list
   end
 end
+end
+end

data/lib/facter/util/uptime.rb

@@ -4,7 +4,7 @@ require 'time'
 #
 module Facter::Util::Uptime
   def self.get_uptime_seconds_unix
-    uptime_proc_uptime or uptime_sysctl or uptime_kstat or uptime_who_dash_b
+    uptime_proc_uptime or uptime_sysctl or uptime_executable
   end
 
   def self.get_uptime_seconds_win
@@ -31,15 +31,30 @@ module Facter::Util::Uptime
     end
   end
 
-  def self.uptime_kstat
-    if output = Facter::Util::Resolution.exec("#{uptime_kstat_cmd} 2>/dev/null")
-      compute_uptime(Time.at(output.chomp.split(/\s/).last.to_i))
-    end
-  end
-
-  def self.uptime_who_dash_b
-    if output = Facter::Util::Resolution.exec("#{uptime_who_cmd} 2>/dev/null")
-      compute_uptime(Time.parse(output))
+  def self.uptime_executable
+    if output = Facter::Util::Resolution.exec("#{uptime_executable_cmd} 2>/dev/null")
+      up=0
+      if output =~ /(\d+) day(?:s|\(s\))?,\s+(\d+):(\d+)/
+        # Regexp handles Solaris, AIX, HP-UX, and Tru64.
+        # 'day(?:s|\(s\))?' says maybe 'day', 'days',
+        #   or 'day(s)', and don't set $2.
+        up=86400*$1.to_i + 3600*$2.to_i + 60*$3.to_i
+      elsif output =~ /(\d+) day(?:s|\(s\))?,\s+(\d+) hr(?:s|\(s\))?,/
+        up=86400*$1.to_i + 3600*$2.to_i
+      elsif output =~ /(\d+) day(?:s|\(s\))?,\s+(\d+) min(?:s|\(s\))?,/
+        up=86400*$1.to_i + 60*$2.to_i
+      elsif output =~ /(\d+) day(?:s|\(s\))?,/
+        up=86400*$1.to_i
+      elsif output =~ /up\s+(\d+):(\d+),/
+        # must anchor to 'up' to avoid matching time of day
+        # at beginning of line.
+        up=3600*$1.to_i + 60*$2.to_i
+      elsif output =~ /(\d+) hr(?:s|\(s\))?,/
+        up=3600*$1.to_i
+      elsif output =~ /(\d+) min(?:s|\(s\))?,/
+        up=60*$1.to_i
+      end
+      up
     end
   end
 
@@ -55,11 +70,7 @@ module Facter::Util::Uptime
     'sysctl -n kern.boottime'
   end
 
-  def self.uptime_kstat_cmd
-    'kstat -p unix:::boot_time'
-  end
-
-  def self.uptime_who_cmd
-    'who -b'
+  def self.uptime_executable_cmd
+    "uptime"
   end
 end