puppet 0.24.6 → 0.24.7

data/CHANGELOG

@@ -1,3 +1,118 @@
+0.24.7
+    Fixed #1804 - Added VDev and MultiVDev properties to the ZPool type
+
+    Fixed #1496 - nagios_servicedependency needs a unique host_name?
+
+    Fixed #1420 - nagios_serviceescalation not allowing host_name more than one type
+
+    Bug #1803 Zfs should auto require the ancestor file systems
+
+    Refactor #1802 Use 'zfs get -H -o value' instead of parsing output for value
+
+    Fixing #1800 - tidy now correctly ignores missing files and directories
+
+    Fixing #1794 - returning sync when it is already initialized
+
+    Fixing #1750 again - All of the properties and now :ensure check replace?
+
+    Deprecate the NetInfo nameservice provider. Use directoryservice instead
+
+    Add macauthorization type
+
+    Fixing #1703 - using a mutex around the sending of the tagmails
+
+    Fix #1788 - allow rspec rake to run only some tests
+
+    Fixing the AST constant warnings, using a variable instead of a constant
+
+    Feature #1696 Add support for branded zones
+
+    Feature #1783 - Add ZFS support
+
+    type/mcx.rb Feature #1026 - MCX Type
+
+    Fixing #1749 - Splay now hopefully behaves "better" for small values
+
+    Fix #1741 - Add inline_template function
+
+    Slight denormalisation to store a host's environment as a first class
+
+    Added Rake :ci namespace and CI tasks
+
+    Refactoring the thread-safety in Puppet::Util
+
+    Removing the included testing gems; you must now install them yourself
+
+    Refactoring of SELinux functions to use native Ruby SELinux interface
+
+    Removing all mention of EPM, RPM, or Sun packages.
+
+    Fixed #1496 - nagios_servicedependency needs a unique host_name?
+
+    Fixed #1420 - nagios_serviceescalation not allowing host_name more than one type
+
+    Fixed #1695 - Solaris 10 zone provider doesn't properly handle unknown zone attributes in newer releases
+
+    Fixed #1776 - Trivial fix for gentoo service provider
+
+    Fixed #1767 - Minor fix to emacs mode
+
+    Fixed #1711 - fileserver test fails due to incorrect mocking
+
+    Fixed #1751 - Mac OS X DirectoryService nameservice provider support for 
+    plist output and password hash fil 
+   
+    Fixed #1752 - Add an optional argument to Puppet::Util.execute to determine 
+    whether stderr and stdout are combined in the output
+    
+    Added versionable feature to the RPM provider
+    
+    Fixed #1668 - puppetca can't clean unsigned certs
+
+    Moved RRD feature from util/metric.rb to feature/base.rb
+
+    Fixed #1735 and #1747 - Fixes to confine system
+
+    Fixed #1681 - Add filesystem type check to test for per-file SELinux context support
+
+    Fixed #1746 - Sync SELinux file attributes after file contents created/modified
+
+    Replaced SELInux calls to binaries with Ruby SELinux bindings
+
+    Fixed #1748 - Include spec directory in packages
+
+    Fixes #1672 - unsafe crontab handling in Solaris
+
+    Fixed #1718 - Added preseed to apt uninstall and purge
+
+    Fixed #1739 - Added uninstall functionality to yum provider
+
+    Fixed #1710 - Spurious output in test run
+
+    Fixed #1667 - Documentation should specify natural language regexs, not Regexp objects
+
+    Fixed #1692 - k5login fails to set mode when file is created
+
+    Fixed #1660 - Added specific recurse values for tidy
+
+    Fixed #1698 - All logs should now show up in the reports
+
+    Fixed #1661 - Type reference: tidy should specify manditory parameters
+
+    Fixed #1104 - Classes and nodes should set $name variables
+
+    Updated Red Hat spec file for 0.24.6
+
+    Removed conf/debian directory - Debian packaging information 
+    now maintained downstream
+
+    Added augeas type
+
+    Added support for @doc type and manifest documentation support - see:
+    http://reductivelabs.com/trac/puppet/wiki/PuppetManifestDocumentation
+
+    Added multiline comment support
+
 0.24.6
     Adding support to the user type for: profiles, auths, project, 
     key/value pairs (extension to Solaris RBAC support added in

data/Rakefile

@@ -24,6 +24,7 @@ project = Rake::RedLabProject.new("puppet") do |p|
         'lib/puppet/**/*.rb',
         'lib/puppet/**/*.py',
         'test/**/*',
+        'spec/**/*',
         'bin/**/*',
         'ext/**/*',
         'examples/**/*',
@@ -33,10 +34,6 @@ project = Rake::RedLabProject.new("puppet") do |p|
     p.filelist.exclude("bin/pi")
 
     p.add_dependency('facter', '1.1.0')
-
-    #p.epmhosts = %w{culain}
-    #p.sunpkghost = "sol10b"
-    #p.rpmhost = "fedora1"
 end
 
 if project.has?(:gem)
@@ -49,7 +46,6 @@ if project.has?(:gem)
         task.executables = ["puppet", "puppetd", "puppetmasterd", "puppetdoc",
                          "puppetca", "puppetrun", "ralsh"]
         task.default_executable = "puppet"
-        task.autorequire = 'puppet'
 
         #### Documentation and testing.
 
@@ -64,14 +60,6 @@ if project.has?(:gem)
     end
 end
 
-if project.has?(:epm)
-    project.mkepmtask do |task|
-        task.bins = FileList.new("bin/puppet", "bin/puppetca")
-        task.sbins = FileList.new("bin/puppetmasterd", "bin/puppetd")
-        task.rubylibs = FileList.new('lib/**/*')
-    end
-end
-
 rule(/_is_runnable$/) do |t|
     available = false
     executable = t.name.sub(/_is_runnable$/, '')
@@ -149,7 +137,7 @@ desc "Run the specs under spec/"
 task :spec do
     require 'spec'
     require 'spec/rake/spectask'
-    require 'rcov'
+    # require 'rcov'
     Spec::Rake::SpecTask.new do |t|
          #   t.rcov = true
          t.spec_opts = ['--format','s', '--loadby','mtime']
@@ -162,6 +150,29 @@ task :unit do
     sh "cd test; rake"
 end
 
+namespace :ci do
+
+  desc "Run the CI prep tasks"
+  task :prep do
+    require 'rubygems'
+    gem 'ci_reporter'
+    require 'ci/reporter/rake/rspec'
+    require 'ci/reporter/rake/test_unit'
+    ENV['CI_REPORTS'] = 'results'
+  end
+
+  desc "Run CI Unit tests"
+  task :unit => [:prep, 'ci:setup:testunit'] do
+     sh "cd test; rake test; exit 0"
+  end
+
+  desc "Run CI RSpec tests"
+  task :spec => [:prep, 'ci:setup:rspec'] do
+     sh "cd spec; rake all; exit 0"
+  end
+
+end
+
 desc "Send patch information to the puppet-dev list"
 task :mail_patches do
     if Dir.glob("00*.patch").length > 0
@@ -197,3 +208,21 @@ task :mail_patches do
     # Finally, clean up the patches
     sh "rm 00*.patch"
 end
+
+    desc "Create a changelog based on your git commits."
+    task :changelog do
+ 
+      CHANGELOG_DIR = "#{Dir.pwd}"
+ 
+      mkdir(CHANGELOG_DIR) unless File.directory?(CHANGELOG_DIR)
+ 
+      change_body=`git log --pretty=format:'%aD%n%an <%ae>%n%s%n'`
+
+      File.open(File.join(CHANGELOG_DIR, "CHANGELOG.git"), 'w') do |f|
+        f << change_body 
+      end
+ 
+      # Changelog commit
+      `git add #{CHANGELOG_DIR}/CHANGELOG.git`
+      `git commit -m "Update CHANGELOG.git"`
+    end

data/bin/puppetca

@@ -236,11 +236,12 @@ when :clean
         cleaned = true
     else
         hosts.each do |host|
-            cert = ca.getclientcert(host)[0]
-                if cert.nil?
-                    $stderr.puts "Could not find client certificate for %s" % host
-                    next
-                end
+          
+            unless cert = ca.getclientcert(host)[0] || ca.getclientcsr(host)
+                $stderr.puts "Could not find client certificate or request for %s" % host
+                next
+            end           
+            
             ca.clean(host)
             cleaned = true
         end

data/bin/puppetdoc

@@ -8,25 +8,36 @@
 #
 # = Usage
 #
-#   puppetdoc [-a|--all] [-h|--help] [-m|--mode <text|pdf|trac> [-r|--reference <[type]|configuration|..>]
+#   puppetdoc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|trac|rdoc>] 
+#             [-r|--reference <[type]|configuration|..>] [manifest-file]
 #
 # = Description
 #
-# This command generates a restructured-text document describing all installed
+# If mode is not 'rdoc', then this command generates a restructured-text document describing all installed
 # 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.
 #
+# In 'rdoc' mode, this command generates an html RDoc hierarchy describing the manifests that
+# 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
+# manifest documentation that is output on stdout.
+#
 # = Options
 #
 # all::
-#   Output the docs for all of the reference types.
+#   Output the docs for all of the reference types. In 'rdoc' modes, this also outputs documentation for all resources
 #
 # help::
 #   Print this help message
 #
+# outputdir::
+#   Specifies the directory where to output the rdoc documentation in 'rdoc' mode.
+#
 # mode::
-#   Determine the output mode.  Valid modes are 'text', 'trac', and 'pdf'.  Note that 'trac' mode only works on Reductive Labs servers.  The default mode is 'text'.
+#   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'
 #
 # reference::
 #   Build a particular reference.  Get a list of references by running +puppetdoc --list+.
@@ -34,6 +45,10 @@
 # = Example
 #
 #   $ puppetdoc -r type > /tmp/type_reference.rst
+# or
+#   $ puppetdoc --outputdir /tmp/rdoc --mode rdoc /path/to/manifests
+# or
+#   $ puppetdoc /etc/puppet/manifests/site.pp
 #
 # = Author
 #
@@ -47,16 +62,24 @@
 require 'puppet'
 require 'puppet/util/reference'
 require 'puppet/network/handler'
+require 'puppet/util/rdoc'
 require 'getoptlong'
 
-result = GetoptLong.new(
-	[ "--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 ]
-)
+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
 
@@ -66,8 +89,11 @@ 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"
@@ -78,7 +104,7 @@ begin
                 raise "Invalid output format %s" % arg
             end
         when "--mode"
-            if Reference.modes.include?(arg)
+            if Reference.modes.include?(arg) or arg.intern==:rdoc
                 options[:mode] = arg.intern
             else
                 raise "Invalid output mode %s" % arg
@@ -88,6 +114,10 @@ begin
             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
@@ -95,14 +125,52 @@ begin
                 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[:all]
+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?
@@ -114,6 +182,33 @@ if options[:references].empty?
 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
@@ -159,4 +254,3 @@ else
     exit exit_code
 end
 
-

data/bin/ralsh

@@ -192,7 +192,9 @@ properties = typeobj.properties.collect { |s| s.name }
 
 format = proc {|trans|
     trans.dup.collect do |param, value|
-        if value == "" or value == []
+        if value.nil? or value.to_s.empty?
+            trans.delete(param)
+        elsif value.to_s == "absent" and param.to_s != "ensure"
             trans.delete(param)
         end