Merge branch 'next'
maint: Fix spec failures caused by having a space in the path to facter's source
Merge branch 'maint/next/fix_space_related_spec_failures' into next
(#5325) Manufacturer and product name on SPARC

Use prtdiag output on Solaris/SPARC to determine manufacturer and productname as
smbios is unavailable.
(#5325) Add tests for SPARC manufacturer and product name

Just tests the regex, won't actually catch problems if prtdiag doesn't
return output like our test.

Paired-with: Nick Lewis
Merge branch 'ticket/next/5325' into next

* ticket/next/5325:
  (#5325) Add tests for SPARC manufacturer and product name
  (#5325) Manufacturer and product name on SPARC
Merge branch 'next'
(#4754) Add support for Darwin and Parallels VM to "virtual" fact

Adds support for Parallels VM guest detection with existing operating
systems. Detects Parallels based on hardware vendor name and pci id. The
Parallels vendor id does not seem to be listed in most pci.ids.

Adds resolution for "virtual" fact in the Darwin kernel. This uses the
existing Facter::Util::Macosx module to resolve system profiler data.
Both vendor name and vendor id values are checked. Resolution appears to
vary based on VM Host product.

Signed-off-by: donavanm <donavan@desinc.net>
(#4754) Change is_virtual logic to not enumerate virtual types

While looking at the patch for adding parallels to the virtual types
David Schmitt noticed that it might be easier just to list the types
that are NOT virtual since there's fewer of them.

Paired-with: Nick Lewis
Merge branch 'ticket/next/4754' into next

* ticket/next/4754:
  (#4754) Change is_virtual logic to not enumerate virtual types
  (#4754) Add support for Darwin and Parallels VM to "virtual" fact
(#1423) Memory facts for Solaris

Add total memory from prtconf output, free from vmstat plus swap free and
total from swap -l listing.
Merge branch 'ticket/next/1423' into next

* ticket/next/1423:
  (#1423) Memory facts for Solaris
(#4575) win32 support for manufacturer, productname, & serialnumber

Signed-off-by: William Van Hevelingen <wvan13@gmail.com>
Merge branch 'feature/next/4575' into next

* feature/next/4575:
  (#4575) win32 support for manufacturer, productname, & serialnumber
Refactor util/uptime.rb tests to reduce duplication using contexts

Reviewed-by: Paul Berry <paul@puppetlabs.com>
(#5086) Try using kstat before falling back to 'who -b' to determine uptime.

'who -b' doesn't report the year of the last system boot on (at least)
Solaris 10, and OpenSolaris 2009.06.  Try using 'kstat -p
unix:::boot_time', which reports as seconds since the epoch on these
systems before falling back to 'who -b'.

Reviewed-by: Paul Berry <paul@puppetlabs.com>
Merge branch 'issue/next/5086' into next

* issue/next/5086:
  (#5086) Try using kstat before falling back to 'who -b' to determine uptime.
  Refactor util/uptime.rb tests to reduce duplication using contexts
Refactor #6044 -- port testing to rspec2

We have moved to rspec2 for puppet, and facter should follow suit.
Refactor #6044 -- require spec_helper with a consistent path.

Because we pull in spec_helper in individual tests, we need to use a
consistent path or Ruby will evaluate it multiple times.  Make the path
consistent by expanding it before require.
Refactor #6044 -- use _spec.rb as the pattern for spec tests.

Rename all the spec tests to follow the rspec convention of *_spec.rb rather
than unadorned *.rb; this also makes it easier to work with them consistently
without using the Rakefile support that customizes that.