facter 1.6.2 → 1.6.3

data/CHANGELOG

@@ -1,3 +1,14 @@
+1.6.3
+===
+b2a66a9 (#7038) Validate prtdiag output in manufacturer
+c9db305 (#10228) Ascendos OS support for various facts.
+6efadbb (#10233) Adds support for Parallels Server Bare Metal to Facter
+ce8f572 (#10079) Remove trailing whitespace
+e89758d Updated CHANGELOG for 1.6.2
+7b14b77 (#9928) Correct readlines stubbing to return an array instead of an empty string.
+0d6df28 (#9904) Remove windows rspec warning.
+f0ccb5e (#9555) Spec tests: Change all cases of tabs and 4 space indentation to 2 space indentation.
+
 1.6.2
 ===
 d7c00f6 (#9852) Fixing watchr on facter

data/LICENSE

@@ -11,5 +11,5 @@ http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and 
+See the License for the specific language governing permissions and
 limitations under the License.

data/conf/osx/createpackage.sh

@@ -56,7 +56,7 @@ function install_facter() {
 
 function install_docs() {
   echo "Installing docs to ${pkgroot}"
-  docdir="${pkgroot}/usr/share/doc/facter" 
+  docdir="${pkgroot}/usr/share/doc/facter"
   mkdir -p "${docdir}"
   for docfile in ChangeLog COPYING LICENSE README README.rst TODO; do
     install -m 0644 "${facter_root}/${docfile}" "${docdir}"

data/conf/redhat/facter.spec

@@ -2,17 +2,17 @@
 
 %define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
 %define has_ruby_noarch %has_ruby_abi
-%global _ver 1.6.2
+%global _ver 1.6.3
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.6.2
-Release: 1%{?dist}
+Version: 1.6.3
+Release: 0.1rc1%{?dist}
 License: Apache 2.0
 Group: System Environment/Base
 URL: http://www.puppetlabs.com/puppet/related-projects/%{name}/
-Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{_ver}.tar.gz
-#Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
+Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz
+#Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz.asc
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
@@ -32,7 +32,7 @@ system. Some of the facts are preconfigured, such as the hostname and the
 operating system. Additional facts can be added through simple Ruby scripts
 
 %prep
-%setup -q  -n %{name}-%{_ver}
+%setup -q  -n %{name}-%{version}rc1
 
 %build
 
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 31 2011 Michael Stahnke <stahnma@puppetlabs.com> - 1.6.3-0.1rc1
+- 1.6.3 rc1
+
 * Mon Oct 10 2011 Michael Stahnke <stahnma@puppetlabs.com> -  1.6.2-1
 - Update to 1.6.2
 

data/conf/solaris/pkginfo

@@ -1,6 +1,6 @@
 PKG=CSWfacter
 NAME=facter - System Fact Gatherer
-VERSION=1.6.2
+VERSION=1.6.3rc1
 CATEGORY=application
 VENDOR=http://www.puppetlabs.com/puppet/related-projects/facter
 HOTLINE=http://puppetlabs.com/cgi-bin/facter.cgi

data/install.rb

@@ -101,7 +101,7 @@ def do_libs(libs, strip = 'lib/')
 end
 
 def do_man(man, strip = 'man/')
-  if (InstallOptions.man == true)  
+  if (InstallOptions.man == true)
   man.each do |mf|
     omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
     om = File.dirname(omf)

data/lib/facter.rb

@@ -11,7 +11,7 @@
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and 
+# See the License for the specific language governing permissions and
 # limitations under the License.
 
 module Facter
@@ -24,7 +24,7 @@ module Facter
   include Comparable
   include Enumerable
 
-  FACTERVERSION = '1.6.2'
+  FACTERVERSION = '1.6.3'
   # = Facter
   # Functions as a hash of 'facts' you might care about about your
   # system, such as mac address, IP address, Video card, etc.

data/lib/facter/architecture.rb

@@ -2,7 +2,7 @@
 #
 # Purpose:
 #   Return the CPU hardware architecture.
-# 
+#
 # Resolution:
 #   On OpenBSD, Linux and Debian's kfreebsd, use the hardwaremodel fact.
 #   Gentoo and Debian call "x86_86" "amd64".
@@ -35,4 +35,3 @@ Facter.add(:architecture) do
     end
   end
 end
-

data/lib/facter/augeasversion.rb

@@ -7,7 +7,7 @@
 #   the underlying Augeas library.
 #
 # Caveats:
-#   The library version may not indicate the presence of certain lenses, 
+#   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.
@@ -26,4 +26,3 @@ Facter.add(:augeasversion) do
     end
   end
 end
-

data/lib/facter/domain.rb

@@ -2,7 +2,7 @@
 #
 # Purpose:
 #   Return the host's primary DNS domain name.
-# 
+#
 # Resolution:
 #   On UNIX (excluding Darwin), first try and use the hostname fact,
 #   which uses the hostname system command, and then parse the output
@@ -23,11 +23,11 @@ Facter.add(:domain) do
     # Get the domain from various sources; the order of these
     # steps is important
 
-    if name = Facter::Util::Resolution.exec('hostname') and 
+    if name = Facter::Util::Resolution.exec('hostname') and
       name =~ /.*?\.(.+$)/
 
       $1
-    elsif domain = Facter::Util::Resolution.exec('dnsdomainname') and 
+    elsif domain = Facter::Util::Resolution.exec('dnsdomainname') and
       domain =~ /.+\..+/
 
       domain

data/lib/facter/hardwareisa.rb

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

data/lib/facter/ipaddress.rb

@@ -117,13 +117,13 @@ Facter.add(:ipaddress, :ldapname => "iphostnumber", :timeout => 2) do
     else
       require 'resolv'
     end
-    
+
     begin
       if hostname = Facter.value(:hostname)
         if Facter.value(:kernel) == 'windows'
           ip = Win32::Resolv.get_resolv_info.last[0]
         else
-          ip = Resolv.getaddress(hostname)        
+          ip = Resolv.getaddress(hostname)
         end
         unless ip == "127.0.0.1"
           ip

data/lib/facter/lsbmajdistrelease.rb

@@ -15,7 +15,7 @@
 require 'facter'
 
 Facter.add("lsbmajdistrelease") do
-  confine :operatingsystem => %w{Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo OEL OracleLinux OVS GNU/kFreeBSD}
+  confine :operatingsystem => %w{Linux Fedora RedHat CentOS Scientific PSBM SLC Ascendos 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

@@ -1,6 +1,6 @@
 # Fact: macaddress
 #
-# Purpose: 
+# Purpose:
 #
 # Resolution:
 #
@@ -10,7 +10,7 @@
 require 'facter/util/macaddress'
 
 Facter.add(:macaddress) do
-  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Gentoo Ubuntu OEL OracleLinux OVS GNU/kFreeBSD}
+  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific PSBM SLC Ascendos SuSE SLES Debian Gentoo Ubuntu OEL OracleLinux OVS GNU/kFreeBSD}
   setcode do
     ether = []
     output = Facter::Util::Resolution.exec("/sbin/ifconfig -a")

data/lib/facter/manufacturer.rb

@@ -26,7 +26,7 @@ if Facter.value(:kernel) == "OpenBSD"
   }
 
   Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
-elsif Facter.value(:kernel) == "Darwin" 
+elsif Facter.value(:kernel) == "Darwin"
   mfg_keys = {
     'hw.model'   => 'productname'
   }

data/lib/facter/netmask.rb

@@ -6,7 +6,6 @@
 #
 # Caveats:
 #
-
 # netmask.rb
 # Find the netmask of the primary ipaddress
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
@@ -14,7 +13,6 @@
 #
 # idea and originial source by Mark 'phips' Phillips
 #
-
 require 'facter/util/netmask'
 
 Facter.add("netmask") do
@@ -23,4 +21,3 @@ Facter.add("netmask") do
     Facter::NetMask.get_netmask
   end
 end
-

data/lib/facter/network.rb

@@ -9,13 +9,12 @@
 #
 # Caveats:
 #
-
 require 'facter/util/ip'
 
 Facter::Util::IP.get_interfaces.each do |interface|
   Facter.add("network_" + Facter::Util::IP.alphafy(interface)) do
     setcode do
       Facter::Util::IP.get_network_value(interface)
-    end 
-  end 
+    end
+  end
 end

data/lib/facter/operatingsystem.rb

@@ -10,7 +10,6 @@
 #
 # Caveats:
 #
-
 require 'facter/lsb'
 
 Facter.add(:operatingsystem) do
@@ -55,10 +54,14 @@ Facter.add(:operatingsystem) do
         "CentOS"
       elsif txt =~ /CERN/
         "SLC"
-      elsif txt =~ /scientific/i 
+      elsif txt =~ /scientific/i
         "Scientific"
       elsif txt =~ /^cloudlinux/i
         "CloudLinux"
+      elsif txt =~ /^Parallels Server Bare Metal/i
+        "PSBM"
+      elsif txt =~ /Ascendos/i
+        "Ascendos"
       else
         "RedHat"
       end

data/lib/facter/operatingsystemrelease.rb

@@ -10,17 +10,17 @@
 #   information.
 #   On Slackware, parses '/etc/slackware-version'.
 #   On Amazon Linux, returns the 'lsbdistrelease' value.
-#   
+#
 #   On all remaining systems, returns the 'kernelrelease' value.
 #
 # Caveats:
 #
 
 Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{CentOS Fedora oel ovs OracleLinux RedHat MeeGo Scientific SLC CloudLinux}
+  confine :operatingsystem => %w{CentOS Fedora oel ovs OracleLinux RedHat MeeGo Scientific SLC Ascendos CloudLinux PSBM}
   setcode do
     case Facter.value(:operatingsystem)
-    when "CentOS", "RedHat", "Scientific", "SLC", "CloudLinux"
+    when "CentOS", "RedHat", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM"
       releasefile = "/etc/redhat-release"
     when "Fedora"
       releasefile = "/etc/fedora-release"

data/lib/facter/osfamily.rb

@@ -16,7 +16,7 @@ Facter.add(:osfamily) do
 
   setcode do
     case Facter.value(:operatingsystem)
-    when "RedHat", "Fedora", "CentOS", "Scientific", "SLC", "CloudLinux", "OracleLinux", "OVS", "OEL"
+    when "RedHat", "Fedora", "CentOS", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM", "OracleLinux", "OVS", "OEL"
       "RedHat"
     when "Ubuntu", "Debian"
       "Debian"

data/lib/facter/processor.rb

@@ -25,7 +25,7 @@ Facter.add("ProcessorCount") do
   confine :kernel => [ :linux, :"gnu/kfreebsd" ]
   setcode do
     processor_list = Facter::Util::Processor.enum_cpuinfo
-    
+
     ## If this returned nothing, then don't resolve the fact
     if processor_list.length != 0
       processor_list.length.to_s
@@ -51,7 +51,7 @@ Facter.add("ProcessorCount") do
   confine :kernel => :aix
   setcode do
     processor_list = Facter::Util::Processor.enum_lsdev
-        
+
     processor_list.length.to_s
   end
 end

data/lib/facter/selinux.rb

@@ -12,7 +12,7 @@
 
 sestatus_cmd = '/usr/sbin/sestatus'
 
-# This supports the fact that the selinux mount point is not always in the 
+# This supports the fact that the selinux mount point is not always in the
 # same location -- the selinux mount point is operating system specific.
 def selinux_mount_point
   if FileTest.exists?('/proc/self/mountinfo')
@@ -29,7 +29,7 @@ end
 Facter.add("selinux") do
   confine :kernel => :linux
   setcode do
-    result = "false" 
+    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")
@@ -90,7 +90,7 @@ Facter.add("selinux_config_policy") do
   end
 end
 
-# This is a legacy fact which returns the old selinux_mode fact value to prevent 
+# 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.
 

data/lib/facter/uniqueid.rb

@@ -1,4 +1,4 @@
 Facter.add(:uniqueid) do
   setcode 'hostid'
-  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo AIX OEL OracleLinux OVS GNU/kFreeBSD}
+  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific PSBM SLC Ascendos SuSE SLES Debian Ubuntu Gentoo AIX OEL OracleLinux OVS GNU/kFreeBSD}
 end

data/lib/facter/uptime_days.rb

@@ -13,4 +13,3 @@ Facter.add(:uptime_days) do
     hours && hours / 24 # hours in day
   end
 end
-

data/lib/facter/uptime_hours.rb

@@ -13,4 +13,3 @@ Facter.add(:uptime_hours) do
     seconds && seconds / (60 * 60) # seconds in hour
   end
 end
-

data/lib/facter/util/manufacturer.rb

@@ -63,11 +63,10 @@ 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::Util::Resolution.exec('/usr/sbin/prtdiag')
+    output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag 2>/dev/null')
 
     # System Configuration:  Sun Microsystems  sun4u Sun SPARC Enterprise M3000 Server
-    sysconfig = output.split("\n")[0]
-    if sysconfig =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/ then
+    if output and output =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/
       Facter.add('manufacturer') do
         setcode do
           $1

data/lib/facter/util/processor.rb

@@ -21,7 +21,7 @@ module Facter::Util::Processor
             end
           end
         end
-       
+
       when "ppc64"
         Thread::exclusive do
           File.readlines(cpuinfo).each do |l|
@@ -33,7 +33,7 @@ module Facter::Util::Processor
             end
           end
         end
-          
+
       when /arm/
         Thread::exclusive do
           File.readlines(cpuinfo).each do |l|
@@ -63,7 +63,7 @@ module Facter::Util::Processor
     end
     processor_list
   end
-  
+
   def self.enum_lsdev
     processor_num = -1
     processor_list = {}

data/lib/facter/util/resolution.rb

@@ -36,12 +36,12 @@ class Facter::Util::Resolution
     # Try to guess whether the specified code can be executed by looking at the
     # first word. If it cannot be found on the PATH defer on resolving the fact
     # by returning nil.
-    # This only fails on shell built-ins, most of which are masked by stuff in 
+    # This only fails on shell built-ins, most of which are masked by stuff in
     # /bin or of dubious value anyways. In the worst case, "sh -c 'builtin'" can
     # be used to work around this limitation
     #
-    # Windows' %x{} throws Errno::ENOENT when the command is not found, so we 
-    # can skip the check there. This is good, since builtins cannot be found 
+    # Windows' %x{} throws Errno::ENOENT when the command is not found, so we
+    # can skip the check there. This is good, since builtins cannot be found
     # elsewhere.
     if have_which and !Facter::Util::Config.is_windows?
       path = nil

data/lib/facter/util/values.rb

@@ -8,7 +8,7 @@ module Facter
         value = value.to_s if value.is_a?(Symbol)
         value = value.downcase if value.is_a?(String)
         value
-      end  
+      end
     end
   end
 end