facter 1.6.1 → 1.6.2

data/CHANGELOG

@@ -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

data/Rakefile

@@ -7,7 +7,7 @@ require 'rubygems'
 require 'rspec'
 require 'rspec/core/rake_task'
 begin
-    require 'rcov'
+  require 'rcov'
 rescue LoadError
 end
 
@@ -18,60 +18,65 @@ require 'rake/packagetask'
 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 = 'info@puppetlabs.com'
-    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 = 'info@puppetlabs.com'
+  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

data/conf/redhat/facter.spec

@@ -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 @@ system. Some of the facts are preconfigured, such as the hostname and the
 operating system. Additional facts can be added through simple Ruby scripts
 
 %prep
-%setup -q
+%setup -q  -n %{name}-%{_ver}
 
 %build
 
@@ -52,6 +53,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 10 2011 Michael Stahnke <stahnma@puppetlabs.com> -  1.6.2-1
+- Update to 1.6.2
+
+* Mon Oct 03 2011 Michael Stahnke <stahnma@puppetlabs.com> -  1.6.2-0.1rc1
+- Updates for 1.6.2-0.1rc1
+
 * Thu Jun 23 2011 Michael Stahnke <stahnma@puppetlabs.com> - 1.6.0-1
 - Update to 1.6.0
 

data/conf/solaris/pkginfo

@@ -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

data/install.rb

@@ -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 'optparse'
 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 @@ PREREQS = %w{openssl xmlrpc/client xmlrpc/server cgi}
 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 @@ end
 # 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
+  # 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.rdoc  = false
-        InstallOptions.ri  = false
+      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
+  if $haveman
+    InstallOptions.man = true
+    if is_windows?
+      InstallOptions.man  = false
     end
+  else
+    InstallOptions.man = false
+  end
+
+  InstallOptions.tests = true
 
-    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!
+  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
 
-    tmpdirs = [ENV['TMP'], ENV['TEMP'], "/tmp", "/var/tmp", "."]
+    opts.parse!
+  end
 
-    version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
-    libdir = File.join(Config::CONFIG["libdir"], "ruby", version)
+  tmpdirs = [ENV['TMP'], ENV['TEMP'], "/tmp", "/var/tmp", "."]
 
-    # 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
+  version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
+  libdir = File.join(Config::CONFIG["libdir"], "ruby", version)
 
-    if not InstallOptions.bindir.nil?
-        bindir = InstallOptions.bindir
-    else
-        bindir = Config::CONFIG['bindir']
-    end
+  # 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.sbindir.nil?
-        sbindir = InstallOptions.sbindir
-    else
-        sbindir = Config::CONFIG['sbindir']
-    end
+  if not InstallOptions.bindir.nil?
+    bindir = InstallOptions.bindir
+  else
+    bindir = Config::CONFIG['bindir']
+  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.sbindir.nil?
+    sbindir = InstallOptions.sbindir
+  else
+    sbindir = Config::CONFIG['sbindir']
+  end
 
-    if not InstallOptions.mandir.nil?
-        mandir = InstallOptions.mandir
-    else
-        mandir = Config::CONFIG['mandir']
+  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
 
-    # 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
+  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
+  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
+  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 @@ end
 # 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 @@ end
 # (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
+  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
+  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 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}.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 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{/}) { "\\" } )
+    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.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
+      File.unlink(tmp_file2)
+      installed_wrapper = true
     end
-    FileUtils.install(tmp_file, File.join(target, op_file), :mode => 0755, :verbose => true)
-    File.unlink(tmp_file)
+  end
+  FileUtils.install(tmp_file, File.join(target, op_file), :mode => 0755, :verbose => true)
+  File.unlink(tmp_file)
 end
 
 CMD_WRAPPER = <<-EOS