Merge lp:~gandelman-a/ubuntu/precise/facter/merge922788 into lp:ubuntu/precise/facter

[Adam Gandelman]

facter (1.6.4-2ubuntu1) precise; urgency=low

  * Merge from Debian testing (LP: #922788). Remaining changes:
    - debian/rules: use what we had in natty; we don't want ruby-pkg-tools
      in main. (LP: #408402)
    - debian/control: Continue using ruby + libopenssl-ruby as Build-Depends
      even tho Debian has moved to gem2deb (not in main). Move ruby-json to
      Suggests.
    - debian/rules: Use dh_prep instead of dh_clean, add build-arch +
      build-indep targets
    - debian/control: Make binary package depend on ruby1.8 explicitly.
  * Dropped changes:
    - debian/control: Update debhelper Build-Depends to 8 (Updated in Debian)

 -- Adam Gandelman <email address hidden> Fri, 27 Jan 2012 11:05:12 -0800

[Jamie Strandboge (jdstrand)]

This was uploaded a few moments ago and pushed to the bzr branch in r18.

=== modified file 'CHANGELOG'
--- CHANGELOG	2011-11-10 10:11:05 +0000
+++ CHANGELOG	2012-01-27 20:04:26 +0000
@@ -1,3 +1,21 @@
+1.6.4
+===
+6406c8f (##11041) Add dmidecode as a requirement for rpm
+ed81492 (#10444) Add identification of system boards to Facter
+bdbb2da (#10885) Malformed facter.bat when ruby dir contains backreferences
+0bad18b (#10490) Handle case where no macaddress can be found
+
+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

=== modified file 'LICENSE'
--- LICENSE	2011-06-24 10:04:12 +0000
+++ LICENSE	2012-01-27 20:04:26 +0000
@@ -11,5 +11,5 @@
 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.

=== modified file 'conf/osx/createpackage.sh'
--- conf/osx/createpackage.sh	2010-12-01 16:02:13 +0000
+++ conf/osx/createpackage.sh	2012-01-27 20:04:26 +0000
@@ -56,7 +56,7 @@
 
 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}"

=== modified file 'conf/redhat/facter.spec'
--- conf/redhat/facter.spec	2011-10-12 11:29:53 +0000
+++ conf/redhat/facter.spec	2012-01-27 20:04:26 +0000
@@ -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.4
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.6.2
-Release: 1%{?dist}
+Version: 1.6.4
+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
@@ -21,6 +21,7 @@
 
 Requires: ruby >= 1.8.1
 Requires: which
+Requires: dmidecode
 %if %has_ruby_abi
 Requires: ruby(abi) = 1.8
 %endif
@@ -32,7 +33,7 @@
 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 +54,12 @@
 
 
 %changelog
+* Wed Nov 30 2011 Matthaus Litteken <[e-mail]> - 1.6.4-0.1rc1
+- 1.6.4 rc1
+
+* Mon Oct 31 2011 Michael Stahnke <[e-mail]> - 1.6.3-0.1rc1
+- 1.6.3 rc1
+
 * Mon Oct 10 2011 Michael Stahnke <[e-mail]> -  1.6.2-1
 - Update to 1.6.2
 

=== modified file 'conf/solaris/pkginfo'
--- conf/solaris/pkginfo	2011-10-12 11:29:53 +0000
+++ conf/solaris/pkginfo	2012-01-27 20:04:26 +0000
@@ -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

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-10 10:11:05 +0000
+++ debian/changelog	2012-01-27 20:04:26 +0000
@@ -1,3 +1,38 @@
+facter (1.6.4-2ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing (LP: #922788). Remaining changes:
+    - debian/rules: use what we had in natty; we don't want ruby-pkg-tools
+      in main. (LP: #408402)
+    - debian/control: Continue using ruby + libopenssl-ruby as Build-Depends
+      even tho Debian has moved to gem2deb (not in main). Move ruby-json to
+      Suggests.
+    - debian/rules: Use dh_prep instead of dh_clean, add build-arch +
+      build-indep targets
+    - debian/control: Make binary package depend on ruby1.8 explicitly.
+  * Dropped changes:
+    - debian/control: Update debhelper Build-Depends to 8 (Updated in Debian)
+
+ -- Adam Gandelman <[e-mail]>  Fri, 27 Jan 2012 11:05:12 -0800
+
+facter (1.6.4-2) unstable; urgency=low
+
+  * Move dmidecode from Depends to Recommends (Closes: #651501)
+
+ -- Stig Sandbeck Mathisen <[e-mail]>  Fri, 09 Dec 2011 09:40:16 +0100
+
+facter (1.6.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Add dependency on dmidecode
+
+ -- Stig Sandbeck Mathisen <[e-mail]>  Thu, 08 Dec 2011 01:19:09 +0100
+
+facter (1.6.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Stig Sandbeck Mathisen <[e-mail]>  Tue, 22 Nov 2011 21:44:38 +0100
+
 facter (1.6.2-1ubuntu1) precise; urgency=low
 
   * Merge from Debian testing (LP: #888671).  Remaining changes:

=== modified file 'debian/control'
--- debian/control	2011-11-10 10:11:05 +0000
+++ debian/control	2012-01-27 20:04:26 +0000
@@ -15,7 +15,7 @@
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends}, ruby1.8, net-tools, bind9-host | host
-Recommends: pciutils
+Recommends: pciutils, dmidecode
 Suggests: ruby-json
 Description: collect and display facts about the system
  A cross-platform Ruby library for retrieving facts from operating systems.

=== removed file 'debian/facter.dirs'
--- debian/facter.dirs	2010-01-29 09:57:40 +0000
+++ debian/facter.dirs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/ruby/1.8

=== modified file 'install.rb'
--- install.rb	2011-11-10 10:11:05 +0000
+++ install.rb	2012-01-27 20:04:26 +0000
@@ -101,7 +101,7 @@
 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)
@@ -418,29 +418,26 @@
     if not installed_wrapper
       tmp_file2 = File.join(tmp_dir, '_tmp_wrapper')
       cwn = File.join(Config::CONFIG['bindir'], op_file)
-      cwv = CMD_WRAPPER.gsub('<ruby>', ruby.gsub(%r{/}) { "\\" }).gsub!('<command>', cwn.gsub(%r{/}) { "\\" } )
-
-      File.open(tmp_file2, "wb") { |cw| cw.puts cwv }
-      FileUtils.install(tmp_file2, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
-
-      File.unlink(tmp_file2)
-      installed_wrapper = true
-    end
-  end
-  FileUtils.install(tmp_file, File.join(target, op_file), :mode => 0755, :verbose => true)
-  File.unlink(tmp_file)
-end
-
-CMD_WRAPPER = <<-EOS
+      cwv = <<-EOS
 @echo off
 if "%OS%"=="Windows_NT" goto WinNT
-<ruby> -x "<command>" %1 %2 %3 %4 %5 %6 %7 %8 %9
+#{ruby} -x "#{cwn}" %1 %2 %3 %4 %5 %6 %7 %8 %9
 goto done
 :WinNT
-<ruby> -x "<command>" %*
+#{ruby} -x "#{cwn}" %*
 goto done
 :done
 EOS
+      File.open(tmp_file2, "w") { |cw| cw.puts cwv }
+      FileUtils.install(tmp_file2, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
+
+      File.unlink(tmp_file2)
+      installed_wrapper = true
+    end
+  end
+  FileUtils.install(tmp_file, File.join(target, op_file), :mode => 0755, :verbose => true)
+  File.unlink(tmp_file)
+end
 
 check_prereqs
 prepare_installation

=== modified file 'lib/facter.rb'
--- lib/facter.rb	2011-11-10 10:11:05 +0000
+++ lib/facter.rb	2012-01-27 20:04:26 +0000
@@ -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 @@
   include Comparable
   include Enumerable
 
-  FACTERVERSION = '1.6.2'
+  FACTERVERSION = '1.6.4'
   # = Facter
   # Functions as a hash of 'facts' you might care about about your
   # system, such as mac address, IP address, Video card, etc.

=== modified file 'lib/facter/architecture.rb'
--- lib/facter/architecture.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/architecture.rb	2012-01-27 20:04:26 +0000
@@ -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 @@
     end
   end
 end
-

=== modified file 'lib/facter/augeasversion.rb'
--- lib/facter/augeasversion.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/augeasversion.rb	2012-01-27 20:04:26 +0000
@@ -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 @@
     end
   end
 end
-

=== modified file 'lib/facter/domain.rb'
--- lib/facter/domain.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/domain.rb	2012-01-27 20:04:26 +0000
@@ -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 @@
     # 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

=== modified file 'lib/facter/hardwareisa.rb'
--- lib/facter/hardwareisa.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/hardwareisa.rb	2012-01-27 20:04:26 +0000
@@ -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

=== modified file 'lib/facter/ipaddress.rb'
--- lib/facter/ipaddress.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/ipaddress.rb	2012-01-27 20:04:26 +0000
@@ -117,13 +117,13 @@
     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

=== modified file 'lib/facter/lsbmajdistrelease.rb'
--- lib/facter/lsbmajdistrelease.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/lsbmajdistrelease.rb	2012-01-27 20:04:26 +0000
@@ -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

=== modified file 'lib/facter/macaddress.rb'
--- lib/facter/macaddress.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/macaddress.rb	2012-01-27 20:04:26 +0000
@@ -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")

=== modified file 'lib/facter/manufacturer.rb'
--- lib/facter/manufacturer.rb	2011-11-10 10:11:05 +0000
+++ lib/facter/manufacturer.rb	2012-01-27 20:04:26 +0000
@@ -26,7 +26,7 @@
   }
 
   Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
-elsif Facter.value(:kernel) == "Darwin" 
+elsif Facter.value(:kernel) == "Darwin"
   mfg_keys = {
     'hw.model'   => 'productname'
   }
@@ -42,6 +42,11 @@
   Facter::Manufacturer.win32_find_system_info(win32_keys)
 else
   query = {
+    '[Bb]ase [Bb]oard [Ii]nformation' => [
+      { 'Manufacturer:'    => 'boardmanufacturer' },
+      { 'Product(?: Name)?:' => 'boardproductname' },
+      { 'Serial Number:'   => 'boardserialnumber' }
+    ],
     '[Ss]ystem [Ii]nformation' => [
       { 'Manufacturer:'    => 'manufacturer' },
       { 'Product(?: Name)?:' => 'productname' },

=== modified file 'lib/facter/netmask.rb'
--- lib/facter/netmask.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/netmask.rb	2012-01-27 20:04:26 +0000
@@ -6,7 +6,6 @@
 #
 # Caveats:
 #
-
 # netmask.rb
 # Find the netmask of the primary ipaddress
 # Copyright (C) 2007 David Schmitt <[e-mail]>
@@ -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::NetMask.get_netmask
   end
 end
-

=== modified file 'lib/facter/network.rb'
--- lib/facter/network.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/network.rb	2012-01-27 20:04:26 +0000
@@ -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

=== modified file 'lib/facter/operatingsystem.rb'
--- lib/facter/operatingsystem.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/operatingsystem.rb	2012-01-27 20:04:26 +0000
@@ -10,7 +10,6 @@
 #
 # Caveats:
 #
-
 require 'facter/lsb'
 
 Facter.add(:operatingsystem) do
@@ -55,10 +54,14 @@
         "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

=== modified file 'lib/facter/operatingsystemrelease.rb'
--- lib/facter/operatingsystemrelease.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/operatingsystemrelease.rb	2012-01-27 20:04:26 +0000
@@ -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"

=== modified file 'lib/facter/osfamily.rb'
--- lib/facter/osfamily.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/osfamily.rb	2012-01-27 20:04:26 +0000
@@ -16,7 +16,7 @@
 
   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"

=== modified file 'lib/facter/processor.rb'
--- lib/facter/processor.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/processor.rb	2012-01-27 20:04:26 +0000
@@ -25,7 +25,7 @@
   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 @@
   confine :kernel => :aix
   setcode do
     processor_list = Facter::Util::Processor.enum_lsdev
-        
+
     processor_list.length.to_s
   end
 end

=== modified file 'lib/facter/selinux.rb'
--- lib/facter/selinux.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/selinux.rb	2012-01-27 20:04:26 +0000
@@ -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 @@
 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 @@
   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.
 

=== modified file 'lib/facter/uniqueid.rb'
--- lib/facter/uniqueid.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/uniqueid.rb	2012-01-27 20:04:26 +0000
@@ -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

=== modified file 'lib/facter/uptime_days.rb'
--- lib/facter/uptime_days.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/uptime_days.rb	2012-01-27 20:04:26 +0000
@@ -13,4 +13,3 @@
     hours && hours / 24 # hours in day
   end
 end
-

=== modified file 'lib/facter/uptime_hours.rb'
--- lib/facter/uptime_hours.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/uptime_hours.rb	2012-01-27 20:04:26 +0000
@@ -13,4 +13,3 @@
     seconds && seconds / (60 * 60) # seconds in hour
   end
 end
-

=== modified file 'lib/facter/util/macaddress.rb'
--- lib/facter/util/macaddress.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/util/macaddress.rb	2012-01-27 20:04:26 +0000
@@ -3,6 +3,7 @@
 module Facter::Util::Macaddress
 
   def self.standardize(macaddress)
+    return nil unless macaddress
     macaddress.split(":").map{|x| "0#{x}"[-2..-1]}.join(":")
   end
 

=== modified file 'lib/facter/util/manufacturer.rb'
--- lib/facter/util/manufacturer.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/util/manufacturer.rb	2012-01-27 20:04:26 +0000
@@ -63,11 +63,10 @@
 
   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

=== modified file 'lib/facter/util/processor.rb'
--- lib/facter/util/processor.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/util/processor.rb	2012-01-27 20:04:26 +0000
@@ -21,7 +21,7 @@
             end
           end
         end
-       
+
       when "ppc64"
         Thread::exclusive do
           File.readlines(cpuinfo).each do |l|
@@ -33,7 +33,7 @@
             end
           end
         end
-          
+
       when /arm/
         Thread::exclusive do
           File.readlines(cpuinfo).each do |l|
@@ -63,7 +63,7 @@
     end
     processor_list
   end
-  
+
   def self.enum_lsdev
     processor_num = -1
     processor_list = {}

=== modified file 'lib/facter/util/resolution.rb'
--- lib/facter/util/resolution.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/util/resolution.rb	2012-01-27 20:04:26 +0000
@@ -36,12 +36,12 @@
     # 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

=== modified file 'lib/facter/util/values.rb'
--- lib/facter/util/values.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/util/values.rb	2012-01-27 20:04:26 +0000
@@ -8,7 +8,7 @@
         value = value.to_s if value.is_a?(Symbol)
         value = value.downcase if value.is_a?(String)
         value
-      end  
+      end
     end
   end
 end

=== modified file 'lib/facter/virtual.rb'
--- lib/facter/virtual.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/virtual.rb	2012-01-27 20:04:26 +0000
@@ -133,7 +133,7 @@
           end
         end
       end
-      
+
       if output = Facter::Util::Resolution.exec("vmware -v")
         result = output.sub(/(\S+)\s+(\S+).*/) { | text | "#{$1}_#{$2}"}.downcase
       end
@@ -148,7 +148,7 @@
 # Purpose: returning true or false for if a machine is virtualised or not.
 #
 # Resolution: Hypervisors and the like may be detected as a virtual type, but
-# are not actual virtual machines, or should not be treated as such. This 
+# are not actual virtual machines, or should not be treated as such. This
 # determines if the host is actually virtualized.
 #
 # Caveats:

=== modified file 'lib/facter/vlans.rb'
--- lib/facter/vlans.rb	2011-10-12 11:29:53 +0000
+++ lib/facter/vlans.rb	2012-01-27 20:04:26 +0000
@@ -7,9 +7,8 @@
 #
 # Caveats:
 #
+require 'facter/util/vlans'
 
-require 'facter/util/vlans'
-    
 Facter.add("vlans") do
   confine :kernel => :linux
   setcode do

=== modified file 'lib/facter/xendomains.rb'
--- lib/facter/xendomains.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/xendomains.rb	2012-01-27 20:04:26 +0000
@@ -8,7 +8,6 @@
 #
 # Caveats:
 #
-
 require 'facter/util/xendomains'
 
 Facter.add("xendomains") do

=== added file 'spec/fixtures/ifconfig/linux_ifconfig_no_mac'
--- spec/fixtures/ifconfig/linux_ifconfig_no_mac	1970-01-01 00:00:00 +0000
+++ spec/fixtures/ifconfig/linux_ifconfig_no_mac	2012-01-27 20:04:26 +0000
@@ -0,0 +1,8 @@
+lo        Link encap:Local Loopback  
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          UP LOOPBACK RUNNING  MTU:16436  Metric:1
+          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+

=== added file 'spec/fixtures/ifconfig/linux_ifconfig_venet'
--- spec/fixtures/ifconfig/linux_ifconfig_venet	1970-01-01 00:00:00 +0000
+++ spec/fixtures/ifconfig/linux_ifconfig_venet	2012-01-27 20:04:26 +0000
@@ -0,0 +1,24 @@
+lo        Link encap:Local Loopback
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          inet6 addr: ::1/128 Scope:Host
+          UP LOOPBACK RUNNING  MTU:16436  Metric:1
+          RX packets:334 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:334 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0
+          RX bytes:16700 (16.7 KB)  TX bytes:16700 (16.7 KB)
+
+venet0    Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+          inet addr:127.0.0.1  P-t-P:127.0.0.1  Bcast:0.0.0.0  Mask:255.255.255.255
+          UP BROADCAST POINTOPOINT RUNNING NOARP  MTU:1500  Metric:1
+          RX packets:7622207 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:8183436 errors:0 dropped:1 overruns:0 carrier:0
+          collisions:0 txqueuelen:0
+          RX bytes:2102750761 (2.1 GB)  TX bytes:2795213667 (2.7 GB)
+
+venet0:0  Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+          inet addr:XXX.XXX.XXX.XX1  P-t-P:XXX.XXX.XXX.XX1  Bcast:0.0.0.0  Mask:255.255.255.255
+          UP BROADCAST POINTOPOINT RUNNING NOARP  MTU:1500  Metric:1
+
+venet0:1  Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+          inet addr:XXX.XXX.XXX.XX2  P-t-P:XXX.XXX.XXX.XX2  Bcast:0.0.0.0  Mask:255.255.255.255
+          UP BROADCAST POINTOPOINT RUNNING NOARP  MTU:1500  Metric:1

=== added directory 'spec/fixtures/unit/util/manufacturer'
=== added file 'spec/fixtures/unit/util/manufacturer/solaris_sunfire_v120_prtdiag'
--- spec/fixtures/unit/util/manufacturer/solaris_sunfire_v120_prtdiag	1970-01-01 00:00:00 +0000
+++ spec/fixtures/unit/util/manufacturer/solaris_sunfire_v120_prtdiag	2012-01-27 20:04:26 +0000
@@ -0,0 +1,33 @@
+System Configuration:  Sun Microsystems  sun4u Sun Fire V120 (UltraSPARC-IIe 648MHz)
+System clock frequency: 100 MHz
+Memory size: 2048 Megabytes
+
+========================= CPUs =========================
+
+                    Run   Ecache   CPU    CPU
+Brd  CPU   Module   MHz     MB    Impl.   Mask
+---  ---  -------  -----  ------  ------  ----
+ 0     0     0      648     0.5   13       3.3
+
+
+========================= IO Cards =========================
+
+     Bus#  Freq
+Brd  Type  MHz   Slot  Name                              Model
+---  ----  ----  ----  --------------------------------  ----------------------
+ 0   PCI-1  33    12   ebus                                                    
+ 0   PCI-1  33     3   pmu-pci10b9,7101                                        
+ 0   PCI-1  33     3   lomp                                                    
+ 0   PCI-1  33     7   isa                                                     
+ 0   PCI-1  33    12   network-pci108e,1101              SUNW,pci-eri          
+ 0   PCI-1  33    12   usb-pci108e,1103.1                                      
+ 0   PCI-1  33    13   ide-pci10b9,5229                                        
+ 0   PCI-1  33     5   network-pci108e,1101              SUNW,pci-eri          
+ 0   PCI-1  33     5   usb-pci108e,1103.1                                      
+ 0   PCI-2  33     8   scsi-glm                          Symbios,53C896        
+ 0   PCI-2  33     8   scsi-glm                          Symbios,53C896        
+ 0   PCI-2  33     5   network-pci108e,2bad              SUNW,pci-gem          
+
+
+No failures found in System
+===========================

=== added file 'spec/fixtures/unit/util/manufacturer/solaris_t5220_prtdiag'
--- spec/fixtures/unit/util/manufacturer/solaris_t5220_prtdiag	1970-01-01 00:00:00 +0000
+++ spec/fixtures/unit/util/manufacturer/solaris_t5220_prtdiag	2012-01-27 20:04:26 +0000
@@ -0,0 +1,136 @@
+System Configuration:  Sun Microsystems  sun4v SPARC Enterprise T5220
+Memory size: 32640 Megabytes
+
+================================ Virtual CPUs ================================
+
+
+CPU ID Frequency Implementation         Status
+------ --------- ---------------------- -------
+0      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+1      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+2      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+3      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+4      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+5      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+6      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+7      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+8      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+9      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+10     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+11     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+12     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+13     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+14     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+15     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+16     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+17     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+18     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+19     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+20     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+21     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+22     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+23     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+24     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+25     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+26     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+27     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+28     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+29     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+30     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+31     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+32     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+33     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+34     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+35     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+36     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+37     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+38     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+39     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+40     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+41     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+42     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+43     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+44     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+45     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+46     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+47     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+48     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+49     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+50     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+51     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+52     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+53     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+54     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+55     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+56     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+57     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+58     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+59     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+60     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+61     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+62     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+63     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+
+======================= Physical Memory Configuration ========================
+Segment Table:
+--------------------------------------------------------------
+Base           Segment  Interleave  Bank     Contains
+Address        Size     Factor      Size     Modules
+--------------------------------------------------------------
+0x0            32 GB    8           4 GB     MB/CMP0/BR0/CH0/D0
+                                             MB/CMP0/BR0/CH1/D0
+                                    4 GB     MB/CMP0/BR0/CH0/D1
+                                             MB/CMP0/BR0/CH1/D1
+                                    4 GB     MB/CMP0/BR1/CH0/D0
+                                             MB/CMP0/BR1/CH1/D0
+                                    4 GB     MB/CMP0/BR1/CH0/D1
+                                             MB/CMP0/BR1/CH1/D1
+                                    4 GB     MB/CMP0/BR2/CH0/D0
+                                             MB/CMP0/BR2/CH1/D0
+                                    4 GB     MB/CMP0/BR2/CH0/D1
+                                             MB/CMP0/BR2/CH1/D1
+                                    4 GB     MB/CMP0/BR3/CH0/D0
+                                             MB/CMP0/BR3/CH1/D0
+                                    4 GB     MB/CMP0/BR3/CH0/D1
+                                             MB/CMP0/BR3/CH1/D1
+
+
+================================ IO Devices ================================
+Slot +            Bus   Name +                            Model   
+Status            Type  Path                                      
+----------------------------------------------------------------------------
+MB/NET0           PCIE  network-pciex8086,105e                    
+                        /pci@0/pci@0/pci@1/pci@0/pci@2/network@0    
+MB/NET1           PCIE  network-pciex8086,105e                    
+                        /pci@0/pci@0/pci@1/pci@0/pci@2/network@0,1  
+MB/NET2           PCIE  network-pciex8086,105e                    
+                        /pci@0/pci@0/pci@1/pci@0/pci@3/network@0    
+MB/NET3           PCIE  network-pciex8086,105e                    
+                        /pci@0/pci@0/pci@1/pci@0/pci@3/network@0,1  
+MB/SASHBA         PCIE  scsi-pciex1000,58                 LSI,1068E
+                        /pci@0/pci@0/pci@2/scsi@0                   
+MB                PCIX  usb-pciclass,0c0310                       
+                        /pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@0  
+MB                PCIX  usb-pciclass,0c0310                       
+                        /pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@0,1
+MB                PCIX  usb-pciclass,0c0320                       
+                        /pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@0,2
+
+============================ Environmental Status ============================
+Fan sensors:
+All fan sensors are OK.
+
+Temperature sensors:
+All temperature sensors are OK.
+
+Current sensors:
+All current sensors are OK.
+
+Voltage sensors:
+All voltage sensors are OK.
+
+Voltage indicators:
+All voltage indicators are OK.
+
+============================ FRU Status ============================
+All FRUs are enabled.

=== modified file 'spec/spec_helper.rb'
--- spec/spec_helper.rb	2011-10-12 11:29:53 +0000
+++ spec/spec_helper.rb	2012-01-27 20:04:26 +0000
@@ -2,6 +2,11 @@
 
 SPECDIR = dir
 
+def fixture_data(file)
+  File.read(File.join(SPECDIR, "fixtures", file))
+end
+
+
 $LOAD_PATH.unshift("#{dir}/")
 $LOAD_PATH.unshift("#{dir}/../lib")
 

=== modified file 'spec/unit/architecture_spec.rb'
--- spec/unit/architecture_spec.rb	2011-10-12 11:29:53 +0000
+++ spec/unit/architecture_spec.rb	2012-01-27 20:04:26 +0000
@@ -6,49 +6,49 @@
 
 describe "Architecture fact" do
 
-    it "should default to the hardware model" do
-        Facter.fact(:hardwaremodel).stubs(:value).returns("NonSpecialCasedHW")
-
-        Facter.fact(:architecture).value.should == "NonSpecialCasedHW"
-    end
-
-    os_archs = Hash.new
-    os_archs = {
-	["Debian","x86_64"] => "amd64",
-	["Gentoo","x86_64"] => "amd64",
-	["GNU/kFreeBSD","x86_64"] => "amd64",
-	["Ubuntu","x86_64"] => "amd64",
-	["Gentoo","i386"] => "x86",
-	["Gentoo","i486"] => "x86",
-	["Gentoo","i586"] => "x86",
-	["Gentoo","i686"] => "x86",
-	["Gentoo","pentium"] => "x86",
-    }
-    generic_archs = Hash.new
-    generic_archs = {
-	"i386" => "i386",
-	"i486" => "i386",
-	"i586" => "i386",
-	"i686" => "i386",
-	"pentium" => "i386",
-    }
-    
-    os_archs.each do |pair, result|
-	it "should be #{result} if os is #{pair[0]} and hardwaremodel is #{pair[1]}" do
-	 Facter.fact(:operatingsystem).stubs(:value).returns(pair[0])
-	 Facter.fact(:hardwaremodel).stubs(:value).returns(pair[1])
-
-	 Facter.fact(:architecture).value.should == result
-	end
-    end
-
-    generic_archs.each do |hw, result|
-	it "should be #{result} if hardwaremodel is #{hw}" do
-	 Facter.fact(:hardwaremodel).stubs(:value).returns(hw)
-	 Facter.fact(:operatingsystem).stubs(:value).returns("NonSpecialCasedOS")
-
-	 Facter.fact(:architecture).value.should == result
-	end
-    end
+  it "should default to the hardware model" do
+    Facter.fact(:hardwaremodel).stubs(:value).returns("NonSpecialCasedHW")
+
+    Facter.fact(:architecture).value.should == "NonSpecialCasedHW"
+  end
+
+  os_archs = Hash.new
+  os_archs = {
+    ["Debian","x86_64"] => "amd64",
+    ["Gentoo","x86_64"] => "amd64",
+    ["GNU/kFreeBSD","x86_64"] => "amd64",
+    ["Ubuntu","x86_64"] => "amd64",
+    ["Gentoo","i386"] => "x86",
+    ["Gentoo","i486"] => "x86",
+    ["Gentoo","i586"] => "x86",
+    ["Gentoo","i686"] => "x86",
+    ["Gentoo","pentium"] => "x86",
+  }
+  generic_archs = Hash.new
+  generic_archs = {
+    "i386" => "i386",
+    "i486" => "i386",
+    "i586" => "i386",
+    "i686" => "i386",
+    "pentium" => "i386",
+  }
+  
+  os_archs.each do |pair, result|
+    it "should be #{result} if os is #{pair[0]} and hardwaremodel is #{pair[1]}" do
+     Facter.fact(:operatingsystem).stubs(:value).returns(pair[0])
+     Facter.fact(:hardwaremodel).stubs(:value).returns(pair[1])
+
+     Facter.fact(:architecture).value.should == result
+    end
+  end
+
+  generic_archs.each do |hw, result|
+    it "should be #{result} if hardwaremodel is #{hw}" do
+     Facter.fact(:hardwaremodel).stubs(:value).returns(hw)
+     Facter.fact(:operatingsystem).stubs(:value).returns("NonSpecialCasedOS")
+
+     Facter.fact(:architecture).value.should == result
+    end
+  end
 
 end

=== modified file 'spec/unit/facter_spec.rb'
--- spec/unit/facter_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/facter_spec.rb	2012-01-27 20:04:26 +0000
@@ -4,268 +4,270 @@
 
 describe Facter do
 
-    it "should have a version" do
-        Facter.version.should =~ /^[0-9]+(\.[0-9]+)*$/
-    end
-
-    it "should have a method for returning its collection" do
-        Facter.should respond_to(:collection)
-    end
-
-    it "should cache the collection" do
-        Facter.collection.should equal(Facter.collection)
-    end
-
-    it "should delegate the :flush method to the collection" do
-        Facter.collection.expects(:flush)
-        Facter.flush
-    end
-
-    it "should delegate the :fact method to the collection" do
-        Facter.collection.expects(:fact)
-        Facter.fact
-    end
-
-    it "should delegate the :list method to the collection" do
-        Facter.collection.expects(:list)
-        Facter.list
-    end
-
-    it "should load all facts when listing" do
-        Facter.collection.expects(:load_all)
-        Facter.collection.stubs(:list)
-        Facter.list
-    end
-
-    it "should delegate the :to_hash method to the collection" do
-        Facter.collection.expects(:to_hash)
-        Facter.to_hash
-    end
-
-    it "should load all facts when calling :to_hash" do
-        Facter.collection.expects(:load_all)
-        Facter.collection.stubs(:to_hash)
-        Facter.to_hash
-    end
-
-    it "should delegate the :value method to the collection" do
-        Facter.collection.expects(:value)
-        Facter.value
-    end
-
-    it "should delegate the :each method to the collection" do
-        Facter.collection.expects(:each)
-        Facter.each
-    end
-
-    it "should load all facts when calling :each" do
-        Facter.collection.expects(:load_all)
-        Facter.collection.stubs(:each)
-        Facter.each
-    end
-
-    it "should yield to the block when using :each" do
-        Facter.collection.stubs(:load_all)
-        Facter.collection.stubs(:each).yields "foo"
-        result = []
-        Facter.each { |f| result << f }
-        result.should == %w{foo}
-    end
-
-    describe "when provided code as a string" do
-        it "should execute the code in the shell" do
-            Facter.add("shell_testing") do
-                setcode "echo yup"
-            end
-
-            Facter["shell_testing"].value.should == "yup"
-        end
-    end
-
-    describe "when asked for a fact as an undefined Facter class method" do
-        describe "and the collection is already initialized" do
-            it "should return the fact's value" do
-                Facter.collection
-                Facter.ipaddress.should == Facter['ipaddress'].value
-            end
-        end
-
-        describe "and the collection has been just reset" do
-            it "should return the fact's value" do
-                Facter.reset
-                Facter.ipaddress.should == Facter['ipaddress'].value
-            end
-        end
-    end
-
-    describe "when passed code as a block" do
-        it "should execute the provided block" do
-            Facter.add("block_testing") { setcode { "foo" } }
-
-            Facter["block_testing"].value.should == "foo"
-        end
-    end
-
-    describe Facter[:hostname] do
-        it "should have its ldapname set to 'cn'" do
-            Facter[:hostname].ldapname.should == "cn"
-        end
-    end
-
-    describe Facter[:ipaddress] do
-        it "should have its ldapname set to 'iphostnumber'" do
-            Facter[:ipaddress].ldapname.should == "iphostnumber"
-        end
-    end
-
-    # #33 Make sure we only get one mac address
-    it "should only return one mac address" do
-        Facter.value(:macaddress).should_not be_include(" ")
-    end
-
-    it "should have a method for registering directories to search" do
-        Facter.should respond_to(:search)
-    end
-
-    it "should have a method for returning the registered search directories" do
-        Facter.should respond_to(:search_path)
-    end
-
-    it "should have a method to query debugging mode" do
-        Facter.should respond_to(:debugging?)
-    end
-
-    it "should have a method to query timing mode" do
-        Facter.should respond_to(:timing?)
-    end
-
-    it "should have a method to show timing information" do
-        Facter.should respond_to(:show_time)
-    end
-
-    it "should have a method to warn" do
-        Facter.should respond_to(:warn)
-    end
-
-    describe "when warning" do
-        it "should warn if debugging is enabled" do
-          Facter.debugging(true)
-          Kernel.stubs(:warn)
-          Kernel.expects(:warn).with('foo')
-          Facter.warn('foo')
-        end
-
-        it "should not warn if debugging is enabled but nil is passed" do
-          Facter.debugging(true)
-          Kernel.stubs(:warn)
-          Kernel.expects(:warn).never
-          Facter.warn(nil)
-        end
-
-        it "should not warn if debugging is enabled but an empyt string is passed" do
-          Facter.debugging(true)
-          Kernel.stubs(:warn)
-          Kernel.expects(:warn).never
-          Facter.warn('')
-        end
-
-        it "should not warn if debugging is disabled" do
-          Facter.debugging(false)
-          Kernel.stubs(:warn)
-          Kernel.expects(:warn).never
-          Facter.warn('foo')
-        end
-
-        it "should warn for any given element for an array if debugging is enabled" do
-          Facter.debugging(true)
-          Kernel.stubs(:warn)
-          Kernel.expects(:warn).with('foo')
-          Kernel.expects(:warn).with('bar')
-          Facter.warn( ['foo','bar'])
-        end
-    end
-
-    describe "when warning once" do
-        it "should only warn once" do
-          Kernel.stubs(:warnonce)
-          Kernel.expects(:warn).with('foo').once
-          Facter.warnonce('foo')
-          Facter.warnonce('foo')
-        end
-
-        it "should not warnonce if nil is passed" do
-          Kernel.stubs(:warn)
-          Kernel.expects(:warnonce).never
-          Facter.warnonce(nil)
-        end
-
-        it "should not warnonce if an empty string is passed" do
-          Kernel.stubs(:warn)
-          Kernel.expects(:warnonce).never
-          Facter.warnonce('')
-        end
-    end
-
-    describe "when setting debugging mode" do
-        it "should have debugging enabled using 1" do
-            Facter.debugging(1)
-            Facter.should be_debugging
-        end
-        it "should have debugging enabled using true" do
-            Facter.debugging(true)
-            Facter.should be_debugging
-        end
-        it "should have debugging enabled using any string except off" do
-            Facter.debugging('aaaaa')
-            Facter.should be_debugging
-        end
-        it "should have debugging disabled using 0" do
-            Facter.debugging(0)
-            Facter.should_not be_debugging
-        end
-        it "should have debugging disabled using false" do
-            Facter.debugging(false)
-            Facter.should_not be_debugging
-        end
-        it "should have debugging disabled using the string 'off'" do
-            Facter.debugging('off')
-            Facter.should_not be_debugging
-        end
-    end
-
-    describe "when setting timing mode" do
-        it "should have timing enabled using 1" do
-            Facter.timing(1)
-            Facter.should be_timing
-        end
-        it "should have timing enabled using true" do
-            Facter.timing(true)
-            Facter.should be_timing
-        end
-        it "should have timing disabled using 0" do
-            Facter.timing(0)
-            Facter.should_not be_timing
-        end
-        it "should have timing disabled using false" do
-            Facter.timing(false)
-            Facter.should_not be_timing
-        end
-    end
-
-    describe "when registering directories to search" do
-        after { Facter.instance_variable_set("@search_path", []) }
-
-        it "should allow registration of a directory" do
-            Facter.search "/my/dir"
-        end
-
-        it "should allow registration of multiple directories" do
-            Facter.search "/my/dir", "/other/dir"
-        end
-
-        it "should return all registered directories when asked" do
-            Facter.search "/my/dir", "/other/dir"
-            Facter.search_path.should == %w{/my/dir /other/dir}
-        end
-    end
+  it "should have a version" do
+    Facter.version.should =~ /^[0-9]+(\.[0-9]+)*$/
+  end
+
+  it "should have a method for returning its collection" do
+    Facter.should respond_to(:collection)
+  end
+
+  it "should cache the collection" do
+    Facter.collection.should equal(Facter.collection)
+  end
+
+  it "should delegate the :flush method to the collection" do
+    Facter.collection.expects(:flush)
+    Facter.flush
+  end
+
+  it "should delegate the :fact method to the collection" do
+    Facter.collection.expects(:fact)
+    Facter.fact
+  end
+
+  it "should delegate the :list method to the collection" do
+    Facter.collection.expects(:list)
+    Facter.list
+  end
+
+  it "should load all facts when listing" do
+    Facter.collection.expects(:load_all)
+    Facter.collection.stubs(:list)
+    Facter.list
+  end
+
+  it "should delegate the :to_hash method to the collection" do
+    Facter.collection.expects(:to_hash)
+    Facter.to_hash
+  end
+
+  it "should load all facts when calling :to_hash" do
+    Facter.collection.expects(:load_all)
+    Facter.collection.stubs(:to_hash)
+    Facter.to_hash
+  end
+
+  it "should delegate the :value method to the collection" do
+    Facter.collection.expects(:value)
+    Facter.value
+  end
+
+  it "should delegate the :each method to the collection" do
+    Facter.collection.expects(:each)
+    Facter.each
+  end
+
+  it "should load all facts when calling :each" do
+    Facter.collection.expects(:load_all)
+    Facter.collection.stubs(:each)
+    Facter.each
+  end
+
+  it "should yield to the block when using :each" do
+    Facter.collection.stubs(:load_all)
+    Facter.collection.stubs(:each).yields "foo"
+    result = []
+    Facter.each { |f| result << f }
+    result.should == %w{foo}
+  end
+
+  describe "when provided code as a string" do
+    it "should execute the code in the shell" do
+      Facter.add("shell_testing") do
+        setcode "echo yup"
+      end
+
+      Facter["shell_testing"].value.should == "yup"
+    end
+  end
+
+  describe "when asked for a fact as an undefined Facter class method" do
+    describe "and the collection is already initialized" do
+      it "should return the fact's value" do
+        Facter.collection
+        Facter.ipaddress.should == Facter['ipaddress'].value
+      end
+    end
+
+    describe "and the collection has been just reset" do
+      it "should return the fact's value" do
+        Facter.reset
+        Facter.ipaddress.should == Facter['ipaddress'].value
+      end
+    end
+  end
+
+  describe "when passed code as a block" do
+    it "should execute the provided block" do
+      Facter.add("block_testing") { setcode { "foo" } }
+
+      Facter["block_testing"].value.should == "foo"
+    end
+  end
+
+  describe Facter[:hostname] do
+    it "should have its ldapname set to 'cn'" do
+      Facter[:hostname].ldapname.should == "cn"
+    end
+  end
+
+  describe Facter[:ipaddress] do
+    it "should have its ldapname set to 'iphostnumber'" do
+      Facter[:ipaddress].ldapname.should == "iphostnumber"
+    end
+  end
+
+  # #33 Make sure we only get one mac address
+  it "should only return one mac address" do
+    if macaddress = Facter.value(:macaddress)
+      macaddress.should_not be_include(" ")
+    end
+  end
+
+  it "should have a method for registering directories to search" do
+    Facter.should respond_to(:search)
+  end
+
+  it "should have a method for returning the registered search directories" do
+    Facter.should respond_to(:search_path)
+  end
+
+  it "should have a method to query debugging mode" do
+    Facter.should respond_to(:debugging?)
+  end
+
+  it "should have a method to query timing mode" do
+    Facter.should respond_to(:timing?)
+  end
+
+  it "should have a method to show timing information" do
+    Facter.should respond_to(:show_time)
+  end
+
+  it "should have a method to warn" do
+    Facter.should respond_to(:warn)
+  end
+
+  describe "when warning" do
+    it "should warn if debugging is enabled" do
+      Facter.debugging(true)
+      Kernel.stubs(:warn)
+      Kernel.expects(:warn).with('foo')
+      Facter.warn('foo')
+    end
+
+    it "should not warn if debugging is enabled but nil is passed" do
+      Facter.debugging(true)
+      Kernel.stubs(:warn)
+      Kernel.expects(:warn).never
+      Facter.warn(nil)
+    end
+
+    it "should not warn if debugging is enabled but an empyt string is passed" do
+      Facter.debugging(true)
+      Kernel.stubs(:warn)
+      Kernel.expects(:warn).never
+      Facter.warn('')
+    end
+
+    it "should not warn if debugging is disabled" do
+      Facter.debugging(false)
+      Kernel.stubs(:warn)
+      Kernel.expects(:warn).never
+      Facter.warn('foo')
+    end
+
+    it "should warn for any given element for an array if debugging is enabled" do
+      Facter.debugging(true)
+      Kernel.stubs(:warn)
+      Kernel.expects(:warn).with('foo')
+      Kernel.expects(:warn).with('bar')
+      Facter.warn( ['foo','bar'])
+    end
+  end
+
+  describe "when warning once" do
+    it "should only warn once" do
+      Kernel.stubs(:warnonce)
+      Kernel.expects(:warn).with('foo').once
+      Facter.warnonce('foo')
+      Facter.warnonce('foo')
+    end
+
+    it "should not warnonce if nil is passed" do
+      Kernel.stubs(:warn)
+      Kernel.expects(:warnonce).never
+      Facter.warnonce(nil)
+    end
+
+    it "should not warnonce if an empty string is passed" do
+      Kernel.stubs(:warn)
+      Kernel.expects(:warnonce).never
+      Facter.warnonce('')
+    end
+  end
+
+  describe "when setting debugging mode" do
+    it "should have debugging enabled using 1" do
+      Facter.debugging(1)
+      Facter.should be_debugging
+    end
+    it "should have debugging enabled using true" do
+      Facter.debugging(true)
+      Facter.should be_debugging
+    end
+    it "should have debugging enabled using any string except off" do
+      Facter.debugging('aaaaa')
+      Facter.should be_debugging
+    end
+    it "should have debugging disabled using 0" do
+      Facter.debugging(0)
+      Facter.should_not be_debugging
+    end
+    it "should have debugging disabled using false" do
+      Facter.debugging(false)
+      Facter.should_not be_debugging
+    end
+    it "should have debugging disabled using the string 'off'" do
+      Facter.debugging('off')
+      Facter.should_not be_debugging
+    end
+  end
+
+  describe "when setting timing mode" do
+    it "should have timing enabled using 1" do
+      Facter.timing(1)
+      Facter.should be_timing
+    end
+    it "should have timing enabled using true" do
+      Facter.timing(true)
+      Facter.should be_timing
+    end
+    it "should have timing disabled using 0" do
+      Facter.timing(0)
+      Facter.should_not be_timing
+    end
+    it "should have timing disabled using false" do
+      Facter.timing(false)
+      Facter.should_not be_timing
+    end
+  end
+
+  describe "when registering directories to search" do
+    after { Facter.instance_variable_set("@search_path", []) }
+
+    it "should allow registration of a directory" do
+      Facter.search "/my/dir"
+    end
+
+    it "should allow registration of multiple directories" do
+      Facter.search "/my/dir", "/other/dir"
+    end
+
+    it "should return all registered directories when asked" do
+      Facter.search "/my/dir", "/other/dir"
+      Facter.search_path.should == %w{/my/dir /other/dir}
+    end
+  end
 end

=== modified file 'spec/unit/id_spec.rb'
--- spec/unit/id_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/id_spec.rb	2012-01-27 20:04:26 +0000
@@ -4,25 +4,25 @@
 
 describe "id fact" do
 
-    kernel = [ 'Linux', 'Darwin', 'windows', 'FreeBSD', 'OpenBSD', 'NetBSD', 'AIX', 'HP-UX' ]
-
-    kernel.each do |k|
-        describe "with kernel reported as #{k}" do
-            it "should return the current user" do
-                Facter.fact(:kernel).stubs(:value).returns(k)
-                Facter::Util::Config.stubs(:is_windows?).returns(k == 'windows')
-                Facter::Util::Resolution.expects(:exec).once.with('whoami').returns 'bar'
-
-                Facter.fact(:id).value.should == 'bar'
-            end
-        end
-    end
-
-    it "should return the current user on Solaris" do
-       Facter::Util::Config.stubs(:is_windows?).returns(false)
-       Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('SunOS')
-       Facter::Util::Resolution.expects(:exec).once.with('/usr/xpg4/bin/id -un').returns 'bar'
-
-       Facter.fact(:id).value.should == 'bar'
-    end
+  kernel = [ 'Linux', 'Darwin', 'windows', 'FreeBSD', 'OpenBSD', 'NetBSD', 'AIX', 'HP-UX' ]
+
+  kernel.each do |k|
+    describe "with kernel reported as #{k}" do
+      it "should return the current user" do
+        Facter.fact(:kernel).stubs(:value).returns(k)
+        Facter::Util::Config.stubs(:is_windows?).returns(k == 'windows')
+        Facter::Util::Resolution.expects(:exec).once.with('whoami').returns 'bar'
+
+        Facter.fact(:id).value.should == 'bar'
+      end
+    end
+  end
+
+  it "should return the current user on Solaris" do
+     Facter::Util::Config.stubs(:is_windows?).returns(false)
+     Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('SunOS')
+     Facter::Util::Resolution.expects(:exec).once.with('/usr/xpg4/bin/id -un').returns 'bar'
+
+     Facter.fact(:id).value.should == 'bar'
+  end
 end

=== modified file 'spec/unit/interfaces_spec.rb'
--- spec/unit/interfaces_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/interfaces_spec.rb	2012-01-27 20:04:26 +0000
@@ -6,13 +6,13 @@
 require 'facter/util/ip'
 
 describe "Per Interface IP facts" do
-    it "should replace the ':' in an interface list with '_'" do
-        # So we look supported
-        Facter.fact(:kernel).stubs(:value).returns("SunOS")
+  it "should replace the ':' in an interface list with '_'" do
+    # So we look supported
+    Facter.fact(:kernel).stubs(:value).returns("SunOS")
 
-        Facter::Util::IP.stubs(:get_interfaces).returns %w{eth0:1 eth1:2}
-        Facter.fact(:interfaces).value.should == %{eth0_1,eth1_2}
-    end
+    Facter::Util::IP.stubs(:get_interfaces).returns %w{eth0:1 eth1:2}
+    Facter.fact(:interfaces).value.should == %{eth0_1,eth1_2}
+  end
 
   it "should replace non-alphanumerics in an interface list with '_'" do
     Facter.fact(:kernel).stubs(:value).returns("windows")

=== modified file 'spec/unit/macaddress_spec.rb'
--- spec/unit/macaddress_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/macaddress_spec.rb	2012-01-27 20:04:26 +0000
@@ -18,21 +18,45 @@
     Facter::Util::Config.stubs(:is_windows?).returns(false)
   end
 
-  it "should return macaddress information for Linux" do
-    Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
-    Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
-      returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
-
-    Facter.value(:macaddress).should == "00:12:3f:be:22:01"
+  describe "when run on Linux" do
+    before :each do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
+    end
+
+    it "should return the macaddress of the first interface" do
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
+        returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
+
+      Facter.value(:macaddress).should == "00:12:3f:be:22:01"
+    end
+
+    it "should return nil when no macaddress can be found" do
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
+        returns(ifconfig_fixture('linux_ifconfig_no_mac'))
+
+      proc { Facter.value(:macaddress) }.should_not raise_error
+      Facter.value(:macaddress).should be_nil
+    end
+
+    # some interfaces dont have a real mac addresses (like venet inside a container)
+    it "should return nil when no interface has a real macaddress" do
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
+        returns(ifconfig_fixture('linux_ifconfig_venet'))
+
+      proc { Facter.value(:macaddress) }.should_not raise_error
+      Facter.value(:macaddress).should be_nil
+    end
   end
 
-  it "should return macaddress information for BSD" do
-    Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-    Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig').
-      returns(ifconfig_fixture('bsd_ifconfig_all_with_multiple_interfaces'))
+  describe "when run on BSD" do
+    it "should return macaddress information" do
+      Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig').
+        returns(ifconfig_fixture('bsd_ifconfig_all_with_multiple_interfaces'))
 
-    Facter.value(:macaddress).should == "00:0b:db:93:09:67"
+      Facter.value(:macaddress).should == "00:0b:db:93:09:67"
+    end
   end
 
 end

=== modified file 'spec/unit/memory_spec.rb'
--- spec/unit/memory_spec.rb	2011-10-12 11:29:53 +0000
+++ spec/unit/memory_spec.rb	2012-01-27 20:04:26 +0000
@@ -5,146 +5,146 @@
 require 'facter'
 
 describe "Memory facts" do
-    before do
-        # We need these facts loaded, but they belong to a file with a
-        # different name, so load the file explicitly.
-        Facter.collection.loader.load(:memory)
-    end
-
-    after do
-        Facter.clear
+  before do
+    # We need these facts loaded, but they belong to a file with a
+    # different name, so load the file explicitly.
+    Facter.collection.loader.load(:memory)
+  end
+
+  after do
+    Facter.clear
+  end
+
+  it "should return the current swap size" do
+
+    Facter.fact(:kernel).stubs(:value).returns("Darwin")
+    Facter::Util::Resolution.stubs(:exec).with('sysctl vm.swapusage').returns("vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)")
+    swapusage = "vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)"
+
+    if swapusage =~ /total = (\S+).*/
+      Facter.fact(:swapfree).value.should == $1
+    end
+  end
+
+  it "should return the current swap free" do
+    Facter.fact(:kernel).stubs(:value).returns("Darwin")
+    Facter::Util::Resolution.stubs(:exec).with('sysctl vm.swapusage').returns("vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)")
+    swapusage = "vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)"
+
+    if swapusage =~ /free = (\S+).*/
+      Facter.fact(:swapfree).value.should == $1
+    end
+  end
+
+  it "should return whether swap is encrypted" do
+    Facter.fact(:kernel).stubs(:value).returns("Darwin")
+    Facter::Util::Resolution.stubs(:exec).with('sysctl vm.swapusage').returns("vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)")
+    swapusage = "vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)"
+
+    swapusage =~ /\(encrypted\)/
+    Facter.fact(:swapencrypted).value.should == true
+  end
+
+  describe "on OpenBSD" do
+    before :each do
+      Facter.clear
+      Facter.fact(:kernel).stubs(:value).returns("OpenBSD")
+
+      swapusage = "total: 148342k bytes allocated = 0k used, 148342k available"
+      Facter::Util::Resolution.stubs(:exec).with('swapctl -s').returns(swapusage)
+
+      vmstat = <<EOS
+ procs  memory     page          disks  traps      cpu
+ r b w  avm   fre  flt  re  pi  po  fr  sr cd0 sd0  int   sys   cs us sy id
+ 0 0 0  11048  181028   39   0   0   0   0   0   0   1  3  90   17  0  0 100
+EOS
+      Facter::Util::Resolution.stubs(:exec).with('vmstat').returns(vmstat)
+
+      Facter::Util::Resolution.stubs(:exec).with("sysctl hw.physmem | cut -d'=' -f2").returns('267321344')
+
+      Facter.collection.loader.load(:memory)
+    end
+
+    after :each do
+      Facter.clear
+    end
+
+    it "should return the current swap free" do
+      Facter.fact(:swapfree).value.should == "144.87 MB"
     end
 
     it "should return the current swap size" do
-
-        Facter.fact(:kernel).stubs(:value).returns("Darwin")
-        Facter::Util::Resolution.stubs(:exec).with('sysctl vm.swapusage').returns("vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)")
-        swapusage = "vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)"
-
-        if swapusage =~ /total = (\S+).*/
-            Facter.fact(:swapfree).value.should == $1
-        end
-    end
-
-    it "should return the current swap free" do
-        Facter.fact(:kernel).stubs(:value).returns("Darwin")
-        Facter::Util::Resolution.stubs(:exec).with('sysctl vm.swapusage').returns("vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)")
-        swapusage = "vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)"
-
-        if swapusage =~ /free = (\S+).*/
-            Facter.fact(:swapfree).value.should == $1
-        end
-    end
-
-    it "should return whether swap is encrypted" do
-        Facter.fact(:kernel).stubs(:value).returns("Darwin")
-        Facter::Util::Resolution.stubs(:exec).with('sysctl vm.swapusage').returns("vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)")
-        swapusage = "vm.swapusage: total = 64.00M  used = 0.00M  free = 64.00M  (encrypted)"
-
-        swapusage =~ /\(encrypted\)/
-        Facter.fact(:swapencrypted).value.should == true
-    end
-
-    describe "on OpenBSD" do
-        before :each do
-            Facter.clear
-            Facter.fact(:kernel).stubs(:value).returns("OpenBSD")
-
-            swapusage = "total: 148342k bytes allocated = 0k used, 148342k available"
-            Facter::Util::Resolution.stubs(:exec).with('swapctl -s').returns(swapusage)
-
-            vmstat = <<EOS
- procs    memory       page                    disks    traps          cpu
- r b w    avm     fre  flt  re  pi  po  fr  sr cd0 sd0  int   sys   cs us sy id
- 0 0 0  11048  181028   39   0   0   0   0   0   0   1    3    90   17  0  0 100
-EOS
-            Facter::Util::Resolution.stubs(:exec).with('vmstat').returns(vmstat)
-
-            Facter::Util::Resolution.stubs(:exec).with("sysctl hw.physmem | cut -d'=' -f2").returns('267321344')
-
-            Facter.collection.loader.load(:memory)
-        end
-
-        after :each do
-            Facter.clear
-        end
-
-        it "should return the current swap free" do
-            Facter.fact(:swapfree).value.should == "144.87 MB"
-        end
-
-        it "should return the current swap size" do
-            Facter.fact(:swapsize).value.should == "144.87 MB"
-        end
-
-        it "should return the current memorysize" do
-            Facter.fact(:memorytotal).value.should == "254.94 MB"
-        end
-    end
-
-    describe "on DragonFly BSD" do
-        before :each do
-            Facter.clear
-            Facter.fact(:kernel).stubs(:value).returns("dragonfly")
-
-            swapusage = "total: 148342k bytes allocated = 0k used, 148342k available"
-            Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n hw.pagesize').returns("4096")
-            Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n vm.swap_size').returns("128461")
-            Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n vm.swap_anon_use').returns("2635")
-            Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n vm.swap_cache_use').returns("0")
-
-            vmstat = <<EOS
- procs      memory      page                    disks     faults      cpu
- r b w     avm    fre  flt  re  pi  po  fr  sr da0 sg1   in   sy  cs us sy id
+      Facter.fact(:swapsize).value.should == "144.87 MB"
+    end
+
+    it "should return the current memorysize" do
+      Facter.fact(:memorytotal).value.should == "254.94 MB"
+    end
+  end
+
+  describe "on DragonFly BSD" do
+    before :each do
+      Facter.clear
+      Facter.fact(:kernel).stubs(:value).returns("dragonfly")
+
+      swapusage = "total: 148342k bytes allocated = 0k used, 148342k available"
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n hw.pagesize').returns("4096")
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n vm.swap_size').returns("128461")
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n vm.swap_anon_use').returns("2635")
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/sysctl -n vm.swap_cache_use').returns("0")
+
+      vmstat = <<EOS
+ procs    memory    page          disks   faults    cpu
+ r b w   avm  fre  flt  re  pi  po  fr  sr da0 sg1   in   sy  cs us sy id
  0 0 0   33152  13940 1902120 2198 53119 11642 6544597 5460994   0   0 6148243 7087927 3484264  0  1 9
 EOS
-            Facter::Util::Resolution.stubs(:exec).with('vmstat').returns(vmstat)
-
-            Facter::Util::Resolution.stubs(:exec).with("sysctl -n hw.physmem").returns('248512512')
-
-            Facter.collection.loader.load(:memory)
-        end
-
-        after :each do
-            Facter.clear
-        end
-
-        it "should return the current swap free" do
-            Facter.fact(:swapfree).value.should == "491.51 MB"
-        end
-
-        it "should return the current swap size" do
-            Facter.fact(:swapsize).value.should == "501.80 MB"
-        end
-
-        it "should return the current memorysize" do
-            Facter.fact(:memorytotal).value.should == "237.00 MB"
-        end
-    end
-
-    describe "on Windows" do
-        before :each do
-             Facter.clear
-             Facter.fact(:kernel).stubs(:value).returns("windows")
-             Facter.collection.loader.load(:memory)
-
-             require 'facter/util/wmi'
-        end
-
-        it "should return free memory" do
-             os = stubs 'os'
-             os.stubs(:FreePhysicalMemory).returns("3415624")
-             Facter::Util::WMI.stubs(:execquery).returns([os])
-
-             Facter.fact(:MemoryFree).value.should == '3.26 GB'
-        end
-
-        it "should return total memory" do
-             computer = stubs 'computer'
-             computer.stubs(:TotalPhysicalMemory).returns("4193837056")
-             Facter::Util::WMI.stubs(:execquery).returns([computer])
-
-             Facter.fact(:MemoryTotal).value.should == '3.91 GB'
-        end
-    end
+      Facter::Util::Resolution.stubs(:exec).with('vmstat').returns(vmstat)
+
+      Facter::Util::Resolution.stubs(:exec).with("sysctl -n hw.physmem").returns('248512512')
+
+      Facter.collection.loader.load(:memory)
+    end
+
+    after :each do
+      Facter.clear
+    end
+
+    it "should return the current swap free" do
+      Facter.fact(:swapfree).value.should == "491.51 MB"
+    end
+
+    it "should return the current swap size" do
+      Facter.fact(:swapsize).value.should == "501.80 MB"
+    end
+
+    it "should return the current memorysize" do
+      Facter.fact(:memorytotal).value.should == "237.00 MB"
+    end
+  end
+
+  describe "on Windows" do
+    before :each do
+      Facter.clear
+      Facter.fact(:kernel).stubs(:value).returns("windows")
+      Facter.collection.loader.load(:memory)
+
+      require 'facter/util/wmi'
+    end
+
+    it "should return free memory" do
+      os = stubs 'os'
+      os.stubs(:FreePhysicalMemory).returns("3415624")
+      Facter::Util::WMI.stubs(:execquery).returns([os])
+
+      Facter.fact(:MemoryFree).value.should == '3.26 GB'
+    end
+
+    it "should return total memory" do
+      computer = stubs 'computer'
+      computer.stubs(:TotalPhysicalMemory).returns("4193837056")
+      Facter::Util::WMI.stubs(:execquery).returns([computer])
+
+      Facter.fact(:MemoryTotal).value.should == '3.91 GB'
+    end
+  end
 end

=== modified file 'spec/unit/operatingsystem_spec.rb'
--- spec/unit/operatingsystem_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/operatingsystem_spec.rb	2012-01-27 20:04:26 +0000
@@ -6,78 +6,87 @@
 
 describe "Operating System fact" do
 
-    before do
-        Facter.clear
-    end
-
-    after do
-        Facter.clear
-    end
-
-    it "should default to the kernel name" do
-        Facter.fact(:kernel).stubs(:value).returns("Nutmeg")
-
-        Facter.fact(:operatingsystem).value.should == "Nutmeg"
-    end
-
-    it "should be Solaris for SunOS" do
-         Facter.fact(:kernel).stubs(:value).returns("SunOS")
-
-         Facter.fact(:operatingsystem).value.should == "Solaris"
-    end
-
-    it "should be ESXi for VMkernel" do
-         Facter.fact(:kernel).stubs(:value).returns("VMkernel")
-
-         Facter.fact(:operatingsystem).value.should == "ESXi"
-    end
-
-    it "should identify Oracle VM as OVS" do
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        Facter.stubs(:value).with(:lsbdistid).returns(nil)
-        FileTest.stubs(:exists?).returns false
-
-        FileTest.expects(:exists?).with("/etc/ovs-release").returns true
-        FileTest.expects(:exists?).with("/etc/enterprise-release").returns true
-
-        Facter.fact(:operatingsystem).value.should == "OVS"
-    end
+  before do
+    Facter.clear
+  end
+
+  after do
+    Facter.clear
+  end
+
+  it "should default to the kernel name" do
+    Facter.fact(:kernel).stubs(:value).returns("Nutmeg")
+
+    Facter.fact(:operatingsystem).value.should == "Nutmeg"
+  end
+
+  it "should be Solaris for SunOS" do
+     Facter.fact(:kernel).stubs(:value).returns("SunOS")
+
+     Facter.fact(:operatingsystem).value.should == "Solaris"
+  end
+
+  it "should be ESXi for VMkernel" do
+     Facter.fact(:kernel).stubs(:value).returns("VMkernel")
+
+     Facter.fact(:operatingsystem).value.should == "ESXi"
+  end
+
+  it "should identify Oracle VM as OVS" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    Facter.stubs(:value).with(:lsbdistid).returns(nil)
+    FileTest.stubs(:exists?).returns false
+
+    FileTest.expects(:exists?).with("/etc/ovs-release").returns true
+    FileTest.expects(:exists?).with("/etc/enterprise-release").returns true
+
+    Facter.fact(:operatingsystem).value.should == "OVS"
+  end
    
-    it "should identify VMWare ESX" do
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        Facter.stubs(:value).with(:lsbdistid).returns(nil)
-        FileTest.stubs(:exists?).returns false
-
-        FileTest.expects(:exists?).with("/etc/vmware-release").returns true
-
-        Facter.fact(:operatingsystem).value.should == "VMWareESX"
-    end
-
-    it "should identify Alpine Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      
-      FileTest.stubs(:exists?).returns false
-      
-      FileTest.expects(:exists?).with("/etc/alpine-release").returns true
-
-      Facter.fact(:operatingsystem).value.should == "Alpine"
-    end
-
-    it "should identify Scientific Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      FileTest.stubs(:exists?).returns false
-
-      FileTest.expects(:exists?).with("/etc/redhat-release").returns true
-      File.expects(:read).with("/etc/redhat-release").returns("Scientific Linux SLC 5.7 (Boron)")
-      Facter.fact(:operatingsystem).value.should == "Scientific"
-    end
-
-    it "should differentiate between Scientific Linux CERN and Scientific Linux" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      FileTest.stubs(:exists?).returns false
-
-      FileTest.expects(:exists?).with("/etc/redhat-release").returns true
-      File.expects(:read).with("/etc/redhat-release").returns("Scientific Linux CERN SLC 5.7 (Boron)")
-      Facter.fact(:operatingsystem).value.should == "SLC"
-    end
+  it "should identify VMWare ESX" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    Facter.stubs(:value).with(:lsbdistid).returns(nil)
+    FileTest.stubs(:exists?).returns false
+
+    FileTest.expects(:exists?).with("/etc/vmware-release").returns true
+
+    Facter.fact(:operatingsystem).value.should == "VMWareESX"
+  end
+
+  it "should identify Alpine Linux" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    
+    FileTest.stubs(:exists?).returns false
+    
+    FileTest.expects(:exists?).with("/etc/alpine-release").returns true
+
+    Facter.fact(:operatingsystem).value.should == "Alpine"
+  end
+
+  it "should identify Scientific Linux" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    FileTest.stubs(:exists?).returns false
+
+    FileTest.expects(:exists?).with("/etc/redhat-release").returns true
+    File.expects(:read).with("/etc/redhat-release").returns("Scientific Linux SLC 5.7 (Boron)")
+    Facter.fact(:operatingsystem).value.should == "Scientific"
+  end
+
+  it "should differentiate between Scientific Linux CERN and Scientific Linux" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    FileTest.stubs(:exists?).returns false
+
+    FileTest.expects(:exists?).with("/etc/redhat-release").returns true
+    File.expects(:read).with("/etc/redhat-release").returns("Scientific Linux CERN SLC 5.7 (Boron)")
+    Facter.fact(:operatingsystem).value.should == "SLC"
+  end
+
+  it "should identify Ascendos Linux" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    FileTest.stubs(:exists?).returns false
+
+    FileTest.expects(:exists?).with("/etc/redhat-release").returns true
+    File.expects(:read).with("/etc/redhat-release").returns("Ascendos release 6.0 (Nameless)")
+    Facter.fact(:operatingsystem).value.should == "Ascendos"
+  end
 end

=== modified file 'spec/unit/operatingsystemrelease_spec.rb'
--- spec/unit/operatingsystemrelease_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/operatingsystemrelease_spec.rb	2012-01-27 20:04:26 +0000
@@ -6,55 +6,56 @@
 
 describe "Operating System Release fact" do
 
-    before do
-        Facter.clear
-    end
-
-    after do
-        Facter.clear
-    end
-
-    test_cases = {
-        "CentOS"      => "/etc/redhat-release",
-        "RedHat"      => "/etc/redhat-release",
-        "Scientific"  => "/etc/redhat-release",
-        "Fedora"      => "/etc/fedora-release",
-        "MeeGo"       => "/etc/meego-release",
-        "OEL"         => "/etc/enterprise-release",
-        "oel"         => "/etc/enterprise-release",
-        "OVS"         => "/etc/ovs-release",
-        "ovs"         => "/etc/ovs-release",
-        "OracleLinux" => "/etc/oracle-release",
-    }
-
-    test_cases.each do |system, file|
-        describe "with operatingsystem reported as #{system.inspect}" do
-            it "should read the #{file.inspect} file" do
-                Facter.fact(:operatingsystem).stubs(:value).returns(system)
-
-                File.expects(:open).with(file, "r").at_least(1)
-
-                Facter.fact(:operatingsystemrelease).value
-            end
-        end
-    end
-
-    it "for VMWareESX it should run the vmware -v command" do
-        Facter.fact(:kernel).stubs(:value).returns("VMkernel")
-        Facter.fact(:kernelrelease).stubs(:value).returns("4.1.0")
-        Facter.fact(:operatingsystem).stubs(:value).returns("VMwareESX")
-
-        Facter::Util::Resolution.stubs(:exec).with('vmware -v').returns('foo')
+  before do
+    Facter.clear
+  end
+
+  after do
+    Facter.clear
+  end
+
+  test_cases = {
+    "CentOS"    => "/etc/redhat-release",
+    "RedHat"    => "/etc/redhat-release",
+    "Scientific"  => "/etc/redhat-release",
+    "Fedora"    => "/etc/fedora-release",
+    "MeeGo"     => "/etc/meego-release",
+    "OEL"     => "/etc/enterprise-release",
+    "oel"     => "/etc/enterprise-release",
+    "OVS"     => "/etc/ovs-release",
+    "ovs"     => "/etc/ovs-release",
+    "OracleLinux" => "/etc/oracle-release",
+    "Ascendos"    => "/etc/redhat-release",
+  }
+
+  test_cases.each do |system, file|
+    describe "with operatingsystem reported as #{system.inspect}" do
+      it "should read the #{file.inspect} file" do
+        Facter.fact(:operatingsystem).stubs(:value).returns(system)
+
+        File.expects(:open).with(file, "r").at_least(1)
 
         Facter.fact(:operatingsystemrelease).value
-    end
-
-    it "for Alpine it should use the contents of /etc/alpine-release" do
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        Facter.fact(:operatingsystem).stubs(:value).returns("Alpine")
-
-        File.expects(:read).with("/etc/alpine-release").returns("foo")
-
-        Facter.fact(:operatingsystemrelease).value.should == "foo"
-    end
+      end
+    end
+  end
+
+  it "for VMWareESX it should run the vmware -v command" do
+    Facter.fact(:kernel).stubs(:value).returns("VMkernel")
+    Facter.fact(:kernelrelease).stubs(:value).returns("4.1.0")
+    Facter.fact(:operatingsystem).stubs(:value).returns("VMwareESX")
+
+    Facter::Util::Resolution.stubs(:exec).with('vmware -v').returns('foo')
+
+    Facter.fact(:operatingsystemrelease).value
+  end
+
+  it "for Alpine it should use the contents of /etc/alpine-release" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    Facter.fact(:operatingsystem).stubs(:value).returns("Alpine")
+
+    File.expects(:read).with("/etc/alpine-release").returns("foo")
+
+    Facter.fact(:operatingsystemrelease).value.should == "foo"
+  end
 end

=== modified file 'spec/unit/processor_spec.rb'
--- spec/unit/processor_spec.rb	2011-10-12 11:29:53 +0000
+++ spec/unit/processor_spec.rb	2012-01-27 20:04:26 +0000
@@ -207,7 +207,7 @@
       File.stubs(:exists?).with('/sys/devices/system/cpu').returns(true)
       ## sysfs method is only used if cpuinfo method returned no processors
       File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns("")
+      File.stubs(:readlines).with("/proc/cpuinfo").returns([])
       Dir.stubs(:glob).with("/sys/devices/system/cpu/cpu[0-9]*").returns(%w{
         /sys/devices/system/cpu/cpu0
         /sys/devices/system/cpu/cpu1
@@ -221,7 +221,7 @@
       File.stubs(:exists?).with('/sys/devices/system/cpu').returns(true)
       ## sysfs method is only used if cpuinfo method returned no processors
       File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-      File.stubs(:readlines).with("/proc/cpuinfo").returns("")
+      File.stubs(:readlines).with("/proc/cpuinfo").returns([])
       Dir.stubs(:glob).with("/sys/devices/system/cpu/cpu[0-9]*").returns(%w{
         /sys/devices/system/cpu/cpu0
         /sys/devices/system/cpu/cpu1

=== modified file 'spec/unit/selinux_spec.rb'
--- spec/unit/selinux_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/selinux_spec.rb	2012-01-27 20:04:26 +0000
@@ -7,84 +7,84 @@
 describe "SELinux facts" do
 
 
-    after do
-        Facter.clear
-    end
-
-    it "should return true if SELinux enabled" do
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-
-        FileTest.stubs(:exists?).returns false
-        File.stubs(:read).with("/proc/self/attr/current").returns("notkernel")
-
-        FileTest.expects(:exists?).with("/selinux/enforce").returns true
-        FileTest.expects(:exists?).with("/proc/self/attr/current").returns true
-        File.expects(:read).with("/proc/self/attr/current").returns("kernel")
-
-        Facter.fact(:selinux).value.should == "true"
-    end
-
-    it "should return true if SELinux policy enabled" do
-       Facter.fact(:selinux).stubs(:value).returns("true")
-
-       FileTest.stubs(:exists?).returns false
-       File.stubs(:read).with("/selinux/enforce").returns("0")
-
-       FileTest.expects(:exists?).with("/selinux/enforce").returns true
-       File.expects(:read).with("/selinux/enforce").returns("1")
-
-       Facter.fact(:selinux_enforced).value.should == "true"
-    end
-
-    it "should return an SELinux policy version" do
-       Facter.fact(:selinux).stubs(:value).returns("true")
-       FileTest.stubs(:exists?).with("/proc/self/mountinfo").returns false
-
-       File.stubs(:read).with("/selinux/policyvers").returns("")
-
-       File.expects(:read).with("/selinux/policyvers").returns("1")
-
-       Facter.fact(:selinux_policyversion).value.should == "1"
-    end
-
-    it "should return the SELinux current mode" do
-       Facter.fact(:selinux).stubs(:value).returns("true")
-
-       sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus'
-       selinux_sestatus = File.read(sample_output_file)
-
-       Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus)
-
-       Facter.fact(:selinux_current_mode).value.should == "permissive"
-    end
-
-    it "should return the SELinux mode from the configuration file" do
-       Facter.fact(:selinux).stubs(:value).returns("true")
-
-       sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus'
-       selinux_sestatus = File.read(sample_output_file)
-
-       Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus)
-
-       Facter.fact(:selinux_config_mode).value.should == "permissive"
-    end
-
-    it "should return the SELinux configuration file policy" do
-       Facter.fact(:selinux).stubs(:value).returns("true")
-
-       sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus'
-       selinux_sestatus = File.read(sample_output_file)
-
-       Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus)
-
-       Facter.fact(:selinux_config_policy).value.should == "targeted"
-    end
-
-    it "should ensure legacy selinux_mode facts returns same value as selinux_config_policy fact" do
-       Facter.fact(:selinux).stubs(:value).returns("true")
-
-       Facter.fact(:selinux_config_policy).stubs(:value).returns("targeted")
-
-       Facter.fact(:selinux_mode).value.should == "targeted"
-    end
+  after do
+    Facter.clear
+  end
+
+  it "should return true if SELinux enabled" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+
+    FileTest.stubs(:exists?).returns false
+    File.stubs(:read).with("/proc/self/attr/current").returns("notkernel")
+
+    FileTest.expects(:exists?).with("/selinux/enforce").returns true
+    FileTest.expects(:exists?).with("/proc/self/attr/current").returns true
+    File.expects(:read).with("/proc/self/attr/current").returns("kernel")
+
+    Facter.fact(:selinux).value.should == "true"
+  end
+
+  it "should return true if SELinux policy enabled" do
+    Facter.fact(:selinux).stubs(:value).returns("true")
+
+    FileTest.stubs(:exists?).returns false
+    File.stubs(:read).with("/selinux/enforce").returns("0")
+
+    FileTest.expects(:exists?).with("/selinux/enforce").returns true
+    File.expects(:read).with("/selinux/enforce").returns("1")
+
+    Facter.fact(:selinux_enforced).value.should == "true"
+  end
+
+  it "should return an SELinux policy version" do
+    Facter.fact(:selinux).stubs(:value).returns("true")
+    FileTest.stubs(:exists?).with("/proc/self/mountinfo").returns false
+
+    File.stubs(:read).with("/selinux/policyvers").returns("")
+
+    File.expects(:read).with("/selinux/policyvers").returns("1")
+
+    Facter.fact(:selinux_policyversion).value.should == "1"
+  end
+
+  it "should return the SELinux current mode" do
+    Facter.fact(:selinux).stubs(:value).returns("true")
+
+    sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus'
+    selinux_sestatus = File.read(sample_output_file)
+
+    Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus)
+
+    Facter.fact(:selinux_current_mode).value.should == "permissive"
+  end
+
+  it "should return the SELinux mode from the configuration file" do
+    Facter.fact(:selinux).stubs(:value).returns("true")
+
+    sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus'
+    selinux_sestatus = File.read(sample_output_file)
+
+    Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus)
+
+    Facter.fact(:selinux_config_mode).value.should == "permissive"
+  end
+
+  it "should return the SELinux configuration file policy" do
+    Facter.fact(:selinux).stubs(:value).returns("true")
+
+    sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus'
+    selinux_sestatus = File.read(sample_output_file)
+
+    Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus)
+
+    Facter.fact(:selinux_config_policy).value.should == "targeted"
+  end
+
+  it "should ensure legacy selinux_mode facts returns same value as selinux_config_policy fact" do
+    Facter.fact(:selinux).stubs(:value).returns("true")
+
+    Facter.fact(:selinux_config_policy).stubs(:value).returns("targeted")
+
+    Facter.fact(:selinux_mode).value.should == "targeted"
+  end
 end

=== modified file 'spec/unit/util/collection_spec.rb'
--- spec/unit/util/collection_spec.rb	2011-03-18 12:06:08 +0000
+++ spec/unit/util/collection_spec.rb	2012-01-27 20:04:26 +0000
@@ -5,251 +5,251 @@
 require 'facter/util/collection'
 
 describe Facter::Util::Collection do
-    it "should have a method for adding facts" do
-        Facter::Util::Collection.new.should respond_to(:add)
-    end
-
-    it "should have a method for returning a loader" do
-        Facter::Util::Collection.new.should respond_to(:loader)
-    end
-
-    it "should use an instance of the Loader class as its loader" do
-        Facter::Util::Collection.new.loader.should be_instance_of(Facter::Util::Loader)
-    end
-
-    it "should cache its loader" do
-        coll = Facter::Util::Collection.new
-        coll.loader.should equal(coll.loader)
-    end
-
-    it "should have a method for loading all facts" do
-        Facter::Util::Collection.new.should respond_to(:load_all)
-    end
-
-    it "should delegate its load_all method to its loader" do
-        coll = Facter::Util::Collection.new
-        coll.loader.expects(:load_all)
-        coll.load_all
-    end
-
-    describe "when adding facts" do
-        before do
-            @coll = Facter::Util::Collection.new
-        end
-
-        it "should create a new fact if no fact with the same name already exists" do
-            fact = mock 'fact'
-            Facter::Util::Fact.expects(:new).with { |name, *args| name == :myname }.returns fact
-
-            @coll.add(:myname)
-        end
-
-        it "should accept options" do
-            @coll.add(:myname, :ldapname => "whatever") { }
-        end
-
-        it "should set any appropriate options on the fact instances" do
-            # Use a real fact instance, because we're using respond_to?
-            fact = Facter::Util::Fact.new(:myname)
-            fact.expects(:ldapname=).with("testing")
-            Facter::Util::Fact.expects(:new).with(:myname).returns fact
-
-            @coll.add(:myname, :ldapname => "testing")
-        end
-
-        it "should set appropriate options on the resolution instance" do
-            fact = Facter::Util::Fact.new(:myname)
-            Facter::Util::Fact.expects(:new).with(:myname).returns fact
-
-            resolve = Facter::Util::Resolution.new(:myname) {}
-            fact.expects(:add).returns resolve
-
-            @coll.add(:myname, :timeout => "myval") {}
-        end
-
-        it "should not pass fact-specific options to resolutions" do
-            fact = Facter::Util::Fact.new(:myname)
-            Facter::Util::Fact.expects(:new).with(:myname).returns fact
-
-            resolve = Facter::Util::Resolution.new(:myname) {}
-            fact.expects(:add).returns resolve
-
-            fact.expects(:ldapname=).with("foo")
-            resolve.expects(:timeout=).with("myval")
-
-            @coll.add(:myname, :timeout => "myval", :ldapname => "foo") {}
-        end
-
-        it "should fail if invalid options are provided" do
-            lambda { @coll.add(:myname, :foo => :bar) }.should raise_error(ArgumentError)
-        end
-
-        describe "and a block is provided" do
-            it "should use the block to add a resolution to the fact" do
-                fact = mock 'fact'
-                Facter::Util::Fact.expects(:new).returns fact
-
-                fact.expects(:add)
-
-                @coll.add(:myname) {}
-            end
-        end
-    end
-
-    it "should have a method for retrieving facts by name" do
-        Facter::Util::Collection.new.should respond_to(:fact)
-    end
-
-    describe "when retrieving facts" do
-        before do
-            @coll = Facter::Util::Collection.new
-
-            @fact = @coll.add("YayNess")
-        end
-
-        it "should return the fact instance specified by the name" do
-            @coll.fact("YayNess").should equal(@fact)
-        end
-
-        it "should be case-insensitive" do
-            @coll.fact("yayness").should equal(@fact)
-        end
-
-        it "should treat strings and symbols equivalently" do
-            @coll.fact(:yayness).should equal(@fact)
-        end
-
-        it "should use its loader to try to load the fact if no fact can be found" do
-            @coll.loader.expects(:load).with(:testing)
-            @coll.fact("testing")
-        end
-
-        it "should return nil if it cannot find or load the fact" do
-            @coll.loader.expects(:load).with(:testing)
-            @coll.fact("testing").should be_nil
-        end
-    end
-
-    it "should have a method for returning a fact's value" do
-        Facter::Util::Collection.new.should respond_to(:value)
-    end
-
-    describe "when returning a fact's value" do
-        before do
-            @coll = Facter::Util::Collection.new
-            @fact = @coll.add("YayNess")
-
-            @fact.stubs(:value).returns "result"
-        end
-
-        it "should use the 'fact' method to retrieve the fact" do
-            @coll.expects(:fact).with(:yayness).returns @fact
-            @coll.value(:yayness)
-        end
-
-        it "should return the result of calling :value on the fact" do
-            @fact.expects(:value).returns "result"
-
-            @coll.value("YayNess").should == "result"
-        end
-
-        it "should be case-insensitive" do
-            @coll.value("yayness").should_not be_nil
-        end
-
-        it "should treat strings and symbols equivalently" do
-            @coll.value(:yayness).should_not be_nil
-        end
-    end
-
-    it "should return the fact's value when the array index method is used" do
-        @coll = Facter::Util::Collection.new
-        @coll.expects(:value).with("myfact").returns "foo"
-        @coll["myfact"].should == "foo"
-    end
-
-    it "should have a method for flushing all facts" do
-        @coll = Facter::Util::Collection.new
-        @fact = @coll.add("YayNess")
-
-        @fact.expects(:flush)
-
-        @coll.flush
-    end
-
-    it "should have a method that returns all fact names" do
-        @coll = Facter::Util::Collection.new
-        @coll.add(:one)
-        @coll.add(:two)
-
-        @coll.list.sort { |a,b| a.to_s <=> b.to_s }.should == [:one, :two]
-    end
-
-    it "should have a method for returning a hash of fact values" do
-        Facter::Util::Collection.new.should respond_to(:to_hash)
-    end
-
-    describe "when returning a hash of values" do
-        before do
-            @coll = Facter::Util::Collection.new
-            @fact = @coll.add(:one)
-            @fact.stubs(:value).returns "me"
-        end
-
-        it "should return a hash of fact names and values with the fact names as strings" do
-            @coll.to_hash.should == {"one" => "me"}
-        end
-
-        it "should not include facts that did not return a value" do
-            f = @coll.add(:two)
-            f.stubs(:value).returns nil
-            @coll.to_hash.should_not be_include(:two)
-        end
-    end
-
-    it "should have a method for iterating over all facts" do
-        Facter::Util::Collection.new.should respond_to(:each)
-    end
-
-    it "should include Enumerable" do
-        Facter::Util::Collection.ancestors.should be_include(Enumerable)
-    end
-
-    describe "when iterating over facts" do
-        before do
-            @coll = Facter::Util::Collection.new
-            @one = @coll.add(:one)
-            @two = @coll.add(:two)
-        end
-
-        it "should yield each fact name and the fact value" do
-            @one.stubs(:value).returns "ONE"
-            @two.stubs(:value).returns "TWO"
-            facts = {}
-            @coll.each do |fact, value|
-                facts[fact] = value
-            end
-            facts.should == {"one" => "ONE", "two" => "TWO"}
-        end
-
-        it "should convert the fact name to a string" do
-            @one.stubs(:value).returns "ONE"
-            @two.stubs(:value).returns "TWO"
-            facts = {}
-            @coll.each do |fact, value|
-                fact.should be_instance_of(String)
-            end
-        end
-
-        it "should only yield facts that have values" do
-            @one.stubs(:value).returns "ONE"
-            @two.stubs(:value).returns nil
-            facts = {}
-            @coll.each do |fact, value|
-                facts[fact] = value
-            end
-
-            facts.should_not be_include("two")
-        end
-    end
+  it "should have a method for adding facts" do
+    Facter::Util::Collection.new.should respond_to(:add)
+  end
+
+  it "should have a method for returning a loader" do
+    Facter::Util::Collection.new.should respond_to(:loader)
+  end
+
+  it "should use an instance of the Loader class as its loader" do
+    Facter::Util::Collection.new.loader.should be_instance_of(Facter::Util::Loader)
+  end
+
+  it "should cache its loader" do
+    coll = Facter::Util::Collection.new
+    coll.loader.should equal(coll.loader)
+  end
+
+  it "should have a method for loading all facts" do
+    Facter::Util::Collection.new.should respond_to(:load_all)
+  end
+
+  it "should delegate its load_all method to its loader" do
+    coll = Facter::Util::Collection.new
+    coll.loader.expects(:load_all)
+    coll.load_all
+  end
+
+  describe "when adding facts" do
+    before do
+      @coll = Facter::Util::Collection.new
+    end
+
+    it "should create a new fact if no fact with the same name already exists" do
+      fact = mock 'fact'
+      Facter::Util::Fact.expects(:new).with { |name, *args| name == :myname }.returns fact
+
+      @coll.add(:myname)
+    end
+
+    it "should accept options" do
+      @coll.add(:myname, :ldapname => "whatever") { }
+    end
+
+    it "should set any appropriate options on the fact instances" do
+      # Use a real fact instance, because we're using respond_to?
+      fact = Facter::Util::Fact.new(:myname)
+      fact.expects(:ldapname=).with("testing")
+      Facter::Util::Fact.expects(:new).with(:myname).returns fact
+
+      @coll.add(:myname, :ldapname => "testing")
+    end
+
+    it "should set appropriate options on the resolution instance" do
+      fact = Facter::Util::Fact.new(:myname)
+      Facter::Util::Fact.expects(:new).with(:myname).returns fact
+
+      resolve = Facter::Util::Resolution.new(:myname) {}
+      fact.expects(:add).returns resolve
+
+      @coll.add(:myname, :timeout => "myval") {}
+    end
+
+    it "should not pass fact-specific options to resolutions" do
+      fact = Facter::Util::Fact.new(:myname)
+      Facter::Util::Fact.expects(:new).with(:myname).returns fact
+
+      resolve = Facter::Util::Resolution.new(:myname) {}
+      fact.expects(:add).returns resolve
+
+      fact.expects(:ldapname=).with("foo")
+      resolve.expects(:timeout=).with("myval")
+
+      @coll.add(:myname, :timeout => "myval", :ldapname => "foo") {}
+    end
+
+    it "should fail if invalid options are provided" do
+      lambda { @coll.add(:myname, :foo => :bar) }.should raise_error(ArgumentError)
+    end
+
+    describe "and a block is provided" do
+      it "should use the block to add a resolution to the fact" do
+        fact = mock 'fact'
+        Facter::Util::Fact.expects(:new).returns fact
+
+        fact.expects(:add)
+
+        @coll.add(:myname) {}
+      end
+    end
+  end
+
+  it "should have a method for retrieving facts by name" do
+    Facter::Util::Collection.new.should respond_to(:fact)
+  end
+
+  describe "when retrieving facts" do
+    before do
+      @coll = Facter::Util::Collection.new
+
+      @fact = @coll.add("YayNess")
+    end
+
+    it "should return the fact instance specified by the name" do
+      @coll.fact("YayNess").should equal(@fact)
+    end
+
+    it "should be case-insensitive" do
+      @coll.fact("yayness").should equal(@fact)
+    end
+
+    it "should treat strings and symbols equivalently" do
+      @coll.fact(:yayness).should equal(@fact)
+    end
+
+    it "should use its loader to try to load the fact if no fact can be found" do
+      @coll.loader.expects(:load).with(:testing)
+      @coll.fact("testing")
+    end
+
+    it "should return nil if it cannot find or load the fact" do
+      @coll.loader.expects(:load).with(:testing)
+      @coll.fact("testing").should be_nil
+    end
+  end
+
+  it "should have a method for returning a fact's value" do
+    Facter::Util::Collection.new.should respond_to(:value)
+  end
+
+  describe "when returning a fact's value" do
+    before do
+      @coll = Facter::Util::Collection.new
+      @fact = @coll.add("YayNess")
+
+      @fact.stubs(:value).returns "result"
+    end
+
+    it "should use the 'fact' method to retrieve the fact" do
+      @coll.expects(:fact).with(:yayness).returns @fact
+      @coll.value(:yayness)
+    end
+
+    it "should return the result of calling :value on the fact" do
+      @fact.expects(:value).returns "result"
+
+      @coll.value("YayNess").should == "result"
+    end
+
+    it "should be case-insensitive" do
+      @coll.value("yayness").should_not be_nil
+    end
+
+    it "should treat strings and symbols equivalently" do
+      @coll.value(:yayness).should_not be_nil
+    end
+  end
+
+  it "should return the fact's value when the array index method is used" do
+    @coll = Facter::Util::Collection.new
+    @coll.expects(:value).with("myfact").returns "foo"
+    @coll["myfact"].should == "foo"
+  end
+
+  it "should have a method for flushing all facts" do
+    @coll = Facter::Util::Collection.new
+    @fact = @coll.add("YayNess")
+
+    @fact.expects(:flush)
+
+    @coll.flush
+  end
+
+  it "should have a method that returns all fact names" do
+    @coll = Facter::Util::Collection.new
+    @coll.add(:one)
+    @coll.add(:two)
+
+    @coll.list.sort { |a,b| a.to_s <=> b.to_s }.should == [:one, :two]
+  end
+
+  it "should have a method for returning a hash of fact values" do
+    Facter::Util::Collection.new.should respond_to(:to_hash)
+  end
+
+  describe "when returning a hash of values" do
+    before do
+      @coll = Facter::Util::Collection.new
+      @fact = @coll.add(:one)
+      @fact.stubs(:value).returns "me"
+    end
+
+    it "should return a hash of fact names and values with the fact names as strings" do
+      @coll.to_hash.should == {"one" => "me"}
+    end
+
+    it "should not include facts that did not return a value" do
+      f = @coll.add(:two)
+      f.stubs(:value).returns nil
+      @coll.to_hash.should_not be_include(:two)
+    end
+  end
+
+  it "should have a method for iterating over all facts" do
+    Facter::Util::Collection.new.should respond_to(:each)
+  end
+
+  it "should include Enumerable" do
+    Facter::Util::Collection.ancestors.should be_include(Enumerable)
+  end
+
+  describe "when iterating over facts" do
+    before do
+      @coll = Facter::Util::Collection.new
+      @one = @coll.add(:one)
+      @two = @coll.add(:two)
+    end
+
+    it "should yield each fact name and the fact value" do
+      @one.stubs(:value).returns "ONE"
+      @two.stubs(:value).returns "TWO"
+      facts = {}
+      @coll.each do |fact, value|
+        facts[fact] = value
+      end
+      facts.should == {"one" => "ONE", "two" => "TWO"}
+    end
+
+    it "should convert the fact name to a string" do
+      @one.stubs(:value).returns "ONE"
+      @two.stubs(:value).returns "TWO"
+      facts = {}
+      @coll.each do |fact, value|
+        fact.should be_instance_of(String)
+      end
+    end
+
+    it "should only yield facts that have values" do
+      @one.stubs(:value).returns "ONE"
+      @two.stubs(:value).returns nil
+      facts = {}
+      @coll.each do |fact, value|
+        facts[fact] = value
+      end
+
+      facts.should_not be_include("two")
+    end
+  end
 end

=== modified file 'spec/unit/util/confine_spec.rb'
--- spec/unit/util/confine_spec.rb	2011-03-18 12:06:08 +0000
+++ spec/unit/util/confine_spec.rb	2012-01-27 20:04:26 +0000
@@ -8,133 +8,133 @@
 include Facter::Util::Values
 
 describe Facter::Util::Confine do
-    it "should require a fact name" do
-        Facter::Util::Confine.new("yay", true).fact.should == "yay"
-    end
-
-    it "should accept a value specified individually" do
-        Facter::Util::Confine.new("yay", "test").values.should == ["test"]
-    end
-
-    it "should accept multiple values specified at once" do
-        Facter::Util::Confine.new("yay", "test", "other").values.should == ["test", "other"]
-    end
-
-    it "should fail if no fact name is provided" do
-        lambda { Facter::Util::Confine.new(nil, :test) }.should raise_error(ArgumentError)
-    end
-
-    it "should fail if no values were provided" do
-        lambda { Facter::Util::Confine.new("yay") }.should raise_error(ArgumentError)
-    end
-
-    it "should have a method for testing whether it matches" do
-        Facter::Util::Confine.new("yay", :test).should respond_to(:true?)
-    end
-
-    describe "when evaluating" do
-        before do
-            @confine = Facter::Util::Confine.new("yay", "one", "two", "Four", :xy, true, 1, [3,4])
-            @fact = mock 'fact'
-            Facter.stubs(:[]).returns @fact
-        end
-
-        it "should return false if the fact does not exist" do
-            Facter.expects(:[]).with("yay").returns nil
-
-            @confine.true?.should be_false
-        end
-
-        it "should use the returned fact to get the value" do
-            Facter.expects(:[]).with("yay").returns @fact
-
-            @fact.expects(:value).returns nil
-
-            @confine.true?
-        end
-
-        it "should return false if the fact has no value" do
-            @fact.stubs(:value).returns nil
-
-            @confine.true?.should be_false
-        end
-
-        it "should return true if any of the provided values matches the fact's value" do
-            @fact.stubs(:value).returns "two"
-
-            @confine.true?.should be_true
-        end
-
-        it "should return true if any of the provided symbol values matches the fact's value" do
-            @fact.stubs(:value).returns :xy
-
-            @confine.true?.should be_true
-        end
-
-        it "should return true if any of the provided integer values matches the fact's value" do
-            @fact.stubs(:value).returns 1
-
-            @confine.true?.should be_true
-        end
-
-        it "should return true if any of the provided boolan values matches the fact's value" do
-            @fact.stubs(:value).returns true
-
-            @confine.true?.should be_true
-        end
-
-        it "should return true if any of the provided array values matches the fact's value" do
-            @fact.stubs(:value).returns [3,4]
-
-            @confine.true?.should be_true
-        end
-
-        it "should return true if any of the provided symbol values matches the fact's string value" do
-            @fact.stubs(:value).returns :one
-
-            @confine.true?.should be_true
-        end
-
-        it "should return true if any of the provided string values matches case-insensitive the fact's value" do
-            @fact.stubs(:value).returns "four"
-
-            @confine.true?.should be_true
-        end
-
-        it "should return true if any of the provided symbol values matches case-insensitive the fact's string value" do
-            @fact.stubs(:value).returns :four
-
-            @confine.true?.should be_true
-        end
-
-        it "should return true if any of the provided symbol values matches the fact's string value" do
-            @fact.stubs(:value).returns :Xy
-
-            @confine.true?.should be_true
-        end
-
-        it "should return false if none of the provided values matches the fact's value" do
-            @fact.stubs(:value).returns "three"
-
-            @confine.true?.should be_false
-        end
-
-        it "should return false if none of the provided integer values matches the fact's value" do
-            @fact.stubs(:value).returns 2
-
-            @confine.true?.should be_false
-        end
-
-        it "should return false if none of the provided boolan values matches the fact's value" do
-            @fact.stubs(:value).returns false
-
-            @confine.true?.should be_false
-        end
-
-        it "should return false if none of the provided array values matches the fact's value" do
-            @fact.stubs(:value).returns [1,2]
-
-            @confine.true?.should be_false
-        end
-    end
+  it "should require a fact name" do
+    Facter::Util::Confine.new("yay", true).fact.should == "yay"
+  end
+
+  it "should accept a value specified individually" do
+    Facter::Util::Confine.new("yay", "test").values.should == ["test"]
+  end
+
+  it "should accept multiple values specified at once" do
+    Facter::Util::Confine.new("yay", "test", "other").values.should == ["test", "other"]
+  end
+
+  it "should fail if no fact name is provided" do
+    lambda { Facter::Util::Confine.new(nil, :test) }.should raise_error(ArgumentError)
+  end
+
+  it "should fail if no values were provided" do
+    lambda { Facter::Util::Confine.new("yay") }.should raise_error(ArgumentError)
+  end
+
+  it "should have a method for testing whether it matches" do
+    Facter::Util::Confine.new("yay", :test).should respond_to(:true?)
+  end
+
+  describe "when evaluating" do
+    before do
+      @confine = Facter::Util::Confine.new("yay", "one", "two", "Four", :xy, true, 1, [3,4])
+      @fact = mock 'fact'
+      Facter.stubs(:[]).returns @fact
+    end
+
+    it "should return false if the fact does not exist" do
+      Facter.expects(:[]).with("yay").returns nil
+
+      @confine.true?.should be_false
+    end
+
+    it "should use the returned fact to get the value" do
+      Facter.expects(:[]).with("yay").returns @fact
+
+      @fact.expects(:value).returns nil
+
+      @confine.true?
+    end
+
+    it "should return false if the fact has no value" do
+      @fact.stubs(:value).returns nil
+
+      @confine.true?.should be_false
+    end
+
+    it "should return true if any of the provided values matches the fact's value" do
+      @fact.stubs(:value).returns "two"
+
+      @confine.true?.should be_true
+    end
+
+    it "should return true if any of the provided symbol values matches the fact's value" do
+      @fact.stubs(:value).returns :xy
+
+      @confine.true?.should be_true
+    end
+
+    it "should return true if any of the provided integer values matches the fact's value" do
+      @fact.stubs(:value).returns 1
+
+      @confine.true?.should be_true
+    end
+
+    it "should return true if any of the provided boolan values matches the fact's value" do
+      @fact.stubs(:value).returns true
+
+      @confine.true?.should be_true
+    end
+
+    it "should return true if any of the provided array values matches the fact's value" do
+      @fact.stubs(:value).returns [3,4]
+
+      @confine.true?.should be_true
+    end
+
+    it "should return true if any of the provided symbol values matches the fact's string value" do
+      @fact.stubs(:value).returns :one
+
+      @confine.true?.should be_true
+    end
+
+    it "should return true if any of the provided string values matches case-insensitive the fact's value" do
+      @fact.stubs(:value).returns "four"
+
+      @confine.true?.should be_true
+    end
+
+    it "should return true if any of the provided symbol values matches case-insensitive the fact's string value" do
+      @fact.stubs(:value).returns :four
+
+      @confine.true?.should be_true
+    end
+
+    it "should return true if any of the provided symbol values matches the fact's string value" do
+      @fact.stubs(:value).returns :Xy
+
+      @confine.true?.should be_true
+    end
+
+    it "should return false if none of the provided values matches the fact's value" do
+      @fact.stubs(:value).returns "three"
+
+      @confine.true?.should be_false
+    end
+
+    it "should return false if none of the provided integer values matches the fact's value" do
+      @fact.stubs(:value).returns 2
+
+      @confine.true?.should be_false
+    end
+
+    it "should return false if none of the provided boolan values matches the fact's value" do
+      @fact.stubs(:value).returns false
+
+      @confine.true?.should be_false
+    end
+
+    it "should return false if none of the provided array values matches the fact's value" do
+      @fact.stubs(:value).returns [1,2]
+
+      @confine.true?.should be_false
+    end
+  end
 end

=== modified file 'spec/unit/util/fact_spec.rb'
--- spec/unit/util/fact_spec.rb	2011-06-24 10:04:12 +0000
+++ spec/unit/util/fact_spec.rb	2012-01-27 20:04:26 +0000
@@ -5,125 +5,125 @@
 require 'facter/util/fact'
 
 describe Facter::Util::Fact do
-    it "should require a name" do
-        lambda { Facter::Util::Fact.new }.should raise_error(ArgumentError)
-    end
-
-    it "should always downcase the name and convert it to a symbol" do
-        Facter::Util::Fact.new("YayNess").name.should == :yayness
-    end
-
-    it "should default to its name converted to a string as its ldapname" do
-        Facter::Util::Fact.new("YayNess").ldapname.should == "yayness"
-    end
-
-    it "should allow specifying the ldap name at initialization" do
-        Facter::Util::Fact.new("YayNess", :ldapname => "fooness").ldapname.should == "fooness"
-    end
-
-    it "should fail if an unknown option is provided" do
-        lambda { Facter::Util::Fact.new('yay', :foo => :bar) }.should raise_error(ArgumentError)
-    end
-
-    it "should have a method for adding resolution mechanisms" do
-        Facter::Util::Fact.new("yay").should respond_to(:add)
-    end
-
-    describe "when adding resolution mechanisms" do
-        before do
-            @fact = Facter::Util::Fact.new("yay")
-
-            @resolution = mock 'resolution'
-            @resolution.stub_everything
-
-        end
-
-        it "should fail if no block is given" do
-            lambda { @fact.add }.should raise_error(ArgumentError)
-        end
-
-        it "should create a new resolution instance" do
-            Facter::Util::Resolution.expects(:new).returns @resolution
-
-            @fact.add { }
-        end
-
-        it "should instance_eval the passed block on the new resolution" do
-            @resolution.expects(:instance_eval)
-
-            Facter::Util::Resolution.stubs(:new).returns @resolution
-
-            @fact.add { }
-        end
-
-        it "should re-sort the resolutions by weight, so the most restricted resolutions are first" do
-            r1 = stub 'r1', :weight => 1
-            r2 = stub 'r2', :weight => 2
-            r3 = stub 'r3', :weight => 0
-            Facter::Util::Resolution.expects(:new).times(3).returns(r1).returns(r2).returns(r3)
-            @fact.add { }
-            @fact.add { }
-            @fact.add { }
-
-            @fact.instance_variable_get("@resolves").should == [r2, r1, r3]
-        end
-    end
-
-    it "should be able to return a value" do
-        Facter::Util::Fact.new("yay").should respond_to(:value)
-    end
-
-    describe "when returning a value" do
-        before do
-            @fact = Facter::Util::Fact.new("yay")
-        end
-
-        it "should return nil if there are no resolutions" do
-            Facter::Util::Fact.new("yay").value.should be_nil
-        end
-
-        it "should return the first value returned by a resolution" do
-            r1 = stub 'r1', :weight => 2, :value => nil, :suitable? => true
-            r2 = stub 'r2', :weight => 1, :value => "yay", :suitable? => true
-            r3 = stub 'r3', :weight => 0, :value => "foo", :suitable? => true
-            Facter::Util::Resolution.expects(:new).times(3).returns(r1).returns(r2).returns(r3)
-            @fact.add { }
-            @fact.add { }
-            @fact.add { }
-
-            @fact.value.should == "yay"
-        end
-
-        it "should short-cut returning the value once one is found" do
-            r1 = stub 'r1', :weight => 2, :value => "foo", :suitable? => true
-            r2 = stub 'r2', :weight => 1, :suitable? => true # would fail if 'value' were asked for
-            Facter::Util::Resolution.expects(:new).times(2).returns(r1).returns(r2)
-            @fact.add { }
-            @fact.add { }
-
-            @fact.value
-        end
-
-        it "should skip unsuitable resolutions" do
-            r1 = stub 'r1', :weight => 2, :suitable? => false # would fail if 'value' were asked for'
-            r2 = stub 'r2', :weight => 1, :value => "yay", :suitable? => true
-            Facter::Util::Resolution.expects(:new).times(2).returns(r1).returns(r2)
-            @fact.add { }
-            @fact.add { }
-
-            @fact.value.should == "yay"
-        end
-
-        it "should return nil if the value is the empty string" do
-            r1 = stub 'r1', :suitable? => true, :value => ""
-            Facter::Util::Resolution.expects(:new).returns r1
-            @fact.add { }
-
-            @fact.value.should be_nil
-        end
-    end
-
-    it "should have a method for flushing the cached fact" do
-        Facter::Util::Fact.new(:foo).should respond_to(:flush)
-    end
+  it "should require a name" do
+    lambda { Facter::Util::Fact.new }.should raise_error(ArgumentError)
+  end
+
+  it "should always downcase the name and convert it to a symbol" do
+    Facter::Util::Fact.new("YayNess").name.should == :yayness
+  end
+
+  it "should default to its name converted to a string as its ldapname" do
+    Facter::Util::Fact.new("YayNess").ldapname.should == "yayness"
+  end
+
+  it "should allow specifying the ldap name at initialization" do
+    Facter::Util::Fact.new("YayNess", :ldapname => "fooness").ldapname.should == "fooness"
+  end
+
+  it "should fail if an unknown option is provided" do
+    lambda { Facter::Util::Fact.new('yay', :foo => :bar) }.should raise_error(ArgumentError)
+  end
+
+  it "should have a method for adding resolution mechanisms" do
+    Facter::Util::Fact.new("yay").should respond_to(:add)
+  end
+
+  describe "when adding resolution mechanisms" do
+    before do
+      @fact = Facter::Util::Fact.new("yay")
+
+      @resolution = mock 'resolution'
+      @resolution.stub_everything
+
+    end
+
+    it "should fail if no block is given" do
+      lambda { @fact.add }.should raise_error(ArgumentError)
+    end
+
+    it "should create a new resolution instance" do
+      Facter::Util::Resolution.expects(:new).returns @resolution
+
+      @fact.add { }
+    end
+
+    it "should instance_eval the passed block on the new resolution" do
+      @resolution.expects(:instance_eval)
+
+      Facter::Util::Resolution.stubs(:new).returns @resolution
+
+      @fact.add { }
+    end
+
+    it "should re-sort the resolutions by weight, so the most restricted resolutions are first" do
+      r1 = stub 'r1', :weight => 1
+      r2 = stub 'r2', :weight => 2
+      r3 = stub 'r3', :weight => 0
+      Facter::Util::Resolution.expects(:new).times(3).returns(r1).returns(r2).returns(r3)
+      @fact.add { }
+      @fact.add { }
+      @fact.add { }
+
+      @fact.instance_variable_get("@resolves").should == [r2, r1, r3]
+    end
+  end
+
+  it "should be able to return a value" do
+    Facter::Util::Fact.new("yay").should respond_to(:value)
+  end
+
+  describe "when returning a value" do
+    before do
+      @fact = Facter::Util::Fact.new("yay")
+    end
+
+    it "should return nil if there are no resolutions" do
+      Facter::Util::Fact.new("yay").value.should be_nil
+    end
+
+    it "should return the first value returned by a resolution" do
+      r1 = stub 'r1', :weight => 2, :value => nil, :suitable? => true
+      r2 = stub 'r2', :weight => 1, :value => "yay", :suitable? => true
+      r3 = stub 'r3', :weight => 0, :value => "foo", :suitable? => true
+      Facter::Util::Resolution.expects(:new).times(3).returns(r1).returns(r2).returns(r3)
+      @fact.add { }
+      @fact.add { }
+      @fact.add { }
+
+      @fact.value.should == "yay"
+    end
+
+    it "should short-cut returning the value once one is found" do
+      r1 = stub 'r1', :weight => 2, :value => "foo", :suitable? => true
+      r2 = stub 'r2', :weight => 1, :suitable? => true # would fail if 'value' were asked for
+      Facter::Util::Resolution.expects(:new).times(2).returns(r1).returns(r2)
+      @fact.add { }
+      @fact.add { }
+
+      @fact.value
+    end
+
+    it "should skip unsuitable resolutions" do
+      r1 = stub 'r1', :weight => 2, :suitable? => false # would fail if 'value' were asked for'
+      r2 = stub 'r2', :weight => 1, :value => "yay", :suitable? => true
+      Facter::Util::Resolution.expects(:new).times(2).returns(r1).returns(r2)
+      @fact.add { }
+      @fact.add { }
+
+      @fact.value.should == "yay"
+    end
+
+    it "should return nil if the value is the empty string" do
+      r1 = stub 'r1', :suitable? => true, :value => ""
+      Facter::Util::Resolution.expects(:new).returns r1
+      @fact.add { }
+
+      @fact.value.should be_nil
+    end
+  end
+
+  it "should have a method for flushing the cached fact" do
+    Facter::Util::Fact.new(:foo).should respond_to(:flush)
+  end
 end

=== modified file 'spec/unit/util/ip_spec.rb'
--- spec/unit/util/ip_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/util/ip_spec.rb	2012-01-27 20:04:26 +0000
@@ -5,295 +5,295 @@
 require 'facter/util/ip'
 
 describe Facter::Util::IP do
+  before :each do
+    Facter::Util::Config.stubs(:is_windows?).returns(false)
+  end
+
+  [:freebsd, :linux, :netbsd, :openbsd, :sunos, :darwin, :"hp-ux", :"gnu/kfreebsd", :windows].each do |platform|
+    it "should be supported on #{platform}" do
+      Facter::Util::Config.stubs(:is_windows?).returns(platform == :windows)
+      Facter::Util::IP.supported_platforms.should be_include(platform)
+    end
+  end
+
+  it "should return a list of interfaces" do
+    Facter::Util::IP.should respond_to(:get_interfaces)
+  end
+
+  it "should return an empty list of interfaces on an unknown kernel" do
+    Facter.stubs(:value).returns("UnknownKernel")
+    Facter::Util::IP.get_interfaces().should == []
+  end
+
+  it "should return a list with a single interface and the loopback interface on Linux with a single interface" do
+    sample_output_file = File.dirname(__FILE__) + '/../data/linux_ifconfig_all_with_single_interface'
+    linux_ifconfig = File.read(sample_output_file)
+    Facter::Util::IP.stubs(:get_all_interface_output).returns(linux_ifconfig)
+    Facter::Util::IP.get_interfaces().should == ["eth0", "lo"]
+  end
+
+  it "should return a list two interfaces on Darwin with two interfaces" do
+    sample_output_file = File.dirname(__FILE__) + '/../data/darwin_ifconfig_all_with_multiple_interfaces'
+    darwin_ifconfig = File.read(sample_output_file)
+    Facter::Util::IP.stubs(:get_all_interface_output).returns(darwin_ifconfig)
+    Facter::Util::IP.get_interfaces().should == ["lo0", "en0"]
+  end
+
+  it "should return a list two interfaces on Solaris with two interfaces multiply reporting" do
+    sample_output_file = File.dirname(__FILE__) + '/../data/solaris_ifconfig_all_with_multiple_interfaces'
+    solaris_ifconfig = File.read(sample_output_file)
+    Facter::Util::IP.stubs(:get_all_interface_output).returns(solaris_ifconfig)
+    Facter::Util::IP.get_interfaces().should == ["lo0", "e1000g0"]
+  end
+
+  it "should return a list three interfaces on HP-UX with three interfaces multiply reporting" do
+    sample_output_file = File.dirname(__FILE__) + '/../data/hpux_netstat_all_interfaces'
+    hpux_netstat = File.read(sample_output_file)
+    Facter::Util::IP.stubs(:get_all_interface_output).returns(hpux_netstat)
+    Facter::Util::IP.get_interfaces().should == ["lan1", "lan0", "lo0"]
+  end
+
+  it "should return a list of six interfaces on a GNU/kFreeBSD with six interfaces" do
+    sample_output_file = File.dirname(__FILE__) + '/../data/debian_kfreebsd_ifconfig'
+    kfreebsd_ifconfig = File.read(sample_output_file)
+    Facter::Util::IP.stubs(:get_all_interface_output).returns(kfreebsd_ifconfig)
+    Facter::Util::IP.get_interfaces().should == ["em0", "em1", "bge0", "bge1", "lo0", "vlan0"]
+  end
+
+  it "should return a list of only connected interfaces on Windows" do
+    Facter.fact(:kernel).stubs(:value).returns("windows")
+    sample_output_file = File.dirname(__FILE__) + '/../data/windows_netsh_all_interfaces'
+    windows_netsh = File.read(sample_output_file)
+    Facter::Util::IP.stubs(:get_all_interface_output).returns(windows_netsh)
+    Facter::Util::IP.get_interfaces().should == ["Loopback Pseudo-Interface 1", "Local Area Connection", "Teredo Tunneling Pseudo-Interface"]
+  end
+
+  it "should return a value for a specific interface" do
+    Facter::Util::IP.should respond_to(:get_interface_value)
+  end
+
+  it "should not return interface information for unsupported platforms" do
+    Facter.stubs(:value).with(:kernel).returns("bleah")
+    Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == []
+  end
+
+  it "should return ipaddress information for Solaris" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
+    solaris_ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("SunOS")
+
+    Facter::Util::IP.get_interface_value("e1000g0", "ipaddress").should == "172.16.15.138"
+  end
+
+  it "should return netmask information for Solaris" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
+    solaris_ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("SunOS")
+
+    Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == "255.255.255.0"
+  end
+
+  it "should return calculated network information for Solaris" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
+    solaris_ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.stubs(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("SunOS")
+
+    Facter::Util::IP.get_network_value("e1000g0").should == "172.16.15.0"
+  end
+
+  it "should return ipaddress information for HP-UX" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
+    hpux_ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("HP-UX")
+
+    Facter::Util::IP.get_interface_value("lan0", "ipaddress").should == "168.24.80.71"
+  end
+
+  it "should return macaddress information for HP-UX" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
+    hpux_ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("HP-UX")
+
+    Facter::Util::IP.get_interface_value("lan0", "macaddress").should == "00:13:21:BD:9C:B7"
+  end
+
+  it "should return macaddress with leading zeros stripped off for GNU/kFreeBSD" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/debian_kfreebsd_ifconfig"
+    kfreebsd_ifconfig = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("em0").returns(kfreebsd_ifconfig)
+    Facter.stubs(:value).with(:kernel).returns("GNU/kFreeBSD")
+
+    Facter::Util::IP.get_interface_value("em0", "macaddress").should == "0:11:a:59:67:90"
+  end
+
+  it "should return netmask information for HP-UX" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
+    hpux_ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("HP-UX")
+
+    Facter::Util::IP.get_interface_value("lan0", "netmask").should == "255.255.255.0"
+  end
+
+  it "should return calculated network information for HP-UX" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
+    hpux_ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.stubs(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("HP-UX")
+
+    Facter::Util::IP.get_network_value("lan0").should == "168.24.80.0"
+  end
+
+  it "should return interface information for FreeBSD supported via an alias" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/6.0-STABLE_FreeBSD_ifconfig"
+    ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("fxp0").returns(ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("FreeBSD")
+
+    Facter::Util::IP.get_interface_value("fxp0", "macaddress").should == "00:0e:0c:68:67:7c"
+  end
+
+  it "should return macaddress information for OS X" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/Mac_OS_X_10.5.5_ifconfig"
+    ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("en1").returns(ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("Darwin")
+
+    Facter::Util::IP.get_interface_value("en1", "macaddress").should == "00:1b:63:ae:02:66"
+  end
+
+  it "should return all interfaces correctly on OS X" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/Mac_OS_X_10.5.5_ifconfig"
+    ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_all_interface_output).returns(ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("Darwin")
+
+    Facter::Util::IP.get_interfaces().should == ["lo0", "gif0", "stf0", "en0", "fw0", "en1", "vmnet8", "vmnet1"]
+  end
+
+  it "should return a human readable netmask on Solaris" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
+    solaris_ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("SunOS")
+
+    Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == "255.255.255.0"
+  end
+
+  it "should return a human readable netmask on HP-UX" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
+    hpux_ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("HP-UX")
+
+    Facter::Util::IP.get_interface_value("lan0", "netmask").should == "255.255.255.0"
+  end
+
+  it "should return a human readable netmask on Darwin" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/darwin_ifconfig_single_interface"
+
+    darwin_ifconfig_interface = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("en1").returns(darwin_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("Darwin")
+
+    Facter::Util::IP.get_interface_value("en1", "netmask").should == "255.255.255.0"
+  end
+
+  it "should return a human readable netmask on GNU/kFreeBSD" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/debian_kfreebsd_ifconfig"
+
+    kfreebsd_ifconfig = File.read(sample_output_file)
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("em1").returns(kfreebsd_ifconfig)
+    Facter.stubs(:value).with(:kernel).returns("GNU/kFreeBSD")
+
+    Facter::Util::IP.get_interface_value("em1", "netmask").should == "255.255.255.0"
+  end
+
+  it "should not get bonding master on interface aliases" do
+    Facter.stubs(:value).with(:kernel).returns("Linux")
+
+    Facter::Util::IP.get_bonding_master("eth0:1").should be_nil
+  end
+
+  [:freebsd, :netbsd, :openbsd, :sunos, :darwin, :"hp-ux"].each do |platform|
+    it "should require conversion from hex on #{platform}" do
+      Facter::Util::IP.convert_from_hex?(platform).should == true
+    end
+  end
+
+  [:windows].each do |platform|
+    it "should not require conversion from hex on #{platform}" do
+      Facter::Util::IP.convert_from_hex?(platform).should be_false
+    end
+  end
+
+  it "should return an arp address on Linux" do
+    Facter.stubs(:value).with(:kernel).returns("Linux")
+
+    Facter::Util::IP.expects(:get_arp_value).with("eth0").returns("00:00:0c:9f:f0:04")
+    Facter::Util::IP.get_arp_value("eth0").should == "00:00:0c:9f:f0:04"
+  end
+
+  describe "on Windows" do
     before :each do
-        Facter::Util::Config.stubs(:is_windows?).returns(false)
-    end
-
-    [:freebsd, :linux, :netbsd, :openbsd, :sunos, :darwin, :"hp-ux", :"gnu/kfreebsd", :windows].each do |platform|
-        it "should be supported on #{platform}" do
-            Facter::Util::Config.stubs(:is_windows?).returns(platform == :windows)
-            Facter::Util::IP.supported_platforms.should be_include(platform)
-        end
-    end
-
-    it "should return a list of interfaces" do
-        Facter::Util::IP.should respond_to(:get_interfaces)
-    end
-
-    it "should return an empty list of interfaces on an unknown kernel" do
-        Facter.stubs(:value).returns("UnknownKernel")
-        Facter::Util::IP.get_interfaces().should == []
-    end
-
-    it "should return a list with a single interface and the loopback interface on Linux with a single interface" do
-        sample_output_file = File.dirname(__FILE__) + '/../data/linux_ifconfig_all_with_single_interface'
-        linux_ifconfig = File.read(sample_output_file)
-        Facter::Util::IP.stubs(:get_all_interface_output).returns(linux_ifconfig)
-        Facter::Util::IP.get_interfaces().should == ["eth0", "lo"]
-    end
-
-    it "should return a list two interfaces on Darwin with two interfaces" do
-        sample_output_file = File.dirname(__FILE__) + '/../data/darwin_ifconfig_all_with_multiple_interfaces'
-        darwin_ifconfig = File.read(sample_output_file)
-        Facter::Util::IP.stubs(:get_all_interface_output).returns(darwin_ifconfig)
-        Facter::Util::IP.get_interfaces().should == ["lo0", "en0"]
-    end
-
-    it "should return a list two interfaces on Solaris with two interfaces multiply reporting" do
-        sample_output_file = File.dirname(__FILE__) + '/../data/solaris_ifconfig_all_with_multiple_interfaces'
-        solaris_ifconfig = File.read(sample_output_file)
-        Facter::Util::IP.stubs(:get_all_interface_output).returns(solaris_ifconfig)
-        Facter::Util::IP.get_interfaces().should == ["lo0", "e1000g0"]
-    end
-
-    it "should return a list three interfaces on HP-UX with three interfaces multiply reporting" do
-        sample_output_file = File.dirname(__FILE__) + '/../data/hpux_netstat_all_interfaces'
-        hpux_netstat = File.read(sample_output_file)
-        Facter::Util::IP.stubs(:get_all_interface_output).returns(hpux_netstat)
-        Facter::Util::IP.get_interfaces().should == ["lan1", "lan0", "lo0"]
-    end
-
-    it "should return a list of six interfaces on a GNU/kFreeBSD with six interfaces" do
-        sample_output_file = File.dirname(__FILE__) + '/../data/debian_kfreebsd_ifconfig'
-        kfreebsd_ifconfig = File.read(sample_output_file)
-        Facter::Util::IP.stubs(:get_all_interface_output).returns(kfreebsd_ifconfig)
-        Facter::Util::IP.get_interfaces().should == ["em0", "em1", "bge0", "bge1", "lo0", "vlan0"]
-    end
-
-    it "should return a list of only connected interfaces on Windows" do
-        Facter.fact(:kernel).stubs(:value).returns("windows")
-        sample_output_file = File.dirname(__FILE__) + '/../data/windows_netsh_all_interfaces'
-        windows_netsh = File.read(sample_output_file)
-        Facter::Util::IP.stubs(:get_all_interface_output).returns(windows_netsh)
-        Facter::Util::IP.get_interfaces().should == ["Loopback Pseudo-Interface 1", "Local Area Connection", "Teredo Tunneling Pseudo-Interface"]
-    end
-
-    it "should return a value for a specific interface" do
-        Facter::Util::IP.should respond_to(:get_interface_value)
-    end
-
-    it "should not return interface information for unsupported platforms" do
-        Facter.stubs(:value).with(:kernel).returns("bleah")
-        Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == []
-    end
-
-    it "should return ipaddress information for Solaris" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
-        solaris_ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("SunOS")
-
-        Facter::Util::IP.get_interface_value("e1000g0", "ipaddress").should == "172.16.15.138"
-    end
-
-    it "should return netmask information for Solaris" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
-        solaris_ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("SunOS")
-
-        Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == "255.255.255.0"
-    end
-
-    it "should return calculated network information for Solaris" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
-        solaris_ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.stubs(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("SunOS")
-
-        Facter::Util::IP.get_network_value("e1000g0").should == "172.16.15.0"
-    end
-
-    it "should return ipaddress information for HP-UX" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
-        hpux_ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("HP-UX")
-
-        Facter::Util::IP.get_interface_value("lan0", "ipaddress").should == "168.24.80.71"
-    end
-
-    it "should return macaddress information for HP-UX" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
-        hpux_ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("HP-UX")
-
-        Facter::Util::IP.get_interface_value("lan0", "macaddress").should == "00:13:21:BD:9C:B7"
-    end
-
-    it "should return macaddress with leading zeros stripped off for GNU/kFreeBSD" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/debian_kfreebsd_ifconfig"
-        kfreebsd_ifconfig = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("em0").returns(kfreebsd_ifconfig)
-        Facter.stubs(:value).with(:kernel).returns("GNU/kFreeBSD")
-
-        Facter::Util::IP.get_interface_value("em0", "macaddress").should == "0:11:a:59:67:90"
-    end
-
-    it "should return netmask information for HP-UX" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
-        hpux_ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("HP-UX")
-
-        Facter::Util::IP.get_interface_value("lan0", "netmask").should == "255.255.255.0"
-    end
-
-    it "should return calculated network information for HP-UX" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
-        hpux_ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.stubs(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("HP-UX")
-
-        Facter::Util::IP.get_network_value("lan0").should == "168.24.80.0"
-    end
-
-    it "should return interface information for FreeBSD supported via an alias" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/6.0-STABLE_FreeBSD_ifconfig"
-        ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("fxp0").returns(ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("FreeBSD")
-
-        Facter::Util::IP.get_interface_value("fxp0", "macaddress").should == "00:0e:0c:68:67:7c"
-    end
-
-    it "should return macaddress information for OS X" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/Mac_OS_X_10.5.5_ifconfig"
-        ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("en1").returns(ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("Darwin")
-
-        Facter::Util::IP.get_interface_value("en1", "macaddress").should == "00:1b:63:ae:02:66"
-    end
-
-    it "should return all interfaces correctly on OS X" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/Mac_OS_X_10.5.5_ifconfig"
-        ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_all_interface_output).returns(ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("Darwin")
-
-        Facter::Util::IP.get_interfaces().should == ["lo0", "gif0", "stf0", "en0", "fw0", "en1", "vmnet8", "vmnet1"]
-    end
-
-    it "should return a human readable netmask on Solaris" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
-        solaris_ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("SunOS")
-
-        Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == "255.255.255.0"
-    end
-
-    it "should return a human readable netmask on HP-UX" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface"
-        hpux_ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("HP-UX")
-
-        Facter::Util::IP.get_interface_value("lan0", "netmask").should == "255.255.255.0"
-    end
-
-    it "should return a human readable netmask on Darwin" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/darwin_ifconfig_single_interface"
-
-        darwin_ifconfig_interface = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("en1").returns(darwin_ifconfig_interface)
-        Facter.stubs(:value).with(:kernel).returns("Darwin")
-
-        Facter::Util::IP.get_interface_value("en1", "netmask").should == "255.255.255.0"
-    end
-
-    it "should return a human readable netmask on GNU/kFreeBSD" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/debian_kfreebsd_ifconfig"
-
-        kfreebsd_ifconfig = File.read(sample_output_file)
-
-        Facter::Util::IP.expects(:get_single_interface_output).with("em1").returns(kfreebsd_ifconfig)
-        Facter.stubs(:value).with(:kernel).returns("GNU/kFreeBSD")
-
-        Facter::Util::IP.get_interface_value("em1", "netmask").should == "255.255.255.0"
-    end
-
-    it "should not get bonding master on interface aliases" do
-        Facter.stubs(:value).with(:kernel).returns("Linux")
-
-        Facter::Util::IP.get_bonding_master("eth0:1").should be_nil
-    end
-
-    [:freebsd, :netbsd, :openbsd, :sunos, :darwin, :"hp-ux"].each do |platform|
-        it "should require conversion from hex on #{platform}" do
-            Facter::Util::IP.convert_from_hex?(platform).should == true
-        end
-    end
-
-    [:windows].each do |platform|
-        it "should not require conversion from hex on #{platform}" do
-            Facter::Util::IP.convert_from_hex?(platform).should be_false
-        end
-    end
-
-    it "should return an arp address on Linux" do
-        Facter.stubs(:value).with(:kernel).returns("Linux")
-
-        Facter::Util::IP.expects(:get_arp_value).with("eth0").returns("00:00:0c:9f:f0:04")
-        Facter::Util::IP.get_arp_value("eth0").should == "00:00:0c:9f:f0:04"
-    end
-
-    describe "on Windows" do
-        before :each do
-            Facter.stubs(:value).with(:kernel).returns("windows")
-        end
-
-        it "should return ipaddress information" do
-            sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface"
-            windows_netsh = File.read(sample_output_file)
-
-            Facter::Util::IP.expects(:get_output_for_interface_and_label).with("Local Area Connection", "ipaddress").returns(windows_netsh)
-
-            Facter::Util::IP.get_interface_value("Local Area Connection", "ipaddress").should == "172.16.138.216"
-        end
-
-        it "should return a human readable netmask" do
-            sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface"
-            windows_netsh = File.read(sample_output_file)
-
-            Facter::Util::IP.expects(:get_output_for_interface_and_label).with("Local Area Connection", "netmask").returns(windows_netsh)
-
-            Facter::Util::IP.get_interface_value("Local Area Connection", "netmask").should == "255.255.255.0"
-        end
-
-        it "should return network information" do
-            sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface"
-            windows_netsh = File.read(sample_output_file)
-
-            Facter::Util::IP.stubs(:get_output_for_interface_and_label).with("Local Area Connection", "ipaddress").returns(windows_netsh)
-            Facter::Util::IP.stubs(:get_output_for_interface_and_label).with("Local Area Connection", "netmask").returns(windows_netsh)
-
-            Facter::Util::IP.get_network_value("Local Area Connection").should == "172.16.138.0"
-        end
-
-        it "should return ipaddress6 information" do
-            sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface6"
-            windows_netsh = File.read(sample_output_file)
-
-            Facter::Util::IP.expects(:get_output_for_interface_and_label).with("Teredo Tunneling Pseudo-Interface", "ipaddress6").returns(windows_netsh)
-
-            Facter::Util::IP.get_interface_value("Teredo Tunneling Pseudo-Interface", "ipaddress6").should == "2001:0:4137:9e76:2087:77a:53ef:7527"
-        end
-    end
+      Facter.stubs(:value).with(:kernel).returns("windows")
+    end
+
+    it "should return ipaddress information" do
+      sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface"
+      windows_netsh = File.read(sample_output_file)
+
+      Facter::Util::IP.expects(:get_output_for_interface_and_label).with("Local Area Connection", "ipaddress").returns(windows_netsh)
+
+      Facter::Util::IP.get_interface_value("Local Area Connection", "ipaddress").should == "172.16.138.216"
+    end
+
+    it "should return a human readable netmask" do
+      sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface"
+      windows_netsh = File.read(sample_output_file)
+
+      Facter::Util::IP.expects(:get_output_for_interface_and_label).with("Local Area Connection", "netmask").returns(windows_netsh)
+
+      Facter::Util::IP.get_interface_value("Local Area Connection", "netmask").should == "255.255.255.0"
+    end
+
+    it "should return network information" do
+      sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface"
+      windows_netsh = File.read(sample_output_file)
+
+      Facter::Util::IP.stubs(:get_output_for_interface_and_label).with("Local Area Connection", "ipaddress").returns(windows_netsh)
+      Facter::Util::IP.stubs(:get_output_for_interface_and_label).with("Local Area Connection", "netmask").returns(windows_netsh)
+
+      Facter::Util::IP.get_network_value("Local Area Connection").should == "172.16.138.0"
+    end
+
+    it "should return ipaddress6 information" do
+      sample_output_file = File.dirname(__FILE__) + "/../data/windows_netsh_single_interface6"
+      windows_netsh = File.read(sample_output_file)
+
+      Facter::Util::IP.expects(:get_output_for_interface_and_label).with("Teredo Tunneling Pseudo-Interface", "ipaddress6").returns(windows_netsh)
+
+      Facter::Util::IP.get_interface_value("Teredo Tunneling Pseudo-Interface", "ipaddress6").should == "2001:0:4137:9e76:2087:77a:53ef:7527"
+    end
+  end
 end

=== modified file 'spec/unit/util/loader_spec.rb'
--- spec/unit/util/loader_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/util/loader_spec.rb	2012-01-27 20:04:26 +0000
@@ -19,273 +19,273 @@
 
 
 describe Facter::Util::Loader do
-    before :each do
-        Facter::Util::Loader.any_instance.unstub(:load_all)
-    end
-
-    def with_env(values)
-        old = {}
-        values.each do |var, value|
-            if old_val = ENV[var]
-                old[var] = old_val
-            end
-            ENV[var] = value
-        end
-        yield
-        values.each do |var, value|
-            if old.include?(var)
-                ENV[var] = old[var]
-            else
-                ENV.delete(var)
-            end
-        end
-    end
-
-    it "should have a method for loading individual facts by name" do
-        Facter::Util::Loader.new.should respond_to(:load)
-    end
-
-    it "should have a method for loading all facts" do
-        Facter::Util::Loader.new.should respond_to(:load_all)
-    end
-
-    it "should have a method for returning directories containing facts" do
-        Facter::Util::Loader.new.should respond_to(:search_path)
-    end
-
-    describe "when determining the search path" do
-        before do
-            @loader = Facter::Util::Loader.new
-            @settings = mock 'settings'
-            @settings.stubs(:value).returns "/eh"
-        end
-
-        it "should include the facter subdirectory of all paths in ruby LOAD_PATH" do
-            dirs = $LOAD_PATH.collect { |d| File.join(d, "facter") }
-            paths = @loader.search_path
-
-            dirs.each do |dir|
-                paths.should be_include(dir)
-            end
-        end
-
-        it "should include all search paths registered with Facter" do
-            Facter.expects(:search_path).returns %w{/one /two}
-            paths = @loader.search_path
-            paths.should be_include("/one")
-            paths.should be_include("/two")
-        end
-
-        describe "and the FACTERLIB environment variable is set" do
-            it "should include all paths in FACTERLIB" do
-                with_env "FACTERLIB" => "/one/path:/two/path" do
-                    paths = @loader.search_path
-                    %w{/one/path /two/path}.each do |dir|
-                        paths.should be_include(dir)
-                    end
-                end
-            end
-        end
-    end
-
-    describe "when loading facts" do
-        before do
-            @loader = Facter::Util::Loader.new
-            @loader.stubs(:search_path).returns []
-        end
-
-        it "should load values from the matching environment variable if one is present" do
-            Facter.expects(:add).with("testing")
-
-            with_env "facter_testing" => "yayness" do
-                @loader.load(:testing)
-            end
-        end
-
-        it "should load any files in the search path with names matching the fact name" do
-            @loader.expects(:search_path).returns %w{/one/dir /two/dir}
-            FileTest.stubs(:exist?).returns false
-            FileTest.expects(:exist?).with("/one/dir/testing.rb").returns true
-            FileTest.expects(:exist?).with("/two/dir/testing.rb").returns true
-
-            Kernel.expects(:load).with("/one/dir/testing.rb")
-            Kernel.expects(:load).with("/two/dir/testing.rb")
-
-            @loader.load(:testing)
-        end
-
-      it 'should load any ruby files in directories matching the fact name in the search path in sorted order regardless of the order returned by Dir.entries' do
-        @loader = TestLoader.new
-
-        @loader.stubs(:search_path).returns %w{/one/dir}
-        FileTest.stubs(:exist?).returns false
-        FileTest.stubs(:directory?).with("/one/dir/testing").returns true
-        @loader.stubs(:search_path).returns %w{/one/dir}
-
-        Dir.stubs(:entries).with("/one/dir/testing").returns %w{foo.rb bar.rb}
-        %w{/one/dir/testing/foo.rb /one/dir/testing/bar.rb}.each do |f|
-          File.stubs(:directory?).with(f).returns false
-          Kernel.stubs(:load).with(f)
-        end
-
+  before :each do
+    Facter::Util::Loader.any_instance.unstub(:load_all)
+  end
+
+  def with_env(values)
+    old = {}
+    values.each do |var, value|
+      if old_val = ENV[var]
+        old[var] = old_val
+      end
+      ENV[var] = value
+    end
+    yield
+    values.each do |var, value|
+      if old.include?(var)
+        ENV[var] = old[var]
+      else
+        ENV.delete(var)
+      end
+    end
+  end
+
+  it "should have a method for loading individual facts by name" do
+    Facter::Util::Loader.new.should respond_to(:load)
+  end
+
+  it "should have a method for loading all facts" do
+    Facter::Util::Loader.new.should respond_to(:load_all)
+  end
+
+  it "should have a method for returning directories containing facts" do
+    Facter::Util::Loader.new.should respond_to(:search_path)
+  end
+
+  describe "when determining the search path" do
+    before do
+      @loader = Facter::Util::Loader.new
+      @settings = mock 'settings'
+      @settings.stubs(:value).returns "/eh"
+    end
+
+    it "should include the facter subdirectory of all paths in ruby LOAD_PATH" do
+      dirs = $LOAD_PATH.collect { |d| File.join(d, "facter") }
+      paths = @loader.search_path
+
+      dirs.each do |dir|
+        paths.should be_include(dir)
+      end
+    end
+
+    it "should include all search paths registered with Facter" do
+      Facter.expects(:search_path).returns %w{/one /two}
+      paths = @loader.search_path
+      paths.should be_include("/one")
+      paths.should be_include("/two")
+    end
+
+    describe "and the FACTERLIB environment variable is set" do
+      it "should include all paths in FACTERLIB" do
+        with_env "FACTERLIB" => "/one/path:/two/path" do
+          paths = @loader.search_path
+          %w{/one/path /two/path}.each do |dir|
+            paths.should be_include(dir)
+          end
+        end
+      end
+    end
+  end
+
+  describe "when loading facts" do
+    before do
+      @loader = Facter::Util::Loader.new
+      @loader.stubs(:search_path).returns []
+    end
+
+    it "should load values from the matching environment variable if one is present" do
+      Facter.expects(:add).with("testing")
+
+      with_env "facter_testing" => "yayness" do
         @loader.load(:testing)
-        @loader.loaded_files.should == %w{/one/dir/testing/bar.rb /one/dir/testing/foo.rb}
       end
-
-        it "should load any ruby files in directories matching the fact name in the search path" do
-            @loader.expects(:search_path).returns %w{/one/dir}
-            FileTest.stubs(:exist?).returns false
-            FileTest.expects(:directory?).with("/one/dir/testing").returns true
-
-            Dir.expects(:entries).with("/one/dir/testing").returns %w{two.rb}
-
-            Kernel.expects(:load).with("/one/dir/testing/two.rb")
-
-            @loader.load(:testing)
-        end
-
-        it "should not load files that don't end in '.rb'" do
-            @loader.expects(:search_path).returns %w{/one/dir}
-            FileTest.stubs(:exist?).returns false
-            FileTest.expects(:directory?).with("/one/dir/testing").returns true
-
-            Dir.expects(:entries).with("/one/dir/testing").returns %w{one}
-
-            Kernel.expects(:load).never
-
-            @loader.load(:testing)
-        end
-    end
-
-    describe "when loading all facts" do
-        before do
-            @loader = Facter::Util::Loader.new
-            @loader.stubs(:search_path).returns []
-
-            FileTest.stubs(:directory?).returns true
-        end
-
-        it "should skip directories that do not exist" do
-            @loader.expects(:search_path).returns %w{/one/dir}
-
-            FileTest.expects(:directory?).with("/one/dir").returns false
-
-            Dir.expects(:entries).with("/one/dir").never
-
-            @loader.load_all
-        end
-
-        it "should load all files in all search paths" do
-            @loader.expects(:search_path).returns %w{/one/dir /two/dir}
-
-            Dir.expects(:entries).with("/one/dir").returns %w{a.rb b.rb}
-            Dir.expects(:entries).with("/two/dir").returns %w{c.rb d.rb}
-
-            %w{/one/dir/a.rb /one/dir/b.rb /two/dir/c.rb /two/dir/d.rb}.each { |f| Kernel.expects(:load).with(f) }
-
-            @loader.load_all
-        end
-
-        it "should load all files in all subdirectories in all search paths" do
-            @loader.expects(:search_path).returns %w{/one/dir /two/dir}
-
-            Dir.expects(:entries).with("/one/dir").returns %w{a}
-            Dir.expects(:entries).with("/two/dir").returns %w{b}
-
-            %w{/one/dir/a /two/dir/b}.each { |f| File.expects(:directory?).with(f).returns true }
-
-            Dir.expects(:entries).with("/one/dir/a").returns %w{c.rb}
-            Dir.expects(:entries).with("/two/dir/b").returns %w{d.rb}
-
-            %w{/one/dir/a/c.rb /two/dir/b/d.rb}.each { |f| Kernel.expects(:load).with(f) }
-
-            @loader.load_all
-        end
-
-      it 'should load all files in sorted order for any given directory regardless of the order returned by Dir.entries' do
-        @loader = TestLoader.new
-
-        @loader.stubs(:search_path).returns %w{/one/dir}
-        Dir.stubs(:entries).with("/one/dir").returns %w{foo.rb bar.rb}
-
-        %w{/one/dir}.each { |f| File.stubs(:directory?).with(f).returns true }
-
-        %w{/one/dir/foo.rb /one/dir/bar.rb}.each do |f|
-          File.stubs(:directory?).with(f).returns false
-          Kernel.expects(:load).with(f)
-        end
-
+    end
+
+    it "should load any files in the search path with names matching the fact name" do
+      @loader.expects(:search_path).returns %w{/one/dir /two/dir}
+      FileTest.stubs(:exist?).returns false
+      FileTest.expects(:exist?).with("/one/dir/testing.rb").returns true
+      FileTest.expects(:exist?).with("/two/dir/testing.rb").returns true
+
+      Kernel.expects(:load).with("/one/dir/testing.rb")
+      Kernel.expects(:load).with("/two/dir/testing.rb")
+
+      @loader.load(:testing)
+    end
+
+    it 'should load any ruby files in directories matching the fact name in the search path in sorted order regardless of the order returned by Dir.entries' do
+    @loader = TestLoader.new
+
+    @loader.stubs(:search_path).returns %w{/one/dir}
+    FileTest.stubs(:exist?).returns false
+    FileTest.stubs(:directory?).with("/one/dir/testing").returns true
+    @loader.stubs(:search_path).returns %w{/one/dir}
+
+    Dir.stubs(:entries).with("/one/dir/testing").returns %w{foo.rb bar.rb}
+    %w{/one/dir/testing/foo.rb /one/dir/testing/bar.rb}.each do |f|
+      File.stubs(:directory?).with(f).returns false
+      Kernel.stubs(:load).with(f)
+    end
+
+    @loader.load(:testing)
+    @loader.loaded_files.should == %w{/one/dir/testing/bar.rb /one/dir/testing/foo.rb}
+    end
+
+    it "should load any ruby files in directories matching the fact name in the search path" do
+      @loader.expects(:search_path).returns %w{/one/dir}
+      FileTest.stubs(:exist?).returns false
+      FileTest.expects(:directory?).with("/one/dir/testing").returns true
+
+      Dir.expects(:entries).with("/one/dir/testing").returns %w{two.rb}
+
+      Kernel.expects(:load).with("/one/dir/testing/two.rb")
+
+      @loader.load(:testing)
+    end
+
+    it "should not load files that don't end in '.rb'" do
+      @loader.expects(:search_path).returns %w{/one/dir}
+      FileTest.stubs(:exist?).returns false
+      FileTest.expects(:directory?).with("/one/dir/testing").returns true
+
+      Dir.expects(:entries).with("/one/dir/testing").returns %w{one}
+
+      Kernel.expects(:load).never
+
+      @loader.load(:testing)
+    end
+  end
+
+  describe "when loading all facts" do
+    before do
+      @loader = Facter::Util::Loader.new
+      @loader.stubs(:search_path).returns []
+
+      FileTest.stubs(:directory?).returns true
+    end
+
+    it "should skip directories that do not exist" do
+      @loader.expects(:search_path).returns %w{/one/dir}
+
+      FileTest.expects(:directory?).with("/one/dir").returns false
+
+      Dir.expects(:entries).with("/one/dir").never
+
+      @loader.load_all
+    end
+
+    it "should load all files in all search paths" do
+      @loader.expects(:search_path).returns %w{/one/dir /two/dir}
+
+      Dir.expects(:entries).with("/one/dir").returns %w{a.rb b.rb}
+      Dir.expects(:entries).with("/two/dir").returns %w{c.rb d.rb}
+
+      %w{/one/dir/a.rb /one/dir/b.rb /two/dir/c.rb /two/dir/d.rb}.each { |f| Kernel.expects(:load).with(f) }
+
+      @loader.load_all
+    end
+
+    it "should load all files in all subdirectories in all search paths" do
+      @loader.expects(:search_path).returns %w{/one/dir /two/dir}
+
+      Dir.expects(:entries).with("/one/dir").returns %w{a}
+      Dir.expects(:entries).with("/two/dir").returns %w{b}
+
+      %w{/one/dir/a /two/dir/b}.each { |f| File.expects(:directory?).with(f).returns true }
+
+      Dir.expects(:entries).with("/one/dir/a").returns %w{c.rb}
+      Dir.expects(:entries).with("/two/dir/b").returns %w{d.rb}
+
+      %w{/one/dir/a/c.rb /two/dir/b/d.rb}.each { |f| Kernel.expects(:load).with(f) }
+
+      @loader.load_all
+    end
+
+    it 'should load all files in sorted order for any given directory regardless of the order returned by Dir.entries' do
+    @loader = TestLoader.new
+
+    @loader.stubs(:search_path).returns %w{/one/dir}
+    Dir.stubs(:entries).with("/one/dir").returns %w{foo.rb bar.rb}
+
+    %w{/one/dir}.each { |f| File.stubs(:directory?).with(f).returns true }
+
+    %w{/one/dir/foo.rb /one/dir/bar.rb}.each do |f|
+      File.stubs(:directory?).with(f).returns false
+      Kernel.expects(:load).with(f)
+    end
+
+    @loader.load_all
+
+    @loader.loaded_files.should == %w{/one/dir/bar.rb /one/dir/foo.rb}
+    end
+
+    it "should not load files in the util subdirectory" do
+      @loader.expects(:search_path).returns %w{/one/dir}
+
+      Dir.expects(:entries).with("/one/dir").returns %w{util}
+
+      File.expects(:directory?).with("/one/dir/util").returns true
+
+      Dir.expects(:entries).with("/one/dir/util").never
+
+      @loader.load_all
+    end
+
+    it "should not load files in a lib subdirectory" do
+      @loader.expects(:search_path).returns %w{/one/dir}
+
+      Dir.expects(:entries).with("/one/dir").returns %w{lib}
+
+      File.expects(:directory?).with("/one/dir/lib").returns true
+
+      Dir.expects(:entries).with("/one/dir/lib").never
+
+      @loader.load_all
+    end
+
+    it "should not load files in '.' or '..'" do
+      @loader.expects(:search_path).returns %w{/one/dir}
+
+      Dir.expects(:entries).with("/one/dir").returns %w{. ..}
+
+      File.expects(:entries).with("/one/dir/.").never
+      File.expects(:entries).with("/one/dir/..").never
+
+      @loader.load_all
+    end
+
+    it "should not raise an exception when a file is unloadable" do
+      @loader.expects(:search_path).returns %w{/one/dir}
+      Dir.expects(:entries).with("/one/dir").returns %w{a.rb}
+
+      Kernel.expects(:load).with("/one/dir/a.rb").raises(LoadError)
+      @loader.expects(:warn)
+
+      lambda { @loader.load_all }.should_not raise_error
+    end
+
+    it "should load all facts from the environment" do
+      Facter.expects(:add).with('one')
+      Facter.expects(:add).with('two')
+
+      with_env "facter_one" => "yayness", "facter_two" => "boo" do
         @loader.load_all
-
-        @loader.loaded_files.should == %w{/one/dir/bar.rb /one/dir/foo.rb}
       end
-
-        it "should not load files in the util subdirectory" do
-            @loader.expects(:search_path).returns %w{/one/dir}
-
-            Dir.expects(:entries).with("/one/dir").returns %w{util}
-
-            File.expects(:directory?).with("/one/dir/util").returns true
-
-            Dir.expects(:entries).with("/one/dir/util").never
-
-            @loader.load_all
-        end
-
-        it "should not load files in a lib subdirectory" do
-            @loader.expects(:search_path).returns %w{/one/dir}
-
-            Dir.expects(:entries).with("/one/dir").returns %w{lib}
-
-            File.expects(:directory?).with("/one/dir/lib").returns true
-
-            Dir.expects(:entries).with("/one/dir/lib").never
-
-            @loader.load_all
-        end
-
-        it "should not load files in '.' or '..'" do
-            @loader.expects(:search_path).returns %w{/one/dir}
-
-            Dir.expects(:entries).with("/one/dir").returns %w{. ..}
-
-            File.expects(:entries).with("/one/dir/.").never
-            File.expects(:entries).with("/one/dir/..").never
-
-            @loader.load_all
-        end
-
-        it "should not raise an exception when a file is unloadable" do
-            @loader.expects(:search_path).returns %w{/one/dir}
-            Dir.expects(:entries).with("/one/dir").returns %w{a.rb}
-
-            Kernel.expects(:load).with("/one/dir/a.rb").raises(LoadError)
-            @loader.expects(:warn)
-
-            lambda { @loader.load_all }.should_not raise_error
-        end
-
-        it "should load all facts from the environment" do
-            Facter.expects(:add).with('one')
-            Facter.expects(:add).with('two')
-
-            with_env "facter_one" => "yayness", "facter_two" => "boo" do
-                @loader.load_all
-            end
-        end
-
-        it "should only load all facts one time" do
-            @loader.expects(:load_env).once
-            @loader.load_all
-            @loader.load_all
-        end
-    end
-
-    it "should load facts on the facter search path only once" do
-        facterlibdir = File.expand_path(File.dirname(__FILE__) + '../../../fixtures/unit/util/loader')
-        with_env 'FACTERLIB' => facterlibdir do
-            Facter::Util::Loader.new.load_all
-            Facter.value(:nosuchfact).should be_nil
-        end
-    end
+    end
+
+    it "should only load all facts one time" do
+      @loader.expects(:load_env).once
+      @loader.load_all
+      @loader.load_all
+    end
+  end
+
+  it "should load facts on the facter search path only once" do
+    facterlibdir = File.expand_path(File.dirname(__FILE__) + '../../../fixtures/unit/util/loader')
+    with_env 'FACTERLIB' => facterlibdir do
+      Facter::Util::Loader.new.load_all
+      Facter.value(:nosuchfact).should be_nil
+    end
+  end
 end

=== modified file 'spec/unit/util/macaddress_spec.rb'
--- spec/unit/util/macaddress_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/util/macaddress_spec.rb	2012-01-27 20:04:26 +0000
@@ -8,10 +8,15 @@
   it "should have zeroes added if missing" do
     Facter::Util::Macaddress::standardize("0:ab:cd:e:12:3").should == "00:ab:cd:0e:12:03"
   end
-  
+
   it "should be identical if each octet already has two digits" do
     Facter::Util::Macaddress::standardize("00:ab:cd:0e:12:03").should == "00:ab:cd:0e:12:03"
   end
+
+  it "should be nil if input is nil" do
+    proc { result = Facter::Util::Macaddress.standardize(nil) }.should_not raise_error
+    Facter::Util::Macaddress.standardize(nil).should be_nil
+  end
 end
 
 describe "Darwin", :unless => Facter.value(:operatingsystem) == 'windows' do

=== modified file 'spec/unit/util/macosx_spec.rb'
--- spec/unit/util/macosx_spec.rb	2011-03-18 12:06:08 +0000
+++ spec/unit/util/macosx_spec.rb	2012-01-27 20:04:26 +0000
@@ -5,77 +5,77 @@
 require 'facter/util/macosx'
 
 describe Facter::Util::Macosx do
-    it "should be able to retrieve profiler data as xml for a given data field" do
-        Facter::Util::Resolution.expects(:exec).with("/usr/sbin/system_profiler -xml foo").returns "yay"
-        Facter::Util::Macosx.profiler_xml("foo").should == "yay"
-    end
-
-    it "should use PList to convert xml to data structures" do
-        Plist.expects(:parse_xml).with("foo").returns "bar"
-
-        Facter::Util::Macosx.intern_xml("foo").should == "bar"
-    end
-
-    describe "when collecting profiler data" do
-        it "should return the first value in the '_items' hash in the first value of the results of the system_profiler data, with the '_name' field removed, if the profiler returns data" do
-            @result = [
-                '_items' => [
-                    {'_name' => "foo", "yay" => "bar"}
-                ]
-            ]
-            Facter::Util::Macosx.expects(:profiler_xml).with("foo").returns "eh"
-            Facter::Util::Macosx.expects(:intern_xml).with("eh").returns @result
-            Facter::Util::Macosx.profiler_data("foo").should == {"yay" => "bar"}
-        end
-
-        it "should return nil if an exception is thrown during parsing of xml" do
-            Facter::Util::Macosx.expects(:profiler_xml).with("foo").returns "eh"
-            Facter::Util::Macosx.expects(:intern_xml).with("eh").raises "boo!"
-            Facter::Util::Macosx.profiler_data("foo").should be_nil
-        end
-    end
-
-    it "should return the profiler data for 'SPHardwareDataType' as the hardware information" do
-        Facter::Util::Macosx.expects(:profiler_data).with("SPHardwareDataType").returns "eh"
-        Facter::Util::Macosx.hardware_overview.should == "eh"
-    end
-
-    it "should return the profiler data for 'SPSoftwareDataType' as the os information" do
-        Facter::Util::Macosx.expects(:profiler_data).with("SPSoftwareDataType").returns "eh"
-        Facter::Util::Macosx.os_overview.should == "eh"
-    end
-    
-    describe "when working out software version" do
-        
-        before do
-            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productName").returns "Mac OS X"
-            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -buildVersion").returns "9J62"
-        end
-        
-        it "should have called sw_vers three times when determining software version" do
-            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "10.5.7"
-            Facter::Util::Macosx.sw_vers
-        end
-    
-        it "should return a hash with the correct keys when determining software version" do
-            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "10.5.7"
-            Facter::Util::Macosx.sw_vers.keys.sort.should == ["macosx_productName",
-                                                              "macosx_buildVersion",
-                                                              "macosx_productversion_minor",
-                                                              "macosx_productversion_major",
-                                                              "macosx_productVersion"].sort
-        end
-    
-        it "should split a product version of 'x.y.z' into separate hash entries correctly" do
-            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "1.2.3"
-            sw_vers = Facter::Util::Macosx.sw_vers
-            sw_vers["macosx_productversion_major"].should == "1.2"
-            sw_vers["macosx_productversion_minor"].should == "3"
-        end
-    
-        it "should treat a product version of 'x.y' as 'x.y.0" do
-            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "2.3"
-            Facter::Util::Macosx.sw_vers["macosx_productversion_minor"].should == "0"
-        end
-    end
+  it "should be able to retrieve profiler data as xml for a given data field" do
+    Facter::Util::Resolution.expects(:exec).with("/usr/sbin/system_profiler -xml foo").returns "yay"
+    Facter::Util::Macosx.profiler_xml("foo").should == "yay"
+  end
+
+  it "should use PList to convert xml to data structures" do
+    Plist.expects(:parse_xml).with("foo").returns "bar"
+
+    Facter::Util::Macosx.intern_xml("foo").should == "bar"
+  end
+
+  describe "when collecting profiler data" do
+    it "should return the first value in the '_items' hash in the first value of the results of the system_profiler data, with the '_name' field removed, if the profiler returns data" do
+      @result = [
+        '_items' => [
+          {'_name' => "foo", "yay" => "bar"}
+        ]
+      ]
+      Facter::Util::Macosx.expects(:profiler_xml).with("foo").returns "eh"
+      Facter::Util::Macosx.expects(:intern_xml).with("eh").returns @result
+      Facter::Util::Macosx.profiler_data("foo").should == {"yay" => "bar"}
+    end
+
+    it "should return nil if an exception is thrown during parsing of xml" do
+      Facter::Util::Macosx.expects(:profiler_xml).with("foo").returns "eh"
+      Facter::Util::Macosx.expects(:intern_xml).with("eh").raises "boo!"
+      Facter::Util::Macosx.profiler_data("foo").should be_nil
+    end
+  end
+
+  it "should return the profiler data for 'SPHardwareDataType' as the hardware information" do
+    Facter::Util::Macosx.expects(:profiler_data).with("SPHardwareDataType").returns "eh"
+    Facter::Util::Macosx.hardware_overview.should == "eh"
+  end
+
+  it "should return the profiler data for 'SPSoftwareDataType' as the os information" do
+    Facter::Util::Macosx.expects(:profiler_data).with("SPSoftwareDataType").returns "eh"
+    Facter::Util::Macosx.os_overview.should == "eh"
+  end
+  
+  describe "when working out software version" do
+    
+    before do
+      Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productName").returns "Mac OS X"
+      Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -buildVersion").returns "9J62"
+    end
+    
+    it "should have called sw_vers three times when determining software version" do
+      Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "10.5.7"
+      Facter::Util::Macosx.sw_vers
+    end
+  
+    it "should return a hash with the correct keys when determining software version" do
+      Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "10.5.7"
+      Facter::Util::Macosx.sw_vers.keys.sort.should == ["macosx_productName",
+                                                        "macosx_buildVersion",
+                                                        "macosx_productversion_minor",
+                                                        "macosx_productversion_major",
+                                                        "macosx_productVersion"].sort
+    end
+  
+    it "should split a product version of 'x.y.z' into separate hash entries correctly" do
+      Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "1.2.3"
+      sw_vers = Facter::Util::Macosx.sw_vers
+      sw_vers["macosx_productversion_major"].should == "1.2"
+      sw_vers["macosx_productversion_minor"].should == "3"
+    end
+  
+    it "should treat a product version of 'x.y' as 'x.y.0" do
+      Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "2.3"
+      Facter::Util::Macosx.sw_vers["macosx_productversion_minor"].should == "0"
+    end
+  end
 end

=== modified file 'spec/unit/util/manufacturer_spec.rb'
--- spec/unit/util/manufacturer_spec.rb	2011-10-06 10:48:30 +0000
+++ spec/unit/util/manufacturer_spec.rb	2012-01-27 20:04:26 +0000
@@ -3,52 +3,69 @@
 require 'facter/util/manufacturer'
 
 describe Facter::Manufacturer do
-    before :each do
-        Facter.clear
-    end
-
-    it "should return the system DMI table" do
-        Facter::Manufacturer.should respond_to(:get_dmi_table)
-    end
-
-    it "should return nil on non-supported operating systems" do
-        Facter.stubs(:value).with(:kernel).returns("SomeThing")
-        Facter::Manufacturer.get_dmi_table().should be_nil
-    end
-
-    it "should parse prtdiag output" do
-        Facter::Util::Resolution.stubs(:exec).returns("System Configuration:  Sun Microsystems  sun4u Sun SPARC Enterprise M3000 Server")
-        Facter::Manufacturer.prtdiag_sparc_find_system_info()
-        Facter.value(:manufacturer).should == "Sun Microsystems"
-        Facter.value(:productname).should == "Sun SPARC Enterprise M3000 Server"
-    end
-
-    it "should strip white space on dmi output with spaces" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/linux_dmidecode_with_spaces"
-        dmidecode_output = File.new(sample_output_file).read()
-        Facter::Manufacturer.expects(:get_dmi_table).returns(dmidecode_output)
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-
-        query = { '[Ss]ystem [Ii]nformation' => [ { 'Product(?: Name)?:' => 'productname' } ] }
-
-        Facter::Manufacturer.dmi_find_system_info(query)
-        Facter.value(:productname).should == "MS-6754"
-    end
-
-    it "should handle output from smbios when run under sunos" do
-        sample_output_file = File.dirname(__FILE__) + "/../data/opensolaris_smbios"
-        smbios_output = File.new(sample_output_file).read()
-        Facter::Manufacturer.expects(:get_dmi_table).returns(smbios_output)
-        Facter.fact(:kernel).stubs(:value).returns("SunOS")
-
-        query = { 'BIOS information' => [ { 'Release Date:' => 'reldate' } ] }
-
-        Facter::Manufacturer.dmi_find_system_info(query)
-        Facter.value(:reldate).should == "12/01/2006"
-    end
-
-    it "should not split on dmi keys containing the string Handle" do
-        dmidecode_output = <<-eos
+  before :each do
+    Facter.clear
+  end
+
+  it "should return the system DMI table" do
+    Facter::Manufacturer.should respond_to(:get_dmi_table)
+  end
+
+  it "should return nil on non-supported operating systems" do
+    Facter.stubs(:value).with(:kernel).returns("SomeThing")
+    Facter::Manufacturer.get_dmi_table().should be_nil
+  end
+
+  it "should parse prtdiag output on a sunfire v120" do
+    Facter::Util::Resolution.stubs(:exec).returns(fixture_data(File.join("unit", "util", "manufacturer", "solaris_sunfire_v120_prtdiag")))
+    Facter::Manufacturer.prtdiag_sparc_find_system_info()
+    Facter.value(:manufacturer).should == "Sun Microsystems"
+    Facter.value(:productname).should == "Sun Fire V120 (UltraSPARC-IIe 648MHz)"
+  end
+
+  it "should parse prtdiag output on a t5220" do
+    Facter::Util::Resolution.stubs(:exec).returns(fixture_data(File.join("unit", "util", "manufacturer", "solaris_t5220_prtdiag")))
+    Facter::Manufacturer.prtdiag_sparc_find_system_info()
+    Facter.value(:manufacturer).should == "Sun Microsystems"
+    Facter.value(:productname).should == "SPARC Enterprise T5220"
+  end
+
+  it "should not set manufacturer or productname if prtdiag output is nil" do
+    # Stub kernel so we don't have windows fall through to its own mechanism
+    Facter.fact(:kernel).stubs(:value).returns("SunOS")
+
+    Facter::Util::Resolution.stubs(:exec).returns(nil)
+    Facter::Manufacturer.prtdiag_sparc_find_system_info()
+    Facter.value(:manufacturer).should be_nil
+    Facter.value(:productname).should be_nil
+  end
+
+  it "should strip white space on dmi output with spaces" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/linux_dmidecode_with_spaces"
+    dmidecode_output = File.new(sample_output_file).read()
+    Facter::Manufacturer.expects(:get_dmi_table).returns(dmidecode_output)
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+
+    query = { '[Ss]ystem [Ii]nformation' => [ { 'Product(?: Name)?:' => 'productname' } ] }
+
+    Facter::Manufacturer.dmi_find_system_info(query)
+    Facter.value(:productname).should == "MS-6754"
+  end
+
+  it "should handle output from smbios when run under sunos" do
+    sample_output_file = File.dirname(__FILE__) + "/../data/opensolaris_smbios"
+    smbios_output = File.new(sample_output_file).read()
+    Facter::Manufacturer.expects(:get_dmi_table).returns(smbios_output)
+    Facter.fact(:kernel).stubs(:value).returns("SunOS")
+
+    query = { 'BIOS information' => [ { 'Release Date:' => 'reldate' } ] }
+
+    Facter::Manufacturer.dmi_find_system_info(query)
+    Facter.value(:reldate).should == "12/01/2006"
+  end
+
+  it "should not split on dmi keys containing the string Handle" do
+    dmidecode_output = <<-eos
 Handle 0x1000, DMI type 16, 15 bytes
 Physical Memory Array
         Location: System Board Or Motherboard
@@ -61,16 +78,16 @@
 Handle 0x001F
         DMI type 127, 4 bytes.
         End Of Table
-        eos
-        Facter::Manufacturer.expects(:get_dmi_table).returns(dmidecode_output)
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        query = { 'Physical Memory Array' => [ { 'Number Of Devices:' => 'ramslots'}]}
-        Facter::Manufacturer.dmi_find_system_info(query)
-        Facter.value(:ramslots).should == "123"
-    end
+    eos
+    Facter::Manufacturer.expects(:get_dmi_table).returns(dmidecode_output)
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    query = { 'Physical Memory Array' => [ { 'Number Of Devices:' => 'ramslots'}]}
+    Facter::Manufacturer.dmi_find_system_info(query)
+    Facter.value(:ramslots).should == "123"
+  end
 
-    it "should match the key in the defined section and not the first one found" do
-        dmidecode_output = <<-eos
+  it "should match the key in the defined section and not the first one found" do
+    dmidecode_output = <<-eos
 Handle 0x000C, DMI type 7, 19 bytes
 Cache Information
         Socket Designation: Internal L2 Cache
@@ -99,55 +116,55 @@
 Handle 0x001F
         DMI type 127, 4 bytes.
         End Of Table
-        eos
-        Facter::Manufacturer.expects(:get_dmi_table).returns(dmidecode_output)
-        Facter.fact(:kernel).stubs(:value).returns("Linux")
-        query = { 'Physical Memory Array' => [ { 'Location:' => 'ramlocation'}]}
-        Facter::Manufacturer.dmi_find_system_info(query)
-        Facter.value(:ramlocation).should == "System Board Or Motherboard"
-    end
-