puppet 0.25.3 → 0.25.4

data/CHANGELOG

@@ -1,3 +1,30 @@
+0.25.4
+======
+0025e13  Partial reversion of patch for #3088 to fix #3104 (Exception misreported)
+bfc9e45  Updated CHANGELOG for 0.25.4rc3
+
+0.25.4rc3
+=========
+a91c476  Fix for #3088 (catching Exception also traps SystemExit)
+1a263e2  Fix for #3089 (timestamp may now be a time object, not a string)
+75634b7  Fix for #3093 (also need to be able to call pkgget_with_cat on class)
+94e269c  Uncommeniting the fix for #3001
+9636b93  Updated CHANGELOG for 0.24.5rc2
+d4319a5  Minimal fix for #3001 (failing to fetch metadata on dangling symlink)
+cdcbdc7  Fixing #2914 - pre/post hooks now work for transactions
+67216aa  Fix for #3075 (sshkey host_aliases ignored)
+e4462c0  Updated version and CHANGELOG for 0.25.4
+
+0.25.4rc2
+=========
+d4319a5  Minimal fix for #3001 (failing to fetch metadata on dangling symlink)
+cdcbdc7  Fixing #2914 - pre/post hooks now work for transactions
+67216aa  Fix for #3075 (sshkey host_aliases ignored)
+e4462c0  Updated version and CHANGELOG for 0.25.4
+441879f  Revert "Fix #2845 Cron entries using "special" parameter lose their title when changed"
+f7e1435  Updated rake task to fix gem build issue
+49013f0  Updated version and CHANGELOG for 0.25.3
+
 0.25.3
 ======
 f8c1b08  Reversion of pipe IO patch for testing on #3025
@@ -7,10 +34,6 @@ c99f394  Fix #2845 Cron entries using "special" parameter lose their title when
 dd22b71  Replaced ugly gem creation task with slightly less ugly task
 d0efcc6  Added tasks directory to Rakefile and gem task file lists
 8a6d66e  Added puppetpackages task description
-
-0.25.2
-======
-
 eada68a  Updated CHANGELOG for 0.25.2
 6111ba8  Fix for temporary file security whole
 e7d98cc  Fix for #2999 (absent package handling on solaris)
@@ -19,9 +42,6 @@ cbc2ef0  Partial rollback of refinements to fix for #2994
 fd631b9  Do not close stdout or stderr in execute.
 f878fe8  Update Red Hat spec file for 0.25.2
 4394c48  Updated CHANGELOG for 0.25.2rc3
-
-0.25.2rc3
-=========
 13cbf04  ReFix 2675 ending slash in directory should get stripped off
 5c6f07b  Use a pipe instead of a temp file for command output.
 7e64393  Additional fix for #2994 (followed symlinks do not have checksums)
@@ -174,45 +194,6 @@ b8470b8  Fix #2757 & CSR 92 (symlinks in recursively managed dirs)
 eca338c  Fix for #2772 (webrick test failures)
 b1c57e9  Al Hoang's patch for #2781, removing obsolete when/: syntax
 50e9c98  Follow-on for #2724 - Adding an external node classifier
-2f0b1e5  Updated CHANGELOG
-20e5222  Fixing #2689 - file owner warnings are reduced
-09fb3f7  Fixing #2752 - "require" loads "include"
-6846c32  Fixing some recently broken Scope tests
-0043392  Fixed typo in lib/puppet/indirector/ldap.rb
-6b254eb  Fix #2753 - Do not "global allow" plugins/modules mount if some rules have been parsed
-ff3a7bc  Re-fixed #2750 - Stop disabling the CRL or checking for a disabled CRL
-594c774  Revised partial fix for #2661 and related issues
-73d04c6  Bug #2534 Raise error if property appears twice
-7517572  Bug #1908 cron environment should allow empty vals
-febe707  Bug #1742 Invalid params to --color outputs 'nil'
-d383ab8  Use notice() in the versioncmp() docs
-9dff716  conf/redhat/*.init: Use -p option to killproc
-f47a70f  Ticket #2665: Regexp exception on ++ in package names
-b6e4ef3  Fixed #2750 - Set :cacrl to nil instead of 'false' in puppetd
-2b57e06  Fix #2691 - Collection AR request should not include params if querying with tags
-e8bce7a  Workaround #2668 - Compress facts so that the request size limit triggers less often
-e2ce790  Fixed #2737 - The zone provider needs to get acquainted with OpenSolaris
-aea1e5f  Update Red Hat spec file for 0.25.1
-fbdded7  Ticket #2685 (Type error in ssh_authorized_keys)
-4d9f76a  Fix for #2745 fakedata tests not working
-b4bcfe9  Fix for #2736, target doesn't work for ssh_authorized_keys
-ae528f6  Ticket #2734 PSON/JSON not serializing classes of a catalog
-f59f805  Bug #1900 Parsing of quoted $ in stdin
-6ba122f  Fixing #2735 - node classes are immed. added to classlist
-bca3b70  Bundling of pure ruby json lib as "pson"
-ce46be5  Proposed alternative solution for #2664 (REGEX / DIV lexing)
-b0518c3  Fix for #2681 (duplicate resource)
-8a73082  Fix #2707 config_version fails more helpfully
-54ded1b  Fixes #1719, this avoids calling the external binary *which* everytime we are looking for a binary
-4c3c279  Updated required Facter version in README
-fcce46a  Fixed #2702 - Set :outputdir to "doc" if not specified
-3940dfb  Fixed #2674 - createpackage.sh: problem finding install.rb
-3b548f4  Fix #2699 - Use --masterport for PUPPET_PORT variable
-a75bf50  This updates the portage provider in three ways:
-ad86e9e  Fixes #2688. Macauthorization provider now handles booleans internally correctly.
-d891f7a  Ticket #2676 (a typo)
-bfba2cd  Fix #2672 - Make sure nodenames keep their underscores when used as classname
-db67e5f  Added rcov exclusion to Rakefile
 
 0.25.1
 ======
@@ -258,6 +239,9 @@ ad86e9e  Fixes #2688. Macauthorization provider now handles booleans internally
 d891f7a  Ticket #2676 (a typo)
 bfba2cd  Fix #2672 - Make sure nodenames keep their underscores when used as classname
 db67e5f  Added rcov exclusion to Rakefile
+
+0.25.1rc1
+=========
 6912a7e  Incremented version to 0.25.1
 fd322da  Fixes #1538 - Fixes the yumrepo backtrace in noop mode.
 6551e86  Fix #2664 - Mathematic expressions mis-lexed as Regex
@@ -503,138 +487,6 @@ a6816ff  Set ENV['PATH'] to an empty string if non-existent
 603b9cf  Change the diff default output to "unified"
 9bc9b5c  Added missing colon to suntab
 0f2d70d  Fixed #2087 and refactored the code that gets the smf service state
-3f070c1  Using the logging utilities to clean up module warnings
-feb7f89  Fixing #1064 - Deprecating module 'plugins' directories
-ccf4e69  Removing deprecated :pluginpath setting
-4036de9  Fixing #2094 - filebucket failures are clearer now
-ed876e0  Refactoring part of the file/filebucket integration
-bd81c25  Adding tests for file/backup behaviour
-c45ebfa  Fixed pi binary so --meta option works and updated documentation
-d2080a5  Fixing #2323 - Modules use environments correctly
-b9e632f  Fixed #2102 - Rails feature update fixed for Debian and Ubuntu
-1c4ef61  Fixed #2052 - Added -e option to puppet --help output
-d332333  Fix #2333 - Make sure lexer skip whitespace on non-token
-5fbf63c  Updated split function and add split function unit tests (courtesy of Thomas Bellman)
-a585bdd  * provider/augeas: strip whitespace and ignore blank lines
-a94d2de  Fixed pi tests
-5f7455e  Fixed #2222 - Cleanup pi binary options and --help output
-134ae3e  Fixing #2329 - puppetqd tests now pass
-de55e19  Cleaning up scope tests a bit
-e4ae870  Fixing #2336 - qualified variables only throw warnings
-607b01e  Fix #2246 - take2: make sure we run the rails tag query only when needed
-06b919d  Fix collector specs which were not working
-2945f8d  Make sure overriding a tag also produces a tag
-e142ca6  Removed a unit test which tested munging which is no longer done in the type
-d8ee6cf  Clearn up a parsing error reported by the tests
-446557f  vim: several improvements + cleanup
-9152678  Fixed #2229 - Red Hat init script error
-b5a8c4d  Fix #1907 (or sort) - 'require' puppet function
-74730df  #2332: Remove trailing slashes from path commands in the plugin
-1a89455  Changing the preferred serialization format to json
-0de70b7  Switching Queueing to using JSON instead of YAML
-7b33b6d  Adding JSON support to Catalogs
-c0bd0aa  Providing JSON support to the Resource class
-c16fd1b  Adding a JSON utility module for providing Ruby compat
-f059c51  Adding JSON support to Puppet::Relationship
-7f322b3  Adding a JSON format
-7666597  Allowing formats to specify the individual method names to use
-d40068f  Allowing formats to specify the methods they require
-024ccf5  Adding a "json" feature
-c8b382d  Fix some tests who were missing some actions
-f9516d4  Make sure virtual and rails query use tags when tag are searched
-b5855ec  Make sure resources are tagged with the user tag on the server
-d69fffb  Fix #2246 - Array tagged resources can't be collected or exported
-6ce0d1e  Partial fix for #2329
-4f2c066  Removed extra whitespace from end of lines
-97e6975  Changed indentation to be more consistent with style guide (4 spaces per level)
-41ce18c  Changed tabs to spaces without interfering with indentation or alignment
-f3b4092  Fix #2308 - Mongrel should use X-Forwarded-For
-7b0413e  Fixes Bug #2324 - Puppetd fails to start without rails
-48d5e8c  Enhance versioncmp documentation
-ef56ba5  * provider/augeas: minor spec test cleanup
-d322329  * provider/augeas: allow escaped whitespace and brackets in paths
-9735c50  * provider/augeas: match comparison uses '==' and '!=' again
-dbfa61b  * provider/augeas (process_match): no match results in empty array
-386923e  * provider/augeas: remove useless checks for nil
-171669a  * provider/augeas: simplify evaluation in process_get/match
-51cc752  * provider/augeas (open_augeas): use Augeas flag names, not ints
-4951cdf  * provider/augeas: ensure Augeas connection is always closed
-0d5a24d  * provider/augeas: minor code cleanup
-cea7bb5  * provider/augeas (parse_commands): use split to split string into lines
-95bd826  * provider/augeas: remove trailing whitespace (no functional change)
-7c5125b  Brought in lutters parse_commands patch and integrated it into the type. This includes reworking the get and match commands as well. This change introduces a few small changes. These are:
-6ce8154  Removed --no-chain-reply-to in rake mail_patches task
-4ef7bba  Removing --no-thread from the mail_patches rake target
-508934b  Fixing a bunch of warnings
-fb0ed7a  Fixing tests broken by a recent fix to Cacher
-650029e  Always providing a value for 'exported' on Rails resources
-f1dba91  Fixing #2230 - exported resources work again
-5522eb8  Disabling the catalog cache, so puppetqd is compatible with storeconfigs
-abbb282  Fixing the rails feature to be compatible with 2.1+
-907b39b  Using Message acknowledgement in queueing
-42247f0  Fixing #2315 - ca --generate works again
-d7be033  Fix #2220 - Make sure stat is refreshed while managing Files
-e4d5966  Added puppet branding to format patch command
-00d5139  vim: Remove another mention of 'site' from syntax
-9067abd  vim: Highlight parameters with 'plusignment' operator
-736b0e4  vim: Highlight strings in single quotes
-ce01c95  vim: Clean up syntax spacing
-3af2dbf  JRuby OpenSSL implementation is more strict than real ruby one and requires certificate serial number to be strictly positive.
-62534a1  Logging when a cached catalog is used.
-ff5c44f  Changing Puppet::Cacher::Expirer#expired? method name
-e3d4c8e  Fixing #2240 - external node failures now log output
-bc1445b  Fixing #2237 - client_yaml dir is always created by puppetd
-e0c19f9  Fixing #2228 - --logdest works again in puppetd and puppetmasterd
-ab34cf6  Fixing puppetmasterd tests when missing rack
-9d5d0a0  Fixing the Agent so puppetrun actually works server-side
-b0ef08b  Fixing #2248 - --no-client correctly leaves off client
-b83b159  Fixing #2243 - puppetrun works again
-3d2189f  Fixed #2304 - Added naggen script to directly generate nagios configuration files from a StoreConfigs Rails database
-700ad5b  Sync conf/redhat/puppet.spec with Fedora/EPEL
-3ec3f91  Fixed #2280 - Detailed exit codes fix
-f98d49f  Fixing #2253 - pluginsync failures propagate correctly
-d860a2f  Fixing a transaction test that had some broken plumbing
-a728757  Refactoring resource generation slightly
-6e824d8  Adding a Spec lib directory and moving tmpfile to it
-1d69dbf  Extracting a method from eval_resource in Transaction
-7650fb2  Not trying to load files that get removed in pluginsyncing
-3995e70  Fix #2300 - Update ssh_authorized_key documentation
-cb4a4d3  Changed version to allow Rake to work.  Minor edit to Rakefile
-99f666f  enable maillist on centos, redhat, fedora
-e13befa  Fixing #2288 - fixing the tests broken by my attr_ttl code
-a406d58  Fix for #2234: test fails with old Rack version
-c189b46  Fixing #2273 - file purging works more intuitively
-138f19f  Caching whether named autoloaded files are missing
-415553e  Adding caching of file metadata to the autoloader
-d489a2b  Adding modulepath caching to the Autoloader
-5f1c228  Adding caching to the Environment class
-047ab78  Adding TTL support to attribute caching
-6a413d2  Fixed #2666 - Broken docstring formatting
-469604f  Deprecating factsync - pluginsync should be used instead
-d39c485  Added spec and unit tests to the Rakefile files list and fixed CI rake tasks
-e1a7f84  Added install.rb to Rakefile package task
-e180a91  Fixed #2271 - Fix to puppetd documentation
-4bf2980  Protecting Stomp client against internal failures
-f4cb8f3  Adding some usability bits to puppetqd
-a18298a  Refactoring the stomp client and tests a bit
-2771918  Relying on threads rather than sleeping for puppetqd
-07ff4be  Fixing #2250 - Missing templates throw a helpful error
-7ce42da  Fixing #2273 - CA location is set correctly in puppetca
-e1779c7  RackXMLRPC: buffer request contents in memory, as a real string.
-fb957cc  Modules now can find their own paths
-c608409  Moving file-searching code out of Puppet::Module
-83ba0e5  Fixing #2234 - fixing all of the tests broken by my bindaddress fix
-4f3a67f  Fixing #2221 - pluginsignore should work again
-2d580c2  Fix snippets tests failing because of activated storeconfigs
-8c718c9  Fix failing test: file.close! and file.path ordering fix
-17f2c7d  Confine stomp tests to Stomp enabled systems
-6a80b76  Fix some master failing tests
-172422f  Fix bug #2124 - ssh_authorized_key always changes target if target is not defined
-f945b66  Fixing #2265 - rack is loaded with features rather than manually
-5aef915  Added .git to pluginsignore default list of ignores
-6db5e8d  Cleanup of the Puppet Rakefile and removal of the requirement for the Reductive Build Library
-5cc4910  Fix #1409 once again, including test
-a6af5bf  Added split function
 
 0.25.0beta2
 ===========
@@ -770,6 +622,9 @@ f945b66  Fixing #2265 - rack is loaded with features rather than manually
 6db5e8d  Cleanup of the Puppet Rakefile and removal of the requirement for the Reductive Build Library
 5cc4910  Fix #1409 once again, including test
 a6af5bf  Added split function
+
+0.25.0beta1
+===========
 2dd55fc  Fixing #2200 - puppetqd expects Daemon to be a class
 c016062  Removing unneeded test stubs
 1a2e1bc  Fixing #2195 - the Server class handles bindaddress

data/ext/puppetlast

@@ -12,5 +12,5 @@ Puppet[:name] = "puppetmasterd"
 Puppet::Node::Facts.terminus_class = :yaml
 
 Puppet::Node::Facts.search("*").sort { |a,b| a.name <=> b.name }.each do |node|
-  puts "#{node.name} #{node.expired? ? 'cached expired, ' : ''}checked in #{((Time.now - Time.parse(node.values[:_timestamp])) / 60).floor} minutes ago"
+  puts "#{node.name} #{node.expired? ? 'cached expired, ' : ''}checked in #{((Time.now - Time.parse(node.values[:_timestamp].to_s)) / 60).floor} minutes ago"
 end

data/lib/puppet.rb

@@ -24,7 +24,7 @@ require 'puppet/util/suidmanager'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-    PUPPETVERSION = '0.25.3'
+    PUPPETVERSION = '0.25.4'
 
     def Puppet.version
         return PUPPETVERSION

data/lib/puppet/agent.rb

@@ -51,6 +51,8 @@ class Puppet::Agent
         with_client do |client|
             begin
                 sync.synchronize { lock { client.run(*args) } }
+            rescue SystemExit,NoMemoryError
+                raise
             rescue Exception => detail
                 puts detail.backtrace if Puppet[:trace]
                 Puppet.err "Could not run %s: %s" % [client_class, detail]
@@ -122,6 +124,8 @@ class Puppet::Agent
     def with_client
         begin
             @client = client_class.new
+        rescue SystemExit,NoMemoryError
+            raise
         rescue Exception => detail
             puts detail.backtrace if Puppet[:trace]
             Puppet.err "Could not create instance of %s: %s" % [client_class, detail]

data/lib/puppet/application/puppet.rb

@@ -1,5 +1,6 @@
 require 'puppet'
 require 'puppet/application'
+require 'puppet/configurer'
 require 'puppet/network/handler'
 require 'puppet/network/client'
 
@@ -124,9 +125,14 @@ Puppet::Application.new(:puppet) do
 
             catalog.retrieval_duration = Time.now - starttime
 
+            configurer = Puppet::Configurer.new
+            configurer.execute_prerun_command
+
             # And apply it
             transaction = catalog.apply
 
+            configurer.execute_postrun_command
+
             status = 0
             if not Puppet[:noop] and options[:detailed_exitcodes] then
                 transaction.generate_report
@@ -135,9 +141,7 @@ Puppet::Application.new(:puppet) do
             end
             exit(status)
         rescue => detail
-            if Puppet[:trace]
-                puts detail.backtrace
-            end
+            puts detail.backtrace if Puppet[:trace]
             if detail.is_a?(XMLRPC::FaultException)
                 $stderr.puts detail.message
             else

data/lib/puppet/configurer.rb

@@ -5,6 +5,8 @@ require 'puppet/network/http_pool'
 require 'puppet/util'
 
 class Puppet::Configurer
+    class CommandHookError < RuntimeError; end
+
     require 'puppet/configurer/fact_handler'
     require 'puppet/configurer/plugin_handler'
 
@@ -39,6 +41,14 @@ class Puppet::Configurer
         @catalog = nil
     end
 
+    def execute_postrun_command
+        execute_from_setting(:postrun_command)
+    end
+
+    def execute_prerun_command
+        execute_from_setting(:prerun_command)
+    end
+
     # Initialize and load storage
     def dostorage
         begin
@@ -75,6 +85,8 @@ class Puppet::Configurer
         download_plugins()
 
         download_fact_plugins()
+
+        execute_prerun_command
     end
 
     # Get the remote catalog, yo.  Returns nil if no catalog can be found.
@@ -93,6 +105,8 @@ class Puppet::Configurer
             duration = thinmark do
                 result = catalog_class.find(name, fact_options.merge(:ignore_cache => true))
             end
+        rescue SystemExit,NoMemoryError
+            raise
         rescue Exception => detail
             puts detail.backtrace if Puppet[:trace]
             Puppet.err "Could not retrieve catalog from remote server: %s" % detail
@@ -136,6 +150,8 @@ class Puppet::Configurer
     def run(options = {})
         begin
             prepare()
+        rescue SystemExit,NoMemoryError
+            raise
         rescue Exception => detail
             puts detail.backtrace if Puppet[:trace]
             Puppet.err "Failed to prepare catalog: %s" % detail
@@ -160,6 +176,8 @@ class Puppet::Configurer
         # Now close all of our existing http connections, since there's no
         # reason to leave them lying open.
         Puppet::Network::HttpPool.clear_http_instances
+    ensure
+        execute_postrun_command
     end
 
     private
@@ -180,4 +198,14 @@ class Puppet::Configurer
 
         return timeout
     end
+
+    def execute_from_setting(setting)
+        return if (command = Puppet[setting]) == ""
+
+        begin
+            Puppet::Util.execute([command])
+        rescue => detail
+            raise CommandHookError, "Could not run command from #{setting}: #{detail}"
+        end
+    end
 end

data/lib/puppet/configurer/fact_handler.rb

@@ -17,6 +17,8 @@ module Puppet::Configurer::FactHandler
         begin
             reload_facter()
             Puppet::Node::Facts.find(Puppet[:certname])
+        rescue SystemExit,NoMemoryError
+            raise
         rescue Exception => detail
             puts detail.backtrace if Puppet[:trace]
             raise Puppet::Error, "Could not retrieve local facts: %s" % detail

data/lib/puppet/configurer/plugin_handler.rb

@@ -19,6 +19,8 @@ module Puppet::Configurer::PluginHandler
         begin
             Puppet.info "Loading downloaded plugin %s" % file
             load file
+        rescue SystemExit,NoMemoryError
+            raise
         rescue Exception => detail
             Puppet.err "Could not load downloaded file %s: %s" % [file, detail]
         end

data/lib/puppet/defaults.rb

@@ -199,7 +199,12 @@ module Puppet
             reports, allowing you to correlate changes on your hosts to the source version on the server."],
         :zlib => [true, 
             "Boolean; whether to use the zlib library",
-        ]
+        ],
+        :prerun_command => ["", "A command to run before every agent run.  If this command returns a non-zero
+            return code, the entire Puppet run will fail."],
+        :postrun_command => ["", "A command to run after every agent run.  If this command returns a non-zero
+            return code, the entire Puppet run will be considered to have failed, even though it might have
+            performed work during the normal run."]
     )
 
     hostname = Facter["hostname"].value

data/lib/puppet/file_serving/mount/file.rb

@@ -25,7 +25,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
 
         file = ::File.join(full_path, relative_path)
 
-        if ! FileTest.exist?(file)
+        if !(FileTest.exist?(file) or FileTest.symlink?(file))
             Puppet.info("File does not exist or is not accessible: #{file}")
             return nil
         end

data/lib/puppet/indirector/facts/facter.rb

@@ -29,6 +29,8 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
                     Timeout::timeout(self.timeout) do
                         load file
                     end
+                rescue SystemExit,NoMemoryError
+                    raise
                 rescue Exception => detail
                     Puppet.warning "Could not load fact file %s: %s" % [fqfile, detail]
                 end

data/lib/puppet/indirector/ldap.rb

@@ -40,6 +40,8 @@ class Puppet::Indirector::Ldap < Puppet::Indirector::Terminus
                 found = true
                 yield entry
             end
+        rescue SystemExit,NoMemoryError
+            raise
         rescue Exception => detail
             if count == 0
                 # Try reconnecting to ldap if we get an exception and we haven't yet retried.

data/lib/puppet/network/http/handler.rb

@@ -66,6 +66,8 @@ module Puppet::Network::HTTP::Handler
         check_authorization(indirection_request)
 
         send("do_%s" % indirection_request.method, indirection_request, request, response)
+    rescue SystemExit,NoMemoryError
+        raise
     rescue Exception => e
         return do_exception(response, e)
     end

data/lib/puppet/network/xmlrpc/client.rb

@@ -144,6 +144,8 @@ module Puppet::Network
             Puppet.debug "Calling %s.%s" % [namespace, method]
             begin
                 call("%s.%s" % [namespace, method.to_s],*args)
+            rescue SystemExit,NoMemoryError
+                raise
             rescue Exception => detail
                 retry if self.class.error_handler(detail).execute(self, detail, namespace, method) == :retry
             end

data/lib/puppet/provider/augeas/augeas.rb

@@ -254,6 +254,8 @@ Puppet::Type.type(:augeas).provide(:augeas) do
                     when "get"; return_value = process_get(cmd_array)
                     when "match"; return_value = process_match(cmd_array)
                     end
+                rescue SystemExit,NoMemoryError
+                    raise
                 rescue Exception => e
                     fail("Error sending command '#{command}' with params #{cmd_array[1..-1].inspect}/#{e.message}")
                 end
@@ -335,6 +337,8 @@ Puppet::Type.type(:augeas).provide(:augeas) do
                         aug.insert(path, label, before)
                     else fail("Command '#{command}' is not supported")
                 end
+            rescue SystemExit,NoMemoryError
+                raise
             rescue Exception => e
                 fail("Error sending command '#{command}' with params #{cmd_array.inspect}/#{e.message}")
             end

data/lib/puppet/provider/cron/crontab.rb

@@ -27,13 +27,18 @@ Puppet::Type.type(:cron).provide(:crontab,
 
     text_line :environment, :match => %r{^\w+=}
 
-    crontab = record_line :crontab, :fields => %w{special minute hour monthday month weekday command},
-        :match => %r{^\s*(?:@(\w+)|(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+))\s+(.+)$},
-        :optional => %w{special minute hour weekday month monthday}, :absent => "*"
+    record_line :freebsd_special, :fields => %w{special command},
+        :match => %r{^@(\w+)\s+(.+)$}, :pre_gen => proc { |record|
+            record[:special] = "@" + record[:special]
+        }
+
+    crontab = record_line :crontab, :fields => %w{minute hour monthday month weekday command},
+        :match => %r{^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$},
+        :optional => %w{minute hour weekday month monthday}, :absent => "*"
 
     class << crontab
         def numeric_fields
-            fields - [:command, :special]
+            fields - [:command]
         end
         # Do some post-processing of the parsed record.  Basically just
         # split the numeric fields on ','.

data/lib/puppet/provider/package/blastwave.rb

@@ -11,7 +11,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
     commands :pkgget => pkgget
 
     def pkgget_with_cat(*args)
-        withenv(:PAGER => "/usr/bin/cat") { pkgget(*args) }
+        Puppet::Util::Execution::withenv(:PAGER => "/usr/bin/cat") { pkgget(*args) }
     end
 
     def self.extended(mod)
@@ -41,7 +41,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
             command << hash[:justme]
         end
 
-        output = pkgget_with_cat command
+        output = Puppet::Util::Execution::withenv(:PAGER => "/usr/bin/cat") { pkgget command }
 
         list = output.split("\n").collect do |line|
             next if line =~ /^#/

data/lib/puppet/provider/sshkey/parsed.rb

@@ -21,14 +21,14 @@ Puppet::Type.type(:sshkey).provide(:parsed,
         :post_parse => proc { |hash|
             names = hash[:name].split(",", -1)
             hash[:name]  = names.shift
-            hash[:alias] = names
+            hash[:host_aliases] = names
         },
         :pre_gen => proc { |hash|
-            if hash[:alias]
-                names = [hash[:name], hash[:alias]].flatten
+            if hash[:host_aliases]
+                names = [hash[:name], hash[:host_aliases]].flatten
 
-                hash[:name] = [hash[:name], hash[:alias]].flatten.join(",")
-                hash.delete(:alias)
+                hash[:name] = [hash[:name], hash[:host_aliases]].flatten.join(",")
+                hash.delete(:host_aliases)
             end
         }
 end

data/lib/puppet/ssl/host.rb

@@ -220,6 +220,8 @@ class Puppet::SSL::Host
             return if certificate
             generate
             return if certificate
+        rescue SystemExit,NoMemoryError
+            raise
         rescue Exception => detail
             Puppet.err "Could not request certificate: %s" % detail.to_s
             if time < 1

data/lib/puppet/util/autoload.rb

@@ -86,6 +86,8 @@ class Puppet::Util::Autoload
                 name = symbolize(name)
                 loaded name, file
                 return true
+            rescue SystemExit,NoMemoryError
+                raise
             rescue Exception => detail
                 # I have no idea what's going on here, but different versions
                 # of ruby are raising different errors on missing files.
@@ -123,6 +125,8 @@ class Puppet::Util::Autoload
                 begin
                     Kernel.require file
                     loaded(name, file)
+                rescue SystemExit,NoMemoryError
+                    raise
                 rescue Exception => detail
                     if Puppet[:trace]
                         puts detail.backtrace

data/lib/puppet/util/feature.rb

@@ -83,6 +83,8 @@ class Puppet::Util::Feature
 
         begin
             require lib
+        rescue SystemExit,NoMemoryError
+            raise
         rescue Exception
             Puppet.debug "Failed to load library '%s' for feature '%s'" % [lib, name]
             return false

data/spec/integration/defaults.rb

@@ -215,4 +215,12 @@ describe "Puppet defaults" do
             Puppet.settings[:report_server].should == "report_server"
         end
     end
+
+    it "should have a 'prerun_command' that defaults to the empty string" do
+        Puppet.settings[:prerun_command].should == ""
+    end
+
+    it "should have a 'postrun_command' that defaults to the empty string" do
+        Puppet.settings[:postrun_command].should == ""
+    end
 end

data/spec/unit/application/puppet.rb

@@ -173,6 +173,9 @@ describe "Puppet" do
         describe "the main command" do
             before :each do
                 Puppet.stubs(:[])
+                Puppet.settings.stubs(:use)
+                Puppet.stubs(:[]).with(:prerun_command).returns ""
+                Puppet.stubs(:[]).with(:postrun_command).returns ""
                 Puppet.stubs(:[]).with(:trace).returns(true)
 
                 @puppet.options.stubs(:[])
@@ -277,6 +280,16 @@ describe "Puppet" do
                 @puppet.main
             end
 
+            it "should call the prerun and postrun commands on a Configurer instance" do
+                configurer = stub 'configurer'
+
+                Puppet::Configurer.expects(:new).returns configurer
+                configurer.expects(:execute_prerun_command)
+                configurer.expects(:execute_postrun_command)
+
+                @puppet.main
+            end
+
             it "should apply the catalog" do
                 @catalog.expects(:apply)
 

data/spec/unit/configurer.rb

@@ -7,6 +7,11 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'puppet/configurer'
 
 describe Puppet::Configurer do
+    before do
+        Puppet.settings.stubs(:use).returns(true)
+        @agent = Puppet::Configurer.new
+    end
+
     it "should include the Plugin Handler module" do
         Puppet::Configurer.ancestors.should be_include(Puppet::Configurer::PluginHandler)
     end
@@ -19,6 +24,52 @@ describe Puppet::Configurer do
         Puppet.settings.expects(:value).with(:puppetdlockfile).returns("/my/lock")
         Puppet::Configurer.lockfile_path.should == "/my/lock"
     end
+
+    describe "when executing a pre-run hook" do
+        it "should do nothing if the hook is set to an empty string" do
+            Puppet.settings[:prerun_command] = ""
+            Puppet::Util.expects(:exec).never
+
+            @agent.execute_prerun_command
+        end
+
+        it "should execute any pre-run command provided via the 'prerun_command' setting" do
+            Puppet.settings[:prerun_command] = "/my/command"
+            Puppet::Util.expects(:execute).with { |args| args[0] == "/my/command" }
+
+            @agent.execute_prerun_command
+        end
+
+        it "should fail if the command fails" do
+            Puppet.settings[:prerun_command] = "/my/command"
+            Puppet::Util.expects(:execute).raises Puppet::ExecutionFailure
+
+            lambda { @agent.execute_prerun_command }.should raise_error(Puppet::Configurer::CommandHookError)
+        end
+    end
+
+    describe "when executing a post-run hook" do
+        it "should do nothing if the hook is set to an empty string" do
+            Puppet.settings[:postrun_command] = ""
+            Puppet::Util.expects(:exec).never
+
+            @agent.execute_postrun_command
+        end
+
+        it "should execute any post-run command provided via the 'postrun_command' setting" do
+            Puppet.settings[:postrun_command] = "/my/command"
+            Puppet::Util.expects(:execute).with { |args| args[0] == "/my/command" }
+
+            @agent.execute_postrun_command
+        end
+
+        it "should fail if the command fails" do
+            Puppet.settings[:postrun_command] = "/my/command"
+            Puppet::Util.expects(:execute).raises Puppet::ExecutionFailure
+
+            lambda { @agent.execute_postrun_command }.should raise_error(Puppet::Configurer::CommandHookError)
+        end
+    end
 end
 
 describe Puppet::Configurer, "when executing a catalog run" do
@@ -74,6 +125,12 @@ describe Puppet::Configurer, "when executing a catalog run" do
         catalog.expects(:apply).never # because we're not yielding
         @agent.run
     end
+
+    it "should execute post-run hooks after the run" do
+        @agent.expects(:execute_postrun_command)
+
+        @agent.run
+    end
 end
 
 describe Puppet::Configurer, "when retrieving a catalog" do
@@ -213,6 +270,9 @@ describe Puppet::Configurer, "when preparing for a run" do
         Puppet.settings.stubs(:use).returns(true)
         @agent = Puppet::Configurer.new
         @agent.stubs(:dostorage)
+        @agent.stubs(:download_fact_plugins)
+        @agent.stubs(:download_plugins)
+        @agent.stubs(:execute_prerun_command)
         @facts = {"one" => "two", "three" => "four"}
     end
 
@@ -223,16 +283,19 @@ describe Puppet::Configurer, "when preparing for a run" do
     end
 
     it "should download fact plugins" do
-        @agent.stubs(:dostorage)
         @agent.expects(:download_fact_plugins)
 
         @agent.prepare
     end
 
     it "should download plugins" do
-        @agent.stubs(:dostorage)
         @agent.expects(:download_plugins)
 
         @agent.prepare
     end
+
+    it "should perform the pre-run commands" do
+        @agent.expects(:execute_prerun_command)
+        @agent.prepare
+    end
 end

data/spec/unit/provider/sshkey/parsed.rb

@@ -8,12 +8,31 @@ describe provider_class do
     before do
         @sshkey_class = Puppet::Type.type(:sshkey)
         @provider_class = @sshkey_class.provider(:parsed)
+        @key = 'AAAAB3NzaC1yc2EAAAABIwAAAQEAzwHhxXvIrtfIwrudFqc8yQcIfMudrgpnuh1F3AV6d2BrLgu/yQE7W5UyJMUjfj427sQudRwKW45O0Jsnr33F4mUw+GIMlAAmp9g24/OcrTiB8ZUKIjoPy/cO4coxGi8/NECtRzpD/ZUPFh6OEpyOwJPMb7/EC2Az6Otw4StHdXUYw22zHazBcPFnv6zCgPx1hA7QlQDWTu4YcL0WmTYQCtMUb3FUqrcFtzGDD0ytosgwSd+JyN5vj5UwIABjnNOHPZ62EY1OFixnfqX/+dUwrFSs5tPgBF/KkC6R7tmbUfnBON6RrGEmu+ajOTOLy23qUZB4CQ53V7nyAWhzqSK+hw=='
     end
 
-    it "should not drop an empty alias" do 
-        line = 'test,alias, ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzwHhxXvIrtfIwrudFqc8yQcIfMudrgpnuh1F3AV6d2BrLgu/yQE7W5UyJMUjfj427sQudRwKW45O0Jsnr33F4mUw+GIMlAAmp9g24/OcrTiB8ZUKIjoPy/cO4coxGi8/NECtRzpD/ZUPFh6OEpyOwJPMb7/EC2Az6Otw4StHdXUYw22zHazBcPFnv6zCgPx1hA7QlQDWTu4YcL0WmTYQCtMUb3FUqrcFtzGDD0ytosgwSd+JyN5vj5UwIABjnNOHPZ62EY1OFixnfqX/+dUwrFSs5tPgBF/KkC6R7tmbUfnBON6RrGEmu+ajOTOLy23qUZB4CQ53V7nyAWhzqSK+hw=='
-        parsed = @provider_class.parse_line(line)
-        parsed[:alias].should == ["alias",""]
+    it "should parse the name from the first field" do 
+        @provider_class.parse_line('test ssh-rsa '+@key)[:name].should == "test"
+    end
+
+    it "should parse the first component of the first field as the name" do 
+        @provider_class.parse_line('test,alias ssh-rsa '+@key)[:name].should == "test"
+    end
+
+    it "should parse host_aliases from the remaining components of the first field" do 
+        @provider_class.parse_line('test,alias ssh-rsa '+@key)[:host_aliases].should == ["alias"]
+    end
+
+    it "should parse multiple host_aliases" do 
+        @provider_class.parse_line('test,alias1,alias2,alias3 ssh-rsa '+@key)[:host_aliases].should == ["alias1","alias2","alias3"]
+    end
+
+    it "should not drop an empty host_alias" do 
+        @provider_class.parse_line('test,alias, ssh-rsa '+@key)[:host_aliases].should == ["alias",""]
+    end
+
+    it "should recognise when there are no host aliases" do 
+        @provider_class.parse_line('test ssh-rsa '+@key)[:host_aliases].should == []
     end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  version: 0.25.3
+  version: 0.25.4
 platform: ruby
 authors: 
 - Reductive Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 +11:00
+date: 2010-01-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -958,7 +958,6 @@ files:
 - spec/unit/provider/zone/solaris.rb
 - spec/unit/provider/mount/parsed.rb
 - spec/unit/provider/zfs/solaris.rb
-- spec/unit/provider/cron/crontab.rb
 - spec/unit/provider/mount.rb
 - spec/unit/provider/selboolean.rb
 - spec/unit/provider/selmodule-example.pp

data/spec/unit/provider/cron/crontab.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
-
-describe Puppet::Type.type(:cron).provider(:crontab) do
-    before :each do
-        @cron_type = Puppet::Type.type(:cron)
-        @provider = @cron_type.provider(:crontab)
-    end
-
-    it "should round-trip the name as a comment for @special events" do
-        parse = @provider.parse <<-CRON
-# Puppet Name: test
-@reboot /bin/echo > /tmp/puppet.txt
-        CRON
-        prefetch = @provider.prefetch_hook(parse)
-
-        @provider.to_line(prefetch[0]).should =~ /Puppet Name: test/
-    end
-
-end