puppet 0.9.2 → 0.13.0

data/CHANGELOG

@@ -0,0 +1,58 @@
+0.13.0
+    Added support for configuration files.
+    Even more bug fixes, including the infamous 'frozen object' bug, which was a
+        problem with 'waitforcert'.
+    David Lutterkort got RPM into good shape.
+
+0.12.0
+    Added Scheduling, and many bug fixes, of course.
+
+0.11.2
+    Fixed bugs related to specifying arrays of requirements
+    Fixed a key bug in retrieving checksums
+    Fixed lots of usability bugs
+    Added 'fail' methods that automatically add file and line info when possible,
+    and converted many errors to use that method
+
+0.11.1
+    Fixed bug with recursive copying with 'ignore' set.
+    Added OpenBSD package support.
+
+0.11.0
+    Added 'ensure' state to many elements.
+    Modified puppetdoc to correctly handle indentation and such.
+    Significantly rewrote much of the builtin documentation to take advantage
+        of the new features in puppetdoc, including many examples.
+
+0.10.2
+    Added SMF support
+    Added autorequire functionality, with specific support for exec and file
+        Exec elements autorequire any mentioned files, including the scripts,
+        along with their CWDs.
+        Files autorequire any parent directories.
+    Added 'alias' metaparam.
+    Fixed dependencies so they don't depend on file order.
+
+0.10.1
+    Added Solaris package support and changed puppetmasterd to run as
+    a non-root user.
+
+0.10.0
+    Significant refactoring of how types, states, and parameters work, including
+    breaking out parameters into a separate class.  This refactoring did not
+    introduce much new functionality, but made extension of Puppet significantly
+    easier
+
+    Also, fixed the bug with 'waitforcert' in puppetd.
+
+0.9.4
+    Small fix to wrap the StatusServer class in the checks for required classes.
+    
+0.9.3
+    Fixed some significant bugs in cron job management.
+
+0.9.2
+    Second Public Beta
+
+0.9.0
+    First Public Beta

data/README

@@ -1,24 +1,27 @@
-$Id: README 722 2005-10-21 22:51:26Z luke $
-
 Documentation (and detailed install instructions) can be found 
-online: http://reductivelabs.com/projects/puppet/documentation/
+online at http://reductivelabs.com/projects/puppet/documentation.
+
+Generally, you need the following things installed:
+
+* Ruby >= 1.8.1 (earlier releases might work but probably not)
 
-This is what you need to get puppet running:
--- Check you have Ruby version 1.8.2 or later
-    You can download it from 
-    ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.2.tar.gz
-    Un tar it, then: ./configure; make; make install
+* The Ruby OpenSSL library.  For some reason, this often isn't included
+  in the main ruby distributions.  You can test for it by running
+  'ruby -ropenssl -e "puts :yep"'.  If that errors out, you're missing the
+  library.
 
--- http://reductivelabs.com/downloads/facter/facter-latest.tgz
-    A library that puppet needs to run.  Un tar it, and calling
-    'ruby install.rb' file should successfully install it; let 
-    me know if it doesn't.  Otherwise, you can just set RUBYLIB
-    to contain its lib directory.
+  If your distribution doesn't come with the necessary library (e.g., on Debian
+  and Ubuntu you need to install libopenssl-ruby), then you'll probably have to
+  compile Ruby yourself, since it's part of the standard library and not
+  available separately.  You could probably just compile and install that one
+  library, though.
 
-    There should also be a recent snapshot there.
+* The Ruby XMLRPC client and server libraries.  For some reason, this often
+  isn't included in the main ruby distributions.  You can test for it by
+  running 'ruby -rxmlrpc/client -e "puts :yep"'.  If that errors out, you're missing
+  the library.
 
--- Install puppet
-   Run 'ruby install.rb' or add the 'lib/' directory to your RUBYLIB path.
+* Facter => 1.1.1
+  You can get this from http://reductivelabs.com/projects/facter
 
--- After that, you should be able to go into test/ and run ./test, 
-   or run 'bin/puppet' on whichever puppet config files you want.
+$Id: README 815 2006-01-12 19:01:41Z luke $

data/Rakefile

@@ -1,3 +1,4 @@
+# -*- ruby -*- (Make emacs happy)
 # Rakefile for Puppet
 
 begin
@@ -7,18 +8,26 @@ rescue Exception
     nil
 end
 
+$rdoc = true
+begin
+    require 'rdoc/rdoc'
+rescue => detail
+    $rdoc = false
+    puts "No rdoc: %s" % detail
+end
 require 'rake/clean'
 require 'rake/testtask'
 
-#require 'rake/rdoctask'
-#CLEAN.include('**/*.o')
-#CLOBBER.include('doc/*')
+if $rdoc
+    require 'rake/rdoctask'
+end
+CLEAN.include('**/*.o')
+CLOBBER.include('doc/*')
 
 def announce(msg='')
     STDERR.puts msg
 end
 
-
 # Determine the current version
 
 if `ruby -Ilib ./bin/puppet --version` =~ /\S+$/
@@ -33,6 +42,14 @@ else
   PKG_VERSION = CURRENT_VERSION
 end
 
+DOWNDIR = "/export/docroots/reductivelabs.com/htdocs/downloads"
+
+if ENV['HOSTS']
+    TESTHOSTS = ENV['HOSTS'].split(/\s+/)
+else
+    TESTHOSTS = %w{fedora1 rh3a kirby culain openbsd1 centos1}
+end
+#TESTHOSTS = %w{sol10b}
 
 # The default task is run if rake is given no explicit arguments.
 
@@ -44,17 +61,21 @@ task :default => :alltests
 task :u => :unittests
 task :a => :alltests
 
-Rake::TestTask.new(:alltests) do |t|
-    t.test_files = FileList['test/tc*.rb']
-    t.warning = true
-    t.verbose = false
+task :alltests do
+    sh %{cd test; ./test}
 end
 
-Rake::TestTask.new(:unittests) do |t|
-    t.test_files = FileList['test/test']
-    t.warning = true
-    t.verbose = false
-end
+#Rake::TestTask.new(:alltests) do |t|
+#    t.test_files = FileList['test/*/*.rb']
+#    t.warning = true
+#    t.verbose = false
+#end
+
+#Rake::TestTask.new(:unittests) do |t|
+#    t.test_files = FileList['test/test']
+#    t.warning = true
+#    t.verbose = false
+#end
 
 # SVN Tasks ----------------------------------------------------------
 # ... none.
@@ -68,15 +89,44 @@ end
 
 # Create a task to build the RDOC documentation tree.
 
-#rd = Rake::RDocTask.new("rdoc") { |rdoc|
-#  rdoc.rdoc_dir = 'html'
-#  rdoc.template = 'css2'
-#  rdoc.title    = "Puppet"
-#  rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
-#  rdoc.rdoc_files.include('README', 'LICENSE', 'TODO', 'CHANGELOG')
-#  rdoc.rdoc_files.include('lib/**/*.rb', 'doc/**/*.rdoc')
+#Rake::RDocTask.new("ri") { |rdoc|
+#    #rdoc.rdoc_dir = 'html'
+#    #rdoc.template = 'html'
+#    rdoc.title    = "Puppet"
+#    rdoc.options << '--ri' << '--line-numbers' << '--inline-source' << '--main' << 'README'
+#    rdoc.rdoc_files.include('README', 'LICENSE', 'TODO', 'CHANGELOG')
+#    rdoc.rdoc_files.include('lib/**/*.rb', 'doc/**/*.rdoc')
 #}
 
+if $rdoc
+    Rake::RDocTask.new(:html) { |rdoc|
+        rdoc.rdoc_dir = 'html'
+        rdoc.template = 'html'
+        rdoc.title    = "Puppet"
+        rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
+        rdoc.rdoc_files.include('README', 'LICENSE', 'TODO', 'CHANGELOG')
+        rdoc.rdoc_files.include('lib/**/*.rb')
+        CLEAN.include("html")
+    }
+end
+
+if $rdoc
+    task :ri do |ri|
+        files = ['README', 'LICENSE', 'TODO', 'CHANGELOG'] + Dir.glob('lib/**/*.rb')
+        puts "files are \n%s" % files.join("\n")
+        begin
+            ri = RDoc::RDoc.new
+            ri.document(["--ri-site"] + files)
+        rescue RDoc::RDocError => detail
+            puts "Failed to build docs: %s" % detail
+            return nil
+        rescue LoadError
+            puts "Missing rdoc; cannot build documentation"
+            return nil
+        end
+    end
+end
+
 # ====================================================================
 # Create a task that will package the Rake software into distributable
 # tar, zip and gem files.
@@ -88,7 +138,8 @@ PKG_FILES = FileList[
     'test/**/*.rb',
     'bin/**/*',
     'ext/**/*',
-    'examples/**/*'
+    'examples/**/*',
+    'conf/**/*'
 ]
 PKG_FILES.delete_if {|item| item.include?(".svn")}
 
@@ -111,7 +162,10 @@ the configuration.
 
         #### Dependencies and requirements.
 
-        s.add_dependency('facter', '>= 1.0.0')
+        # I'd love to explicitly list all of the libraries that I need,
+        # but gems seem to only be able to handle dependencies on other
+        # gems, which is, um, stupid.
+        s.add_dependency('facter', '>= 1.1.0')
         #s.requirements << ""
 
         s.files = PKG_FILES.to_a
@@ -128,12 +182,12 @@ the configuration.
 
         #### Documentation and testing.
 
-        s.has_rdoc = false
+        s.has_rdoc = true
         #s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
-        #s.rdoc_options <<
-        #  '--title' <<  'Puppet - Configuration Management' <<
-        #  '--main' << 'README' <<
-        #  '--line-numbers'
+        s.rdoc_options <<
+            '--title' <<  'Puppet - Configuration Management' <<
+            '--main' << 'README' <<
+            '--line-numbers'
         s.test_file = "test/test"
 
         #### Signing key and cert chain
@@ -145,13 +199,14 @@ the configuration.
         s.author = "Luke Kanies"
         s.email = "dev@reductivelabs.com"
         s.homepage = "http://reductivelabs.com/projects/puppet"
-        #s.rubyforge_project = "puppet"
+        s.rubyforge_project = "puppet"
     }
 
     Rake::GemPackageTask.new(spec) { |pkg|
         #pkg.need_zip = true
         pkg.need_tar = true
     }
+    CLEAN.include("pkg")
 end
 
 # Misc tasks =========================================================
@@ -206,12 +261,13 @@ desc "Make a new release"
 task :release => [
         :prerelease,
         :clobber,
-        :alltests,
         :update_version,
+        :tag, # tag everything before we make a bunch of extra dirs
+        :html,
         :package,
-        :tag
+        :fedorarpm,
+        :copy
       ] do
-    puts "okay?"
   
     announce 
     announce "**************************************************************"
@@ -262,24 +318,48 @@ task :update_version => [:prerelease] do
         open("lib/puppet.rb") do |rakein|
             open("lib/puppet.rb.new", "w") do |rakeout|
                 rakein.each do |line|
-                    if line =~ /^PUPPETVERSION\s*=\s*/
-                        rakeout.puts "PUPPETVERSION = '#{PKG_VERSION}'"
+                    if line =~ /^(\s*)PUPPETVERSION\s*=\s*/
+                        rakeout.puts "#{$1}PUPPETVERSION = '#{PKG_VERSION}'"
                     else
                         rakeout.puts line
                     end
                 end
             end
         end
-
         mv "lib/puppet.rb.new", "lib/puppet.rb"
+
+        open("conf/redhat/puppet.spec") do |rakein|
+            open("conf/redhat/puppet.spec.new", "w") do |rakeout|
+                rakein.each do |line|
+                    if line =~ /^Version:\s*/
+                        rakeout.puts "Version: #{PKG_VERSION}"
+                    else
+                        rakeout.puts line
+                    end
+                end
+            end
+        end
+        mv "conf/redhat/puppet.spec.new", "conf/redhat/puppet.spec"
+
         if ENV['RELTEST']
             announce "Release Task Testing, skipping commiting of new version"
         else
-            sh %{svn commit -m "Updated to version #{PKG_VERSION}" lib/puppet.rb}
+            sh %{svn commit -m "Updated to version #{PKG_VERSION}" lib/puppet.rb conf/redhat/puppet.spec}
         end
     end
 end
 
+desc "Copy the newly created package into the downloads directory"
+task :copy => [:package, :html, :fedorarpm] do
+    puts Dir.getwd
+    sh %{cp pkg/puppet-#{PKG_VERSION}.gem #{DOWNDIR}/gems}
+    sh %{generate_yaml_index.rb -d #{DOWNDIR}}
+    sh %{cp pkg/puppet-#{PKG_VERSION}.tgz #{DOWNDIR}/puppet}
+    sh %{ln -sf puppet-#{PKG_VERSION}.tgz #{DOWNDIR}/puppet/puppet-latest.tgz}
+    sh %{cp -r html #{DOWNDIR}/puppet/apidocs}
+    sh %{rsync -av /home/luke/rpm/. #{DOWNDIR}/rpm}
+end
+
 desc "Tag all the SVN files with the latest release number (REL=x.y.z)"
 task :tag => [:prerelease] do
     reltag = "REL_#{PKG_VERSION.gsub(/\./, '_')}"
@@ -288,7 +368,67 @@ task :tag => [:prerelease] do
     if ENV['RELTEST']
         announce "Release Task Testing, skipping SVN tagging"
     else
-        #sh %{svn copy ../trunk/ ../tags/#{reltag}}
+        sh %{svn copy ../trunk/ ../tags/#{reltag}}
+        sh %{cd ../tags; svn ci -m "Adding release tag #{reltag}"}
+    end
+end
+
+desc "Test Puppet on each test host"
+task :hosttest do
+    out = ""
+    TESTHOSTS.each { |host|
+        puts "testing %s" % host
+        cwd = Dir.getwd
+        out += %x{ssh #{host} 'cd puppet/test; sudo ./test' 2>&1} 
+
+        if $? != 0
+            file = File.join("/tmp", "%stest.out" % host)
+            File.open(file, "w") { |of| of.print out }
+            puts "%s failed; output is in %s" % [host, file]
+            puts out
+        end
+        #sh %{ssh #{host} 'cd #{cwd}/test; sudo ./test' 2>&1} 
+    }
+
+    #IO.popen("mail -s 'Puppet Test Results' luke@madstop.com") do |m|
+    #    m.puts out
+    #end
+end
+
+desc "Create an RPM"
+task :rpm do
+    tarball = File.join(Dir.getwd, "pkg", "puppet-#{PKG_VERSION}.tgz")
+
+    sourcedir = `rpm --define 'name puppet' --define 'version #{PKG_VERSION}' --eval '%_sourcedir'`.chomp
+    specdir = `rpm --define 'name puppet' --define 'version #{PKG_VERSION}' --eval '%_specdir'`.chomp
+    basedir = File.dirname(sourcedir)
+
+    if ! FileTest::exist?(sourcedir)
+        FileUtils.mkdir_p(sourcedir)
+    end
+    FileUtils.mkdir_p(basedir)
+
+    target = "#{sourcedir}/#{File::basename(tarball)}"
+
+    sh %{cp %s %s} % [tarball, target]
+    sh %{cp conf/redhat/puppet.spec %s/puppet.spec} % basedir
+
+    Dir.chdir(basedir) do
+        sh %{rpmbuild -ba puppet.spec}
     end
+
+    sh %{mv %s/puppet.spec %s} % [basedir, specdir]
+end
+
+desc "Create an rpm on a system that can actually do so"
+task :fedorarpm => [:package] do
+    sh %{ssh fedora1 'cd puppet; rake rpm'}
+end
+
+desc "Create a Native Package"
+task :nativepkg do
+    # Okay, first we get a file list
+    
 end
 
+# $Id$

data/bin/puppet

@@ -8,8 +8,7 @@
 # = Usage
 #
 #   puppet [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
-#               [-l|--logfile <file>] [-p|--parse-only] <file>
-#               [-c|--confdir <configuration directory>] [--vardir <var directory>]
+#               [-l|--logfile <file>] <file>
 #
 # = Description
 #
@@ -19,9 +18,11 @@
 #
 # = Options
 #
-# confdir::
-#   The configuration root directory, where +puppetmasterd+ defaults to looking
-#   for all of its configuration files.  Defaults to +/etc/puppet+.
+# Note that any configuration parameter that's valid in the configuration file
+# is also a valid long argument.  For example, 'ssldir' is a valid configuration
+# parameter, so you can specify '--ssldir <directory>' as an argument.
+#
+# See the configuration file for the full list of acceptable parameters.
 #
 # debug::
 #   Enable full debugging.
@@ -33,13 +34,6 @@
 #   Where to send messages.  Choose between syslog, the console, and a log file.
 #   Defaults to sending messages to the console.
 #
-# parse-only::
-#   Just verify syntax, do not apply anything.
-#
-# vardir::
-#   The variable-size directory, used for storing state.  Defaults to
-#   /var/puppet.
-#
 # verbose::
 #   Print extra information.
 #
@@ -69,18 +63,19 @@ rescue LoadError
     $haveusage = false
 end
 
-result = GetoptLong.new(
-	[ "--confdir",	"-c",			GetoptLong::REQUIRED_ARGUMENT ],
+options = [
     [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
     [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
     [ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
     [ "--verbose",  "-v",			GetoptLong::NO_ARGUMENT ],
-    [ "--noop",     "-n",			GetoptLong::NO_ARGUMENT ],
     [ "--use-nodes",    			GetoptLong::NO_ARGUMENT ],
-    [ "--parse-only",  "-p",		GetoptLong::NO_ARGUMENT ],
-	[ "--vardir",	    			GetoptLong::REQUIRED_ARGUMENT ],
     [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
-)
+]
+
+# Add all of the config parameters as valid options.
+Puppet.config.addargs(options)
+
+result = GetoptLong.new(*options)
 
 debug = false
 verbose = false
@@ -92,13 +87,11 @@ master = {
     :Local => true
 }
 
-Puppet[:logdest] = :console
+Puppet::Log.newdestination(:console)
 
 begin
     result.each { |opt,arg|
         case opt
-            when "--confdir"
-                Puppet[:puppetconf] = arg
             when "--version"
                 puts "%s" % Puppet.version
                 exit
@@ -109,24 +102,20 @@ begin
                     puts "No help available unless you have RDoc::usage installed"
                     exit
                 end
-            when "--noop"
-                Puppet[:noop] = true
             when "--use-nodes"
                 master[:UseNodes] = true
             when "--verbose"
                 verbose = true
-            when "--parse-only"
-                parseonly = true
             when "--debug"
                 debug = true
             when "--logdest"
                 begin
-                    Puppet[:logdest] = arg
+                    Puppet::Log.newdestination(arg)
                 rescue => detail
                     $stderr.puts detail.to_s
                 end
-            when "--vardir"
-                Puppet[:puppetvar] = arg
+            else
+                Puppet.config.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
@@ -138,39 +127,36 @@ rescue GetoptLong::InvalidOption => detail
 end
 
 if debug
-    Puppet[:loglevel] = :debug
+    Puppet::Log.level = :debug
 elsif verbose
-    Puppet[:loglevel] = :info
+    Puppet::Log.level = :info
+end
+
+# Now parse the config
+if Puppet[:config] and File.exists? Puppet[:config]
+    Puppet.config.parse(Puppet[:config])
 end
 
+Puppet.genconfig
+Puppet.genmanifest
+
 master[:File] = ARGV.shift
 
 begin
     server = Puppet::Server::Master.new(master)
-rescue => detail
-    $stderr.puts detail
-    exit(1)
-end
-
-begin
     client = Puppet::Client::MasterClient.new(
         :Master => server,
         :Cache => false
     )
-rescue => detail
-    $stderr.puts detail
-    exit(1)
-end
-
-
-if parseonly
-    exit(0)
-end
-
-begin
+    if parseonly
+        exit(0)
+    end
     client.getconfig
     client.apply
 rescue => detail
-    Puppet.err detail
+    $stderr.puts detail
+    if Puppet[:debug]
+        puts detail.backtrace
+    end
     exit(1)
 end