puppet 0.24.9 → 0.25.0

data/bin/filebucket

@@ -45,7 +45,7 @@
 #   /etc/passwd: 429b225650b912a2ee067b0a4cf1e949
 #   $ filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
 #   $
-# 
+#
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
@@ -53,7 +53,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
@@ -94,119 +94,8 @@
 # Copyright (c) 2005 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
-require 'puppet'
-require 'puppet/network/client'
-require 'getoptlong'
-
-options = [
-    [ "--bucket",   "-b",			GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
-    [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
-    [ "--local",	"-l",			GetoptLong::NO_ARGUMENT ],
-    [ "--remote",	"-r",			GetoptLong::NO_ARGUMENT ],
-    [ "--verbose",  "-v",			GetoptLong::NO_ARGUMENT ],
-    [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
-]
-
-# Add all of the config parameters as valid options.
-Puppet.settings.addargs(options)
-
-result = GetoptLong.new(*options)
-
-options = {}
-
-begin
-    result.each { |opt,arg|
-        case opt
-            when "--version"
-                puts "%s" % Puppet.version
-                exit
-            when "--help"
-                if Puppet.features.usage?
-                    RDoc::usage && exit
-                else
-                    puts "No help available unless you have RDoc::usage installed"
-                    exit
-                end
-            when "--bucket"
-                options[:bucket] = arg
-            when "--verbose"
-                options[:verbose] = true
-            when "--debug"
-                options[:debug] = true
-            when "--local"
-                options[:local] = true
-            when "--remote"
-                options[:remote] = true
-            else
-                Puppet.settings.handlearg(opt, arg)
-        end
-    }
-rescue GetoptLong::InvalidOption => detail
-    $stderr.puts "Try '#{$0} --help'"
-    exit(1)
-end
-
-Puppet::Log.newdestination(:console)
-
-client = nil
-server = nil
-
-Puppet.settraps
-
-if options[:debug]
-    Puppet::Log.level = :debug
-elsif options[:verbose]
-    Puppet::Log.level = :info
-end
-
-# Now parse the config
-Puppet.parse_config
-
-if Puppet.settings.print_configs?
-        exit(Puppet.settings.print_configs ? 0 : 1)
-end
-
-begin
-    if options[:local] or options[:bucket]
-        path = options[:bucket] || Puppet[:bucketdir]
-        client = Puppet::Network::Client.dipper.new(:Path => path)
-    else
-        require 'puppet/network/handler'
-        client = Puppet::Network::Client.dipper.new(:Server => Puppet[:server])
-    end
-rescue => detail
-    $stderr.puts detail
-    if Puppet[:trace]
-        puts detail.backtrace
-    end
-    exit(1)
-end
-
-mode = ARGV.shift
-case mode
-when "get":
-    md5 = ARGV.shift
-    out = client.getfile(md5)
-    print out
-when "backup":
-    ARGV.each do |file|
-        unless FileTest.exists?(file)
-            $stderr.puts "%s: no such file" % file
-            next
-        end
-        unless FileTest.readable?(file)
-            $stderr.puts "%s: cannot read file" % file
-            next
-        end
-        md5 = client.backup(file)
-        puts "%s: %s" % [file, md5]
-    end
-when "restore":
-    file = ARGV.shift
-    md5 = ARGV.shift
-    client.restore(file, md5)
-else
-    raise "Invalid mode %s" % mode
-end
+require 'puppet/application'
+require 'puppet/application/filebucket'
 
+# launch the filebucket
+Puppet::Application[:filebucket].run

data/bin/pi

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+#
+# = Synopsis
+#
+# Print help about puppet types on the console. Run with '-h' to get detailed
+# help.
+# = Usage
+#
+#   pi [-h|--help] [-s|--short] [-p|--providers] [-l|--list] [-m|--meta] 
+#
+# = Description
+#
+# Prints details of Puppet types, providers and metaparameters on the console.
+#
+# = Options
+#
+# help::
+#   Print this help text
+#
+# providers::
+#   Describe providers in detail for each type
+#
+# list::
+#   List all types
+#
+# meta::
+#   List all metaparameters
+#
+# short::
+#   List only parameters without detail 
+#
+# = Example
+#
+#   pi --list
+#   pi file --providers
+#   pi user -s -m
+#
+# = Author
+#
+# David Lutterkort
+#
+# = Copyright
+#
+# Copyright (c) 2005 Reductive Labs, LLC
+# Licensed under the GNU Public License
+
+require 'puppet/application/pi'
+
+Puppet::Application[:pi].run

data/bin/puppet

@@ -7,7 +7,7 @@
 #
 # = Usage
 #
-#   puppet [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
+#   puppet [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] [-e|--execute]
 #               [--detailed-exitcodes] [-l|--logdest <file>] <file>
 #
 # = Description
@@ -23,7 +23,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
@@ -48,6 +48,9 @@
 #   Where to send messages.  Choose between syslog, the console, and a log file.
 #   Defaults to sending messages to the console.
 #
+# execute::  
+#   Execute a specific piece of Puppet code 
+#  
 # verbose::
 #   Print extra information.
 #
@@ -64,189 +67,5 @@
 # Copyright (c) 2005 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
-require 'puppet'
-require 'puppet/network/handler'
-require 'puppet/network/client'
-require 'getoptlong'
-
-options = [
-    [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
-    [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
-    [ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--execute",	"-e",			GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--loadclasses", "-L",		GetoptLong::NO_ARGUMENT ],
-    [ "--verbose",  "-v",			GetoptLong::NO_ARGUMENT ],
-    [ "--use-nodes",    			GetoptLong::NO_ARGUMENT ],
-    [ "--detailed-exitcodes",		GetoptLong::NO_ARGUMENT ],
-    [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
-]
-
-# Add all of the config parameters as valid options.
-Puppet.settings.addargs(options)
-
-result = GetoptLong.new(*options)
-
-options = {
-    :debug => false,
-    :verbose => false,
-    :noop => false,
-    :logfile => false,
-    :loadclasses => false,
-    :logset => false,
-    :code => nil,
-    :detailed_exits => false,
-}
-
-
-master = {
-    :Local => true
-}
-
-begin
-    result.each { |opt,arg|
-        case opt
-            when "--version"
-                puts "%s" % Puppet.version
-                exit
-            when "--help"
-                if Puppet.features.usage?
-                    RDoc::usage && exit
-                else
-                    puts "No help available unless you have RDoc::usage installed"
-                    exit
-                end
-            when "--use-nodes"
-                options[:UseNodes] = true
-            when "--verbose"
-                options[:verbose] = true
-            when "--debug"
-                options[:debug] = true
-            when "--execute"
-                options[:code] = arg
-            when "--loadclasses"
-                options[:loadclasses] = true
-            when "--detailed-exitcodes"
-                options[:detailed_exits] = true
-            when "--logdest"
-                begin
-                    Puppet::Util::Log.newdestination(arg)
-                    options[:logset] = true
-                rescue => detail
-                    $stderr.puts detail.to_s
-                end
-            else
-                Puppet.settings.handlearg(opt, arg)
-        end
-    }
-rescue GetoptLong::InvalidOption => detail
-    $stderr.puts "Try '#{$0} --help'"
-    exit(1)
-end
-
-Puppet.parse_config
-
-# Now parse the config
-if Puppet[:config] and File.exists? Puppet[:config]
-    Puppet.settings.parse(Puppet[:config])
-end
-
-if Puppet.settings.print_configs?
-    exit(Puppet.settings.print_configs ? 0 : 1)
-end
-
-# If noop is set, then also enable diffs
-if Puppet[:noop]
-    Puppet[:show_diff] = true
-end
-
-unless options[:logset]
-    Puppet::Util::Log.newdestination(:console)
-end
-
-client = nil
-server = nil
-
-Puppet.settraps
-
-if options[:debug]
-    Puppet::Util::Log.level = :debug
-elsif options[:verbose]
-    Puppet::Util::Log.level = :info
-end
-
-# Set our code or file to use.
-if options[:code] or ARGV.length == 0
-    Puppet[:code] = options[:code] || STDIN.read
-else
-    Puppet[:manifest] = ARGV.shift
-end
-
-if Puppet[:parseonly]
-    begin
-        Puppet::Parser::Interpreter.new.parser(Puppet[:environment])
-    rescue => detail
-        Puppet.err detail
-        exit 1
-    end
-    exit 0
-end
-
-# Collect our facts.
-facts = Puppet::Node::Facts.find(Puppet[:certname])
-
-# Find our Node
-unless node = Puppet::Node.find(Puppet[:certname])
-    raise "Could not find node %s" % Puppet[:certname]
-end
-
-# Merge in the facts.
-node.merge(facts.values)
-
-# Allow users to load the classes that puppetd creates.
-if options[:loadclasses]
-    file = Puppet[:classfile]
-    if FileTest.exists?(file)
-        unless FileTest.readable?(file)
-            $stderr.puts "%s is not readable" % file
-            exit(63)
-        end
-
-        node.classes = File.read(file).split(/[\s\n]+/)
-    end
-end
-
-begin
-    # Compile our catalog
-    starttime = Time.now
-    catalog = Puppet::Node::Catalog.find(node.name, :use_node => node)
-
-    # Translate it to a RAL catalog
-    catalog = catalog.to_ral
-
-    catalog.host_config = true if Puppet[:graph] or Puppet[:report]
-
-    catalog.finalize
-
-    catalog.retrieval_duration = Time.now - starttime
-
-    # And apply it
-    transaction = catalog.apply
-
-    status = 0
-    if not Puppet[:noop] and options[:detailed_exits] then
-        transaction.generate_report
-    	status |= 2 if transaction.report.metrics["changes"][:total] > 0
-        status |= 4 if transaction.report.metrics["resources"][:failed] > 0
-    end
-    exit(status)
-rescue => detail
-    if Puppet[:trace]
-        puts detail.backtrace
-    end
-    if detail.is_a?(XMLRPC::FaultException)
-        $stderr.puts detail.message
-    else
-        $stderr.puts detail
-    end
-    exit(1)
-end
+require 'puppet/application/puppet'
+Puppet::Application[:puppet].run

data/bin/puppetdoc

@@ -8,7 +8,7 @@
 #
 # = Usage
 #
-#   puppetdoc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|trac|rdoc>] 
+#   puppetdoc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|markdown|trac|rdoc>]
 #             [-r|--reference <[type]|configuration|..>] [manifest-file]
 #
 # = Description
@@ -19,7 +19,7 @@
 # available on the Reductive Labs web site.
 #
 # In 'rdoc' mode, this command generates an html RDoc hierarchy describing the manifests that
-# are in 'manifestdir' and 'modulepath' configuration directives. 
+# are in 'manifestdir' and 'modulepath' configuration directives.
 # The generated documentation directory is doc by default but can be changed with the 'outputdir' option.
 #
 # If the command is started with 'manifest-file' command-line arguments, puppetdoc generate a single
@@ -37,7 +37,7 @@
 #   Specifies the directory where to output the rdoc documentation in 'rdoc' mode.
 #
 # mode::
-#   Determine the output mode.  Valid modes are 'text', 'trac', 'pdf' and 'rdoc'.  Note that 'trac' mode only works on Reductive Labs servers.  The default mode is 'text'.  In 'rdoc' mode you must provide 'manifests-path'
+#   Determine the output mode.  Valid modes are 'text', 'trac', 'pdf', 'markdown' and 'rdoc'. The 'pdf' and 'markdown' modes create PDF or Markdown formatted files in the /tmp directory. Note that 'trac' mode only works on Reductive Labs servers.  The default mode is 'text'.  In 'rdoc' mode you must provide 'manifests-path'
 #
 # reference::
 #   Build a particular reference.  Get a list of references by running +puppetdoc --list+.
@@ -49,6 +49,8 @@
 #   $ puppetdoc --outputdir /tmp/rdoc --mode rdoc /path/to/manifests
 # or
 #   $ puppetdoc /etc/puppet/manifests/site.pp
+# or
+#   $ puppetdoc -m markdown -r configuration
 #
 # = Author
 #
@@ -59,198 +61,5 @@
 # Copyright (c) 2005-2007 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
-require 'puppet'
-require 'puppet/util/reference'
-require 'puppet/network/handler'
-require 'puppet/util/rdoc'
-require 'getoptlong'
-
-options = [
-    [ "--all",          "-a",   GetoptLong::NO_ARGUMENT ],
-    [ "--list",         "-l",   GetoptLong::NO_ARGUMENT ],
-    [ "--format",       "-f",   GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--mode",         "-m",   GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--reference",    "-r",   GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--help",         "-h",   GetoptLong::NO_ARGUMENT ],
-    [ "--outputdir",    "-o",   GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--verbose",      "-v",   GetoptLong::NO_ARGUMENT ],
-    [ "--debug",        "-d",   GetoptLong::NO_ARGUMENT ]
-]
-
-# Add all of the config parameters as valid options.
-Puppet.settings.addargs(options)
-result = GetoptLong.new(*options)
-
-debug = false
-
-$tab = "    "
-options = {:references => [], :mode => :text, :format => :to_rest}
-
-Reference = Puppet::Util::Reference
-
-begin
-    unknown_args = []
-    result.each { |opt,arg|
-        case opt
-        when "--outputdir"
-            options[:outputdir] = arg
-        when "--all"
-            options[:all] = true
-        when "--format"
-            method = "to_%s" % arg
-            if Reference.method_defined?(method)
-                options[:format] = method
-            else
-                raise "Invalid output format %s" % arg
-            end
-        when "--mode"
-            if Reference.modes.include?(arg) or arg.intern==:rdoc
-                options[:mode] = arg.intern
-            else
-                raise "Invalid output mode %s" % arg
-            end
-        when "--list"
-            puts Reference.references.collect { |r| Reference.reference(r).doc }.join("\n")
-            exit(0)
-        when "--reference"
-            options[:references] << arg.intern
-        when "--verbose"
-            options[:verbose] = true
-        when "--debug"
-            options[:debug] = true
-        when "--help"
-            if Puppet.features.usage?
-                RDoc::usage && exit
-            else
-                puts "No help available unless you have RDoc::usage installed"
-                exit
-            end
-        else
-            unknown_args << {:opt => opt, :arg => arg }
-        end
-    }
-
-    # sole manifest documentation
-    if ARGV.size > 0
-        options[:mode] = :rdoc
-        manifest = true
-    end
-
-    # consume the remaining unknown options
-    # and feed them as settings, but only for rdoc mode
-    if options[:mode] == :rdoc and unknown_args.size > 0
-        unknown_args.each do |option|
-            # force absolute path for modulepath when passed on commandline
-            if option[:opt]=="--modulepath" or option[:opt] == "--manifestdir"
-                option[:arg] = option[:arg].split(':').collect { |p| File.expand_path(p) }.join(':')
-            end
-            Puppet.settings.handlearg(option[:opt], option[:arg])
-        end
-    end
-rescue GetoptLong::InvalidOption => detail
-    $stderr.puts "Try '#{$0} --help'"
-    exit(1)
-end
-
-if options[:mode] == :rdoc # rdoc mode
-    # hack to get access to puppetmasterd modulepath and manifestdir
-    Puppet[:name] = "puppetmasterd"
-    # Now parse the config
-    Puppet.parse_config
-
-    # Handle the logging settings.
-    if options[:debug] or options[:verbose]
-        if options[:debug]
-            Puppet::Util::Log.level = :debug
-        else
-            Puppet::Util::Log.level = :info
-        end
-
-        Puppet::Util::Log.newdestination(:console)
-    end
-end
-
-if options[:all] and options[:mode] != :rdoc
-    # Don't add dynamic references to the "all" list.
-    options[:references] = Reference.references.reject do |ref|
-        Reference.reference(ref).dynamic?
-    end
-end
-
-if options[:references].empty?
-    options[:references] << :type
-end
-
-case options[:mode]
-when :rdoc # rdoc or sole manifest mode
-    exit_code = 0
-    files = []
-    unless manifest
-        files += Puppet[:modulepath].split(':').collect { |p| File.expand_path(p) }
-        files += Puppet[:manifestdir].split(':').collect { |p| File.expand_path(p) }
-    end
-    files += ARGV
-    Puppet.info "scanning: %s" % files.inspect
-    Puppet.settings.setdefaults("puppetdoc",
-        "document_all" => [false, "Document all resources"]
-    )
-    Puppet.settings[:document_all] = options[:all] || false
-    begin
-        if manifest
-            Puppet::Util::RDoc.manifestdoc(files)
-        else
-            Puppet::Util::RDoc.rdoc(options[:outputdir], files)
-        end
-    rescue => detail
-        if Puppet[:trace]
-            puts detail.backtrace
-        end
-        $stderr.puts "Could not generate documentation: %s" % detail
-        exit_code = 1
-    end
-    exit exit_code
-when :trac
-    options[:references].each do |name|
-        section = Puppet::Util::Reference.reference(name) or raise "Could not find section %s" % name
-        unless options[:mode] == :pdf
-            section.trac
-        end
-    end
-else
-    text = ""
-    if options[:references].length > 1
-        with_contents = false
-    else
-        with_contents = true
-    end
-    exit_code = 0
-    options[:references].sort { |a,b| a.to_s <=> b.to_s }.each do |name|
-        raise "Could not find reference %s" % name unless section = Puppet::Util::Reference.reference(name)
-
-        begin
-            # Add the per-section text, but with no ToC
-            text += section.send(options[:format], with_contents)
-        rescue => detail
-            puts detail.backtrace
-            $stderr.puts "Could not generate reference %s: %s" % [name, detail]
-            exit_code = 1
-            next
-        end
-    end
-
-    unless with_contents # We've only got one reference
-        text += Puppet::Util::Reference.footer
-    end
-
-    # Replace the trac links, since they're invalid everywhere else
-    text.gsub!(/`\w+\s+([^`]+)`:trac:/) { |m| $1 }
-
-    if options[:mode] == :pdf
-        Puppet::Util::Reference.pdf(text)
-    else
-        puts text
-    end
-
-    exit exit_code
-end
-
+require 'puppet/application/puppetdoc'
+Puppet::Application[:puppetdoc].run