puppet 0.13.6 → 0.16.0

data/bin/puppet

@@ -27,10 +27,6 @@
 # debug::
 #   Enable full debugging.
 #
-# extclassfile::
-#   Specify the location of the class file to load.  Only affects the
-#   +--loadclasses+ option.
-#
 # help::
 #   Print this help message
 #
@@ -74,10 +70,10 @@ end
 
 options = [
     [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
-    [ "--extclassfile", "-e",		GetoptLong::REQUIRED_ARGUMENT ],
     [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
     [ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--loadclasses",				GetoptLong::NO_ARGUMENT ],
+    [ "--execute",	"-e",			GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--loadclasses", "-L",		GetoptLong::NO_ARGUMENT ],
     [ "--verbose",  "-v",			GetoptLong::NO_ARGUMENT ],
     [ "--use-nodes",    			GetoptLong::NO_ARGUMENT ],
     [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
@@ -93,7 +89,8 @@ verbose = false
 noop = false
 logfile = false
 loadclasses = false
-classfile = nil
+
+code = nil
 
 master = {
     :Local => true
@@ -120,8 +117,8 @@ begin
                 verbose = true
             when "--debug"
                 debug = true
-            when "--extclassfile"
-                classfile = arg
+            when "--execute"
+                code = arg
             when "--loadclasses"
                 loadclasses = true
             when "--logdest"
@@ -170,17 +167,22 @@ end
 Puppet.genconfig
 Puppet.genmanifest
 
-master[:File] = ARGV.shift
+if code
+    master[:Code] = code
+else
+    master[:Manifest] = ARGV.shift
+end
 
+# Allow users to load the classes that puppetd creates.
 if loadclasses
-    file = classfile || Puppet[:classfile]
+    file = Puppet[:classfile]
     if FileTest.exists?(file)
         unless FileTest.readable?(file)
             $stderr.puts "%s is not readable" % file
             exit(63)
         end
 
-        master[:Classes] = File.read(file).split(/[\s\n]/)
+        master[:Classes] = File.read(file).split(/[\s\n]+/)
     end
 end
 

data/bin/puppetca

@@ -138,8 +138,6 @@ end
 Puppet.genconfig
 Puppet.genmanifest
 
-Puppet::Util.chuser
-
 begin
     ca = Puppet::SSLCertificates::CA.new()
 rescue => detail
@@ -223,4 +221,4 @@ else
     exit(42)
 end
 
-# $Id: puppetca 873 2006-02-07 23:12:33Z luke $
+# $Id: puppetca 1111 2006-04-12 17:36:14Z luke $

data/bin/puppetd

@@ -10,7 +10,8 @@
 #
 #   puppetd  [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
 #               [-l|--logdest <syslog|<file>|console>] [--fqdn <host name>]
-#               [-o|--onetime] [-w|--waitforcert <seconds>] [--centrallogging]
+#               [-o|--onetime] [-w|--waitforcert <seconds>] [-t|--test]
+#               [--disable] [--enable]
 #
 # = Description
 #
@@ -25,6 +26,10 @@
 # Once the client has a signed certificate, it will retrieve its configuration
 # and apply it.
 #
+# The vast majority of options are shared between all Puppet executables and
+# are documented completely at
+# http://reductivelabs.com/projects/puppet/documentation.
+#
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
@@ -33,10 +38,6 @@
 #
 # See the configuration file for the full list of acceptable parameters.
 #
-# centrallogging::
-#   Send all produced logs to the central puppetmasterd system.  This currently
-#   results in a significant slowdown, so it is not recommended.
-#
 # disable::
 #   Disable working on the local system.  This puts a lock file in place,
 #   causing +puppetd+ not to work on the system until the lock file is removed.
@@ -44,6 +45,9 @@
 #   configuration to override the local state until everything is tested and
 #   committed.
 #
+#   +puppetd+ uses the same lock file while it is running, so no more than one
+#   +puppetd+ process is working at a time.
+#
 #   +puppetd+ exits after executing this.
 #
 # debug::
@@ -51,7 +55,8 @@
 #
 # enable::
 #   Enable working on the local system.  This removes any lock file, causing
-#   +puppetd+ to start managing the local system again.
+#   +puppetd+ to start managing the local system again (although it will continue
+#   to use its normal scheduling, so it might not start for another half hour).
 #
 #   +puppetd+ exits after executing this.
 #
@@ -72,6 +77,10 @@
 #   Run the configuration once, rather than as a long-running daemon.  This is
 #   useful for interactively running puppetd.
 #
+# test::
+#   Enable the most common options used for testing.  These are +onetime+,
+#   +verbose+, and +no-usecacheonfailure+.
+#
 # verbose::
 #   Turn on verbose reporting.
 #
@@ -117,6 +126,7 @@ options = [
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
 	[ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--onetime",  "-o",			GetoptLong::NO_ARGUMENT ],
+	[ "--test",	    "-t",			GetoptLong::NO_ARGUMENT ],
 	[ "--verbose",	"-v",			GetoptLong::NO_ARGUMENT ],
 	[ "--version",	"-V",			GetoptLong::NO_ARGUMENT ],
 	[ "--waitforcert",	"-w",		GetoptLong::REQUIRED_ARGUMENT ]
@@ -151,6 +161,14 @@ begin
                 disable = true
             when "--enable"
                 enable = true
+            when "--test"
+                # Enable all of the most common test options.
+                Puppet.config.handlearg("--no-usecacheonfailure")
+                onetime = true
+                unless Puppet::Log.level == :debug
+                    Puppet::Log.level = :info
+                end
+                Puppet::Log.newdestination(:console)
             when "--centrallogging"
                 centrallogs = true
             when "--help"
@@ -301,4 +319,4 @@ else
     Puppet.start
 end
 
-# $Id: puppetd 945 2006-02-24 23:01:25Z luke $
+# $Id: puppetd 1108 2006-04-11 23:08:48Z luke $

data/bin/puppetdoc

@@ -8,19 +8,26 @@
 #
 # = Usage
 #
-#   puppetdoc [-h|--help]
+#   puppetdoc [-h|--help] [-a|--arguments] [-t|--types]
 #
 # = Description
 #
 # This command generates a restructured-text document describing all installed
-# Puppet types.  It is largely meant for internal use and is used to generate
-# the reference document available on the Reductive Labs web site.
+# Puppet types or all allowable arguments to puppet executables.  It is largely
+# meant for internal use and is used to generate the reference document
+# available on the Reductive Labs web site.
 #
 # = Options
 #
+# arguments::
+#   Print the documentation for arguments.
+#
 # help::
 #   Print this help message
 #
+# types::
+#   Print the argumenst for Puppet types.  This is the default.
+#
 # = Example
 #
 #   $ puppetdoc > /tmp/reference.rst
@@ -46,6 +53,8 @@ rescue LoadError
 end
 
 result = GetoptLong.new(
+	[ "--arguments",	"-a",			GetoptLong::NO_ARGUMENT ],
+	[ "--types",	"-t",			GetoptLong::NO_ARGUMENT ],
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ]
 )
 
@@ -53,9 +62,15 @@ debug = false
 
 $tab = "    "
 
+mode = :types
+
 begin
     result.each { |opt,arg|
         case opt
+            when "--arguments"
+                mode = :arguments
+            when "--types"
+                mode = :types
             when "--help"
                 if $haveusage
                     RDoc::usage && exit
@@ -96,22 +111,56 @@ def indent(text, tab)
     return text.gsub(/(^|\A)/, tab).gsub(/^ +\.\./, "..")
 end
 
-#def tab(num)
-#    return $tab * num
-#end
+# Print the docs for arguments
+def self.arguments
+    puts %{
+===========================
+Puppet Executable Reference
+===========================
+
+Every Puppet executable (with the exception of ``puppetdoc``) accepts all of
+these arguments, but not all of the arguments make sense for every executable.
+Each argument has a section listed with it in parentheses; often, that section
+will map to an executable (e.g., ``puppetd``), in which case it probably only
+makes sense for that one executable.  If ``puppet`` is listed as the section,
+it is most likely an option that is valid for everyone.
+
+This will not always be the case.  I have tried to be as thorough as possible
+in the descriptions of the arguments, so it should be obvious whether an
+argument is approprite or not.
+
+}
+
+    docs = {}
+    Puppet.config.each do |name, object|
+        docs[name] = object
+    end
 
-puts %{
+    docs.sort { |a, b|
+        a[0].to_s <=> b[0].to_s
+    }.each do |name, object|
+        puts "* **#{name.to_s}** (*#{object.section.to_s}*)"
+        puts ""
+        puts "  " + object.desc.gsub(/\n/, " ")
+        puts ""
+    end
+
+end
+
+# Print the docs for types
+def self.types
+    puts %{
 ==============
 Type Reference
 ==============
 
-}
+    }
 
-types = {}
-Puppet::Type.eachtype { |type|
-    types[type.name] = type
-}
-puts %{
+    types = {}
+    Puppet::Type.eachtype { |type|
+        types[type.name] = type
+    }
+    puts %{
 ---------------
 Meta-Parameters
 ---------------
@@ -121,26 +170,26 @@ Puppet framework itself rather than being part of the implementation of any
 given instance.  Thus, any defined metaparameter can be used with any instance
 in your manifest, including defined components.
 
-}
-begin
-    params = []
-    Puppet::Type.eachmetaparam { |param|
-        params << param
-    }
-
-    params.sort { |a,b|
-        a.to_s <=> b.to_s
-    }.each { |param|
-        puts "- **" + param.to_s + "**"
-        #puts tab(1) + Puppet::Type.metaparamdoc(param).scrub.indent($tab)gsub(/\n\s*/,' ')
-        puts indent(scrub(Puppet::Type.metaparamdoc(param)), $tab)
     }
-rescue => detail
-    puts "incorrect metaparams: %s" % detail
-    exit(1)
-end
+    begin
+        params = []
+        Puppet::Type.eachmetaparam { |param|
+            params << param
+        }
+
+        params.sort { |a,b|
+            a.to_s <=> b.to_s
+        }.each { |param|
+            puts "- **" + param.to_s + "**"
+            #puts tab(1) + Puppet::Type.metaparamdoc(param).scrub.indent($tab)gsub(/\n\s*/,' ')
+            puts indent(scrub(Puppet::Type.metaparamdoc(param)), $tab)
+        }
+    rescue => detail
+        puts "incorrect metaparams: %s" % detail
+        exit(1)
+    end
 
-puts %{
+    puts %{
 -----
 Types
 -----
@@ -167,94 +216,102 @@ Types
   how the instance behaves (e.g., adding a search path for ``exec`` instances
   or determining recursion on ``file`` instances).
 
-}
+    }
 
-types.sort { |a,b|
-    a.to_s <=> b.to_s
-}.each { |name,type|
-    next if name == :puppet
-    next if name == :component
+    types.sort { |a,b|
+        a.to_s <=> b.to_s
+    }.each { |name,type|
+        next if name == :puppet
+        next if name == :component
 
-    puts "
+        puts "
 
 ----------------
 
 "
 
-    puts "
+        puts "
 %s
 %s" % [name, "=" * (name.to_s.length + 4)]
-    #String.new('n%s\n') % name.to_s
-    #puts "**" + type.doc.gsub(/\n\s*/, ' ') + "**\n\n"
-    puts scrub(type.doc) + "\n\n"
-
-    #puts tab(1) + "* namevar: %s" % type.namevar
-    docs = {}
-    #puts "%s States\n'''''''''''''''''''''''''''''''" % name.to_s.capitalize
-    type.validstates.sort { |a,b|
-        a.to_s <=> b.to_s
-    }.reject { |sname|
-        state = type.statebyname(sname)
-        state.nodoc
-    }.each { |sname|
-        state = type.statebyname(sname)
-
-        doc = nil
-        str = nil
-        unless doc = state.doc.dup
-            $stderr.puts "No docs for %s[%s]" % [type, sname]
-            next
-        end
-        str = doc
-        #puts "A---" + str + "---"
-        str = scrub(str)
-        #puts "B---" + str + "---"
-        #str = indent(str, $tab)
-        #puts "C---" + str + "---"
-        #str = indent($tab, scrub(doc))
-
-        # If the state has values, then add them: 
-
-        #if values = state.values
-        #    unless values.empty?
-        #        extra = "Acceptable values are %s." % values.join(", ")
-        #        str += "\n\n#{extra}"
-        #    end
-        #end
-
-        str = indent(str, $tab)
-        #puts "---" + str + "---"
-        docs[sname]  = str
-        #puts "- **%s**" % sname
-        #puts tab(1) + state.doc.gsub(/\n\s*/,' ')
+        #String.new('n%s\n') % name.to_s
+        #puts "**" + type.doc.gsub(/\n\s*/, ' ') + "**\n\n"
+        puts scrub(type.doc) + "\n\n"
+
+        #puts tab(1) + "* namevar: %s" % type.namevar
+        docs = {}
+        #puts "%s States\n'''''''''''''''''''''''''''''''" % name.to_s.capitalize
+        type.validstates.sort { |a,b|
+            a.to_s <=> b.to_s
+        }.reject { |sname|
+            state = type.statebyname(sname)
+            state.nodoc
+        }.each { |sname|
+            state = type.statebyname(sname)
+
+            unless state
+                raise "Could not retrieve state %s on type %s" % [sname, type.name]
+            end
+
+            doc = nil
+            str = nil
+            unless doc = state.doc
+                $stderr.puts "No docs for %s[%s]" % [type, sname]
+                next
+            end
+            doc = doc.dup
+            str = doc
+            #puts "A---" + str + "---"
+            str = scrub(str)
+            #puts "B---" + str + "---"
+            #str = indent(str, $tab)
+            #puts "C---" + str + "---"
+            #str = indent($tab, scrub(doc))
+
+            # If the state has values, then add them: 
+
+            #if values = state.values
+            #    unless values.empty?
+            #        extra = "Acceptable values are %s." % values.join(", ")
+            #        str += "\n\n#{extra}"
+            #    end
+            #end
+
+            str = indent(str, $tab)
+            #puts "---" + str + "---"
+            docs[sname]  = str
+            #puts "- **%s**" % sname
+            #puts tab(1) + state.doc.gsub(/\n\s*/,' ')
+        }
+
+        puts "\n%s Parameters\n''''''''''''''''''''''''''''''" % name.to_s.capitalize
+        type.parameters.sort { |a,b|
+            a.to_s <=> b.to_s
+        }.each { |name,param|
+            docs[name] = indent(scrub(type.paramdoc(name)), $tab)
+        }
+
+        docs.sort { |a, b|
+            a[0].to_s <=> b[0].to_s
+        }.each { |name, doc|
+            print "- **%s**" % name
+            if type.namevar == name and name != :name
+                puts " (*namevar*)"
+            else
+                puts ""
+            end
+            puts doc
+        }
+        puts "\n"
     }
+end
 
-    puts "\n%s Parameters\n''''''''''''''''''''''''''''''" % name.to_s.capitalize
-    type.parameters.sort { |a,b|
-        a.to_s <=> b.to_s
-    }.each { |name,param|
-        docs[name] = indent(scrub(type.paramdoc(name)), $tab)
-    }
-
-    docs.sort { |a, b|
-        a[0].to_s <=> b[0].to_s
-    }.each { |name, doc|
-        print "- **%s**" % name
-        if type.namevar == name and name != :name
-            puts " (*namevar*)"
-        else
-            puts ""
-        end
-        puts doc
-    }
-    puts "\n"
-}
+send(mode)
 
 puts "
 
 ----------------
 
 "
-
 puts "\n*This page autogenerated on %s*" % Time.now
-# $Id: puppetdoc 832 2006-01-17 07:11:50Z luke $
+
+# $Id: puppetdoc 1110 2006-04-11 23:44:36Z luke $