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

[Adam Gandelman]

facter (1.6.2-1ubuntu1) precise; urgency=low

  * Merge from Debian testing (LP: #888671). Remaining changes:
    - debian/rules: use what we had in natty; we dont 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.

 -- Adam Gandelman <email address hidden> Thu, 10 Nov 2011 10:11:05 -0800

[Dave Walker (davewalker)]

Great work, two comments:

Diff from Debian to your merge:
-Build-Depends: debhelper (>= 8), gem2deb (>= 0.2.4~)
+Build-Depends: debhelper (>= 5.0.0), ruby (>= 1.8), libopenssl-ruby

lintian is complaining that we do infact need debhelper (>= 8)
I'm also wondering if the ruby depends should be changed to, "ruby (>= 1.8) , ruby (<< 1.9)" - as the Ubuntu delta makes use of "--sitelibdir=/usr/lib/ruby/1.8", which will silently break if 1.9 is installed?

What are your thoughts?

Other things that should probably be looked at:
http://lintian.debian.org/tags/dh-clean-k-is-deprecated.html

As this is a Ubuntu delta of debian/rules: we should probably add:
http://lintian.debian.org/tags/debian-rules-missing-recommended-target.html

(Otherwise, looks great!)

Thanks!

review: Needs Fixing

[lp:~gandelman-a/ubuntu/precise/facter/lp888671]

18. By Adam Gandelman on 2011-11-11

debian/rules: Add build-arch and build-indep targets to satisfy lintian

19. By Adam Gandelman on 2011-11-11

debian/rules: use dh_prep instead of dh_clean

20. By Adam Gandelman on 2011-11-11

debian/control: Update to debhelper >= 8

21. By Adam Gandelman on 2011-11-11

debian/control: Depend on ruby1.8 explicitly

22. By Adam Gandelman on 2011-11-11

* debian/rules: Use dh_prep instead of dh_clean, add build-arch + build-indep
  targets
* debian/control: Update debhelper Build-Depends to 8, make binary package
  depend on ruby1.8 explicitly.

[Adam Gandelman (gandelman-a)]

Hi Dave-

I've pushed some changes that fix the lintian warnings (I'll get in the habit of catching those myself soon, I promise :)

As for the ruby 1.8/1.9.. It's true that, as currently packaged, facter won't function with only 1.9.1, even though it installs fine. I've set ruby1.8 as an explicit dependency because (as you pointed out) we're explicitly setting that elsewhere, and I don't anticipate any other ruby interpreter entering main that would satisfy "ruby (>= 1.8) , ruby (<< 1.9)" If that's not ideal, let me know!

Thanks.
Adam

[Dave Walker (davewalker)]

Thanks for addressing those things. I did notice a couple of other things, if it was just 1 - i'd have just uploaded it, but these should probably be addressed.

Ah! But depending on ruby1.8, rather than a ruby (>=1.8) has introduced:
http://lintian.debian.org/tags/ruby-script-but-no-ruby-dep.html

debian/changelog: "we dont want ruby-pkg-tools" , should be s/dont/don't/ ?

Seems our delta has lost the manpage for /usr/bin/facter. :(

Thanks for your work on this.

review: Needs Fixing

[lp:~gandelman-a/ubuntu/precise/facter/lp888671]

23. By Adam Gandelman on 2011-11-14

Install man pages, fix typo in changelog

[Adam Gandelman (gandelman-a)]

Dave-

The 'ruby-script-but-no-ruby-dep' warning seems to only emit when I've got a Dependency on "ruby (>= 1.8) , ruby (<< 1.9)". Pegging it directly to ruby1.8 silences it (here, anyway). Perhaps introducing the dependency on 1.8 via '--sitelibdir=/usr/lib/ruby/1.8', as opposed to '#!/usr/bin/ruby1.8', is throwing lintian off?

Other two points resolved in latest push.

Thanks for the input
Adam

[Dave Walker (davewalker)]

Great work, thanks Adam.

Lintian did report this on the binary, which isn't a blocker.. but also not clear where it's being created.
I: facter: package-contains-empty-directory usr/sbin/

Uploaded!

review: Approve

=== added directory '.pc'
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2011-11-14 19:37:34 +0000
@@ -0,0 +1,1 @@
+2

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2011-11-14 19:37:34 +0000
@@ -0,0 +1,1 @@
+no-require-rubygems

=== added directory '.pc/no-require-rubygems'
=== added directory '.pc/no-require-rubygems/lib'
=== added directory '.pc/no-require-rubygems/lib/facter'
=== added file '.pc/no-require-rubygems/lib/facter/application.rb'
--- .pc/no-require-rubygems/lib/facter/application.rb	1970-01-01 00:00:00 +0000
+++ .pc/no-require-rubygems/lib/facter/application.rb	2011-11-14 19:37:34 +0000
@@ -0,0 +1,123 @@
+module Facter
+  module Application
+    def self.run(argv)
+      require 'optparse'
+      require 'facter'
+
+      options = parse(argv)
+
+      # Accept fact names to return from the command line
+      names = argv
+
+      # Create the facts hash that is printed to standard out.
+      unless names.empty?
+        facts = {}
+        names.each do |name|
+          begin
+            facts[name] = Facter.value(name)
+          rescue => error
+            $stderr.puts "Could not retrieve #{name}: #{error}"
+            exit 10
+          end
+        end
+      end
+
+      # Print everything if they didn't ask for specific facts.
+      facts ||= Facter.to_hash
+
+      # Print the facts as YAML and exit
+      if options[:yaml]
+        require 'yaml'
+        puts YAML.dump(facts)
+        exit(0)
+      end
+
+      # Print the facts as JSON and exit
+      if options[:json]
+        begin
+          require 'rubygems'
+          require 'json'
+          puts JSON.dump(facts)
+          exit(0)
+        rescue LoadError
+          $stderr.puts "You do not have JSON support in your version of Ruby. JSON output disabled"
+          exit(1)
+        end
+      end
+
+      # Print the value of a single fact, otherwise print a list sorted by fact
+      # name and separated by "=>"
+      if facts.length == 1
+        if value = facts.values.first
+          puts value
+        end
+      else
+        facts.sort_by{ |fact| fact.first }.each do |name,value|
+          puts "#{name} => #{value}"
+        end
+      end
+
+    rescue => e
+      if options && options[:trace]
+        raise e
+      else
+        $stderr.puts "Error: #{e}"
+        exit(12)
+      end
+    end
+
+    private
+
+    def self.parse(argv)
+      options = {}
+      OptionParser.new do |opts|
+        opts.on("-y", "--yaml")   { |v| options[:yaml]   = v }
+        opts.on("-j", "--json")   { |v| options[:json]   = v }
+        opts.on(      "--trace")  { |v| options[:trace]  = v }
+        opts.on("-d", "--debug")  { |v| Facter.debugging(1) }
+        opts.on("-t", "--timing") { |v| Facter.timing(1) }
+        opts.on("-p", "--puppet") { |v| load_puppet }
+
+        opts.on_tail("-v", "--version") do
+          puts Facter.version
+          exit(0)
+        end
+
+        opts.on_tail("-h", "--help") do
+          begin
+            require 'rdoc/ri/ri_paths'
+            require 'rdoc/usage'
+            RDoc.usage # print usage and exit
+          rescue LoadError
+            $stderr.puts "No help available unless your RDoc has RDoc.usage"
+            exit(1)
+          rescue => e
+            $stderr.puts "fatal: #{e}"
+            exit(1)
+          end
+        end
+      end.parse!
+
+      options
+    rescue OptionParser::InvalidOption => e
+      $stderr.puts e.message
+      exit(12)
+    end
+
+    def self.load_puppet
+      require 'puppet'
+      Puppet.parse_config
+
+      # If you've set 'vardir' but not 'libdir' in your
+      # puppet.conf, then the hook to add libdir to $:
+      # won't get triggered.  This makes sure that it's setup
+      # correctly.
+      unless $LOAD_PATH.include?(Puppet[:libdir])
+        $LOAD_PATH << Puppet[:libdir]
+      end
+    rescue LoadError => detail
+      $stderr.puts "Could not load Puppet: #{detail}"
+    end
+
+  end
+end

=== modified file 'CHANGELOG'
--- CHANGELOG	2011-10-18 10:32:42 +0000
+++ CHANGELOG	2011-11-14 19:37:34 +0000
@@ -1,3 +1,34 @@
+1.6.2
+===
+d7c00f6 (#9852) Fixing watchr on facter
+abf636e (#9555) Change all cases of tabs and 4 space indentation to 2 space indentation.
+db1b5af (#9830) Add sshecdsakey fact
+1b69791 (#9404) Add memory & update processor facts for DragonFly and OpenBSD.
+bce2c69 (#9404) De-clumsify CPU count detection and swap detection on OpenBSD.
+cd0ae15 (#9404) Efficiency cleanups for DragonFly facts.
+d5511f6 (#9404) Add cross-fact support to facter for DragonFly BSD.
+0dfc4e9 (#6728) Improve openvz/cloudlinux detection.
+2c5ad52 (#6728) Facter improperly detects openvzve on CloudLinux systems
+9101e46 (#7951) added OS support for Amazon Linux
+b3784f7 add operatingsystema and operatingsystemrelease support for cloudlinux
+8605bba (#9787) Change rspec format so we use the default, not document
+b579613 (#7726) Silence prtconf error message inside zones
+db3c606 (#9786) Add aliases: specs, tests, test in rake that points at 'spec'.
+dfda9be (#4980, #6470) Fix architecture in Darwin and Ubuntu
+8f938c1 (#6792) Added osfamily fact.
+af1ef43 (#6515) Fix for ruby-1.8.5. Switched use of 'line.each' to 'each_line'.
+328ff75 (#6515 and #2945) Fix processorcount for arm, sparc & ppc for linux.
+51329b8 (#3856) Detect VirtualBox on Darwin as well as Linux and SunOS
+83498b5 (#7996) Restrict solaris cpu processor detection
+6e29ff7 (#8615) ENV hash is now local to tests
+124a09b (#8240) Fixed regex pattern for domain
+fd93c5f (#7996) Add solaris processor facts
+3f1a163 (#9593) Require rubygems to handle json output for ruby 1.8.7.
+c4fe415 (#9295) Added spec tests for Hyper-V detection
+ea23417 (#9295) Initial detection of Hyper-V hypervisor
+82351ab Stub out OS and HW model to avoid test failures. Only stub vmware -v (don't expect it) since it needn't be invoked if we already identified Xen or something else.
+16a8cab (#2747) Fix detection of xen0 vs xenu in Xen 3.2.
+
 1.6.1
 ===
 1f009e0 Updated CHANGELOG for 1.6.1rc4

=== modified file 'Rakefile'
--- Rakefile	2011-10-18 10:32:42 +0000
+++ Rakefile	2011-11-14 19:37:34 +0000
@@ -7,7 +7,7 @@
 require 'rspec'
 require 'rspec/core/rake_task'
 begin
-    require 'rcov'
+  require 'rcov'
 rescue LoadError
 end
 
@@ -18,60 +18,65 @@
 require 'rake/gempackagetask'
 
 module Facter
-    FACTERVERSION = File.read('lib/facter.rb')[/FACTERVERSION *= *'(.*)'/,1] or fail "Couldn't find FACTERVERSION"
+  FACTERVERSION = File.read('lib/facter.rb')[/FACTERVERSION *= *'(.*)'/,1] or fail "Couldn't find FACTERVERSION"
 end
 
 FILES = FileList[
-    '[A-Z]*',
-    'install.rb',
-    'bin/**/*',
-    'lib/**/*',
-    'conf/**/*',
-    'etc/**/*',
-    'spec/**/*'
+  '[A-Z]*',
+  'install.rb',
+  'bin/**/*',
+  'lib/**/*',
+  'conf/**/*',
+  'etc/**/*',
+  'spec/**/*'
 ]
 
 spec = Gem::Specification.new do |spec|
-    spec.platform = Gem::Platform::RUBY
-    spec.name = 'facter'
-    spec.files = FILES.to_a
-    spec.executables = %w{facter}
-    spec.version = Facter::FACTERVERSION
-    spec.summary = 'Facter, a system inventory tool'
-    spec.author = 'Puppet Labs'
-    spec.email = '[e-mail]'
-    spec.homepage = 'http://puppetlabs.com'
-    spec.rubyforge_project = 'facter'
-    spec.has_rdoc = true
-    spec.rdoc_options <<
-        '--title' <<  'Facter - System Inventory Tool' <<
-        '--main' << 'README' <<
-        '--line-numbers'
+  spec.platform = Gem::Platform::RUBY
+  spec.name = 'facter'
+  spec.files = FILES.to_a
+  spec.executables = %w{facter}
+  spec.version = Facter::FACTERVERSION
+  spec.summary = 'Facter, a system inventory tool'
+  spec.author = 'Puppet Labs'
+  spec.email = '[e-mail]'
+  spec.homepage = 'http://puppetlabs.com'
+  spec.rubyforge_project = 'facter'
+  spec.has_rdoc = true
+  spec.rdoc_options <<
+    '--title' <<  'Facter - System Inventory Tool' <<
+    '--main' << 'README' <<
+    '--line-numbers'
 end
 
 Rake::PackageTask.new("facter", Facter::FACTERVERSION) do |pkg|
-    pkg.package_dir = 'pkg'
-    pkg.need_tar_gz = true
-    pkg.package_files = FILES.to_a
+  pkg.package_dir = 'pkg'
+  pkg.need_tar_gz = true
+  pkg.package_files = FILES.to_a
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 task :default do
-    sh %{rake -T}
+  sh %{rake -T}
 end
 
+# Aliases for spec
+task :test    => [:spec]
+task :tests   => [:spec]
+task :specs   => [:spec]
+
 RSpec::Core::RakeTask.new do |t|
-    t.pattern ='spec/{unit,integration}/**/*_spec.rb'
-    t.fail_on_error = true
+  t.pattern ='spec/{unit,integration}/**/*_spec.rb'
+  t.fail_on_error = true
 end
 
 RSpec::Core::RakeTask.new('spec:rcov') do |t|
-    t.pattern ='spec/{unit,integration}/**/*_spec.rb'
-    t.fail_on_error = true
-    if defined?(Rcov)
-        t.rcov = true
-        t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*,gems/*']
-    end
+  t.pattern ='spec/{unit,integration}/**/*_spec.rb'
+  t.fail_on_error = true
+  if defined?(Rcov)
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*,gems/*']
+  end
 end

=== modified file 'conf/redhat/facter.spec'
--- conf/redhat/facter.spec	2011-10-06 10:48:30 +0000
+++ conf/redhat/facter.spec	2011-11-14 19:37:34 +0000
@@ -2,16 +2,17 @@
 
 %define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
 %define has_ruby_noarch %has_ruby_abi
+%global _ver 1.6.2
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.6.0
+Version: 1.6.2
 Release: 1%{?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}-%{version}.tar.gz
-Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
+Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{_ver}.tar.gz
+#Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
@@ -31,7 +32,7 @@
 operating system. Additional facts can be added through simple Ruby scripts
 
 %prep
-%setup -q
+%setup -q  -n %{name}-%{_ver}
 
 %build
 
@@ -52,6 +53,12 @@
 
 
 %changelog
+* Mon Oct 10 2011 Michael Stahnke <[e-mail]> -  1.6.2-1
+- Update to 1.6.2
+
+* Mon Oct 03 2011 Michael Stahnke <[e-mail]> -  1.6.2-0.1rc1
+- Updates for 1.6.2-0.1rc1
+
 * Thu Jun 23 2011 Michael Stahnke <[e-mail]> - 1.6.0-1
 - Update to 1.6.0
 

=== modified file 'conf/solaris/pkginfo'
--- conf/solaris/pkginfo	2011-06-24 10:04:12 +0000
+++ conf/solaris/pkginfo	2011-11-14 19:37:34 +0000
@@ -1,6 +1,6 @@
 PKG=CSWfacter
 NAME=facter - System Fact Gatherer
-VERSION=1.6.0
+VERSION=1.6.2
 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-10-18 10:32:42 +0000
+++ debian/changelog	2011-11-14 19:37:34 +0000
@@ -1,7 +1,28 @@
+facter (1.6.2-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing (LP: #888671).  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: Update debhelper Build-Depends to 8, make binary package
+    depend on ruby1.8 explicitly.
+
+ -- Adam Gandelman <[e-mail]>  Thu, 10 Nov 2011 10:11:05 -0800
+
+facter (1.6.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Stig Sandbeck Mathisen <[e-mail]>  Wed, 12 Oct 2011 11:29:53 +0200
+
 facter (1.6.1-1ubuntu1) precise; urgency=low
 
   * Merge from Debian unstable (LP: #877621). Remaining changes:
-    - debian/rules: use what we had in natty; we dont want ruby-pkg-tools
+    - 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
@@ -29,7 +50,7 @@
 
   * Merge from debian unstable (LP: #788284).  Remaining changes:
     - Dropped ruby-pkg-tools and libsetup-ruby1.8; debian/rules: use what we
-      had in natty; we dont want ruby-pkg-tools in main. (LP: #408402)
+      had in natty; we don't want ruby-pkg-tools in main. (LP: #408402)
   * Dropped changes to lib/facter/ec2.rb. (Use the latest-meta api so it
     always does not retunr false). This was fixed upstream.
 
@@ -59,7 +80,7 @@
 facter (1.5.8-2ubuntu1) natty; urgency=low
 
   * Merge from debian unstable.  Remaining changes:
-    - Dropped ruby-pkg-tools and libsetup-ruby1.8, we dont want ruby-pkg-tools
+    - Dropped ruby-pkg-tools and libsetup-ruby1.8, we don't want ruby-pkg-tools
       in main. (LP: #408402)
 
  -- Chuck Short <[e-mail]>  Tue, 08 Feb 2011 00:18:35 +0000
@@ -97,7 +118,7 @@
 facter (1.5.7-3ubuntu1) natty; urgency=low
 
   * Merge from debian unstable, remaining changes are:
-    - Dropped ruby-pkg-tools and libsetup-ruby1.8, we dont want ruby-pkg-tools 
+    - Dropped ruby-pkg-tools and libsetup-ruby1.8, we don't want ruby-pkg-tools 
       in main. (LP: #408402)
 
  -- Chuck Short <[e-mail]>  Mon, 10 Jan 2011 11:25:00 -0500
@@ -135,7 +156,7 @@
 
   * Merge from debian testing.  Remaining changes:
     - Dropped ruby-pkg-tools, and libsetup-ruby1.8, and cdbs, use what
-      we had in lucid. Since we dont want ruby-pkg-tools in main
+      we had in lucid. Since we don't want ruby-pkg-tools in main
       (LP: #408402)
 
  -- Chuck Short <[e-mail]>  Fri, 26 Mar 2010 16:14:26 +0000
@@ -165,7 +186,7 @@
 facter (1.5.6-2ubuntu2) lucid; urgency=low
 
   * Dropped ruby-pkg-tools, and libsetup-ruby1.8, and cdbs, use what 
-    we had in karmic. Since we dont want ruby-pkg-tools in main. 
+    we had in karmic. Since we don't want ruby-pkg-tools in main. 
     (LP: #408402)
 
  -- Chuck Short <[e-mail]>  Fri, 26 Mar 2010 08:34:25 -0400

=== modified file 'debian/control'
--- debian/control	2011-10-18 10:32:42 +0000
+++ debian/control	2011-11-14 19:37:34 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Puppet Package Maintainers <[e-mail]>
 Uploaders: Andrew Pollock <[e-mail]>, Nigel Kersten <[e-mail]>, Micah Anderson <[e-mail]>, Stig Sandbeck Mathisen <[e-mail]>
-Build-Depends: debhelper (>= 5.0.0), ruby (>= 1.8), libopenssl-ruby
+Build-Depends: debhelper (>= 8), ruby (>= 1.8), libopenssl-ruby
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-puppet/facter.git
 Vcs-Browser: http://git.debian.org/?p=pkg-puppet/facter.git
@@ -14,7 +14,7 @@
 Package: facter
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${misc:Depends}, ruby | ruby-interpreter, net-tools, bind9-host | host
+Depends: ${misc:Depends}, ruby1.8, net-tools, bind9-host | host
 Recommends: pciutils
 Suggests: ruby-json
 Description: collect and display facts about the system

=== added directory 'debian/patches'
=== added file 'debian/patches/no-require-rubygems'
--- debian/patches/no-require-rubygems	1970-01-01 00:00:00 +0000
+++ debian/patches/no-require-rubygems	2011-11-14 19:37:34 +0000
@@ -0,0 +1,15 @@
+From: Stig Sandbeck Mathisen <[e-mail]>
+Forwarded: not-needed
+Subject: Do not require rubygems
+ We do not require rubygems; the apt repository should contain all
+ dependencies.
+--- a/lib/facter/application.rb
++++ b/lib/facter/application.rb
+@@ -35,7 +35,6 @@
+       # Print the facts as JSON and exit
+       if options[:json]
+         begin
+-          require 'rubygems'
+           require 'json'
+           puts JSON.dump(facts)
+           exit(0)

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-11-14 19:37:34 +0000
@@ -0,0 +1,1 @@
+no-require-rubygems

=== modified file 'debian/rules'
--- debian/rules	2011-10-18 10:32:42 +0000
+++ debian/rules	2011-11-14 19:37:34 +0000
@@ -18,7 +18,9 @@
 	touch configure-stamp
 
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 	touch build-stamp
@@ -32,7 +34,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep 
 	dh_installdirs
 
 	$(CURDIR)/install.rb --destdir=$(CURDIR)/debian/facter/ \
@@ -49,6 +51,7 @@
 	dh_testroot
 	dh_installchangelogs CHANGELOG
 	dh_installdocs
+	dh_installman
 	dh_compress
 	dh_fixperms
 	dh_installdeb

=== modified file 'install.rb'
--- install.rb	2011-10-18 10:32:42 +0000
+++ install.rb	2011-11-14 19:37:34 +0000
@@ -12,23 +12,23 @@
 # In most cases, if you have a typical project layout, you will need to do
 # absolutely nothing to make this work for you. This layout is:
 #
-#   bin/    # executable files -- "commands"
-#   lib/    # the source of the library
+#   bin/  # executable files -- "commands"
+#   lib/  # the source of the library
 #   tests/  # unit tests
 #
 # The default behaviour:
 # 1) Run all unit test files (ending in .rb) found in all directories under
-#    tests/.
+#  tests/.
 # 2) Build Rdoc documentation from all files in bin/ (excluding .bat and .cmd),
-#    all .rb files in lib/, ./README, ./ChangeLog, and ./Install.
+#  all .rb files in lib/, ./README, ./ChangeLog, and ./Install.
 # 3) Build ri documentation from all files in bin/ (excluding .bat and .cmd),
-#    and all .rb files in lib/. This is disabled by default on Win32.
+#  and all .rb files in lib/. This is disabled by default on Win32.
 # 4) Install commands from bin/ into the Ruby bin directory. On Windows, if a
-#    if a corresponding batch file (.bat or .cmd) exists in the bin directory,
-#    it will be copied over as well. Otherwise, a batch file (always .bat) will
-#    be created to run the specified command.
+#  if a corresponding batch file (.bat or .cmd) exists in the bin directory,
+#  it will be copied over as well. Otherwise, a batch file (always .bat) will
+#  be created to run the specified command.
 # 5) Install all library files ending in .rb from lib/ into Ruby's
-#    site_lib/version directory.
+#  site_lib/version directory.
 #
 #++
 
@@ -39,23 +39,23 @@
 require 'ostruct'
 
 begin
-    require 'rdoc/rdoc'
-    $haverdoc = true
+  require 'rdoc/rdoc'
+  $haverdoc = true
 rescue LoadError
-    puts "Missing rdoc; skipping documentation"
-    $haverdoc = false
+  puts "Missing rdoc; skipping documentation"
+  $haverdoc = false
 end
 
 begin
-    if $haverdoc
-       rst2man = %x{which rst2man.py}
-       $haveman = true
-    else
-       $haveman = false
-    end
+  if $haverdoc
+     rst2man = %x{which rst2man.py}
+     $haveman = true
+  else
+     $haveman = false
+  end
 rescue
-    puts "Missing rst2man; skipping man page creation"
-    $haveman = false
+  puts "Missing rst2man; skipping man page creation"
+  $haveman = false
 end
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
@@ -67,66 +67,66 @@
 InstallOptions = OpenStruct.new
 
 def glob(list)
-    g = list.map { |i| Dir.glob(i) }
-    g.flatten!
-    g.compact!
-    g.reject! { |e| e =~ /\.svn/ }
-    g
+  g = list.map { |i| Dir.glob(i) }
+  g.flatten!
+  g.compact!
+  g.reject! { |e| e =~ /\.svn/ }
+  g
 end
 
 # Set these values to what you want installed.
 sbins = glob(%w{sbin/*})
 bins  = glob(%w{bin/*})
 rdoc  = glob(%w{bin/* sbin/* lib/**/*.rb README README-library CHANGELOG TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ }
-ri    = glob(%w(bin/*.rb sbin/* lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }
+ri  = glob(%w(bin/*.rb sbin/* lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }
 man   = glob(%w{man/man8/*})
 libs  = glob(%w{lib/**/*.rb lib/**/*.py})
 tests = glob(%w{tests/**/*.rb})
 
 def do_bins(bins, target, strip = 's?bin/')
-    bins.each do |bf|
-        obf = bf.gsub(/#{strip}/, '')
-            install_binfile(bf, obf, target)
-    end
+  bins.each do |bf|
+    obf = bf.gsub(/#{strip}/, '')
+      install_binfile(bf, obf, target)
+  end
 end
 
 def do_libs(libs, strip = 'lib/')
-    libs.each do |lf|
-        olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
-        op = File.dirname(olf)
-        FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
-        FileUtils.chmod(0755, op)
-        FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
-    end
+  libs.each do |lf|
+    olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
+    op = File.dirname(olf)
+    FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
+    FileUtils.chmod(0755, op)
+    FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
+  end
 end
 
 def do_man(man, strip = 'man/')
   if (InstallOptions.man == true)  
-    man.each do |mf|
-	omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
-	om = File.dirname(omf)
-	FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
-	FileUtils.chmod(0755, om)
-	FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
-	gzip = %x{which gzip}
-	gzip.chomp!
-	%x{#{gzip} -f #{omf}}
-    end
+  man.each do |mf|
+    omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
+    om = File.dirname(omf)
+    FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
+    FileUtils.chmod(0755, om)
+    FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
+    gzip = %x{which gzip}
+    gzip.chomp!
+    %x{#{gzip} -f #{omf}}
+  end
   else
-    puts "Skipping Man Page Generation"
+  puts "Skipping Man Page Generation"
   end
 end
 
 # Verify that all of the prereqs are installed
 def check_prereqs
-    PREREQS.each { |pre|
-        begin
-            require pre
-        rescue LoadError
-            puts "Could not load #{pre} Ruby library; cannot install"
-            exit -1
-        end
-    }
+  PREREQS.each { |pre|
+    begin
+      require pre
+    rescue LoadError
+      puts "Could not load #{pre} Ruby library; cannot install"
+      exit -1
+    end
+  }
 end
 
 def is_windows?
@@ -137,160 +137,160 @@
 # Prepare the file installation.
 #
 def prepare_installation
-    # Only try to do docs if we're sure they have rdoc
-    if $haverdoc
-        InstallOptions.rdoc  = true
-        if is_windows?
-            InstallOptions.ri  = false
-        else
-            InstallOptions.ri  = true
-        end
-    else
-        InstallOptions.rdoc  = false
-        InstallOptions.ri  = false
-    end
-
-
-    if $haveman
-        InstallOptions.man = true
-        if is_windows?
-            InstallOptions.man  = false
-        end
-    else
-        InstallOptions.man = false
-    end
-
-    InstallOptions.tests = true
-
-    ARGV.options do |opts|
-        opts.banner = "Usage: #{File.basename($0)} [options]"
-        opts.separator ""
-        opts.on('--[no-]rdoc', 'Prevents the creation of RDoc output.', 'Default on.') do |onrdoc|
-            InstallOptions.rdoc = onrdoc
-        end
-        opts.on('--[no-]ri', 'Prevents the creation of RI output.', 'Default off on mswin32.') do |onri|
-            InstallOptions.ri = onri
-        end
-        opts.on('--[no-]man', 'Presents the creation of man pages.', 'Default on.') do |onman|
-        InstallOptions.man = onman
-        end
-        opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|
-            InstallOptions.tests = ontest
-        end
-        opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', 'Default essentially /') do |destdir|
-            InstallOptions.destdir = destdir
-        end
-        opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides Config::CONFIG["bindir"]') do |bindir|
-            InstallOptions.bindir = bindir
-        end
-        opts.on('--sbindir[=OPTIONAL]', 'Installation directory for system binaries', 'overrides Config::CONFIG["sbindir"]') do |sbindir|
-            InstallOptions.sbindir = sbindir
-        end
-        opts.on('--sitelibdir[=OPTIONAL]', 'Installation directory for libraries', 'overrides Config::CONFIG["sitelibdir"]') do |sitelibdir|
-            InstallOptions.sitelibdir = sitelibdir
-        end
-        opts.on('--mandir[=OPTIONAL]', 'Installation directory for man pages', 'overrides Config::CONFIG["mandir"]') do |mandir|
-            InstallOptions.mandir = mandir
-        end
-        opts.on('--quick', 'Performs a quick installation. Only the', 'installation is done.') do |quick|
-            InstallOptions.rdoc   = false
-            InstallOptions.ri     = false
-            InstallOptions.tests  = false
-        end
-        opts.on('--full', 'Performs a full installation. All', 'optional installation steps are run.') do |full|
-            InstallOptions.rdoc   = true
-            InstallOptions.ri     = true
-            InstallOptions.tests  = true
-        end
-        opts.separator("")
-        opts.on_tail('--help', "Shows this help text.") do
-            $stderr.puts opts
-            exit
-        end
-
-        opts.parse!
-    end
-
-    tmpdirs = [ENV['TMP'], ENV['TEMP'], "/tmp", "/var/tmp", "."]
-
-    version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
-    libdir = File.join(Config::CONFIG["libdir"], "ruby", version)
-
-    # Mac OS X 10.5 and higher declare bindir and sbindir as
-    # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
-    # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/sbin
-    # which is not generally where people expect executables to be installed
-    # These settings are appropriate defaults for all OS X versions.
-    if RUBY_PLATFORM =~ /^universal-darwin[\d\.]+$/
-      Config::CONFIG['bindir'] = "/usr/bin"
-      Config::CONFIG['sbindir'] = "/usr/sbin"
-    end
-
-    if not InstallOptions.bindir.nil?
-        bindir = InstallOptions.bindir
-    else
-        bindir = Config::CONFIG['bindir']
-    end
-
-    if not InstallOptions.sbindir.nil?
-        sbindir = InstallOptions.sbindir
-    else
-        sbindir = Config::CONFIG['sbindir']
-    end
-
-    if not InstallOptions.sitelibdir.nil?
-        sitelibdir = InstallOptions.sitelibdir
-    else
-        sitelibdir = Config::CONFIG["sitelibdir"]
-        if sitelibdir.nil?
-            sitelibdir = $:.find { |x| x =~ /site_ruby/ }
-            if sitelibdir.nil?
-                sitelibdir = File.join(libdir, "site_ruby")
-            elsif sitelibdir !~ Regexp.quote(version)
-                sitelibdir = File.join(sitelibdir, version)
-            end
-        end
-    end
-
-    if not InstallOptions.mandir.nil?
-        mandir = InstallOptions.mandir
-    else
-        mandir = Config::CONFIG['mandir']
-    end
-
-    # To be deprecated once people move over to using --destdir option
-    if (destdir = ENV['DESTDIR'])
-        warn "DESTDIR is deprecated. Use --destdir instead."
-        bindir = join(destdir, bindir)
-        sbindir = join(destdir, sbindir)
-        mandir = join(destdir, mandir)
-        sitelibdir = join(destdir, sitelibdir)
-
-        FileUtils.makedirs(bindir)
-        FileUtils.makedirs(sbindir)
-        FileUtils.makedirs(mandir)
-        FileUtils.makedirs(sitelibdir)
-        # This is the new way forward
-    elsif (destdir = InstallOptions.destdir)
-        bindir = join(destdir, bindir)
-        sbindir = join(destdir, sbindir)
-        mandir = join(destdir, mandir)
-        sitelibdir = join(destdir, sitelibdir)
-
-        FileUtils.makedirs(bindir)
-        FileUtils.makedirs(sbindir)
-        FileUtils.makedirs(mandir)
-        FileUtils.makedirs(sitelibdir)
-    end
-
-    tmpdirs << bindir
-
-    InstallOptions.tmp_dirs = tmpdirs.compact
-    InstallOptions.site_dir = sitelibdir
-    InstallOptions.bin_dir  = bindir
-    InstallOptions.sbin_dir = sbindir
-    InstallOptions.lib_dir  = libdir
-    InstallOptions.man_dir  = mandir
+  # Only try to do docs if we're sure they have rdoc
+  if $haverdoc
+    InstallOptions.rdoc  = true
+    if is_windows?
+      InstallOptions.ri  = false
+    else
+      InstallOptions.ri  = true
+    end
+  else
+    InstallOptions.rdoc  = false
+    InstallOptions.ri  = false
+  end
+
+
+  if $haveman
+    InstallOptions.man = true
+    if is_windows?
+      InstallOptions.man  = false
+    end
+  else
+    InstallOptions.man = false
+  end
+
+  InstallOptions.tests = true
+
+  ARGV.options do |opts|
+    opts.banner = "Usage: #{File.basename($0)} [options]"
+    opts.separator ""
+    opts.on('--[no-]rdoc', 'Prevents the creation of RDoc output.', 'Default on.') do |onrdoc|
+      InstallOptions.rdoc = onrdoc
+    end
+    opts.on('--[no-]ri', 'Prevents the creation of RI output.', 'Default off on mswin32.') do |onri|
+      InstallOptions.ri = onri
+    end
+    opts.on('--[no-]man', 'Presents the creation of man pages.', 'Default on.') do |onman|
+    InstallOptions.man = onman
+    end
+    opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|
+      InstallOptions.tests = ontest
+    end
+    opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', 'Default essentially /') do |destdir|
+      InstallOptions.destdir = destdir
+    end
+    opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides Config::CONFIG["bindir"]') do |bindir|
+      InstallOptions.bindir = bindir
+    end
+    opts.on('--sbindir[=OPTIONAL]', 'Installation directory for system binaries', 'overrides Config::CONFIG["sbindir"]') do |sbindir|
+      InstallOptions.sbindir = sbindir
+    end
+    opts.on('--sitelibdir[=OPTIONAL]', 'Installation directory for libraries', 'overrides Config::CONFIG["sitelibdir"]') do |sitelibdir|
+      InstallOptions.sitelibdir = sitelibdir
+    end
+    opts.on('--mandir[=OPTIONAL]', 'Installation directory for man pages', 'overrides Config::CONFIG["mandir"]') do |mandir|
+      InstallOptions.mandir = mandir
+    end
+    opts.on('--quick', 'Performs a quick installation. Only the', 'installation is done.') do |quick|
+      InstallOptions.rdoc   = false
+      InstallOptions.ri   = false
+      InstallOptions.tests  = false
+    end
+    opts.on('--full', 'Performs a full installation. All', 'optional installation steps are run.') do |full|
+      InstallOptions.rdoc   = true
+      InstallOptions.ri   = true
+      InstallOptions.tests  = true
+    end
+    opts.separator("")
+    opts.on_tail('--help', "Shows this help text.") do
+      $stderr.puts opts
+      exit
+    end
+
+    opts.parse!
+  end
+
+  tmpdirs = [ENV['TMP'], ENV['TEMP'], "/tmp", "/var/tmp", "."]
+
+  version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
+  libdir = File.join(Config::CONFIG["libdir"], "ruby", version)
+
+  # Mac OS X 10.5 and higher declare bindir and sbindir as
+  # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
+  # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/sbin
+  # which is not generally where people expect executables to be installed
+  # These settings are appropriate defaults for all OS X versions.
+  if RUBY_PLATFORM =~ /^universal-darwin[\d\.]+$/
+    Config::CONFIG['bindir'] = "/usr/bin"
+    Config::CONFIG['sbindir'] = "/usr/sbin"
+  end
+
+  if not InstallOptions.bindir.nil?
+    bindir = InstallOptions.bindir
+  else
+    bindir = Config::CONFIG['bindir']
+  end
+
+  if not InstallOptions.sbindir.nil?
+    sbindir = InstallOptions.sbindir
+  else
+    sbindir = Config::CONFIG['sbindir']
+  end
+
+  if not InstallOptions.sitelibdir.nil?
+    sitelibdir = InstallOptions.sitelibdir
+  else
+    sitelibdir = Config::CONFIG["sitelibdir"]
+    if sitelibdir.nil?
+      sitelibdir = $:.find { |x| x =~ /site_ruby/ }
+      if sitelibdir.nil?
+        sitelibdir = File.join(libdir, "site_ruby")
+      elsif sitelibdir !~ Regexp.quote(version)
+        sitelibdir = File.join(sitelibdir, version)
+      end
+    end
+  end
+
+  if not InstallOptions.mandir.nil?
+    mandir = InstallOptions.mandir
+  else
+    mandir = Config::CONFIG['mandir']
+  end
+
+  # To be deprecated once people move over to using --destdir option
+  if (destdir = ENV['DESTDIR'])
+    warn "DESTDIR is deprecated. Use --destdir instead."
+    bindir = join(destdir, bindir)
+    sbindir = join(destdir, sbindir)
+    mandir = join(destdir, mandir)
+    sitelibdir = join(destdir, sitelibdir)
+
+    FileUtils.makedirs(bindir)
+    FileUtils.makedirs(sbindir)
+    FileUtils.makedirs(mandir)
+    FileUtils.makedirs(sitelibdir)
+    # This is the new way forward
+  elsif (destdir = InstallOptions.destdir)
+    bindir = join(destdir, bindir)
+    sbindir = join(destdir, sbindir)
+    mandir = join(destdir, mandir)
+    sitelibdir = join(destdir, sitelibdir)
+
+    FileUtils.makedirs(bindir)
+    FileUtils.makedirs(sbindir)
+    FileUtils.makedirs(mandir)
+    FileUtils.makedirs(sitelibdir)
+  end
+
+  tmpdirs << bindir
+
+  InstallOptions.tmp_dirs = tmpdirs.compact
+  InstallOptions.site_dir = sitelibdir
+  InstallOptions.bin_dir  = bindir
+  InstallOptions.sbin_dir = sbindir
+  InstallOptions.lib_dir  = libdir
+  InstallOptions.man_dir  = mandir
 end
 
 ##
@@ -307,69 +307,69 @@
 # Build the rdoc documentation. Also, try to build the RI documentation.
 #
 def build_rdoc(files)
-    return unless $haverdoc
-    begin
-        r = RDoc::RDoc.new
-        r.document(["--main", "README", "--title",
-            "Puppet -- Site Configuration Management", "--line-numbers"] + files)
-    rescue RDoc::RDocError => e
-        $stderr.puts e.message
-    rescue Exception => e
-        $stderr.puts "Couldn't build RDoc documentation\n#{e.message}"
-    end
+  return unless $haverdoc
+  begin
+    r = RDoc::RDoc.new
+    r.document(["--main", "README", "--title",
+      "Puppet -- Site Configuration Management", "--line-numbers"] + files)
+  rescue RDoc::RDocError => e
+    $stderr.puts e.message
+  rescue Exception => e
+    $stderr.puts "Couldn't build RDoc documentation\n#{e.message}"
+  end
 end
 
 def build_ri(files)
-    return unless $haverdoc
-    begin
-        ri = RDoc::RDoc.new
-        #ri.document(["--ri-site", "--merge"] + files)
-        ri.document(["--ri-site"] + files)
-    rescue RDoc::RDocError => e
-        $stderr.puts e.message
-    rescue Exception => e
-        $stderr.puts "Couldn't build Ri documentation\n#{e.message}"
-        $stderr.puts "Continuing with install..."
-    end
+  return unless $haverdoc
+  begin
+    ri = RDoc::RDoc.new
+    #ri.document(["--ri-site", "--merge"] + files)
+    ri.document(["--ri-site"] + files)
+  rescue RDoc::RDocError => e
+    $stderr.puts e.message
+  rescue Exception => e
+    $stderr.puts "Couldn't build Ri documentation\n#{e.message}"
+    $stderr.puts "Continuing with install..."
+  end
 end
 
 def build_man(bins)
-    return unless $haveman
-    begin
-        # Locate rst2man
-        rst2man = %x{which rst2man.py}
-        rst2man.chomp!
-        bins.each do |bin|
-            b = bin.gsub( "bin/", "")
-            %x{#{bin} --help > ./#{b}.rst}
-            %x{#{rst2man} ./#{b}.rst ./man/man8/#{b}.8}
-            File.unlink("./#{b}.rst")
-        end
-    rescue SystemCallError
-        $stderr.puts "Couldn't build man pages: " + $!
-        $stderr.puts "Continuing with install..."
+  return unless $haveman
+  begin
+    # Locate rst2man
+    rst2man = %x{which rst2man.py}
+    rst2man.chomp!
+    bins.each do |bin|
+      b = bin.gsub( "bin/", "")
+      %x{#{bin} --help > ./#{b}.rst}
+      %x{#{rst2man} ./#{b}.rst ./man/man8/#{b}.8}
+      File.unlink("./#{b}.rst")
     end
+  rescue SystemCallError
+    $stderr.puts "Couldn't build man pages: " + $!
+    $stderr.puts "Continuing with install..."
+  end
 end
 
 def run_tests(test_list)
-    begin
-        require 'test/unit/ui/console/testrunner'
-        $:.unshift "lib"
-        test_list.each do |test|
-            next if File.directory?(test)
-            require test
-        end
-
-        tests = []
-        ObjectSpace.each_object { |o| tests << o if o.kind_of?(Class) }
-        tests.delete_if { |o| !o.ancestors.include?(Test::Unit::TestCase) }
-        tests.delete_if { |o| o == Test::Unit::TestCase }
-
-        tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
-        $:.shift
-    rescue LoadError
-        puts "Missing testrunner library; skipping tests"
+  begin
+    require 'test/unit/ui/console/testrunner'
+    $:.unshift "lib"
+    test_list.each do |test|
+      next if File.directory?(test)
+      require test
     end
+
+    tests = []
+    ObjectSpace.each_object { |o| tests << o if o.kind_of?(Class) }
+    tests.delete_if { |o| !o.ancestors.include?(Test::Unit::TestCase) }
+    tests.delete_if { |o| o == Test::Unit::TestCase }
+
+    tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
+    $:.shift
+  rescue LoadError
+    puts "Missing testrunner library; skipping tests"
+  end
 end
 
 ##
@@ -378,57 +378,57 @@
 # (e.g., bin/rdoc becomes rdoc); the shebang line handles running it. Under
 # windows, we add an '.rb' extension and let file associations do their stuff.
 def install_binfile(from, op_file, target)
-    tmp_dir = nil
-    InstallOptions.tmp_dirs.each do |t|
-        if File.directory?(t) and File.writable?(t)
-            tmp_dir = t
-            break
-        end
-    end
-
-    fail "Cannot find a temporary directory" unless tmp_dir
-    tmp_file = File.join(tmp_dir, '_tmp')
-    ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
-
-    File.open(from) do |ip|
-        File.open(tmp_file, "w") do |op|
-            ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
-            op.puts "#!#{ruby}"
-            contents = ip.readlines
-            if contents[0] =~ /^#!/
-                contents.shift
-            end
-            op.write contents.join()
-        end
-    end
-
-    if is_windows?
-        installed_wrapper = false
-
-        if File.exists?("#{from}.bat")
-            FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
-            installed_wrapper = true
-        end
-
-        if File.exists?("#{from}.cmd")
-            FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :verbose => true)
-            installed_wrapper = true
-        end
-
-        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)
+  tmp_dir = nil
+  InstallOptions.tmp_dirs.each do |t|
+    if File.directory?(t) and File.writable?(t)
+      tmp_dir = t
+      break
+    end
+  end
+
+  fail "Cannot find a temporary directory" unless tmp_dir
+  tmp_file = File.join(tmp_dir, '_tmp')
+  ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+
+  File.open(from) do |ip|
+    File.open(tmp_file, "w") do |op|
+      ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+      op.puts "#!#{ruby}"
+      contents = ip.readlines
+      if contents[0] =~ /^#!/
+        contents.shift
+      end
+      op.write contents.join()
+    end
+  end
+
+  if is_windows?
+    installed_wrapper = false
+
+    if File.exists?("#{from}.bat")
+      FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
+      installed_wrapper = true
+    end
+
+    if File.exists?("#{from}.cmd")
+      FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :verbose => true)
+      installed_wrapper = true
+    end
+
+    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

=== modified file 'lib/facter.rb'
--- lib/facter.rb	2011-10-18 10:32:42 +0000
+++ lib/facter.rb	2011-11-14 19:37:34 +0000
@@ -15,233 +15,233 @@
 # limitations under the License.
 
 module Facter
-    # This is just so the other classes have the constant.
-    module Util; end
-
-    require 'facter/util/fact'
-    require 'facter/util/collection'
-
-    include Comparable
-    include Enumerable
-
-    FACTERVERSION = '1.6.1'
-    # = Facter
-    # Functions as a hash of 'facts' you might care about about your
-    # system, such as mac address, IP address, Video card, etc.
-    # returns them dynamically
-
-    # == Synopsis
-    #
-    # Generally, treat <tt>Facter</tt> as a hash:
-    # == Example
-    # require 'facter'
-    # puts Facter['operatingsystem']
-    #
-
-    # Set LANG to force i18n to C
-    #
-    ENV['LANG'] = 'C'
-
-    GREEN = ""
-    RESET = ""
-    @@debug = 0
-    @@timing = 0
-    @@messages = {}
-
-    # module methods
-
-    def self.collection
-        unless defined?(@collection) and @collection
-            @collection = Facter::Util::Collection.new
-        end
-        @collection
-    end
-
-    # Return the version of the library.
-    def self.version
-        return FACTERVERSION
-    end
-
-    # Add some debugging
-    def self.debug(string)
-        if string.nil?
-            return
-        end
-        if self.debugging?
-            puts GREEN + string + RESET
-        end
-    end
-
-    def self.debugging?
-        @@debug != 0
-    end
-
-    # show the timing information
-    def self.show_time(string)
-        puts "#{GREEN}#{string}#{RESET}" if string and Facter.timing?
-    end
-
-    def self.timing?
-        @@timing != 0
-    end
-
-    # Return a fact object by name.  If you use this, you still have to call
-    # 'value' on it to retrieve the actual value.
-    def self.[](name)
-        collection.fact(name)
-    end
-
-    class << self
-        [:fact, :flush, :list, :value].each do |method|
-            define_method(method) do |*args|
-                collection.send(method, *args)
-            end
-        end
-
-        [:list, :to_hash].each do |method|
-            define_method(method) do |*args|
-                collection.load_all
-                collection.send(method, *args)
-            end
-        end
-    end
-
-
-    # Add a resolution mechanism for a named fact.  This does not distinguish
-    # between adding a new fact and adding a new way to resolve a fact.
-    def self.add(name, options = {}, &block)
-        collection.add(name, options, &block)
-    end
-
-    def self.each
-        # Make sure all facts are loaded.
-        collection.load_all
-
-        collection.each do |*args|
-            yield(*args)
-        end
-    end
-
-    class << self
-        # Allow users to call fact names directly on the Facter class,
-        # either retrieving the value or comparing it to an existing value.
-        def method_missing(name, *args)
-            question = false
-            if name.to_s =~ /\?$/
-                question = true
-                name = name.to_s.sub(/\?$/,'')
-            end
-
-            if fact = collection.fact(name)
-                if question
-                    value = fact.value.downcase
-                    args.each do |arg|
-                        if arg.to_s.downcase == value
-                            return true
-                        end
-                    end
-
-                    # If we got this far, there was no match.
-                    return false
-                else
-                    return fact.value
-                end
-            else
-                # Else, fail like a normal missing method.
-                raise NoMethodError, "Could not find fact '%s'" % name
-            end
-        end
-    end
-
-    # Clear all facts.  Mostly used for testing.
-    def self.clear
-        Facter.flush
-        Facter.reset
-    end
-
-    # Clear all messages. Used only in testing. Can't add to self.clear
-    # because we don't want to warn multiple times for items that are warnonce'd
-    def self.clear_messages
-        @@messages.clear
-    end
-
-    # Set debugging on or off.
-    def self.debugging(bit)
-        if bit
-            case bit
-            when TrueClass; @@debug = 1
-            when FalseClass; @@debug = 0
-            when Fixnum
-                if bit > 0
-                    @@debug = 1
-                else
-                    @@debug = 0
-                end
-            when String;
-                if bit.downcase == 'off'
-                    @@debug = 0
-                else
-                    @@debug = 1
-                end
-            else
-                @@debug = 0
-            end
-        else
-            @@debug = 0
-        end
-    end
-
-    # Set timing on or off.
-    def self.timing(bit)
-        if bit
-            case bit
-            when TrueClass; @@timing = 1
-            when Fixnum
-                if bit > 0
-                    @@timing = 1
-                else
-                    @@timing = 0
-                end
-            end
-        else
-            @@timing = 0
-        end
-    end
-
-    def self.warn(msg)
-        if Facter.debugging? and msg and not msg.empty?
-            msg = [msg] unless msg.respond_to? :each
-            msg.each { |line| Kernel.warn line }
-        end
-    end
-
-    # Warn once.
-    def self.warnonce(msg)
-        if msg and not msg.empty? and @@messages[msg].nil?
-            @@messages[msg] = true
-            Kernel.warn(msg)
-        end
-    end
-
-    # Remove them all.
-    def self.reset
-        @collection = nil
-    end
-
-    # Load all of the default facts, and then everything from disk.
-    def self.loadfacts
-        collection.load_all
-    end
-
-    @search_path = []
-
-    # Register a directory to search through.
-    def self.search(*dirs)
-        @search_path += dirs
-    end
-
-    # Return our registered search directories.
-    def self.search_path
-        @search_path.dup
-    end
+  # This is just so the other classes have the constant.
+  module Util; end
+
+  require 'facter/util/fact'
+  require 'facter/util/collection'
+
+  include Comparable
+  include Enumerable
+
+  FACTERVERSION = '1.6.2'
+  # = Facter
+  # Functions as a hash of 'facts' you might care about about your
+  # system, such as mac address, IP address, Video card, etc.
+  # returns them dynamically
+
+  # == Synopsis
+  #
+  # Generally, treat <tt>Facter</tt> as a hash:
+  # == Example
+  # require 'facter'
+  # puts Facter['operatingsystem']
+  #
+
+  # Set LANG to force i18n to C
+  #
+  ENV['LANG'] = 'C'
+
+  GREEN = ""
+  RESET = ""
+  @@debug = 0
+  @@timing = 0
+  @@messages = {}
+
+  # module methods
+
+  def self.collection
+    unless defined?(@collection) and @collection
+      @collection = Facter::Util::Collection.new
+    end
+    @collection
+  end
+
+  # Return the version of the library.
+  def self.version
+    return FACTERVERSION
+  end
+
+  # Add some debugging
+  def self.debug(string)
+    if string.nil?
+      return
+    end
+    if self.debugging?
+      puts GREEN + string + RESET
+    end
+  end
+
+  def self.debugging?
+    @@debug != 0
+  end
+
+  # show the timing information
+  def self.show_time(string)
+    puts "#{GREEN}#{string}#{RESET}" if string and Facter.timing?
+  end
+
+  def self.timing?
+    @@timing != 0
+  end
+
+  # Return a fact object by name.  If you use this, you still have to call
+  # 'value' on it to retrieve the actual value.
+  def self.[](name)
+    collection.fact(name)
+  end
+
+  class << self
+    [:fact, :flush, :list, :value].each do |method|
+      define_method(method) do |*args|
+        collection.send(method, *args)
+      end
+    end
+
+    [:list, :to_hash].each do |method|
+      define_method(method) do |*args|
+        collection.load_all
+        collection.send(method, *args)
+      end
+    end
+  end
+
+
+  # Add a resolution mechanism for a named fact.  This does not distinguish
+  # between adding a new fact and adding a new way to resolve a fact.
+  def self.add(name, options = {}, &block)
+    collection.add(name, options, &block)
+  end
+
+  def self.each
+    # Make sure all facts are loaded.
+    collection.load_all
+
+    collection.each do |*args|
+      yield(*args)
+    end
+  end
+
+  class << self
+    # Allow users to call fact names directly on the Facter class,
+    # either retrieving the value or comparing it to an existing value.
+    def method_missing(name, *args)
+      question = false
+      if name.to_s =~ /\?$/
+        question = true
+        name = name.to_s.sub(/\?$/,'')
+      end
+
+      if fact = collection.fact(name)
+        if question
+          value = fact.value.downcase
+          args.each do |arg|
+            if arg.to_s.downcase == value
+              return true
+            end
+          end
+
+          # If we got this far, there was no match.
+          return false
+        else
+          return fact.value
+        end
+      else
+        # Else, fail like a normal missing method.
+        raise NoMethodError, "Could not find fact '%s'" % name
+      end
+    end
+  end
+
+  # Clear all facts.  Mostly used for testing.
+  def self.clear
+    Facter.flush
+    Facter.reset
+  end
+
+  # Clear all messages. Used only in testing. Can't add to self.clear
+  # because we don't want to warn multiple times for items that are warnonce'd
+  def self.clear_messages
+    @@messages.clear
+  end
+
+  # Set debugging on or off.
+  def self.debugging(bit)
+    if bit
+      case bit
+      when TrueClass; @@debug = 1
+      when FalseClass; @@debug = 0
+      when Fixnum
+        if bit > 0
+          @@debug = 1
+        else
+          @@debug = 0
+        end
+      when String;
+        if bit.downcase == 'off'
+          @@debug = 0
+        else
+          @@debug = 1
+        end
+      else
+        @@debug = 0
+      end
+    else
+      @@debug = 0
+    end
+  end
+
+  # Set timing on or off.
+  def self.timing(bit)
+    if bit
+      case bit
+      when TrueClass; @@timing = 1
+      when Fixnum
+        if bit > 0
+          @@timing = 1
+        else
+          @@timing = 0
+        end
+      end
+    else
+      @@timing = 0
+    end
+  end
+
+  def self.warn(msg)
+    if Facter.debugging? and msg and not msg.empty?
+      msg = [msg] unless msg.respond_to? :each
+      msg.each { |line| Kernel.warn line }
+    end
+  end
+
+  # Warn once.
+  def self.warnonce(msg)
+    if msg and not msg.empty? and @@messages[msg].nil?
+      @@messages[msg] = true
+      Kernel.warn(msg)
+    end
+  end
+
+  # Remove them all.
+  def self.reset
+    @collection = nil
+  end
+
+  # Load all of the default facts, and then everything from disk.
+  def self.loadfacts
+    collection.load_all
+  end
+
+  @search_path = []
+
+  # Register a directory to search through.
+  def self.search(*dirs)
+    @search_path += dirs
+  end
+
+  # Return our registered search directories.
+  def self.search_path
+    @search_path.dup
+  end
 end

=== modified file 'lib/facter/Cfkey.rb'
--- lib/facter/Cfkey.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/Cfkey.rb	2011-11-14 19:37:34 +0000
@@ -14,29 +14,29 @@
 ##
 
 Facter.add(:Cfkey) do
-    setcode do
-        value = nil
-        ["/usr/local/etc/cfkey.pub",
-            "/etc/cfkey.pub",
-            "/var/cfng/keys/localhost.pub",
-            "/var/cfengine/ppkeys/localhost.pub",
-            "/var/lib/cfengine/ppkeys/localhost.pub",
-            "/var/lib/cfengine2/ppkeys/localhost.pub"
-        ].each do |file|
-            if FileTest.file?(file)
-                File.open(file) { |openfile|
-                    value = openfile.readlines.reject { |line|
-                        line =~ /PUBLIC KEY/
-                    }.collect { |line|
-                        line.chomp
-                    }.join("")
-                }
-            end
-            if value
-                break
-            end
-        end
-
-        value
+  setcode do
+    value = nil
+    ["/usr/local/etc/cfkey.pub",
+      "/etc/cfkey.pub",
+      "/var/cfng/keys/localhost.pub",
+      "/var/cfengine/ppkeys/localhost.pub",
+      "/var/lib/cfengine/ppkeys/localhost.pub",
+      "/var/lib/cfengine2/ppkeys/localhost.pub"
+    ].each do |file|
+      if FileTest.file?(file)
+        File.open(file) { |openfile|
+          value = openfile.readlines.reject { |line|
+            line =~ /PUBLIC KEY/
+          }.collect { |line|
+            line.chomp
+          }.join("")
+        }
+      end
+      if value
+        break
+      end
     end
+
+    value
+  end
 end

=== modified file 'lib/facter/architecture.rb'
--- lib/facter/architecture.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/architecture.rb	2011-11-14 19:37:34 +0000
@@ -12,35 +12,27 @@
 #
 
 Facter.add(:architecture) do
-    confine :kernel => [:linux, :"gnu/kfreebsd"]
-    setcode do
-        model = Facter.value(:hardwaremodel)
-        case model
-        # most linuxen use "x86_64"
-        when "x86_64"
-            case Facter.value(:operatingsystem)
-            when "Debian", "Gentoo", "GNU/kFreeBSD"
-                "amd64"
-            else
-                model
-            end
-        when /(i[3456]86|pentium)/
-            case Facter.value(:operatingsystem)
-            when "Gentoo"
-                "x86"
-            else
-                "i386"
-            end
-        else
-            model
-        end
-    end
-end
-
-Facter.add(:architecture) do
-    confine :kernel => :openbsd
-    setcode do
-        architecture = Facter.value(:hardwaremodel)
-    end
+  setcode do
+    model = Facter.value(:hardwaremodel)
+    case model
+      # most linuxen use "x86_64"
+    when "x86_64"
+      case Facter.value(:operatingsystem)
+      when "Debian", "Gentoo", "GNU/kFreeBSD", "Ubuntu"
+        "amd64"
+      else
+        model
+      end
+    when /(i[3456]86|pentium)/
+      case Facter.value(:operatingsystem)
+      when "Gentoo"
+        "x86"
+      else
+        "i386"
+      end
+    else
+      model
+    end
+  end
 end
 

=== modified file 'lib/facter/domain.rb'
--- lib/facter/domain.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/domain.rb	2011-11-14 19:37:34 +0000
@@ -19,45 +19,45 @@
 #
 
 Facter.add(:domain) do
-    setcode do
-        # Get the domain from various sources; the order of these
-        # steps is important
-
-        if name = Facter::Util::Resolution.exec('hostname') and 
-            name =~ /.*?\.(.+$)/
-
-            $1
-        elsif domain = Facter::Util::Resolution.exec('dnsdomainname') and 
-            domain =~ /.+\..+/
-
-            domain
-        elsif FileTest.exists?("/etc/resolv.conf")
-            domain = nil
-            search = nil
-            File.open("/etc/resolv.conf") { |file|
-                file.each { |line|
-                    if line =~ /domain\s+(\S+)/
-                        domain = $1
-                    elsif line =~ /search\s+(\S+)/
-                        search = $1
-                    end
-                }
-            }
-            next domain if domain
-            next search if search
-        end
-    end
-end
-
-Facter.add(:domain) do
-    confine :kernel => :windows
-    setcode do
-        require 'facter/util/wmi'
-        domain = ""
-        Facter::Util::WMI.execquery("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").each { |nic|
-            domain = nic.DNSDomain
-            break
+  setcode do
+    # Get the domain from various sources; the order of these
+    # steps is important
+
+    if name = Facter::Util::Resolution.exec('hostname') and 
+      name =~ /.*?\.(.+$)/
+
+      $1
+    elsif domain = Facter::Util::Resolution.exec('dnsdomainname') and 
+      domain =~ /.+\..+/
+
+      domain
+    elsif FileTest.exists?("/etc/resolv.conf")
+      domain = nil
+      search = nil
+      File.open("/etc/resolv.conf") { |file|
+        file.each { |line|
+          if line =~ /^\s*domain\s+(\S+)/
+            domain = $1
+          elsif line =~ /^\s*search\s+(\S+)/
+            search = $1
+          end
         }
-        domain
+      }
+      next domain if domain
+      next search if search
     end
+  end
+end
+
+Facter.add(:domain) do
+  confine :kernel => :windows
+  setcode do
+    require 'facter/util/wmi'
+    domain = ""
+    Facter::Util::WMI.execquery("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").each { |nic|
+      domain = nic.DNSDomain
+      break
+    }
+    domain
+  end
 end

=== modified file 'lib/facter/facterversion.rb'
--- lib/facter/facterversion.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/facterversion.rb	2011-11-14 19:37:34 +0000
@@ -8,5 +8,5 @@
 #
 
 Facter.add(:facterversion) do
-    setcode { Facter::FACTERVERSION.to_s }
+  setcode { Facter::FACTERVERSION.to_s }
 end

=== modified file 'lib/facter/fqdn.rb'
--- lib/facter/fqdn.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/fqdn.rb	2011-11-14 19:37:34 +0000
@@ -10,13 +10,13 @@
 #
 
 Facter.add(:fqdn) do
-    setcode do
-        host = Facter.value(:hostname)
-        domain = Facter.value(:domain)
-        if host and domain
-            [host, domain].join(".")
-        else
-            nil
-        end
+  setcode do
+    host = Facter.value(:hostname)
+    domain = Facter.value(:domain)
+    if host and domain
+      [host, domain].join(".")
+    else
+      nil
     end
+  end
 end

=== modified file 'lib/facter/hardwareisa.rb'
--- lib/facter/hardwareisa.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/hardwareisa.rb	2011-11-14 19:37:34 +0000
@@ -11,6 +11,6 @@
 #
 
 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 OEL OracleLinux OVS GNU/kFreeBSD}
+  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}
 end

=== modified file 'lib/facter/hardwaremodel.rb'
--- lib/facter/hardwaremodel.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/hardwaremodel.rb	2011-11-14 19:37:34 +0000
@@ -12,23 +12,23 @@
 #
 
 Facter.add(:hardwaremodel) do
-    setcode 'uname -m'
-end
-
-Facter.add(:hardwaremodel) do
-    confine :operatingsystem => :aix
-    setcode do
-        model = Facter::Util::Resolution.exec('lsattr -El sys0 -a modelname')
-        if model =~ /modelname\s(\S+)\s/
-            $1
-        end
-    end
-end
-
-Facter.add(:hardwaremodel) do
-    confine :operatingsystem => :windows
-    setcode do
-        require 'rbconfig'
-        Config::CONFIG['host_cpu']
-    end
+  setcode 'uname -m'
+end
+
+Facter.add(:hardwaremodel) do
+  confine :operatingsystem => :aix
+  setcode do
+    model = Facter::Util::Resolution.exec('lsattr -El sys0 -a modelname')
+    if model =~ /modelname\s(\S+)\s/
+      $1
+    end
+  end
+end
+
+Facter.add(:hardwaremodel) do
+  confine :operatingsystem => :windows
+  setcode do
+    require 'rbconfig'
+    Config::CONFIG['host_cpu']
+  end
 end

=== modified file 'lib/facter/hostname.rb'
--- lib/facter/hostname.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/hostname.rb	2011-11-14 19:37:34 +0000
@@ -12,22 +12,22 @@
 #
 
 Facter.add(:hostname, :ldapname => "cn") do
-    setcode do
-        hostname = nil
-        if name = Facter::Util::Resolution.exec('hostname')
-            if name =~ /(.*?)\./
-                hostname = $1
-            else
-                hostname = name
-            end
-        end
-        hostname
+  setcode do
+    hostname = nil
+    if name = Facter::Util::Resolution.exec('hostname')
+      if name =~ /(.*?)\./
+        hostname = $1
+      else
+        hostname = name
+      end
     end
+    hostname
+  end
 end
 
 Facter.add(:hostname) do
-    confine :kernel => :darwin, :kernelrelease => "R7"
-    setcode do
-        Facter::Util::Resolution.exec('/usr/sbin/scutil --get LocalHostName')
-    end
+  confine :kernel => :darwin, :kernelrelease => "R7"
+  setcode do
+    Facter::Util::Resolution.exec('/usr/sbin/scutil --get LocalHostName')
+  end
 end

=== modified file 'lib/facter/id.rb'
--- lib/facter/id.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/id.rb	2011-11-14 19:37:34 +0000
@@ -12,10 +12,10 @@
 #
 
 Facter.add(:id) do
-    setcode "whoami"
+  setcode "whoami"
 end
 
 Facter.add(:id) do
-    confine :kernel => :SunOS
-    setcode "/usr/xpg4/bin/id -un"
+  confine :kernel => :SunOS
+  setcode "/usr/xpg4/bin/id -un"
 end

=== modified file 'lib/facter/interfaces.rb'
--- lib/facter/interfaces.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/interfaces.rb	2011-11-14 19:37:34 +0000
@@ -20,22 +20,22 @@
 # is missing.
 
 Facter.add(:interfaces) do
-    confine :kernel => Facter::Util::IP.supported_platforms
-    setcode do
-        Facter::Util::IP.get_interfaces.collect { |iface| Facter::Util::IP.alphafy(iface) }.join(",")
-    end
+  confine :kernel => Facter::Util::IP.supported_platforms
+  setcode do
+    Facter::Util::IP.get_interfaces.collect { |iface| Facter::Util::IP.alphafy(iface) }.join(",")
+  end
 end
 
 Facter::Util::IP.get_interfaces.each do |interface|
 
-    # Make a fact for each detail of each interface.  Yay.
-    #   There's no point in confining these facts, since we wouldn't be able to create
-    # them if we weren't running on a supported platform.
-    %w{ipaddress ipaddress6 macaddress netmask}.each do |label|
-        Facter.add(label + "_" + Facter::Util::IP.alphafy(interface)) do
-            setcode do
-                Facter::Util::IP.get_interface_value(interface, label)
-            end
-        end
+  # Make a fact for each detail of each interface.  Yay.
+  #   There's no point in confining these facts, since we wouldn't be able to create
+  # them if we weren't running on a supported platform.
+  %w{ipaddress ipaddress6 macaddress netmask}.each do |label|
+    Facter.add(label + "_" + Facter::Util::IP.alphafy(interface)) do
+      setcode do
+        Facter::Util::IP.get_interface_value(interface, label)
+      end
     end
+  end
 end

=== modified file 'lib/facter/ipaddress.rb'
--- lib/facter/ipaddress.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/ipaddress.rb	2011-11-14 19:37:34 +0000
@@ -23,138 +23,138 @@
 #
 
 Facter.add(:ipaddress) do
-    confine :kernel => :linux
-    setcode do
-        ip = nil
-        output = %x{/sbin/ifconfig}
-
-        output.split(/^\S/).each { |str|
-            if str =~ /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-                tmp = $1
-                unless tmp =~ /^127\./
-                    ip = tmp
-                    break
-                end
-            end
-        }
-
-        ip
-    end
-end
-
-Facter.add(:ipaddress) do
-    confine :kernel => %w{FreeBSD OpenBSD Darwin}
-    setcode do
-        ip = nil
-        output = %x{/sbin/ifconfig}
-
-        output.split(/^\S/).each { |str|
-            if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-                tmp = $1
-                unless tmp =~ /^127\./
-                    ip = tmp
-                    break
-                end
-            end
-        }
-
-        ip
-    end
-end
-
-Facter.add(:ipaddress) do
-    confine :kernel => %w{NetBSD SunOS}
-    setcode do
-        ip = nil
-        output = %x{/sbin/ifconfig -a}
-
-        output.split(/^\S/).each { |str|
-            if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-                tmp = $1
-                unless tmp =~ /^127\./ or tmp == "0.0.0.0"
-                    ip = tmp
-                    break
-                end
-            end
-        }
-
-        ip
-    end
-end
-
-Facter.add(:ipaddress) do
-    confine :kernel => %w{AIX}
-    setcode do
-        ip = nil
-        output = %x{/usr/sbin/ifconfig -a}
-
-        output.split(/^\S/).each { |str|
-            if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-                tmp = $1
-                unless tmp =~ /^127\./
-                    ip = tmp
-                    break
-                end
-            end
-        }
-
-        ip
-    end
-end
-
-Facter.add(:ipaddress) do
-    confine :kernel => %w{windows}
-    setcode do
-        require 'socket'
-        IPSocket.getaddress(Socket.gethostname)
-    end
+  confine :kernel => :linux
+  setcode do
+    ip = nil
+    output = %x{/sbin/ifconfig}
+
+    output.split(/^\S/).each { |str|
+      if str =~ /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+        tmp = $1
+        unless tmp =~ /^127\./
+          ip = tmp
+          break
+        end
+      end
+    }
+
+    ip
+  end
+end
+
+Facter.add(:ipaddress) do
+  confine :kernel => %w{FreeBSD OpenBSD Darwin DragonFly}
+  setcode do
+    ip = nil
+    output = %x{/sbin/ifconfig}
+
+    output.split(/^\S/).each { |str|
+      if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+        tmp = $1
+        unless tmp =~ /^127\./
+          ip = tmp
+          break
+        end
+      end
+    }
+
+    ip
+  end
+end
+
+Facter.add(:ipaddress) do
+  confine :kernel => %w{NetBSD SunOS}
+  setcode do
+    ip = nil
+    output = %x{/sbin/ifconfig -a}
+
+    output.split(/^\S/).each { |str|
+      if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+        tmp = $1
+        unless tmp =~ /^127\./ or tmp == "0.0.0.0"
+          ip = tmp
+          break
+        end
+      end
+    }
+
+    ip
+  end
+end
+
+Facter.add(:ipaddress) do
+  confine :kernel => %w{AIX}
+  setcode do
+    ip = nil
+    output = %x{/usr/sbin/ifconfig -a}
+
+    output.split(/^\S/).each { |str|
+      if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+        tmp = $1
+        unless tmp =~ /^127\./
+          ip = tmp
+          break
+        end
+      end
+    }
+
+    ip
+  end
+end
+
+Facter.add(:ipaddress) do
+  confine :kernel => %w{windows}
+  setcode do
+    require 'socket'
+    IPSocket.getaddress(Socket.gethostname)
+  end
 end
 
 Facter.add(:ipaddress, :ldapname => "iphostnumber", :timeout => 2) do
-    setcode do
+  setcode do
+    if Facter.value(:kernel) == 'windows'
+      require 'win32/resolv'
+    else
+      require 'resolv'
+    end
+    
+    begin
+      if hostname = Facter.value(:hostname)
         if Facter.value(:kernel) == 'windows'
-            require 'win32/resolv'
+          ip = Win32::Resolv.get_resolv_info.last[0]
         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)                
-                end
-                unless ip == "127.0.0.1"
-                    ip
-                end
-            else
-                nil
-            end
-        rescue Resolv::ResolvError
-            nil
-        rescue NoMethodError # i think this is a bug in resolv.rb?
-            nil
-        end
+          ip = Resolv.getaddress(hostname)        
+        end
+        unless ip == "127.0.0.1"
+          ip
+        end
+      else
+        nil
+      end
+    rescue Resolv::ResolvError
+      nil
+    rescue NoMethodError # i think this is a bug in resolv.rb?
+      nil
     end
+  end
 end
 
 Facter.add(:ipaddress, :timeout => 2) do
-    setcode do
-        if hostname = Facter.value(:hostname)
-            # we need Hostname to exist for this to work
-            host = nil
-            if host = Facter::Util::Resolution.exec("host #{hostname}")
-                list = host.chomp.split(/\s/)
-                if defined? list[-1] and
-                        list[-1] =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
-                    list[-1]
-                end
-            else
-                nil
-            end
-        else
-            nil
+  setcode do
+    if hostname = Facter.value(:hostname)
+      # we need Hostname to exist for this to work
+      host = nil
+      if host = Facter::Util::Resolution.exec("host #{hostname}")
+        list = host.chomp.split(/\s/)
+        if defined? list[-1] and
+          list[-1] =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
+          list[-1]
         end
+      else
+        nil
+      end
+    else
+      nil
     end
+  end
 end

=== modified file 'lib/facter/iphostnumber.rb'
--- lib/facter/iphostnumber.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/iphostnumber.rb	2011-11-14 19:37:34 +0000
@@ -10,20 +10,20 @@
 #
 
 Facter.add(:iphostnumber) do
-    confine :kernel => :darwin, :kernelrelease => "R6"
-    setcode do
-        %x{/usr/sbin/scutil --get LocalHostName}
-    end
+  confine :kernel => :darwin, :kernelrelease => "R6"
+  setcode do
+    %x{/usr/sbin/scutil --get LocalHostName}
+  end
 end
 Facter.add(:iphostnumber) do
-    confine :kernel => :darwin, :kernelrelease => "R6"
-    setcode do
-        ether = nil
-        output = %x{/sbin/ifconfig}
-
-        output =~ /HWaddr (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
-        ether = $1
-
-        ether
-    end
+  confine :kernel => :darwin, :kernelrelease => "R6"
+  setcode do
+    ether = nil
+    output = %x{/sbin/ifconfig}
+
+    output =~ /HWaddr (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
+    ether = $1
+
+    ether
+  end
 end

=== modified file 'lib/facter/kernel.rb'
--- lib/facter/kernel.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/kernel.rb	2011-11-14 19:37:34 +0000
@@ -10,13 +10,13 @@
 #
 
 Facter.add(:kernel) do
-    setcode do
-        require 'facter/util/config'
+  setcode do
+    require 'facter/util/config'
 
-        if Facter::Util::Config.is_windows?
-            'windows'
-        else
-            Facter::Util::Resolution.exec("uname -s")
-        end
+    if Facter::Util::Config.is_windows?
+      'windows'
+    else
+      Facter::Util::Resolution.exec("uname -s")
     end
+  end
 end

=== modified file 'lib/facter/kernelmajversion.rb'
--- lib/facter/kernelmajversion.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/kernelmajversion.rb	2011-11-14 19:37:34 +0000
@@ -9,7 +9,7 @@
 #
 
 Facter.add("kernelmajversion") do
-    setcode do
-        Facter.value(:kernelversion).split('.')[0..1].join('.')
-    end
+  setcode do
+    Facter.value(:kernelversion).split('.')[0..1].join('.')
+  end
 end

=== modified file 'lib/facter/kernelrelease.rb'
--- lib/facter/kernelrelease.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/kernelrelease.rb	2011-11-14 19:37:34 +0000
@@ -12,23 +12,23 @@
 #
 
 Facter.add(:kernelrelease) do
-    setcode 'uname -r'
-end
-
-Facter.add(:kernelrelease) do
-    confine :kernel => :aix
-    setcode 'oslevel -s'
-end
-
-Facter.add(:kernelrelease) do
-    confine :kernel => %{windows}
-    setcode do
-        require 'facter/util/wmi'
-        version = ""
-        Facter::Util::WMI.execquery("SELECT Version from Win32_OperatingSystem").each do |ole|
-            version = "#{ole.Version}"
-            break
-        end
-        version
+  setcode 'uname -r'
+end
+
+Facter.add(:kernelrelease) do
+  confine :kernel => :aix
+  setcode 'oslevel -s'
+end
+
+Facter.add(:kernelrelease) do
+  confine :kernel => %{windows}
+  setcode do
+    require 'facter/util/wmi'
+    version = ""
+    Facter::Util::WMI.execquery("SELECT Version from Win32_OperatingSystem").each do |ole|
+      version = "#{ole.Version}"
+      break
     end
+    version
+  end
 end

=== modified file 'lib/facter/kernelversion.rb'
--- lib/facter/kernelversion.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/kernelversion.rb	2011-11-14 19:37:34 +0000
@@ -11,12 +11,12 @@
 #
 
 Facter.add("kernelversion") do
-    setcode do
-        Facter['kernelrelease'].value.split('-')[0]
-    end
+  setcode do
+    Facter['kernelrelease'].value.split('-')[0]
+  end
 end
 
 Facter.add("kernelversion") do
-    confine :kernel => :sunos
-    setcode 'uname -v'
+  confine :kernel => :sunos
+  setcode 'uname -v'
 end

=== modified file 'lib/facter/lsb.rb'
--- lib/facter/lsb.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/lsb.rb	2011-11-14 19:37:34 +0000
@@ -20,20 +20,20 @@
    "LSBDistDescription" => %r{^Description:\t(.*)$},
    "LSBDistCodeName"    => %r{^Codename:\t(.*)$}
 }.each do |fact, pattern|
-    Facter.add(fact) do
-        confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-        setcode do
-            unless defined?(lsbdata) and defined?(lsbtime) and (Time.now.to_i - lsbtime.to_i < 5)
-                type = nil
-                lsbtime = Time.now
-                lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null')
-            end
+  Facter.add(fact) do
+    confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+    setcode do
+      unless defined?(lsbdata) and defined?(lsbtime) and (Time.now.to_i - lsbtime.to_i < 5)
+        type = nil
+        lsbtime = Time.now
+        lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null')
+      end
 
-            if pattern.match(lsbdata)
-                $1
-            else
-                nil
-            end
-        end
+      if pattern.match(lsbdata)
+        $1
+      else
+        nil
+      end
     end
+  end
 end

=== modified file 'lib/facter/lsbmajdistrelease.rb'
--- lib/facter/lsbmajdistrelease.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/lsbmajdistrelease.rb	2011-11-14 19:37:34 +0000
@@ -15,13 +15,13 @@
 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}
-    setcode do
-        if /(\d*)\./i =~ Facter.value(:lsbdistrelease)
-            result=$1
-        else
-            result=Facter.value(:lsbdistrelease)
-        end
-        result
+  confine :operatingsystem => %w{Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo OEL OracleLinux OVS GNU/kFreeBSD}
+  setcode do
+    if /(\d*)\./i =~ Facter.value(:lsbdistrelease)
+      result=$1
+    else
+      result=Facter.value(:lsbdistrelease)
     end
+    result
+  end
 end

=== modified file 'lib/facter/macaddress.rb'
--- lib/facter/macaddress.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/macaddress.rb	2011-11-14 19:37:34 +0000
@@ -10,69 +10,69 @@
 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}
-    setcode do
-        ether = []
-        output = Facter::Util::Resolution.exec("/sbin/ifconfig -a")
-        output.each_line do |s|
-            ether.push($1) if s =~ /(?:ether|HWaddr) (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
-        end
-        Facter::Util::Macaddress.standardize(ether[0])
-    end
-end
-
-Facter.add(:macaddress) do
-    confine :operatingsystem => "Solaris"
-    setcode do
-        ether = []
-        output = Facter::Util::Resolution.exec("/usr/bin/netstat -np")
-        output.each_line do |s|
-            ether.push($1) if s =~ /(?:SPLA)\s+(\w{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2})/
-        end
-        Facter::Util::Macaddress.standardize(ether[0])
-    end
-end
-
-Facter.add(:macaddress) do
-    confine :operatingsystem => %w{FreeBSD OpenBSD}
-    setcode do
-    ether = []
-        output = Facter::Util::Resolution.exec("/sbin/ifconfig")
-        output.each_line do |s|
-            if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
-                ether.push($1)
-            end
-        end
-        Facter::Util::Macaddress.standardize(ether[0])
-    end
-end
-
-Facter.add(:macaddress) do
-    confine :kernel => :darwin
-    setcode { Facter::Util::Macaddress::Darwin.macaddress }
-end
-
-Facter.add(:macaddress) do
-    confine :kernel => %w{AIX}
-    setcode do
-        ether = []
-        ip = nil
-        output = %x{/usr/sbin/ifconfig -a}
-        output.each_line do |str|
-            if str =~ /([a-z]+\d+): flags=/
-                devname = $1
-                unless devname =~ /lo0/
-                    output2 = %x{/usr/bin/entstat #{devname}}
-                    output2.each_line do |str2|
-                        if str2 =~ /^Hardware Address: (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
-                            ether.push($1)
-                        end
-                    end
-                end
-            end
-        end
-        Facter::Util::Macaddress.standardize(ether[0])
-    end
+  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Gentoo Ubuntu OEL OracleLinux OVS GNU/kFreeBSD}
+  setcode do
+    ether = []
+    output = Facter::Util::Resolution.exec("/sbin/ifconfig -a")
+    output.each_line do |s|
+      ether.push($1) if s =~ /(?:ether|HWaddr) (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
+    end
+    Facter::Util::Macaddress.standardize(ether[0])
+  end
+end
+
+Facter.add(:macaddress) do
+  confine :operatingsystem => "Solaris"
+  setcode do
+    ether = []
+    output = Facter::Util::Resolution.exec("/usr/bin/netstat -np")
+    output.each_line do |s|
+      ether.push($1) if s =~ /(?:SPLA)\s+(\w{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2})/
+    end
+    Facter::Util::Macaddress.standardize(ether[0])
+  end
+end
+
+Facter.add(:macaddress) do
+  confine :operatingsystem => %w{FreeBSD OpenBSD DragonFly}
+  setcode do
+    ether = []
+    output = Facter::Util::Resolution.exec("/sbin/ifconfig")
+    output.each_line do |s|
+      if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
+        ether.push($1)
+      end
+    end
+    Facter::Util::Macaddress.standardize(ether[0])
+  end
+end
+
+Facter.add(:macaddress) do
+  confine :kernel => :darwin
+  setcode { Facter::Util::Macaddress::Darwin.macaddress }
+end
+
+Facter.add(:macaddress) do
+  confine :kernel => %w{AIX}
+  setcode do
+    ether = []
+    ip = nil
+    output = %x{/usr/sbin/ifconfig -a}
+    output.each_line do |str|
+      if str =~ /([a-z]+\d+): flags=/
+        devname = $1
+        unless devname =~ /lo0/
+          output2 = %x{/usr/bin/entstat #{devname}}
+          output2.each_line do |str2|
+            if str2 =~ /^Hardware Address: (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
+              ether.push($1)
+            end
+          end
+        end
+      end
+    end
+    Facter::Util::Macaddress.standardize(ether[0])
+  end
 end
 
 Facter.add(:macaddress) do

=== modified file 'lib/facter/macosx.rb'
--- lib/facter/macosx.rb	2011-10-18 10:32:42 +0000
+++ lib/facter/macosx.rb	2011-11-14 19:37:34 +0000
@@ -27,30 +27,30 @@
 require 'facter/util/macosx'
 
 if Facter.value(:kernel) == "Darwin"
-    Facter::Util::Macosx.hardware_overview.each do |fact, value|
-        Facter.add("sp_#{fact}") do
-            confine :kernel => :darwin
-            setcode do
-                value.to_s
-            end
-        end
-    end
-
-    Facter::Util::Macosx.os_overview.each do |fact, value|
-        Facter.add("sp_#{fact}") do
-            confine :kernel => :darwin
-            setcode do
-                value.to_s
-            end
-        end
-    end
-
-    Facter::Util::Macosx.sw_vers.each do |fact, value|
-        Facter.add(fact) do
-            confine :kernel => :darwin
-            setcode do
-                value
-            end
-        end
-    end
+  Facter::Util::Macosx.hardware_overview.each do |fact, value|
+    Facter.add("sp_#{fact}") do
+      confine :kernel => :darwin
+      setcode do
+        value.to_s
+      end
+    end
+  end
+
+  Facter::Util::Macosx.os_overview.each do |fact, value|
+    Facter.add("sp_#{fact}") do
+      confine :kernel => :darwin
+      setcode do
+        value.to_s
+      end
+    end
+  end
+
+  Facter::Util::Macosx.sw_vers.each do |fact, value|
+    Facter.add(fact) do
+      confine :kernel => :darwin
+      setcode do
+        value
+      end
+    end
+  end
 end

=== modified file 'lib/facter/manufacturer.rb'
--- lib/facter/manufacturer.rb	2011-10-18 10:32:42 +0000
+++ lib/facter/manufacturer.rb	2011-11-14 19:37:34 +0000
@@ -19,39 +19,39 @@
 require 'facter/util/manufacturer'
 
 if Facter.value(:kernel) == "OpenBSD"
-    mfg_keys = {
-        'hw.vendor'   => 'manufacturer',
-        'hw.product'  => 'productname',
-        'hw.serialno' => 'serialnumber'
-    }
+  mfg_keys = {
+    'hw.vendor'   => 'manufacturer',
+    'hw.product'  => 'productname',
+    'hw.serialno' => 'serialnumber'
+  }
 
-    Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
+  Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
 elsif Facter.value(:kernel) == "Darwin" 
-    mfg_keys = {
-        'hw.model'   => 'productname'
-    }
-    Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
+  mfg_keys = {
+    'hw.model'   => 'productname'
+  }
+  Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
 elsif Facter.value(:kernel) == "SunOS" and Facter.value(:hardwareisa) == "sparc"
-    Facter::Manufacturer.prtdiag_sparc_find_system_info()
+  Facter::Manufacturer.prtdiag_sparc_find_system_info()
 elsif Facter.value(:kernel) == "windows"
-    win32_keys = {
-        'manufacturer' => ['Manufacturer', 'Bios'],
-        'serialNumber' => ['Serialnumber', 'Bios'],
-        'productname'  => ['Name', 'ComputerSystemProduct']
-    }
-    Facter::Manufacturer.win32_find_system_info(win32_keys)
+  win32_keys = {
+    'manufacturer' => ['Manufacturer', 'Bios'],
+    'serialNumber' => ['Serialnumber', 'Bios'],
+    'productname'  => ['Name', 'ComputerSystemProduct']
+  }
+  Facter::Manufacturer.win32_find_system_info(win32_keys)
 else
-    query = {
-        '[Ss]ystem [Ii]nformation' => [
-            { 'Manufacturer:'      => 'manufacturer' },
-            { 'Product(?: Name)?:' => 'productname' },
-            { 'Serial Number:'     => 'serialnumber' }
-        ],
-        '(Chassis Information|system enclosure or chassis)' => [
-            { '(?:Chassis )?Type:' => 'type' }
-        ]
-    }
+  query = {
+    '[Ss]ystem [Ii]nformation' => [
+      { 'Manufacturer:'    => 'manufacturer' },
+      { 'Product(?: Name)?:' => 'productname' },
+      { 'Serial Number:'   => 'serialnumber' }
+    ],
+    '(Chassis Information|system enclosure or chassis)' => [
+      { '(?:Chassis )?Type:' => 'type' }
+    ]
+  }
 
-    Facter::Manufacturer.dmi_find_system_info(query)
+  Facter::Manufacturer.dmi_find_system_info(query)
 end
 

=== modified file 'lib/facter/memory.rb'
--- lib/facter/memory.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/memory.rb	2011-11-14 19:37:34 +0000
@@ -29,182 +29,180 @@
     :SwapSize   => "SwapTotal",
     :SwapFree   => "SwapFree"
 }.each do |fact, name|
-    Facter.add(fact) do
-        confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-        setcode do
-            Facter::Memory.meminfo_number(name)
-        end
+  Facter.add(fact) do
+    confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+    setcode do
+      Facter::Memory.meminfo_number(name)
     end
+  end
 end
 
 Facter.add("SwapSize") do
-    confine :kernel => :Darwin
-    setcode do
+  confine :kernel => :Darwin
+  setcode do
     swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
     swaptotal = 0
     if swap =~ /total = (\S+)/ then swaptotal = $1; end
-      swaptotal
-    end
+    swaptotal
+  end
 end
 
 Facter.add("SwapFree") do
-    confine :kernel => :Darwin
-    setcode do
+  confine :kernel => :Darwin
+  setcode do
     swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
     swapfree = 0
     if swap =~ /free = (\S+)/ then swapfree = $1; end
-      swapfree
-    end
+    swapfree
+  end
 end
 
 Facter.add("SwapEncrypted") do
-    confine :kernel => :Darwin
-    setcode do
+  confine :kernel => :Darwin
+  setcode do
     swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
     encrypted = false
     if swap =~ /\(encrypted\)/ then encrypted = true; end
-      encrypted
-    end
+    encrypted
+  end
 end
 
 if Facter.value(:kernel) == "AIX" and Facter.value(:id) == "root"
-    swap = Facter::Util::Resolution.exec('swap -l')
-    swapfree, swaptotal = 0, 0
-    swap.each_line do |dev|
-      if dev =~ /^\/\S+\s.*\s+(\S+)MB\s+(\S+)MB/
-        swaptotal += $1.to_i
-        swapfree  += $2.to_i
-      end
-    end
-
-    Facter.add("SwapSize") do
-        confine :kernel => :aix
-        setcode do
-            Facter::Memory.scale_number(swaptotal.to_f,"MB")
-        end
-    end
-
-    Facter.add("SwapFree") do
-        confine :kernel => :aix
-        setcode do
-            Facter::Memory.scale_number(swapfree.to_f,"MB")
-        end
-    end
+  swap = Facter::Util::Resolution.exec('swap -l')
+  swapfree, swaptotal = 0, 0
+  swap.each_line do |dev|
+    if dev =~ /^\/\S+\s.*\s+(\S+)MB\s+(\S+)MB/
+      swaptotal += $1.to_i
+      swapfree  += $2.to_i
+    end
+  end
+
+  Facter.add("SwapSize") do
+    confine :kernel => :aix
+    setcode do
+      Facter::Memory.scale_number(swaptotal.to_f,"MB")
+    end
+  end
+
+  Facter.add("SwapFree") do
+    confine :kernel => :aix
+    setcode do
+      Facter::Memory.scale_number(swapfree.to_f,"MB")
+    end
+  end
 end
 
 if Facter.value(:kernel) == "OpenBSD"
-    swap = Facter::Util::Resolution.exec('swapctl -l | sed 1d')
-    swapfree, swaptotal = 0, 0
-    swap.each_line do |dev|
-        if dev =~ /^\S+\s+(\S+)\s+\S+\s+(\S+)\s+.*$/
-            swaptotal += $1.to_i
-            swapfree  += $2.to_i
-        end
-    end
-
-    Facter.add("SwapSize") do
-        confine :kernel => :openbsd
-        setcode do
-            Facter::Memory.scale_number(swaptotal.to_f,"kB")
-        end
-    end
-
-    Facter.add("SwapFree") do
-        confine :kernel => :openbsd
-        setcode do
-            Facter::Memory.scale_number(swapfree.to_f,"kB")
-        end
-    end
-
-    Facter::Memory.vmstat_find_free_memory()
-
-    Facter.add("MemoryTotal") do
-        confine :kernel => :openbsd
-        memtotal = Facter::Util::Resolution.exec("sysctl hw.physmem | cut -d'=' -f2")
-        setcode do
-            Facter::Memory.scale_number(memtotal.to_f,"")
-        end
-    end
+  swap = Facter::Util::Resolution.exec('swapctl -s')
+  swapfree, swaptotal = 0, 0
+  if swap =~ /^total: (\d+)k bytes allocated = \d+k used, (\d+)k available$/
+    swaptotal = $1.to_i
+    swapfree  = $2.to_i
+  end
+
+  Facter.add("SwapSize") do
+    confine :kernel => :openbsd
+    setcode do
+      Facter::Memory.scale_number(swaptotal.to_f,"kB")
+    end
+  end
+
+  Facter.add("SwapFree") do
+    confine :kernel => :openbsd
+    setcode do
+      Facter::Memory.scale_number(swapfree.to_f,"kB")
+    end
+  end
+
+  Facter::Memory.vmstat_find_free_memory()
+
+  Facter.add("MemoryTotal") do
+    confine :kernel => :openbsd
+    memtotal = Facter::Util::Resolution.exec("sysctl hw.physmem | cut -d'=' -f2")
+    setcode do
+      Facter::Memory.scale_number(memtotal.to_f,"")
+    end
+  end
 end
 
 if Facter.value(:kernel) == "Darwin"
-    swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
-    swapfree, swaptotal = 0, 0
-    unless swap.empty?
-        # Parse the line:
-        # vm.swapusage: total = 128.00M  used = 0.37M  free = 127.63M  (encrypted)
-        if swap =~ /total\s=\s(\S+)\s+used\s=\s(\S+)\s+free\s=\s(\S+)\s/
-            swaptotal += $1.to_i
-            swapfree  += $3.to_i
-        end
-    end
-
-    Facter.add("SwapSize") do
-        confine :kernel => :Darwin
-        setcode do
-            Facter::Memory.scale_number(swaptotal.to_f,"MB")
-        end
-    end
-
-    Facter.add("SwapFree") do
-        confine :kernel => :Darwin
-        setcode do
-            Facter::Memory.scale_number(swapfree.to_f,"MB")
-        end
-    end
-
-    Facter::Memory.vmstat_darwin_find_free_memory()
-
-    Facter.add("MemoryTotal") do
-        confine :kernel => :Darwin
-        memtotal = Facter::Util::Resolution.exec("sysctl hw.memsize | cut -d':' -f2")
-        setcode do
-            Facter::Memory.scale_number(memtotal.to_f,"")
-        end
-    end
+  swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
+  swapfree, swaptotal = 0, 0
+  unless swap.empty?
+    # Parse the line:
+    # vm.swapusage: total = 128.00M  used = 0.37M  free = 127.63M  (encrypted)
+    if swap =~ /total\s=\s(\S+)\s+used\s=\s(\S+)\s+free\s=\s(\S+)\s/
+      swaptotal += $1.to_i
+      swapfree  += $3.to_i
+    end
+  end
+
+  Facter.add("SwapSize") do
+    confine :kernel => :Darwin
+    setcode do
+      Facter::Memory.scale_number(swaptotal.to_f,"MB")
+    end
+  end
+
+  Facter.add("SwapFree") do
+    confine :kernel => :Darwin
+    setcode do
+      Facter::Memory.scale_number(swapfree.to_f,"MB")
+    end
+  end
+
+  Facter::Memory.vmstat_darwin_find_free_memory()
+
+  Facter.add("MemoryTotal") do
+    confine :kernel => :Darwin
+    memtotal = Facter::Util::Resolution.exec("sysctl hw.memsize | cut -d':' -f2")
+    setcode do
+      Facter::Memory.scale_number(memtotal.to_f,"")
+    end
+  end
 end
 
 if Facter.value(:kernel) == "SunOS"
-    swap = Facter::Util::Resolution.exec('/usr/sbin/swap -l')
-    swapfree, swaptotal = 0, 0
-    swap.each_line do |dev|
-        if dev =~ /^\/\S+\s.*\s+(\d+)\s+(\d+)$/
-            swaptotal += $1.to_i / 2
-            swapfree  += $2.to_i / 2
-        end
-    end
-
-    Facter.add("SwapSize") do
-        confine :kernel => :sunos
-        setcode do
-            Facter::Memory.scale_number(swaptotal.to_f,"kB")
-        end
-    end
-
-    Facter.add("SwapFree") do
-        confine :kernel => :sunos
-        setcode do
-            Facter::Memory.scale_number(swapfree.to_f,"kB")
-        end
-    end
-
-    # Total memory size available from prtconf
-    pconf = Facter::Util::Resolution.exec('/usr/sbin/prtconf')
-    phymem = ""
-    pconf.each_line do |line|
-        if line =~ /^Memory size:\s+(\d+) Megabytes/
-            phymem = $1
-        end
-    end
-
-    Facter.add("MemorySize") do
-        confine :kernel => :sunos
-        setcode do
-            Facter::Memory.scale_number(phymem.to_f,"MB")
-        end
-    end
-
-    Facter::Memory.vmstat_find_free_memory()
+  swap = Facter::Util::Resolution.exec('/usr/sbin/swap -l')
+  swapfree, swaptotal = 0, 0
+  swap.each_line do |dev|
+    if dev =~ /^\/\S+\s.*\s+(\d+)\s+(\d+)$/
+      swaptotal += $1.to_i / 2
+      swapfree  += $2.to_i / 2
+    end
+  end
+
+  Facter.add("SwapSize") do
+    confine :kernel => :sunos
+    setcode do
+      Facter::Memory.scale_number(swaptotal.to_f,"kB")
+    end
+  end
+
+  Facter.add("SwapFree") do
+    confine :kernel => :sunos
+    setcode do
+      Facter::Memory.scale_number(swapfree.to_f,"kB")
+    end
+  end
+
+  # Total memory size available from prtconf
+  pconf = Facter::Util::Resolution.exec('/usr/sbin/prtconf 2>/dev/null')
+  phymem = ""
+  pconf.each_line do |line|
+    if line =~ /^Memory size:\s+(\d+) Megabytes/
+      phymem = $1
+    end
+  end
+
+  Facter.add("MemorySize") do
+    confine :kernel => :sunos
+    setcode do
+      Facter::Memory.scale_number(phymem.to_f,"MB")
+    end
+  end
+
+  Facter::Memory.vmstat_find_free_memory()
 end
 
 if Facter.value(:kernel) == "windows"
@@ -234,3 +232,33 @@
     end
   end
 end
+
+Facter.add("SwapSize") do
+  confine :kernel => :dragonfly
+  setcode do
+    page_size = Facter::Util::Resolution.exec("/sbin/sysctl -n hw.pagesize").to_f
+    swaptotal = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_size").to_f * page_size
+    Facter::Memory.scale_number(swaptotal.to_f,"")
+  end
+end
+
+Facter.add("SwapFree") do
+  confine :kernel => :dragonfly
+  setcode do
+    page_size = Facter::Util::Resolution.exec("/sbin/sysctl -n hw.pagesize").to_f
+    swaptotal = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_size").to_f * page_size
+    swap_anon_use = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_anon_use").to_f * page_size
+    swap_cache_use = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_cache_use").to_f * page_size
+    swapfree = swaptotal - swap_anon_use - swap_cache_use
+    Facter::Memory.scale_number(swapfree.to_f,"")
+  end
+end
+
+Facter.add("MemoryTotal") do
+  confine :kernel => :dragonfly
+  setcode do
+    Facter::Memory.vmstat_find_free_memory()
+    memtotal = Facter::Util::Resolution.exec("sysctl -n hw.physmem")
+    Facter::Memory.scale_number(memtotal.to_f,"")
+  end
+end

=== modified file 'lib/facter/netmask.rb'
--- lib/facter/netmask.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/netmask.rb	2011-11-14 19:37:34 +0000
@@ -18,9 +18,9 @@
 require 'facter/util/netmask'
 
 Facter.add("netmask") do
-    confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd" ]
-    setcode do
-        Facter::NetMask.get_netmask
-    end
+  confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd", :dragonfly ]
+  setcode do
+    Facter::NetMask.get_netmask
+  end
 end
 

=== modified file 'lib/facter/network.rb'
--- lib/facter/network.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/network.rb	2011-11-14 19:37:34 +0000
@@ -13,9 +13,9 @@
 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 
+  Facter.add("network_" + Facter::Util::IP.alphafy(interface)) do
+    setcode do
+      Facter::Util::IP.get_network_value(interface)
     end 
+  end 
 end

=== modified file 'lib/facter/operatingsystem.rb'
--- lib/facter/operatingsystem.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/operatingsystem.rb	2011-11-14 19:37:34 +0000
@@ -14,83 +14,87 @@
 require 'facter/lsb'
 
 Facter.add(:operatingsystem) do
-    confine :kernel => :sunos
-    setcode do "Solaris" end
-end
-
-Facter.add(:operatingsystem) do
-    confine :kernel => :linux
-    setcode do
-        if Facter.value(:lsbdistid) == "Ubuntu"
-           "Ubuntu"
-        elsif FileTest.exists?("/etc/debian_version")
-            "Debian"
-        elsif FileTest.exists?("/etc/gentoo-release")
-            "Gentoo"
-        elsif FileTest.exists?("/etc/fedora-release")
-            "Fedora"
-        elsif FileTest.exists?("/etc/mandriva-release")
-            "Mandriva"
-        elsif FileTest.exists?("/etc/mandrake-release")
-            "Mandrake"
-        elsif FileTest.exists?("/etc/meego-release")
-            "MeeGo"
-        elsif FileTest.exists?("/etc/arch-release")
-            "Archlinux"
-        elsif FileTest.exists?("/etc/oracle-release")
-            "OracleLinux"
-        elsif FileTest.exists?("/etc/enterprise-release")
-            if FileTest.exists?("/etc/ovs-release")
-                "OVS"
-            else
-                "OEL"
-            end
-        elsif FileTest.exists?("/etc/arch-release")
-            "Arch"
-        elsif FileTest.exists?("/etc/vmware-release")
-            "VMWareESX"
-        elsif FileTest.exists?("/etc/redhat-release")
-            txt = File.read("/etc/redhat-release")
-            if txt =~ /centos/i
-                "CentOS"
-            elsif txt =~ /CERN/
-                "SLC"
-            elsif txt =~ /scientific/i 
-                "Scientific"
-            else
-                "RedHat"
-            end
-        elsif FileTest.exists?("/etc/SuSE-release")
-            txt = File.read("/etc/SuSE-release")
-            if txt =~ /^SUSE LINUX Enterprise Server/i
-                "SLES"
-            elsif txt =~ /^SUSE LINUX Enterprise Desktop/i
-                "SLED"
-            elsif txt =~ /^openSUSE/i
-                "OpenSuSE"
-            else
-                "SuSE"
-            end
-        elsif FileTest.exists?("/etc/bluewhite64-version")
-            "Bluewhite64"
-        elsif FileTest.exists?("/etc/slamd64-version")
-            "Slamd64"
-        elsif FileTest.exists?("/etc/slackware-version")
-            "Slackware"
-        elsif FileTest.exists?("/etc/alpine-release")
-            "Alpine"
-        end
-    end
-end
-
-Facter.add(:operatingsystem) do
-    confine :kernel => "VMkernel"
-    setcode do
-        "ESXi"
-    end
-end
-
-Facter.add(:operatingsystem) do
-    # Default to just returning the kernel as the operating system
-    setcode do Facter[:kernel].value end
+  confine :kernel => :sunos
+  setcode do "Solaris" end
+end
+
+Facter.add(:operatingsystem) do
+  confine :kernel => :linux
+  setcode do
+    if Facter.value(:lsbdistid) == "Ubuntu"
+       "Ubuntu"
+    elsif FileTest.exists?("/etc/debian_version")
+      "Debian"
+    elsif FileTest.exists?("/etc/gentoo-release")
+      "Gentoo"
+    elsif FileTest.exists?("/etc/fedora-release")
+      "Fedora"
+    elsif FileTest.exists?("/etc/mandriva-release")
+      "Mandriva"
+    elsif FileTest.exists?("/etc/mandrake-release")
+      "Mandrake"
+    elsif FileTest.exists?("/etc/meego-release")
+      "MeeGo"
+    elsif FileTest.exists?("/etc/arch-release")
+      "Archlinux"
+    elsif FileTest.exists?("/etc/oracle-release")
+      "OracleLinux"
+    elsif FileTest.exists?("/etc/enterprise-release")
+      if FileTest.exists?("/etc/ovs-release")
+        "OVS"
+      else
+        "OEL"
+      end
+    elsif FileTest.exists?("/etc/arch-release")
+      "Arch"
+    elsif FileTest.exists?("/etc/vmware-release")
+      "VMWareESX"
+    elsif FileTest.exists?("/etc/redhat-release")
+      txt = File.read("/etc/redhat-release")
+      if txt =~ /centos/i
+        "CentOS"
+      elsif txt =~ /CERN/
+        "SLC"
+      elsif txt =~ /scientific/i 
+        "Scientific"
+      elsif txt =~ /^cloudlinux/i
+        "CloudLinux"
+      else
+        "RedHat"
+      end
+    elsif FileTest.exists?("/etc/SuSE-release")
+      txt = File.read("/etc/SuSE-release")
+      if txt =~ /^SUSE LINUX Enterprise Server/i
+        "SLES"
+      elsif txt =~ /^SUSE LINUX Enterprise Desktop/i
+        "SLED"
+      elsif txt =~ /^openSUSE/i
+        "OpenSuSE"
+      else
+        "SuSE"
+      end
+    elsif FileTest.exists?("/etc/bluewhite64-version")
+      "Bluewhite64"
+    elsif FileTest.exists?("/etc/slamd64-version")
+      "Slamd64"
+    elsif FileTest.exists?("/etc/slackware-version")
+      "Slackware"
+    elsif FileTest.exists?("/etc/alpine-release")
+      "Alpine"
+    elsif Facter.value(:lsbdistdescription) =~ /Amazon Linux/
+      "Amazon"
+    end
+  end
+end
+
+Facter.add(:operatingsystem) do
+  confine :kernel => "VMkernel"
+  setcode do
+    "ESXi"
+  end
+end
+
+Facter.add(:operatingsystem) do
+  # Default to just returning the kernel as the operating system
+  setcode do Facter[:kernel].value end
 end

=== modified file 'lib/facter/operatingsystemrelease.rb'
--- lib/facter/operatingsystemrelease.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/operatingsystemrelease.rb	2011-11-14 19:37:34 +0000
@@ -9,6 +9,7 @@
 #   On Suse, derivatives, parses '/etc/SuSE-release' for a selection of version
 #   information.
 #   On Slackware, parses '/etc/slackware-version'.
+#   On Amazon Linux, returns the 'lsbdistrelease' value.
 #   
 #   On all remaining systems, returns the 'kernelrelease' value.
 #
@@ -16,112 +17,112 @@
 #
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{CentOS Fedora oel ovs OracleLinux RedHat MeeGo Scientific SLC}
-    setcode do
-        case Facter.value(:operatingsystem)
-        when "CentOS", "RedHat", "Scientific", "SLC"
-            releasefile = "/etc/redhat-release"
-        when "Fedora"
-            releasefile = "/etc/fedora-release"
-        when "MeeGo"
-            releasefile = "/etc/meego-release"
-        when "OracleLinux"
-            releasefile = "/etc/oracle-release"
-        when "OEL", "oel"
-            releasefile = "/etc/enterprise-release"
-        when "OVS", "ovs"
-            releasefile = "/etc/ovs-release"
-        end
-        File::open(releasefile, "r") do |f|
-            line = f.readline.chomp
-            if line =~ /\(Rawhide\)$/
-                "Rawhide"
-            elsif line =~ /release (\d[\d.]*)/
-                $1
-            end
-        end
-    end
-end
-
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{Debian}
-    setcode do
-        release = Facter::Util::Resolution.exec('cat /etc/debian_version')
-    end
-end
-
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{Ubuntu}
-    setcode do
-        release = Facter::Util::Resolution.exec('cat /etc/issue')
-        if release =~ /Ubuntu (\d+.\d+)/
-            $1
-        end
-    end
-end
-
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{SLES SLED OpenSuSE}
-    setcode do
-        releasefile = Facter::Util::Resolution.exec('cat /etc/SuSE-release')
-        if releasefile =~ /^VERSION\s*=\s*(\d+)/
-            releasemajor = $1
-            if releasefile =~ /^PATCHLEVEL\s*=\s*(\d+)/
-                releaseminor = $1
-            elsif releasefile =~ /^VERSION\s=.*.(\d+)/
-                releaseminor = $1
-            else
-                releaseminor = "0"
-            end
-            releasemajor + "." + releaseminor
-        else
-            "unknown"
-        end
-    end
-end
-
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{Slackware}
-    setcode do
-        release = Facter::Util::Resolution.exec('cat /etc/slackware-version')
-        if release =~ /Slackware ([0-9.]+)/
-            $1
-        end
-    end
-end
-
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{Bluewhite64}
-    setcode do
-        releasefile = Facter::Util::Resolution.exec('cat /etc/bluewhite64-version')
-        if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
-            $1 + "." + $2
-        else
-            "unknown"
-        end
-    end
-end
-
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{VMwareESX}
-    setcode do
-        release = Facter::Util::Resolution.exec('vmware -v')
-        if release =~ /VMware ESX .*?(\d.*)/
-            $1
-        end
-    end
-end
-
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{Slamd64}
-    setcode do
-        releasefile = Facter::Util::Resolution.exec('cat /etc/slamd64-version')
-        if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
-            $1 + "." + $2
-        else
-            "unknown"
-        end
-    end
+  confine :operatingsystem => %w{CentOS Fedora oel ovs OracleLinux RedHat MeeGo Scientific SLC CloudLinux}
+  setcode do
+    case Facter.value(:operatingsystem)
+    when "CentOS", "RedHat", "Scientific", "SLC", "CloudLinux"
+      releasefile = "/etc/redhat-release"
+    when "Fedora"
+      releasefile = "/etc/fedora-release"
+    when "MeeGo"
+      releasefile = "/etc/meego-release"
+    when "OracleLinux"
+      releasefile = "/etc/oracle-release"
+    when "OEL", "oel"
+      releasefile = "/etc/enterprise-release"
+    when "OVS", "ovs"
+      releasefile = "/etc/ovs-release"
+    end
+    File::open(releasefile, "r") do |f|
+      line = f.readline.chomp
+      if line =~ /\(Rawhide\)$/
+        "Rawhide"
+      elsif line =~ /release (\d[\d.]*)/
+        $1
+      end
+    end
+  end
+end
+
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => %w{Debian}
+  setcode do
+    release = Facter::Util::Resolution.exec('cat /etc/debian_version')
+  end
+end
+
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => %w{Ubuntu}
+  setcode do
+    release = Facter::Util::Resolution.exec('cat /etc/issue')
+    if release =~ /Ubuntu (\d+.\d+)/
+      $1
+    end
+  end
+end
+
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => %w{SLES SLED OpenSuSE}
+  setcode do
+    releasefile = Facter::Util::Resolution.exec('cat /etc/SuSE-release')
+    if releasefile =~ /^VERSION\s*=\s*(\d+)/
+      releasemajor = $1
+      if releasefile =~ /^PATCHLEVEL\s*=\s*(\d+)/
+        releaseminor = $1
+      elsif releasefile =~ /^VERSION\s=.*.(\d+)/
+        releaseminor = $1
+      else
+        releaseminor = "0"
+      end
+      releasemajor + "." + releaseminor
+    else
+      "unknown"
+    end
+  end
+end
+
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => %w{Slackware}
+  setcode do
+    release = Facter::Util::Resolution.exec('cat /etc/slackware-version')
+    if release =~ /Slackware ([0-9.]+)/
+      $1
+    end
+  end
+end
+
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => %w{Bluewhite64}
+  setcode do
+    releasefile = Facter::Util::Resolution.exec('cat /etc/bluewhite64-version')
+    if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
+      $1 + "." + $2
+    else
+      "unknown"
+    end
+  end
+end
+
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => %w{VMwareESX}
+  setcode do
+    release = Facter::Util::Resolution.exec('vmware -v')
+    if release =~ /VMware ESX .*?(\d.*)/
+      $1
+    end
+  end
+end
+
+Facter.add(:operatingsystemrelease) do
+  confine :operatingsystem => %w{Slamd64}
+  setcode do
+    releasefile = Facter::Util::Resolution.exec('cat /etc/slamd64-version')
+    if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
+      $1 + "." + $2
+    else
+      "unknown"
+    end
+  end
 end
 
 Facter.add(:operatingsystemrelease) do
@@ -132,5 +133,10 @@
 end
 
 Facter.add(:operatingsystemrelease) do
-    setcode do Facter[:kernelrelease].value end
+  confine :operatingsystem => %W{Amazon}
+  setcode do Facter[:lsbdistrelease].value end
+end
+
+Facter.add(:operatingsystemrelease) do
+  setcode do Facter[:kernelrelease].value end
 end

=== added file 'lib/facter/osfamily.rb'
--- lib/facter/osfamily.rb	1970-01-01 00:00:00 +0000
+++ lib/facter/osfamily.rb	2011-11-14 19:37:34 +0000
@@ -0,0 +1,31 @@
+# Fact: osfamily
+#
+# Purpose: Returns the operating system
+#
+# Resolution:
+#   Maps operating systems to operating system families, such as linux
+#   distribution derivatives. Adds mappings from specific operating systems
+#   to kernels in the case that it is relevant.
+#
+# Caveats:
+#   This fact is completely reliant on the operatingsystem fact, and no
+#   heuristics are used
+#
+
+Facter.add(:osfamily) do
+
+  setcode do
+    case Facter.value(:operatingsystem)
+    when "RedHat", "Fedora", "CentOS", "Scientific", "SLC", "CloudLinux", "OracleLinux", "OVS", "OEL"
+      "RedHat"
+    when "Ubuntu", "Debian"
+      "Debian"
+    when "SLES", "SLED", "OpenSuSE", "SuSE"
+      "Suse"
+    when "Solaris"
+      "Solaris"
+    else
+      Facter.value("kernel")
+    end
+  end
+end

=== modified file 'lib/facter/path.rb'
--- lib/facter/path.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/path.rb	2011-11-14 19:37:34 +0000
@@ -8,7 +8,7 @@
 #
 
 Facter.add(:path) do
-    setcode do
-        ENV['PATH']
-    end
+  setcode do
+    ENV['PATH']
+  end
 end

=== modified file 'lib/facter/physicalprocessorcount.rb'
--- lib/facter/physicalprocessorcount.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/physicalprocessorcount.rb	2011-11-14 19:37:34 +0000
@@ -62,3 +62,11 @@
     Facter::Util::WMI.execquery("select Name from Win32_Processor").Count
   end
 end
+
+Facter.add('physicalprocessorcount') do
+  confine :kernel => :sunos
+
+  setcode do
+    Facter::Util::Resolution.exec("/usr/sbin/psrinfo -p")
+  end
+end

=== modified file 'lib/facter/processor.rb'
--- lib/facter/processor.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/processor.rb	2011-11-14 19:37:34 +0000
@@ -19,90 +19,87 @@
 #
 
 require 'thread'
-
-if ["Linux", "GNU/kFreeBSD"].include? Facter.value(:kernel)
-    processor_num = -1
-    processor_list = []
-    Thread::exclusive do
-        File.readlines("/proc/cpuinfo").each do |l|
-            if l =~ /processor\s+:\s+(\d+)/
-                processor_num = $1.to_i
-            elsif l =~ /model name\s+:\s+(.*)\s*$/
-                processor_list[processor_num] = $1 unless processor_num == -1
-                processor_num = -1
-            elsif l =~ /processor\s+(\d+):\s+(.*)/
-                processor_num = $1.to_i
-                processor_list[processor_num] = $2 unless processor_num == -1
-            end
-        end
-    end
-
-    Facter.add("ProcessorCount") do
-        confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-        setcode do
-            processor_list.length.to_s
-        end
-    end
-
-    processor_list.each_with_index do |desc, i|
-        Facter.add("Processor#{i}") do
-            confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-            setcode do
-                desc
-            end
-        end
-    end
-end
-
-if Facter.value(:kernel) == "AIX"
-    processor_num = -1
-    processor_list = {}
-    Thread::exclusive do
-        procs = Facter::Util::Resolution.exec('lsdev -Cc processor')
-        procs.each do |proc|
-            if proc =~ /^proc(\d+)/
-                processor_num = $1.to_i
-                # Not retrieving the frequency since AIX 4.3.3 doesn't support the
-                # attribute and some people still use the OS.
-                proctype = Facter::Util::Resolution.exec('lsattr -El proc0 -a type')
-                if proctype =~ /^type\s+(\S+)\s+/
-                    processor_list["processor#{processor_num}"] = $1
-                end
-            end
-        end
-    end
-
-    Facter.add("ProcessorCount") do
-        confine :kernel => :aix
-        setcode do
-            processor_list.length.to_s
-        end
-    end
-
-    processor_list.each do |proc, desc|
-        Facter.add(proc) do
-            confine :kernel => :aix
-            setcode do
-                desc
-            end
-        end
-    end
-end
-
-if Facter.value(:kernel) == "OpenBSD"
-    Facter.add("Processor") do
-        confine :kernel => :openbsd
-        setcode do
-            Facter::Util::Resolution.exec("uname -p")
-        end
-    end
-
-    Facter.add("ProcessorCount") do
-        confine :kernel => :openbsd
-        setcode do
-            Facter::Util::Resolution.exec("sysctl hw.ncpu | cut -d'=' -f2")
-        end
-    end
+require 'facter/util/processor'
+
+Facter.add("ProcessorCount") do
+  confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+  setcode do
+    processor_list = Facter::Util::Processor.enum_cpuinfo
+    
+    ## If this returned nothing, then don't resolve the fact
+    if processor_list.length != 0
+      processor_list.length.to_s
+    end
+  end
+end
+
+Facter.add("ProcessorCount") do
+  confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+  setcode do
+    ## The method above is preferable since it provides the description of the CPU as well
+    ## but if that returned 0, then we enumerate sysfs
+    sysfs_cpu_directory = '/sys/devices/system/cpu'
+    if File.exists?(sysfs_cpu_directory)
+      lookup_pattern = "#{sysfs_cpu_directory}" + "/cpu[0-9]*"
+      cpuCount = Dir.glob(lookup_pattern).length
+      cpuCount.to_s
+    end
+  end
+end
+
+Facter.add("ProcessorCount") do
+  confine :kernel => :aix
+  setcode do
+    processor_list = Facter::Util::Processor.enum_lsdev
+        
+    processor_list.length.to_s
+  end
+end
+
+Facter.add("Processor") do
+  confine :kernel => :openbsd
+  setcode do
+    Facter::Util::Resolution.exec("uname -p")
+  end
+end
+
+Facter.add("ProcessorCount") do
+  confine :kernel => :openbsd
+  setcode do
+    Facter::Util::Resolution.exec("sysctl -n hw.ncpu")
+  end
+end
+
+Facter.add("ProcessorCount") do
+  confine :kernel => :Darwin
+  setcode do
+    Facter::Util::Resolution.exec("sysctl -n hw.ncpu")
+  end
+end
+
+## We have to enumerate these outside a Facter.add block to get the processorN descriptions iteratively
+## (but we need them inside the Facter.add block above for tests on processorcount to work)
+processor_list = Facter::Util::Processor.enum_cpuinfo
+processor_list_aix = Facter::Util::Processor.enum_lsdev
+
+if processor_list.length != 0
+  processor_list.each_with_index do |desc, i|
+    Facter.add("Processor#{i}") do
+      confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+      setcode do
+        desc
+      end
+    end
+  end
+elsif processor_list_aix.length != 0
+  processor_list_aix.each_with_index do |desc, i|
+    Facter.add("Processor#{i}") do
+      confine :kernel => [ :aix ]
+      setcode do
+        desc
+      end
+    end
+  end
 end
 
 if Facter.value(:kernel) == "windows"
@@ -142,3 +139,25 @@
     end
   end
 end
+
+Facter.add("Processor") do
+  confine :kernel => :dragonfly
+  setcode do
+    Facter::Util::Resolution.exec("sysctl -n hw.model")
+  end
+end
+
+Facter.add("ProcessorCount") do
+  confine :kernel => :dragonfly
+  setcode do
+    Facter::Util::Resolution.exec("sysctl -n hw.ncpu")
+  end
+end
+
+Facter.add("processorcount") do
+  confine :kernel => :sunos
+  setcode do
+    kstat = Facter::Util::Resolution.exec("/usr/bin/kstat cpu_info")
+    kstat.scan(/\bcore_id\b\s+\d+/).uniq.length
+  end
+end

=== modified file 'lib/facter/ps.rb'
--- lib/facter/ps.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/ps.rb	2011-11-14 19:37:34 +0000
@@ -11,12 +11,12 @@
 #
 
 Facter.add(:ps) do
-    setcode do 'ps -ef' end
+  setcode do 'ps -ef' end
 end
 
 Facter.add(:ps) do
-    confine :operatingsystem => %w{FreeBSD NetBSD OpenBSD Darwin}
-    setcode do 'ps auxwww' end
+  confine :operatingsystem => %w{FreeBSD NetBSD OpenBSD Darwin DragonFly}
+  setcode do 'ps auxwww' end
 end
 
 Facter.add(:ps) do

=== modified file 'lib/facter/puppetversion.rb'
--- lib/facter/puppetversion.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/puppetversion.rb	2011-11-14 19:37:34 +0000
@@ -9,12 +9,12 @@
 #
 
 Facter.add(:puppetversion) do
-    setcode do
-        begin
-            require 'puppet'
-            Puppet::PUPPETVERSION.to_s
-        rescue LoadError
-            nil
-        end
+  setcode do
+    begin
+      require 'puppet'
+      Puppet::PUPPETVERSION.to_s
+    rescue LoadError
+      nil
     end
+  end
 end

=== modified file 'lib/facter/rubysitedir.rb'
--- lib/facter/rubysitedir.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/rubysitedir.rb	2011-11-14 19:37:34 +0000
@@ -9,10 +9,10 @@
 #
 
 Facter.add :rubysitedir do
-    setcode do
-        version = RUBY_VERSION.to_s.sub(/\.\d+$/, '')
-        $:.find do |dir|
-            dir =~ /#{File.join("site_ruby", version)}$/
-        end
+  setcode do
+    version = RUBY_VERSION.to_s.sub(/\.\d+$/, '')
+    $:.find do |dir|
+      dir =~ /#{File.join("site_ruby", version)}$/
     end
+  end
 end

=== modified file 'lib/facter/rubyversion.rb'
--- lib/facter/rubyversion.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/rubyversion.rb	2011-11-14 19:37:34 +0000
@@ -8,5 +8,5 @@
 #
 
 Facter.add(:rubyversion) do
-    setcode { RUBY_VERSION.to_s }
+  setcode { RUBY_VERSION.to_s }
 end

=== modified file 'lib/facter/ssh.rb'
--- lib/facter/ssh.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/ssh.rb	2011-11-14 19:37:34 +0000
@@ -12,20 +12,20 @@
 ##
 
 ["/etc/ssh","/usr/local/etc/ssh","/etc","/usr/local/etc"].each do |dir|
-    {"SSHDSAKey" => "ssh_host_dsa_key.pub", "SSHRSAKey" => "ssh_host_rsa_key.pub"}.each do |name,file|
-        Facter.add(name) do
-            setcode do
-                value = nil
-                filepath = File.join(dir,file)
-                if FileTest.file?(filepath)
-                    begin
-                        File.open(filepath) { |f| value = f.read.chomp.split(/\s+/)[1] }
-                    rescue
-                        value = nil
-                    end
-                end
-                value
-            end # end of proc
-        end # end of add
-    end # end of hash each
+  {"SSHDSAKey" => "ssh_host_dsa_key.pub", "SSHRSAKey" => "ssh_host_rsa_key.pub", "SSHECDSAKey" => "ssh_host_ecdsa_key.pub"}.each do |name,file|
+    Facter.add(name) do
+      setcode do
+        value = nil
+        filepath = File.join(dir,file)
+        if FileTest.file?(filepath)
+          begin
+            File.open(filepath) { |f| value = f.read.chomp.split(/\s+/)[1] }
+          rescue
+            value = nil
+          end
+        end
+        value
+      end # end of proc
+    end # end of add
+  end # end of hash each
 end # end of dir each

=== modified file 'lib/facter/timezone.rb'
--- lib/facter/timezone.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/timezone.rb	2011-11-14 19:37:34 +0000
@@ -8,7 +8,7 @@
 #
 
 Facter.add("timezone") do
-     setcode do
-         Time.new.zone
-     end
+  setcode do
+    Time.new.zone
+  end
 end

=== modified file 'lib/facter/uniqueid.rb'
--- lib/facter/uniqueid.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/uniqueid.rb	2011-11-14 19:37:34 +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}
+  setcode 'hostid'
+  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo AIX OEL OracleLinux OVS GNU/kFreeBSD}
 end

=== modified file 'lib/facter/util/collection.rb'
--- lib/facter/util/collection.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/util/collection.rb	2011-11-14 19:37:34 +0000
@@ -5,126 +5,126 @@
 # Manage which facts exist and how we access them.  Largely just a wrapper
 # around a hash of facts.
 class Facter::Util::Collection
-    # Return a fact object by name.  If you use this, you still have to call
-    # 'value' on it to retrieve the actual value.
-    def [](name)
-        value(name)
-    end
-
-    # Add a resolution mechanism for a named fact.  This does not distinguish
-    # between adding a new fact and adding a new way to resolve a fact.
-    def add(name, options = {}, &block)
-        name = canonize(name)
-
-        unless fact = @facts[name]
-            fact = Facter::Util::Fact.new(name)
-
-            @facts[name] = fact
-        end
-
-        # Set any fact-appropriate options.
-        options.each do |opt, value|
-            method = opt.to_s + "="
-            if fact.respond_to?(method)
-                fact.send(method, value)
-                options.delete(opt)
-            end
-        end
-
-        if block
-            resolve = fact.add(&block)
-            # Set any resolve-appropriate options
-            options.each do |opt, value|
-                method = opt.to_s + "="
-                if resolve.respond_to?(method)
-                    resolve.send(method, value)
-                    options.delete(opt)
-                end
-            end
-        end
-
-        unless options.empty?
-            raise ArgumentError, "Invalid facter option(s) %s" % options.keys.collect { |k| k.to_s }.join(",")
-        end
-
-        return fact
-    end
-
-    include Enumerable
-
-    # Iterate across all of the facts.
-    def each
-        @facts.each do |name, fact|
-            value = fact.value
-            unless value.nil?
-                yield name.to_s, value
-            end
-        end
-    end
-
-    # Return a fact by name.
-    def fact(name)
-        name = canonize(name)
-
-        # Try to load the fact if necessary
-        loader.load(name) unless @facts[name]
-
-        # Try HARDER
-        loader.load_all unless @facts[name]
-
-        @facts[name]
-    end
-
-    # Flush all cached values.
-    def flush
-        @facts.each { |name, fact| fact.flush }
-    end
-
-    def initialize
-        @facts = Hash.new
-    end
-
-    # Return a list of all of the facts.
-    def list
-        return @facts.keys
-    end
-
-    # Load all known facts.
-    def load_all
-        loader.load_all
-    end
-
-    # The thing that loads facts if we don't have them.
-    def loader
-        unless defined?(@loader)
-            @loader = Facter::Util::Loader.new
-        end
-        @loader
-    end
-
-    # Return a hash of all of our facts.
-    def to_hash
-        @facts.inject({}) do |h, ary|
-            value = ary[1].value
-            if ! value.nil?
-                # For backwards compatibility, convert the fact name to a string.
-                h[ary[0].to_s] = value
-            end
-            h
-        end
-    end
-
-    def value(name)
-        if fact = fact(name)
-            fact.value
-        end
-    end
-
-    private
-
-    # Provide a consistent means of getting the exact same fact name
-    # every time.
-    def canonize(name)
-        name.to_s.downcase.to_sym
-    end
+  # Return a fact object by name.  If you use this, you still have to call
+  # 'value' on it to retrieve the actual value.
+  def [](name)
+    value(name)
+  end
+
+  # Add a resolution mechanism for a named fact.  This does not distinguish
+  # between adding a new fact and adding a new way to resolve a fact.
+  def add(name, options = {}, &block)
+    name = canonize(name)
+
+    unless fact = @facts[name]
+      fact = Facter::Util::Fact.new(name)
+
+      @facts[name] = fact
+    end
+
+    # Set any fact-appropriate options.
+    options.each do |opt, value|
+      method = opt.to_s + "="
+      if fact.respond_to?(method)
+        fact.send(method, value)
+        options.delete(opt)
+      end
+    end
+
+    if block
+      resolve = fact.add(&block)
+      # Set any resolve-appropriate options
+      options.each do |opt, value|
+        method = opt.to_s + "="
+        if resolve.respond_to?(method)
+          resolve.send(method, value)
+          options.delete(opt)
+        end
+      end
+    end
+
+    unless options.empty?
+      raise ArgumentError, "Invalid facter option(s) %s" % options.keys.collect { |k| k.to_s }.join(",")
+    end
+
+    return fact
+  end
+
+  include Enumerable
+
+  # Iterate across all of the facts.
+  def each
+    @facts.each do |name, fact|
+      value = fact.value
+      unless value.nil?
+        yield name.to_s, value
+      end
+    end
+  end
+
+  # Return a fact by name.
+  def fact(name)
+    name = canonize(name)
+
+    # Try to load the fact if necessary
+    loader.load(name) unless @facts[name]
+
+    # Try HARDER
+    loader.load_all unless @facts[name]
+
+    @facts[name]
+  end
+
+  # Flush all cached values.
+  def flush
+    @facts.each { |name, fact| fact.flush }
+  end
+
+  def initialize
+    @facts = Hash.new
+  end
+
+  # Return a list of all of the facts.
+  def list
+    return @facts.keys
+  end
+
+  # Load all known facts.
+  def load_all
+    loader.load_all
+  end
+
+  # The thing that loads facts if we don't have them.
+  def loader
+    unless defined?(@loader)
+      @loader = Facter::Util::Loader.new
+    end
+    @loader
+  end
+
+  # Return a hash of all of our facts.
+  def to_hash
+    @facts.inject({}) do |h, ary|
+      value = ary[1].value
+      if ! value.nil?
+        # For backwards compatibility, convert the fact name to a string.
+        h[ary[0].to_s] = value
+      end
+      h
+    end
+  end
+
+  def value(name)
+    if fact = fact(name)
+      fact.value
+    end
+  end
+
+  private
+
+  # Provide a consistent means of getting the exact same fact name
+  # every time.
+  def canonize(name)
+    name.to_s.downcase.to_sym
+  end
 end

=== modified file 'lib/facter/util/confine.rb'
--- lib/facter/util/confine.rb	2009-06-30 00:21:23 +0000
+++ lib/facter/util/confine.rb	2011-11-14 19:37:34 +0000
@@ -4,38 +4,38 @@
 require 'facter/util/values'
 
 class Facter::Util::Confine
-    attr_accessor :fact, :values
-
-    include Facter::Util::Values
-
-    # Add the restriction.  Requires the fact name, an operator, and the value
-    # we're comparing to.
-    def initialize(fact, *values)
-        raise ArgumentError, "The fact name must be provided" unless fact
-        raise ArgumentError, "One or more values must be provided" if values.empty?
-        @fact = fact
-        @values = values
-    end
-
-    def to_s
-        return "'%s' '%s'" % [@fact, @values.join(",")]
-    end
-
-    # Evaluate the fact, returning true or false.
-    def true?
-        unless fact = Facter[@fact]
-            Facter.debug "No fact for %s" % @fact
-            return false
-        end
-        value = convert(fact.value)
-
-        return false if value.nil?
-
-        @values.each do |v|
-            v = convert(v)
-            next unless v.class == value.class
-            return true if value == v
-        end
-        return false
-    end
+  attr_accessor :fact, :values
+
+  include Facter::Util::Values
+
+  # Add the restriction.  Requires the fact name, an operator, and the value
+  # we're comparing to.
+  def initialize(fact, *values)
+    raise ArgumentError, "The fact name must be provided" unless fact
+    raise ArgumentError, "One or more values must be provided" if values.empty?
+    @fact = fact
+    @values = values
+  end
+
+  def to_s
+    return "'%s' '%s'" % [@fact, @values.join(",")]
+  end
+
+  # Evaluate the fact, returning true or false.
+  def true?
+    unless fact = Facter[@fact]
+      Facter.debug "No fact for %s" % @fact
+      return false
+    end
+    value = convert(fact.value)
+
+    return false if value.nil?
+
+    @values.each do |v|
+      v = convert(v)
+      next unless v.class == value.class
+      return true if value == v
+    end
+    return false
+  end
 end

=== modified file 'lib/facter/util/fact.rb'
--- lib/facter/util/fact.rb	2011-06-24 10:04:12 +0000
+++ lib/facter/util/fact.rb	2011-11-14 19:37:34 +0000
@@ -2,119 +2,119 @@
 require 'facter/util/resolution'
 
 class Facter::Util::Fact
-    TIMEOUT = 5
-
-    attr_accessor :name, :ldapname
-
-    # Create a new fact, with no resolution mechanisms.
-    def initialize(name, options = {})
-        @name = name.to_s.downcase.intern
-
-        # LAK:NOTE: This is slow for many options, but generally we won't have any and at
-        # worst we'll have one.  If we add more, this should be made more efficient.
-        options.each do |name, value|
-            case name
-            when :ldapname; self.ldapname = value
-            else
-                raise ArgumentError, "Invalid fact option '%s'" % name
-            end
-        end
-
-        @ldapname ||= @name.to_s
-
-        @resolves = []
-        @searching = false
-
-        @value = nil
-    end
-
-    # Add a new resolution mechanism.  This requires a block, which will then
-    # be evaluated in the context of the new mechanism.
-    def add(&block)
-        raise ArgumentError, "You must pass a block to Fact<instance>.add" unless block_given?
-
-        resolve = Facter::Util::Resolution.new(@name)
-
-        resolve.instance_eval(&block)
-
-        @resolves << resolve
-
-        # Immediately sort the resolutions, so that we always have
-        # a sorted list for looking up values.
-        @resolves.sort! { |a, b| b.weight <=> a.weight }
-
-        return resolve
-    end
-
-    # Flush any cached values.
-    def flush
-        @value = nil
-        @suitable = nil
-    end
-
-    # Return the value for a given fact.  Searches through all of the mechanisms
-    # and returns either the first value or nil.
-    def value
-        return @value if @value
-
-        if @resolves.length == 0
-            Facter.debug "No resolves for %s" % @name
-            return nil
-        end
-
-        searching do
-            @value = nil
-
-            foundsuits = false
-            @value = @resolves.inject(nil) { |result, resolve|
-                next unless resolve.suitable?
-                foundsuits = true
-
-                tmp = resolve.value
-
-                break tmp unless tmp.nil? or tmp == ""
-            }
-
-            unless foundsuits
-                Facter.debug "Found no suitable resolves of %s for %s" % [@resolves.length, @name]
-            end
-        end
-
-        if @value.nil?
-            # nothing
-            Facter.debug("value for %s is still nil" % @name)
-            return nil
-        else
-            return @value
-        end
-    end
-
-    private
-
-    # Are we in the midst of a search?
-    def searching?
-        @searching
-    end
-
-    # Lock our searching process, so we never ge stuck in recursion.
-    def searching
-        if searching?
-            Facter.debug "Caught recursion on %s" % @name
-
-            # return a cached value if we've got it
-            if @value
-                return @value
-            else
-                return nil
-            end
-        end
-
-        # If we've gotten this far, we're not already searching, so go ahead and do so.
-        @searching = true
-        begin
-            yield
-        ensure
-            @searching = false
-        end
-    end
+  TIMEOUT = 5
+
+  attr_accessor :name, :ldapname
+
+  # Create a new fact, with no resolution mechanisms.
+  def initialize(name, options = {})
+    @name = name.to_s.downcase.intern
+
+    # LAK:NOTE: This is slow for many options, but generally we won't have any and at
+    # worst we'll have one.  If we add more, this should be made more efficient.
+    options.each do |name, value|
+      case name
+      when :ldapname; self.ldapname = value
+      else
+        raise ArgumentError, "Invalid fact option '%s'" % name
+      end
+    end
+
+    @ldapname ||= @name.to_s
+
+    @resolves = []
+    @searching = false
+
+    @value = nil
+  end
+
+  # Add a new resolution mechanism.  This requires a block, which will then
+  # be evaluated in the context of the new mechanism.
+  def add(&block)
+    raise ArgumentError, "You must pass a block to Fact<instance>.add" unless block_given?
+
+    resolve = Facter::Util::Resolution.new(@name)
+
+    resolve.instance_eval(&block)
+
+    @resolves << resolve
+
+    # Immediately sort the resolutions, so that we always have
+    # a sorted list for looking up values.
+    @resolves.sort! { |a, b| b.weight <=> a.weight }
+
+    return resolve
+  end
+
+  # Flush any cached values.
+  def flush
+    @value = nil
+    @suitable = nil
+  end
+
+  # Return the value for a given fact.  Searches through all of the mechanisms
+  # and returns either the first value or nil.
+  def value
+    return @value if @value
+
+    if @resolves.length == 0
+      Facter.debug "No resolves for %s" % @name
+      return nil
+    end
+
+    searching do
+      @value = nil
+
+      foundsuits = false
+      @value = @resolves.inject(nil) { |result, resolve|
+        next unless resolve.suitable?
+        foundsuits = true
+
+        tmp = resolve.value
+
+        break tmp unless tmp.nil? or tmp == ""
+      }
+
+      unless foundsuits
+        Facter.debug "Found no suitable resolves of %s for %s" % [@resolves.length, @name]
+      end
+    end
+
+    if @value.nil?
+      # nothing
+      Facter.debug("value for %s is still nil" % @name)
+      return nil
+    else
+      return @value
+    end
+  end
+
+  private
+
+  # Are we in the midst of a search?
+  def searching?
+    @searching
+  end
+
+  # Lock our searching process, so we never ge stuck in recursion.
+  def searching
+    if searching?
+      Facter.debug "Caught recursion on %s" % @name
+
+      # return a cached value if we've got it
+      if @value
+        return @value
+      else
+        return nil
+      end
+    end
+
+    # If we've gotten this far, we're not already searching, so go ahead and do so.
+    @searching = true
+    begin
+      yield
+    ensure
+      @searching = false
+    end
+  end
 end

=== modified file 'lib/facter/util/ip.rb'
--- lib/facter/util/ip.rb	2011-10-06 10:48:30 +0000
+++ lib/facter/util/ip.rb	2011-11-14 19:37:34 +0000
@@ -1,202 +1,202 @@
 # A base module for collecting IP-related
 # information from all kinds of platforms.
 module Facter::Util::IP
-    # A map of all the different regexes that work for
-    # a given platform or set of platforms.
-    REGEX_MAP = {
-        :linux => {
-            :ipaddress  => /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-            :ipaddress6 => /inet6 addr: ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
-            :macaddress => /(?:ether|HWaddr)\s+(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
-            :netmask    => /Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-        },
-        :bsd   => {
-            :aliases    => [:openbsd, :netbsd, :freebsd, :darwin, :"gnu/kfreebsd"],
-            :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-            :ipaddress6 => /inet6 ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
-            :macaddress => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
-            :netmask    => /netmask\s+0x(\w{8})/
-        },
-        :sunos => {
-            :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-            :ipaddress6 => /inet6 ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
-            :macaddress => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
-            :netmask    => /netmask\s+(\w{8})/
-        },
-        :"hp-ux" => {
-            :ipaddress  => /\s+inet (\S+)\s.*/,
-            :macaddress => /(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
-            :netmask    => /.*\s+netmask (\S+)\s.*/
-        },
-        :windows => {
-            :ipaddress  => /\s+IP Address:\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-            :ipaddress6 => /Address ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
-            :netmask    => /\s+Subnet Prefix:\s+\S+\s+\(mask ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\)/
-        }
+  # A map of all the different regexes that work for
+  # a given platform or set of platforms.
+  REGEX_MAP = {
+    :linux => {
+      :ipaddress  => /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+      :ipaddress6 => /inet6 addr: ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+      :macaddress => /(?:ether|HWaddr)\s+(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
+      :netmask  => /Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+    },
+    :bsd   => {
+      :aliases  => [:openbsd, :netbsd, :freebsd, :darwin, :"gnu/kfreebsd", :dragonfly],
+      :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+      :ipaddress6 => /inet6 ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+      :macaddress => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
+      :netmask  => /netmask\s+0x(\w{8})/
+    },
+    :sunos => {
+      :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+      :ipaddress6 => /inet6 ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+      :macaddress => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
+      :netmask  => /netmask\s+(\w{8})/
+    },
+    :"hp-ux" => {
+      :ipaddress  => /\s+inet (\S+)\s.*/,
+      :macaddress => /(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
+      :netmask  => /.*\s+netmask (\S+)\s.*/
+    },
+    :windows => {
+      :ipaddress  => /\s+IP Address:\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+      :ipaddress6 => /Address ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+      :netmask  => /\s+Subnet Prefix:\s+\S+\s+\(mask ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\)/
     }
-
-    # Convert an interface name into purely alphanumeric characters.
-    def self.alphafy(interface)
-        interface.gsub(/[^a-z0-9_]/i, '_')
-    end
-
-    def self.convert_from_hex?(kernel)
-        kernels_to_convert = [:sunos, :openbsd, :netbsd, :freebsd, :darwin, :"hp-ux", :"gnu/kfreebsd"]
-        kernels_to_convert.include?(kernel)
-    end
-
-    def self.supported_platforms
-        REGEX_MAP.inject([]) do |result, tmp|
-            key, map = tmp
-            if map[:aliases]
-                result += map[:aliases]
-            else
-                result << key
-            end
-            result
-        end
-    end
-
-    def self.get_interfaces
-        return [] unless output = Facter::Util::IP.get_all_interface_output()
-
-        # windows interface names contain spaces and are quoted and can appear multiple
-        # times as ipv4 and ipv6
-        return output.scan(/\s* connected\s*(\S.*)/).flatten.uniq if Facter.value(:kernel) == 'windows'
-
-        # Our regex appears to be stupid, in that it leaves colons sitting
-        # at the end of interfaces.  So, we have to trim those trailing
-        # characters.  I tried making the regex better but supporting all
-        # platforms with a single regex is probably a bit too much.
-        output.scan(/^\S+/).collect { |i| i.sub(/:$/, '') }.uniq
-    end
-
-    def self.get_all_interface_output
-        case Facter.value(:kernel)
-        when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD'
-            output = %x{/sbin/ifconfig -a}
-        when 'SunOS'
-            output = %x{/usr/sbin/ifconfig -a}
-        when 'HP-UX'
-            output = %x{/bin/netstat -in | sed -e 1d}
-        when 'windows'
-          output = %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ip show interface|
-          output += %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ipv6 show interface|
-        end
-        output
-    end
-
-    def self.get_single_interface_output(interface)
-        output = ""
-        case Facter.value(:kernel)
-        when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD'
-            output = %x{/sbin/ifconfig #{interface}}
-        when 'SunOS'
-            output = %x{/usr/sbin/ifconfig #{interface}}
-        when 'HP-UX'
-           mac = ""
-           ifc = %x{/usr/sbin/ifconfig #{interface}}
-           %x{/usr/sbin/lanscan}.scan(/(\dx\S+).*UP\s+(\w+\d+)/).each {|i| mac = i[0] if i.include?(interface) }
-           mac = mac.sub(/0x(\S+)/,'\1').scan(/../).join(":")
-           output = ifc + "\n" + mac
-        end
-        output
-    end
-
-    def self.get_output_for_interface_and_label(interface, label)
-        return get_single_interface_output(interface) unless Facter.value(:kernel) == 'windows'
-
-        if label == 'ipaddress6'
-          output = %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ipv6 show address \"#{interface}\"|
-        else
-          output = %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ip show address \"#{interface}\"|
-        end
-        output
-    end
-
-    def self.get_bonding_master(interface)
-        if Facter.value(:kernel) != 'Linux'
-            return nil
-        end
-        # We need ip instead of ifconfig because it will show us
-        # the bonding master device.
-        if not FileTest.executable?("/sbin/ip")
-            return nil
-        end
-        # A bonding interface can never be an alias interface. Alias
-        # interfaces do have a colon in their name and the ip link show
-        # command throws an error message when we pass it an alias
-        # interface.
-        if interface =~ /:/
-            return nil
-        end
-        regex = /SLAVE[,>].* (bond[0-9]+)/
-            ethbond = regex.match(%x{/sbin/ip link show #{interface}})
-        if ethbond
-            device = ethbond[1]
-        else
-            device = nil
-        end
-        device
-    end
-
-    def self.get_interface_value(interface, label)
-        tmp1 = []
-
-        kernel = Facter.value(:kernel).downcase.to_sym
-
-        # If it's not directly in the map or aliased in the map, then we don't know how to deal with it.
-        unless map = REGEX_MAP[kernel] || REGEX_MAP.values.find { |tmp| tmp[:aliases] and tmp[:aliases].include?(kernel) }
-            return []
-        end
-
-        # Pull the correct regex out of the map.
-        regex = map[label.to_sym]
-
-        # Linux changes the MAC address reported via ifconfig when an ethernet interface
-        # becomes a slave of a bonding device to the master MAC address.
-        # We have to dig a bit to get the original/real MAC address of the interface.
-        bonddev = get_bonding_master(interface)
-        if label == 'macaddress' and bonddev
-            bondinfo = IO.readlines("/proc/net/bonding/#{bonddev}")
-            hwaddrre = /^Slave Interface: #{interface}\n[^\n].+?\nPermanent HW addr: (([0-9a-fA-F]{2}:?)*)$/m
-            value = hwaddrre.match(bondinfo.to_s)[1].upcase
-        else
-            output_int = get_output_for_interface_and_label(interface, label)
-
-            output_int.each_line do |s|
-                if s =~ regex
-                    value = $1
-                        if label == 'netmask' && convert_from_hex?(kernel)
-                            value = value.scan(/../).collect do |byte| byte.to_i(16) end.join('.')
-                        end
-                    tmp1.push(value)
-                end
-            end
-
-            if tmp1
-                value = tmp1.shift
-            end
-        end
-    end
-
-    def self.get_network_value(interface)
-        require 'ipaddr'
-
-        ipaddress = get_interface_value(interface, "ipaddress")
-        netmask = get_interface_value(interface, "netmask")
-
-        if ipaddress && netmask
-            ip = IPAddr.new(ipaddress, Socket::AF_INET)
-            subnet = IPAddr.new(netmask, Socket::AF_INET)
-            network = ip.mask(subnet.to_s).to_s
-        end
-    end
-
-    def self.get_arp_value(interface)
-        arp = Facter::Util::Resolution.exec("arp -en -i #{interface} | sed -e 1d")
-        if arp =~ /^\S+\s+\w+\s+(\S+)\s+\w\s+\S+$/
-         return $1
-        end
-    end
+  }
+
+  # Convert an interface name into purely alphanumeric characters.
+  def self.alphafy(interface)
+    interface.gsub(/[^a-z0-9_]/i, '_')
+  end
+
+  def self.convert_from_hex?(kernel)
+    kernels_to_convert = [:sunos, :openbsd, :netbsd, :freebsd, :darwin, :"hp-ux", :"gnu/kfreebsd", :dragonfly]
+    kernels_to_convert.include?(kernel)
+  end
+
+  def self.supported_platforms
+    REGEX_MAP.inject([]) do |result, tmp|
+      key, map = tmp
+      if map[:aliases]
+        result += map[:aliases]
+      else
+        result << key
+      end
+      result
+    end
+  end
+
+  def self.get_interfaces
+    return [] unless output = Facter::Util::IP.get_all_interface_output()
+
+    # windows interface names contain spaces and are quoted and can appear multiple
+    # times as ipv4 and ipv6
+    return output.scan(/\s* connected\s*(\S.*)/).flatten.uniq if Facter.value(:kernel) == 'windows'
+
+    # Our regex appears to be stupid, in that it leaves colons sitting
+    # at the end of interfaces.  So, we have to trim those trailing
+    # characters.  I tried making the regex better but supporting all
+    # platforms with a single regex is probably a bit too much.
+    output.scan(/^\S+/).collect { |i| i.sub(/:$/, '') }.uniq
+  end
+
+  def self.get_all_interface_output
+    case Facter.value(:kernel)
+    when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly'
+      output = %x{/sbin/ifconfig -a}
+    when 'SunOS'
+      output = %x{/usr/sbin/ifconfig -a}
+    when 'HP-UX'
+      output = %x{/bin/netstat -in | sed -e 1d}
+    when 'windows'
+      output = %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ip show interface|
+      output += %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ipv6 show interface|
+    end
+    output
+  end
+
+  def self.get_single_interface_output(interface)
+    output = ""
+    case Facter.value(:kernel)
+    when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly'
+      output = %x{/sbin/ifconfig #{interface}}
+    when 'SunOS'
+      output = %x{/usr/sbin/ifconfig #{interface}}
+    when 'HP-UX'
+       mac = ""
+       ifc = %x{/usr/sbin/ifconfig #{interface}}
+       %x{/usr/sbin/lanscan}.scan(/(\dx\S+).*UP\s+(\w+\d+)/).each {|i| mac = i[0] if i.include?(interface) }
+       mac = mac.sub(/0x(\S+)/,'\1').scan(/../).join(":")
+       output = ifc + "\n" + mac
+    end
+    output
+  end
+
+  def self.get_output_for_interface_and_label(interface, label)
+    return get_single_interface_output(interface) unless Facter.value(:kernel) == 'windows'
+
+    if label == 'ipaddress6'
+      output = %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ipv6 show address \"#{interface}\"|
+    else
+      output = %x|#{ENV['SYSTEMROOT']}/system32/netsh interface ip show address \"#{interface}\"|
+    end
+    output
+  end
+
+  def self.get_bonding_master(interface)
+    if Facter.value(:kernel) != 'Linux'
+      return nil
+    end
+    # We need ip instead of ifconfig because it will show us
+    # the bonding master device.
+    if not FileTest.executable?("/sbin/ip")
+      return nil
+    end
+    # A bonding interface can never be an alias interface. Alias
+    # interfaces do have a colon in their name and the ip link show
+    # command throws an error message when we pass it an alias
+    # interface.
+    if interface =~ /:/
+      return nil
+    end
+    regex = /SLAVE[,>].* (bond[0-9]+)/
+      ethbond = regex.match(%x{/sbin/ip link show #{interface}})
+    if ethbond
+      device = ethbond[1]
+    else
+      device = nil
+    end
+    device
+  end
+
+  def self.get_interface_value(interface, label)
+    tmp1 = []
+
+    kernel = Facter.value(:kernel).downcase.to_sym
+