puppet 0.13.6 → 0.16.0

data/bin/puppetmasterd

@@ -184,9 +184,9 @@ if haveca
     handlers[:CA] = ca
 end
 
-#if havebucket
-#    handlers[:FileBucket] = bucket
-#end
+if havebucket
+    handlers[:FileBucket] = bucket
+end
 
 if File.exists?(Puppet[:fileserverconfig])
     fs[:Config] = Puppet[:fileserverconfig]
@@ -245,4 +245,4 @@ rescue => detail
     exit(1)
 end
 
-# $Id: puppetmasterd 966 2006-03-02 17:12:26Z luke $
+# $Id: puppetmasterd 1012 2006-03-12 02:56:23Z luke $

data/conf/epm.list

@@ -0,0 +1,8 @@
+%product Puppet
+%copyright 2004-2005 by Reductive Labs, All Rights Reserved
+%vendor Reductive Labs
+%license COPYING
+%readme README
+%description System Automation and Configuration Management Software
+%version 0.15.0
+%requires facter 1.1

data/conf/redhat/client.init

@@ -15,7 +15,7 @@ export PATH
 
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet/puppet.pid}
+pidfile=${PIDFILE-/var/run/puppet.pid}
 puppetd=${PUPPETD-/usr/sbin/puppetd}
 RETVAL=0
 
@@ -27,6 +27,11 @@ PUPPET_OPTS=""
 [ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
 [ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
 
+# Figure out if the system just booted. Let's assume
+# boot doesn't take longer than 5 minutes
+## Not used for now
+##[ -n "$INIT_VERSION" ] && PUPPET_OPTS="${PUPPET_OPTS} --fullrun"
+
 start() {
 	echo -n $"Starting puppet: "
         daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}

data/conf/redhat/no-chuser-0.15.1.patch

@@ -0,0 +1,38 @@
+--- puppet-0.15.1/bin/puppetmasterd.orig	2006-03-15 08:33:45.000000000 -0800
++++ puppet-0.15.1/bin/puppetmasterd	2006-03-22 13:07:54.000000000 -0800
+@@ -210,14 +210,15 @@
+     exit(1)
+ end
+ 
+-if Process.uid == 0
+-    begin
+-        Puppet::Util.chuser
+-    rescue => detail
+-        $stderr.puts "Could not change user to %s: %s" % [Puppet[:user], detail]
+-        exit(39)
+-    end
+-end
++# FIXME: Running as non-root is not ready for primetime
++# if Process.uid == 0
++#     begin
++#         Puppet::Util.chuser
++#     rescue => detail
++#         $stderr.puts "Could not change user to %s: %s" % [Puppet[:user], detail]
++#         exit(39)
++#     end
++# end
+ 
+ if Puppet[:parseonly]
+     # we would have already exited if the file weren't syntactically correct
+--- puppet-0.15.1/bin/puppetca.orig	2006-02-07 15:12:39.000000000 -0800
++++ puppet-0.15.1/bin/puppetca	2006-03-22 13:07:56.000000000 -0800
+@@ -138,7 +138,8 @@
+ Puppet.genconfig
+ Puppet.genmanifest
+ 
+-Puppet::Util.chuser
++# FIXME: Running as non-root is not ready for primetime
++# Puppet::Util.chuser
+ 
+ begin
+     ca = Puppet::SSLCertificates::CA.new()

data/conf/redhat/puppet.spec

@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.13.6
+Version: 0.16.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -15,7 +15,10 @@ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
 Requires: ruby >= 1.8.1
 Requires: facter >= 1.1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArchitectures: noarch
+# It's not possible to build ruby noarch packages currently
+# See bz184199
+#BuildArchitectures: noarch
+BuildRequires: ruby >= 1.8.1
 
 %description
 Puppet lets you centrally manage every important aspect of your system using a 
@@ -90,13 +93,10 @@ find %{buildroot}%{rubylibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %{__ch
     -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || :
 
 %post
-touch %{_localstatedir}/log/puppet.log
 /sbin/chkconfig --add puppet
 exit 0
 
 %post server
-touch %{_localstatedir}/log/puppetmaster.log
-touch %{_localstatedir}/log/puppetmaster-http.log
 /sbin/chkconfig --add puppetmaster
 
 %preun
@@ -120,6 +120,21 @@ fi
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Apr 17 2006 David Lutterkort <dlutter@redhat.com> - 0.15.3-2
+- Don't create empty log files in post-install scriptlet
+
+* Fri Apr  7 2006 David Lutterkort <dlutter@redhat.com> - 0.15.3-1
+- Rebuilt for new version
+
+* Wed Mar 22 2006 David Lutterkort <dlutter@redhat.com> - 0.15.1-1
+- Patch0: Run puppetmaster as root; running as puppet is not ready for primetime
+
+* Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 0.15.0-1
+- Commented out noarch; requires fix for bz184199
+
+* Mon Mar  6 2006 David Lutterkort <dlutter@redhat.com> - 0.14.0-1
+- Added BuildRequires for ruby
+
 * Wed Mar  1 2006 David Lutterkort <dlutter@redhat.com> - 0.13.5-1
 - Removed use of fedora-usermgmt. It is not required for Fedora Extras and
   makes it unnecessarily hard to use this rpm outside of Fedora. Just

data/conf/redhat/puppetd.conf

@@ -2,4 +2,4 @@
 # Make sure all log messages are sent to the right directory
 # This directory must be writable by the puppet user
 logdir=/var/log/puppet
-rundir=/var/run/puppet
+rundir=/var/run

data/conf/redhat/puppetmasterd.conf

@@ -2,4 +2,4 @@
 # Make sure all log messages are sent to the right directory
 # This directory must be writable by the puppet user
 logdir=/var/log/puppet
-rundir=/var/run/puppet
+rundir=/var/run

data/conf/redhat/server.init

@@ -3,7 +3,7 @@
 #
 # Author:       Duane Griffin <d.griffin@psenterprise.com>
 #
-# chkconfig: 345 65 45
+# chkconfig: - 65 45
 #
 # description: Server for the puppet system management tool.
 # processname: puppetmaster
@@ -37,7 +37,7 @@ start() {
 
 	# Confirm the manifest exists
 	if [ -r $PUPPETMASTER_MANIFEST ]; then
-		$PUPPETMASTER $PUPPETMASTER_OPTS
+		daemon $PUPPETMASTER $PUPPETMASTER_OPTS
 		RETVAL=$?
 	else
 		failure $"Manifest does not exist: $PUPPETMASTER_MANIFEST"
@@ -45,8 +45,6 @@ start() {
 		return 1
 	fi
 	[ $RETVAL -eq 0 ] && touch "$lockfile"
-	[ $RETVAL -eq 0 ] && echo_success
-	[ $RETVAL -ne 0 ] && echo_failure
 	echo
 	return $RETVAL
 }

data/examples/code/snippets/{casestatement → casestatement.pp}

@@ -1,4 +1,4 @@
-# $Id: casestatement 832 2006-01-17 07:11:50Z luke $
+# $Id: casestatement.pp 976 2006-03-03 22:23:00Z luke $
 
 $var = "value"
 
@@ -45,3 +45,14 @@ case $bool {
         file { "/tmp/existsfile4": mode => 755, ensure => file }
     }
 }
+
+$yay = yay
+$a = yay
+$b = boo
+
+case $yay {
+    $a: { file { "/tmp/existsfile5": mode => 755, ensure => file } }
+    $b: { file { "/tmp/existsfile5": mode => 644, ensure => file } }
+    default: { file { "/tmp/existsfile5": mode => 711, ensure => file } }
+
+}

data/examples/code/snippets/selectorvalues.pp

@@ -1,6 +1,9 @@
 $value1 = ""
 $value2 = true
 $value3 = false
+$value4 = yay
+
+$test = "yay"
 
 $mode1 = $value1 ? {
     "" => 755,
@@ -17,6 +20,18 @@ $mode3 = $value3 ? {
     default => 644
 }
 
+$mode4 = $value4 ? {
+    $test => 755,
+    default => 644
+}
+
+$mode5 = yay ? {
+    $test => 755,
+    default => 644
+}
+
 file { "/tmp/selectorvalues1": ensure => file, mode => $mode1 }
 file { "/tmp/selectorvalues2": ensure => file, mode => $mode2 }
 file { "/tmp/selectorvalues3": ensure => file, mode => $mode3 }
+file { "/tmp/selectorvalues4": ensure => file, mode => $mode4 }
+file { "/tmp/selectorvalues5": ensure => file, mode => $mode4 }

data/examples/code/snippets/singleselector.pp

@@ -0,0 +1,22 @@
+$value1 = ""
+$value2 = true
+$value3 = false
+$value4 = yay
+
+$test = "yay"
+
+$mode1 = $value1 ? {
+    "" => 755
+}
+
+$mode2 = $value2 ? {
+    true => 755
+}
+
+$mode3 = $value3 ? {
+    default => 755
+}
+
+file { "/tmp/singleselector1": ensure => file, mode => $mode1 }
+file { "/tmp/singleselector2": ensure => file, mode => $mode2 }
+file { "/tmp/singleselector3": ensure => file, mode => $mode3 }

data/examples/code/snippets/tag.pp

@@ -0,0 +1,9 @@
+# $Id: tag.pp 1113 2006-04-17 16:15:33Z luke $
+
+$variable = value
+
+tag yayness, rahness
+
+tag booness, $variable
+
+file { "/tmp/settestingness": ensure => file }

data/ext/module_puppet

@@ -158,7 +158,7 @@ unless setdest
     Puppet::Log.newdestination(:syslog)
 end
 
-master[:File] = ARGV.shift
+master[:Manifest] = ARGV.shift
 
 unless ENV.include?("CFALLCLASSES")
     $stderr.puts "Cfengine classes must be passed to the module"

data/install.rb

@@ -1,303 +1,303 @@
-#! /usr/bin/env ruby
-#--
-# Copyright 2004 Austin Ziegler <ruby-install@halostatue.ca>
-#   Install utility. Based on the original installation script for rdoc by the
-#   Pragmatic Programmers.
-#
-# This program is free software. It may be redistributed and/or modified under
-# the terms of the GPL version 2 (or later) or the Ruby licence.
-#
-# Usage
-# -----
-# 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
-#   tests/  # unit tests
-#
-# The default behaviour:
-# 1) Run all unit test files (ending in .rb) found in all directories under
-#    tests/.
-# 2) Build Rdoc documentation from all files in bin/ (excluding .bat and .cmd),
-#    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.
-# 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.
-# 5) Install all library files ending in .rb from lib/ into Ruby's
-#    site_lib/version directory.
-#
-# $Id: install.rb 779 2006-01-05 20:36:01Z luke $
-#++
-
-require 'rbconfig'
-require 'find'
-require 'fileutils'
-require 'ftools' # apparently on some system ftools doesn't get loaded
-require 'optparse'
-require 'ostruct'
-
-begin
-    require 'rdoc/rdoc'
-    $haverdoc = true
-rescue LoadError
-    puts "Missing rdoc; skipping documentation"
-    $haverdoc = false
-end
-
-PREREQS = %w{openssl facter 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
-end
-
-# Set these values to what you want installed.
-bins  = glob(%w{bin/**/*})
-rdoc  = glob(%w{bin/**/* lib/**/*.rb README README-library CHANGELOG TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ }
-ri    = glob(%w(bin/**/*.rb lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }
-libs  = glob(%w{lib/**/*.rb})
-tests = glob(%w{tests/**/*.rb})
-
-def do_bins(bins, target, strip = 'bin/')
-  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)
-    File.makedirs(op, true)
-    File.chmod(0755, op)
-    File.install(lf, olf, 0755, true)
-  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 %s; cannot install" % pre
-        end
-    }
-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 RUBY_PLATFORM == "i386-mswin32"
-        InstallOptions.ri  = false
-      else
-        InstallOptions.ri  = true
-      end
-  else
-      InstallOptions.rdoc  = false
-      InstallOptions.ri  = 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-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|
-      InstallOptions.tests = ontest
-    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
-
-  bds = [".", ENV['TMP'], ENV['TEMP']]
-
-  version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
-  ld = File.join(Config::CONFIG["libdir"], "ruby", version)
-
-  sd = Config::CONFIG["sitelibdir"]
-  if sd.nil?
-    sd = $:.find { |x| x =~ /site_ruby/ }
-    if sd.nil?
-      sd = File.join(ld, "site_ruby")
-    elsif sd !~ Regexp.quote(version)
-      sd = File.join(sd, version)
-    end
-  end
-
-  if (destdir = ENV['DESTDIR'])
-    bd = "#{destdir}#{Config::CONFIG['bindir']}"
-    sd = "#{destdir}#{sd}"
-    bds << bd
-
-    FileUtils.makedirs(bd)
-    FileUtils.makedirs(sd)
-  else
-    bds << Config::CONFIG['bindir']
-  end
-
-  InstallOptions.bin_dirs = bds.compact
-  InstallOptions.site_dir = sd
-  InstallOptions.bin_dir  = bd
-  InstallOptions.lib_dir  = ld
-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
-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
-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"
-	end
-end
-
-##
-# Install file(s) from ./bin to Config::CONFIG['bindir']. Patch it on the way
-# to insert a #! line; on a Unix install, the command is named as expected
-# (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.bin_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}"
-      op.write ip.read
-    end
-  end
-
-  if Config::CONFIG["target_os"] =~ /win/io
-    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
-@echo off
-if "%OS%"=="Windows_NT" goto WinNT
-<ruby> -x "<command>" %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto done
-:WinNT
-<ruby> -x "<command>" %*
-goto done
-:done
-EOS
-
-check_prereqs
-prepare_installation
-
-run_tests(tests) if InstallOptions.tests
-#build_rdoc(rdoc) if InstallOptions.rdoc
-#build_ri(ri) if InstallOptions.ri
-do_bins(bins, Config::CONFIG['bindir'])
-do_libs(libs)
+#! /usr/bin/env ruby
+#--
+# Copyright 2004 Austin Ziegler <ruby-install@halostatue.ca>
+#   Install utility. Based on the original installation script for rdoc by the
+#   Pragmatic Programmers.
+#
+# This program is free software. It may be redistributed and/or modified under
+# the terms of the GPL version 2 (or later) or the Ruby licence.
+#
+# Usage
+# -----
+# 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
+#   tests/  # unit tests
+#
+# The default behaviour:
+# 1) Run all unit test files (ending in .rb) found in all directories under
+#    tests/.
+# 2) Build Rdoc documentation from all files in bin/ (excluding .bat and .cmd),
+#    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.
+# 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.
+# 5) Install all library files ending in .rb from lib/ into Ruby's
+#    site_lib/version directory.
+#
+# $Id: install.rb 1030 2006-03-14 04:29:26Z luke $
+#++
+
+require 'rbconfig'
+require 'find'
+require 'fileutils'
+require 'ftools' # apparently on some system ftools doesn't get loaded
+require 'optparse'
+require 'ostruct'
+
+begin
+    require 'rdoc/rdoc'
+    $haverdoc = true
+rescue LoadError
+    puts "Missing rdoc; skipping documentation"
+    $haverdoc = false
+end
+
+PREREQS = %w{openssl facter 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
+end
+
+# Set these values to what you want installed.
+bins  = glob(%w{bin/**/*})
+rdoc  = glob(%w{bin/**/* lib/**/*.rb README README-library CHANGELOG TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ }
+ri    = glob(%w(bin/**/*.rb lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }
+libs  = glob(%w{lib/**/*.rb})
+tests = glob(%w{tests/**/*.rb})
+
+def do_bins(bins, target, strip = 'bin/')
+  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)
+    File.makedirs(op, true)
+    File.chmod(0755, op)
+    File.install(lf, olf, 0755, true)
+  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 %s; cannot install" % pre
+        end
+    }
+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 RUBY_PLATFORM == "i386-mswin32"
+        InstallOptions.ri  = false
+      else
+        InstallOptions.ri  = true
+      end
+  else
+      InstallOptions.rdoc  = false
+      InstallOptions.ri  = 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-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|
+      InstallOptions.tests = ontest
+    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
+
+  bds = [".", ENV['TMP'], ENV['TEMP']]
+
+  version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
+  ld = File.join(Config::CONFIG["libdir"], "ruby", version)
+
+  sd = Config::CONFIG["sitelibdir"]
+  if sd.nil?
+    sd = $:.find { |x| x =~ /site_ruby/ }
+    if sd.nil?
+      sd = File.join(ld, "site_ruby")
+    elsif sd !~ Regexp.quote(version)
+      sd = File.join(sd, version)
+    end
+  end
+
+  if (destdir = ENV['DESTDIR'])
+    bd = "#{destdir}#{Config::CONFIG['bindir']}"
+    sd = "#{destdir}#{sd}"
+    bds << bd
+
+    FileUtils.makedirs(bd)
+    FileUtils.makedirs(sd)
+  else
+    bds << Config::CONFIG['bindir']
+  end
+
+  InstallOptions.bin_dirs = bds.compact
+  InstallOptions.site_dir = sd
+  InstallOptions.bin_dir  = bd
+  InstallOptions.lib_dir  = ld
+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
+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
+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"
+	end
+end
+
+##
+# Install file(s) from ./bin to Config::CONFIG['bindir']. Patch it on the way
+# to insert a #! line; on a Unix install, the command is named as expected
+# (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.bin_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}"
+      op.write ip.read
+    end
+  end
+
+  if Config::CONFIG["target_os"] =~ /win/io
+    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
+@echo off
+if "%OS%"=="Windows_NT" goto WinNT
+<ruby> -x "<command>" %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto done
+:WinNT
+<ruby> -x "<command>" %*
+goto done
+:done
+EOS
+
+check_prereqs
+prepare_installation
+
+run_tests(tests) if InstallOptions.tests
+#build_rdoc(rdoc) if InstallOptions.rdoc
+#build_ri(ri) if InstallOptions.ri
+do_bins(bins, Config::CONFIG['bindir'])
+do_libs(libs)