From d866ce187d45897acb9b099e7a4d77a2aadced8d Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@puppetlabs.com>
Date: Fri, 10 Jun 2011 10:32:30 -0700
Subject: Cleanup indentation, comment, and unused code

The Great Reindentation of '10 left certain structures indented incorrectly;
this addresses some of these instances.

The comment about loading all providers incorrectly stated that we're trying to
figure out the type, when we're actually trying to figure out the provider.

There was an unused variable initialization that was introduced in 2b14f627,
which was reverting c19835c, 9290cc8, and ffb4c2d.

Paired-with: Jacob Helwig <jacob@puppetlabs.com>
---
 lib/puppet/metatype/manager.rb | 26 ++++++--------------------
 lib/puppet/type.rb             | 18 ++++++++----------
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/lib/puppet/metatype/manager.rb b/lib/puppet/metatype/manager.rb
index 12cbf645c..3a2f77b6f 100644
--- a/lib/puppet/metatype/manager.rb
+++ b/lib/puppet/metatype/manager.rb
@@ -61,10 +61,9 @@ module Manager
 
     # Then create the class.
 
-          klass = genclass(
-        name,
+    klass = genclass(
+      name,
       :parent => (parent || Puppet::Type),
-        
       :overwrite => true,
       :hash => @types,
       :attributes => options,
@@ -87,13 +86,9 @@ module Manager
 
     # Now set up autoload any providers that might exist for this type.
 
-          klass.providerloader = Puppet::Util::Autoload.new(
-        klass,
-        
-      "puppet/provider/#{klass.name.to_s}"
-    )
+    klass.providerloader = Puppet::Util::Autoload.new(klass, "puppet/provider/#{klass.name.to_s}")
 
-    # We have to load everything so that we can figure out the default type.
+    # We have to load everything so that we can figure out the default provider.
     klass.providerloader.loadall
 
     klass
@@ -103,11 +98,7 @@ module Manager
   def rmtype(name)
     # Then create the class.
 
-          klass = rmclass(
-        name,
-        
-      :hash => @types
-    )
+    klass = rmclass(name, :hash => @types)
 
     singleton_class.send(:remove_method, "new#{name}") if respond_to?("new#{name}")
   end
@@ -132,12 +123,7 @@ module Manager
   # Create a loader for Puppet types.
   def typeloader
     unless defined?(@typeloader)
-
-            @typeloader = Puppet::Util::Autoload.new(
-        self,
-        
-        "puppet/type", :wrap => false
-      )
+      @typeloader = Puppet::Util::Autoload.new(self, "puppet/type", :wrap => false)
     end
 
     @typeloader
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index d24cc8554..58673462a 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -1442,15 +1442,14 @@ class Type
     self.providify
 
 
-      provider = genclass(
-        name,
-      :parent => parent,
-      :hash => provider_hash,
-      :prefix => "Provider",
-      :block => block,
-      :include => feature_module,
-      :extend => feature_module,
-
+    provider = genclass(
+      name,
+      :parent     => parent,
+      :hash       => provider_hash,
+      :prefix     => "Provider",
+      :block      => block,
+      :include    => feature_module,
+      :extend     => feature_module,
       :attributes => options
     )
 
@@ -1581,7 +1580,6 @@ class Type
 
       # Collect the current prereqs
       list.each { |dep|
-        obj = nil
         # Support them passing objects directly, to save some effort.
         unless dep.is_a? Puppet::Type
           # Skip autorequires that we aren't managing
-- 
cgit 


From 413b136671232a8a0a9e27c18c1b6547241276e7 Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@puppetlabs.com>
Date: Fri, 10 Jun 2011 10:48:36 -0700
Subject: (#4416) Always remove old provider before recreating it

In the case where provider class evaluation failed midway, the provider class
would be created but not registered. Thus, when checking whether it should be
removed, it wasn't found, and wasn't removed. This caused it to then fail to be
recreated, because it collided with the existing class.

Now we don't bother checking whether the provider is registered before we
remove it, since rmclass has the appropriate checks to do the unregistration,
and class removal safely.

Removing a provider class that has been created but not registered should not
be a problem since the only time this can happen is when the class is unusable
because of parsing or other fatal errors in the provider itself.

Paired-with: Jacob Helwig <jacob@puppetlabs.com>
---
 lib/puppet/type.rb     | 19 ++++-----------
 spec/unit/type_spec.rb | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 58673462a..1933097da 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -1416,9 +1416,8 @@ class Type
   def self.provide(name, options = {}, &block)
     name = Puppet::Util.symbolize(name)
 
-    if obj = provider_hash[name]
+    if unprovide(name)
       Puppet.debug "Reloading #{name} #{self.name} provider"
-      unprovide(name)
     end
 
     parent = if pname = options[:parent]
@@ -1441,7 +1440,6 @@ class Type
 
     self.providify
 
-
     provider = genclass(
       name,
       :parent     => parent,
@@ -1509,18 +1507,11 @@ class Type
   end
 
   def self.unprovide(name)
-    if provider_hash.has_key? name
-
-      rmclass(
-        name,
-        :hash => provider_hash,
-
-        :prefix => "Provider"
-      )
-      if @defaultprovider and @defaultprovider.name == name
-        @defaultprovider = nil
-      end
+    if @defaultprovider and @defaultprovider.name == name
+      @defaultprovider = nil
     end
+
+    rmclass(name, :hash => provider_hash, :prefix => "Provider")
   end
 
   # Return an array of all of the suitable providers.
diff --git a/spec/unit/type_spec.rb b/spec/unit/type_spec.rb
index 9b1f20500..442c759e7 100755
--- a/spec/unit/type_spec.rb
+++ b/spec/unit/type_spec.rb
@@ -165,6 +165,72 @@ describe Puppet::Type do
     end
   end
 
+  describe "when creating a provider" do
+    before :each do
+      @type = Puppet::Type.newtype(:provider_test_type)
+    end
+
+    after :each do
+      @type.provider_hash.clear
+    end
+
+    it "should create a subclass of Puppet::Provider for the provider" do
+      provider = @type.provide(:test_provider)
+
+      provider.ancestors.should include(Puppet::Provider)
+    end
+
+    it "should use a parent class if specified" do
+      parent_provider = @type.provide(:parent_provider)
+      child_provider  = @type.provide(:child_provider, :parent => parent_provider)
+
+      child_provider.ancestors.should include(parent_provider)
+    end
+
+    it "should use a parent class if specified by name" do
+      parent_provider = @type.provide(:parent_provider)
+      child_provider  = @type.provide(:child_provider, :parent => :parent_provider)
+
+      child_provider.ancestors.should include(parent_provider)
+    end
+
+    it "should raise an error when the parent class can't be found" do
+      expect {
+        @type.provide(:child_provider, :parent => :parent_provider)
+      }.to raise_error(Puppet::DevError, /Could not find parent provider.+parent_provider/)
+    end
+
+    it "should ensure its type has a 'provider' parameter" do
+      @type.provide(:test_provider)
+
+      @type.parameters.should include(:provider)
+    end
+
+    it "should remove a previously registered provider with the same name" do
+      old_provider = @type.provide(:test_provider)
+      new_provider = @type.provide(:test_provider)
+
+      old_provider.should_not equal(new_provider)
+    end
+
+    it "should register itself as a provider for the type" do
+      provider = @type.provide(:test_provider)
+
+      provider.should == @type.provider(:test_provider)
+    end
+
+    it "should create a provider when a provider with the same name previously failed" do
+      @type.provide(:test_provider) do
+        raise "failed to create this provider"
+      end rescue nil
+
+      provider = @type.provide(:test_provider)
+
+      provider.ancestors.should include(Puppet::Provider)
+      provider.should == @type.provider(:test_provider)
+    end
+  end
+
   describe "when choosing a default provider" do
     it "should choose the provider with the highest specificity" do
       # Make a fake type
-- 
cgit 


From caca469976cc8b5ff6c7f68d7324eecd35399176 Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@puppetlabs.com>
Date: Fri, 10 Jun 2011 10:58:19 -0700
Subject: (#4416) Ensure types are providified after reloading

Previously, the 'provider' parameter for a type was only added when creating a
provider for that type. This would cause a type to forget about its 'provider'
parameter when only the type was reloaded.

This was manifesting itself in pluginsync, when a provider plugin would be
loaded before its type, causing the type to be autoloaded. The type plugin
would then be loaded again by the plugin handler. Because the type => provider
information is stored separately from the type, the providers don't need to be
reloaded, and thus don't recreate the type's 'provider' parameter.

Now we always "providify" the type (add its 'provider' parameter) upon
creation, after trying to load its providers, if any providers are present.

Paired-with: Jacob Helwig <jacob@puppetlabs.com>
---
 lib/puppet/metatype/manager.rb |  1 +
 spec/integration/type_spec.rb  | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/lib/puppet/metatype/manager.rb b/lib/puppet/metatype/manager.rb
index 3a2f77b6f..597a89f31 100644
--- a/lib/puppet/metatype/manager.rb
+++ b/lib/puppet/metatype/manager.rb
@@ -90,6 +90,7 @@ module Manager
 
     # We have to load everything so that we can figure out the default provider.
     klass.providerloader.loadall
+    klass.providify unless klass.providers.empty?
 
     klass
   end
diff --git a/spec/integration/type_spec.rb b/spec/integration/type_spec.rb
index 957dfe344..74e268a3c 100755
--- a/spec/integration/type_spec.rb
+++ b/spec/integration/type_spec.rb
@@ -19,4 +19,15 @@ describe Puppet::Type do
 
     type.provider(:myprovider).should equal(provider)
   end
+
+  it "should not lose its provider parameter when it is reloaded" do
+    type = Puppet::Type.newtype(:reload_test_type)
+
+    provider = type.provide(:test_provider)
+
+    # reload it
+    type = Puppet::Type.newtype(:reload_test_type)
+
+    type.parameters.should include(:provider)
+  end
 end
-- 
cgit 


From 6996e0bbfb3559773e5fa0d133a7632dcb06b2d5 Mon Sep 17 00:00:00 2001
From: Josh Cooper <josh@puppetlabs.com>
Date: Fri, 10 Jun 2011 14:03:47 -0700
Subject: Do not needlessly create multiple reports when creating a transaction

Previously, the transaction would always create a report, which would
some times be overridden with a new report.

Now, the transaction optionally takes a report at initialization time,
and only creates a report of its own if none was provided.

Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
---
 lib/puppet/resource/catalog.rb |  3 +--
 lib/puppet/transaction.rb      |  9 +++------
 spec/unit/transaction_spec.rb  | 10 ++++++++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb
index a8668d844..8d4918bbf 100644
--- a/lib/puppet/resource/catalog.rb
+++ b/lib/puppet/resource/catalog.rb
@@ -132,9 +132,8 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph
     expire
 
     Puppet::Util::Storage.load if host_config?
-    transaction = Puppet::Transaction.new(self)
+    transaction = Puppet::Transaction.new(self, options[:report])
 
-    transaction.report = options[:report] if options[:report]
     transaction.tags = options[:tags] if options[:tags]
     transaction.ignoreschedules = true if options[:ignoreschedules]
 
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 48154ad6f..16f201ec5 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -15,7 +15,7 @@ class Puppet::Transaction
   attr_accessor :sorted_resources, :configurator
 
   # The report, once generated.
-  attr_accessor :report
+  attr_reader :report
 
   # Routes and stores any events and subscriptions.
   attr_reader :event_manager
@@ -228,13 +228,10 @@ class Puppet::Transaction
 
   # this should only be called by a Puppet::Type::Component resource now
   # and it should only receive an array
-  def initialize(catalog)
+  def initialize(catalog, report = nil)
     @catalog = catalog
-
-    @report = Report.new("apply", catalog.version)
-
+    @report = report || Report.new("apply", catalog.version)
     @event_manager = Puppet::Transaction::EventManager.new(self)
-
     @resource_harness = Puppet::Transaction::ResourceHarness.new(self)
   end
 
diff --git a/spec/unit/transaction_spec.rb b/spec/unit/transaction_spec.rb
index 862413a31..b5703e752 100755
--- a/spec/unit/transaction_spec.rb
+++ b/spec/unit/transaction_spec.rb
@@ -88,13 +88,19 @@ describe Puppet::Transaction do
     @transaction.should_not be_any_failed
   end
 
-  it "should be possible to replace the report object" do
+  it "should use the provided report object" do
     report = Puppet::Transaction::Report.new("apply")
-    @transaction.report = report
+    @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new, report)
 
     @transaction.report.should == report
   end
 
+  it "should create a report if none is provided" do
+    @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new)
+
+    @transaction.report.should be_kind_of Puppet::Transaction::Report
+  end
+
   it "should consider a resource to have failed dependencies if any of its dependencies are failed"
 
   describe "when initializing" do
-- 
cgit 


From 98ba4071f424932173b450d1a94a9ae39f33a6c7 Mon Sep 17 00:00:00 2001
From: Josh Cooper <josh@puppetlabs.com>
Date: Fri, 10 Jun 2011 14:09:32 -0700
Subject: (#7127) Stop puppet if a prerun command fails

Before this change there were several problems with pre and post run
commands, logging, and sending of reports.

1. If a prerun command failed, puppet would attempt to apply the
catalog. Now puppet will not apply the catalog, but it will run the
postrun command and send the report (as it did before).

2. If a postrun command failed, puppet would not send the report. Sending the
report is now in an outer ensure block from the postrun command, so
postrun failures won't prevent the report from being sent.

3. Errors, e.g. Puppet.err, occuring during the prepare step, which
which includes plugin/fact download and prerun commands were not
appended to the report. Now the report log destination is registered as
early as possible, and unregistered as late as possible to ensure
Configurer errors that occur in the run method are included in the report.

4. The transaction was closing the Configurer's report destination out
from underneath it. As a result, postrun errors were not included in the
report.

Paired-with: Nick Lewis <nick@puppetlabs.com>
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
---
 lib/puppet/application/apply.rb    |   8 +-
 lib/puppet/configurer.rb           | 107 +++++++++++++------------
 lib/puppet/resource/catalog.rb     |   9 ++-
 lib/puppet/transaction.rb          |  32 +++-----
 lib/puppet/transaction/report.rb   |   4 +-
 spec/unit/configurer_spec.rb       | 157 ++++++++++++++++++++++++++-----------
 spec/unit/resource/catalog_spec.rb |   2 +-
 7 files changed, 198 insertions(+), 121 deletions(-)

diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
index 717935640..f2bbcb99b 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -130,7 +130,13 @@ class Puppet::Application::Apply < Puppet::Application
       configurer = Puppet::Configurer.new
       report = configurer.run(:skip_plugin_download => true, :catalog => catalog)
 
-      exit( options[:detailed_exitcodes] ? report.exit_status : 0 )
+      if not report
+        exit(1)
+      elsif options[:detailed_exitcodes] then
+        exit(report.exit_status)
+      else
+        exit(0)
+      end
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       $stderr.puts detail.message
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index 596d2dc53..7f39a3853 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -5,8 +5,6 @@ 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'
 
@@ -79,8 +77,6 @@ class Puppet::Configurer
     download_plugins unless options[:skip_plugin_download]
 
     download_fact_plugins unless options[:skip_plugin_download]
-
-    execute_prerun_command
   end
 
   # Get the remote catalog, yo.  Returns nil if no catalog can be found.
@@ -109,67 +105,73 @@ class Puppet::Configurer
     catalog
   end
 
-  # The code that actually runs the catalog.
-  # This just passes any options on to the catalog,
-  # which accepts :tags and :ignoreschedules.
-  def run(options = {})
-    begin
-      prepare(options)
-    rescue SystemExit,NoMemoryError
-      raise
-    rescue Exception => detail
-      puts detail.backtrace if Puppet[:trace]
-      Puppet.err "Failed to prepare catalog: #{detail}"
+  # Retrieve (optionally) and apply a catalog. If a catalog is passed in
+  # the options, then apply that one, otherwise retrieve it.
+  def retrieve_and_apply_catalog(options, fact_options)
+    unless catalog = (options.delete(:catalog) || retrieve_catalog(fact_options))
+      Puppet.err "Could not retrieve catalog; skipping run"
+      return
     end
 
-    if Puppet::Resource::Catalog.indirection.terminus_class == :rest
-      # This is a bit complicated.  We need the serialized and escaped facts,
-      # and we need to know which format they're encoded in.  Thus, we
-      # get a hash with both of these pieces of information.
-      fact_options = facts_for_uploading
+    report = options[:report]
+    report.configuration_version = catalog.version
+
+    benchmark(:notice, "Finished catalog run") do
+      catalog.apply(options)
     end
 
+    report.finalize_report
+    report
+  end
+
+  # The code that actually runs the catalog.
+  # This just passes any options on to the catalog,
+  # which accepts :tags and :ignoreschedules.
+  def run(options = {})
     options[:report] ||= Puppet::Transaction::Report.new("apply")
     report = options[:report]
-    Puppet::Util::Log.newdestination(report)
 
-    if catalog = options[:catalog]
-      options.delete(:catalog)
-    elsif ! catalog = retrieve_catalog(fact_options)
-      Puppet.err "Could not retrieve catalog; skipping run"
-      return
-    end
+    Puppet::Util::Log.newdestination(report)
+    begin
+      prepare(options)
 
-    report.configuration_version = catalog.version
+      if Puppet::Resource::Catalog.indirection.terminus_class == :rest
+        # This is a bit complicated.  We need the serialized and escaped facts,
+        # and we need to know which format they're encoded in.  Thus, we
+        # get a hash with both of these pieces of information.
+        fact_options = facts_for_uploading
+      end
 
-    transaction = nil
+      # set report host name now that we have the fact
+      report.host = Puppet[:node_name_value]
 
-    begin
-      benchmark(:notice, "Finished catalog run") do
-        transaction = catalog.apply(options)
+      begin
+        execute_prerun_command or return nil
+        retrieve_and_apply_catalog(options, fact_options)
+      rescue SystemExit,NoMemoryError
+        raise
+      rescue => detail
+        puts detail.backtrace if Puppet[:trace]
+        Puppet.err "Failed to apply catalog: #{detail}"
+        return nil
+      ensure
+        execute_postrun_command or return nil
       end
-      report
-    rescue => detail
-      puts detail.backtrace if Puppet[:trace]
-      Puppet.err "Failed to apply catalog: #{detail}"
-      return
+    ensure
+      # Make sure we forget the retained module_directories of any autoload
+      # we might have used.
+      Thread.current[:env_module_directories] = nil
+
+      # Now close all of our existing http connections, since there's no
+      # reason to leave them lying open.
+      Puppet::Network::HttpPool.clear_http_instances
     end
   ensure
-    # Make sure we forget the retained module_directories of any autoload
-    # we might have used.
-    Thread.current[:env_module_directories] = nil
-
-    # Now close all of our existing http connections, since there's no
-    # reason to leave them lying open.
-    Puppet::Network::HttpPool.clear_http_instances
-    execute_postrun_command
-
     Puppet::Util::Log.close(report)
-    send_report(report, transaction)
+    send_report(report)
   end
 
-  def send_report(report, trans)
-    report.finalize_report if trans
+  def send_report(report)
     puts report.summary if Puppet[:summarize]
     save_last_run_summary(report)
     report.save if Puppet[:report]
@@ -207,12 +209,15 @@ class Puppet::Configurer
   end
 
   def execute_from_setting(setting)
-    return if (command = Puppet[setting]) == ""
+    return true if (command = Puppet[setting]) == ""
 
     begin
       Puppet::Util.execute([command])
+      true
     rescue => detail
-      raise CommandHookError, "Could not run command from #{setting}: #{detail}"
+      puts detail.backtrace if Puppet[:trace]
+      Puppet.err "Could not run command from #{setting}: #{detail}"
+      false
     end
   end
 
diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb
index 8d4918bbf..0a63ff172 100644
--- a/lib/puppet/resource/catalog.rb
+++ b/lib/puppet/resource/catalog.rb
@@ -132,7 +132,9 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph
     expire
 
     Puppet::Util::Storage.load if host_config?
+
     transaction = Puppet::Transaction.new(self, options[:report])
+    register_report = options[:report].nil?
 
     transaction.tags = options[:tags] if options[:tags]
     transaction.ignoreschedules = true if options[:ignoreschedules]
@@ -140,7 +142,12 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph
     transaction.add_times :config_retrieval => self.retrieval_duration || 0
 
     begin
-      transaction.evaluate
+      Puppet::Util::Log.newdestination(transaction.report) if register_report
+      begin
+        transaction.evaluate
+      ensure
+        Puppet::Util::Log.close(transaction.report) if register_report
+      end
     rescue Puppet::Error => detail
       puts detail.backtrace if Puppet[:trace]
       Puppet.err "Could not apply complete catalog: #{detail}"
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 16f201ec5..d6d50d410 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -123,31 +123,23 @@ class Puppet::Transaction
   # collects all of the changes, executes them, and responds to any
   # necessary events.
   def evaluate
-    # Start logging.
-    Puppet::Util::Log.newdestination(@report)
-
     prepare
 
     Puppet.info "Applying configuration version '#{catalog.version}'" if catalog.version
 
-    begin
-      @sorted_resources.each do |resource|
-        next if stop_processing?
-        if resource.is_a?(Puppet::Type::Component)
-          Puppet.warning "Somehow left a component in the relationship graph"
-          next
-        end
-        ret = nil
-        seconds = thinmark do
-          ret = eval_resource(resource)
-        end
-
-        resource.info "Evaluated in %0.2f seconds" % seconds if Puppet[:evaltrace] and @catalog.host_config?
-        ret
+    @sorted_resources.each do |resource|
+      next if stop_processing?
+      if resource.is_a?(Puppet::Type::Component)
+        Puppet.warning "Somehow left a component in the relationship graph"
+        next
+      end
+      ret = nil
+      seconds = thinmark do
+        ret = eval_resource(resource)
       end
-    ensure
-      # And then close the transaction log.
-      Puppet::Util::Log.close(@report)
+
+      resource.info "valuated in %0.2f seconds" % seconds if Puppet[:evaltrace] and @catalog.host_config?
+      ret
     end
 
     Puppet.debug "Finishing transaction #{object_id}"
diff --git a/lib/puppet/transaction/report.rb b/lib/puppet/transaction/report.rb
index 841c56968..77b9da833 100644
--- a/lib/puppet/transaction/report.rb
+++ b/lib/puppet/transaction/report.rb
@@ -10,8 +10,8 @@ class Puppet::Transaction::Report
 
   indirects :report, :terminus_class => :processor
 
-  attr_accessor :configuration_version
-  attr_reader :resource_statuses, :logs, :metrics, :host, :time, :kind, :status
+  attr_accessor :configuration_version, :host
+  attr_reader :resource_statuses, :logs, :metrics, :time, :kind, :status
 
   # This is necessary since Marshall doesn't know how to
   # dump hash with default proc (see below @records)
diff --git a/spec/unit/configurer_spec.rb b/spec/unit/configurer_spec.rb
index b825e3404..f96876b58 100755
--- a/spec/unit/configurer_spec.rb
+++ b/spec/unit/configurer_spec.rb
@@ -36,16 +36,16 @@ describe Puppet::Configurer do
 
     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" }
+      Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
       @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
+      Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      lambda { @agent.execute_prerun_command }.should raise_error(Puppet::Configurer::CommandHookError)
+      @agent.execute_prerun_command.should be_false
     end
   end
 
@@ -59,16 +59,16 @@ describe Puppet::Configurer do
 
     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" }
+      Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
       @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
+      Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      lambda { @agent.execute_postrun_command }.should raise_error(Puppet::Configurer::CommandHookError)
+      @agent.execute_postrun_command.should be_false
     end
   end
 
@@ -85,8 +85,8 @@ describe Puppet::Configurer do
       Puppet::Resource::Catalog.terminus_class = :rest
       Puppet::Resource::Catalog.stubs(:find).returns(@catalog)
       @agent.stubs(:send_report)
+      @agent.stubs(:save_last_run_summary)
 
-      Puppet::Util::Log.stubs(:newdestination)
       Puppet::Util::Log.stubs(:close)
     end
 
@@ -98,7 +98,7 @@ describe Puppet::Configurer do
 
     it "should initialize a transaction report if one is not provided" do
       report = Puppet::Transaction::Report.new("apply")
-      Puppet::Transaction::Report.expects(:new).at_least_once.returns report
+      Puppet::Transaction::Report.expects(:new).returns report
 
       @agent.run
     end
@@ -128,9 +128,11 @@ describe Puppet::Configurer do
 
     it "should set the report as a log destination" do
       report = Puppet::Transaction::Report.new("apply")
-      Puppet::Transaction::Report.expects(:new).at_least_once.returns report
+      Puppet::Transaction::Report.expects(:new).returns report
 
       Puppet::Util::Log.expects(:newdestination).with(report)
+      Puppet::Util::Log.expects(:close).with(report)
+      Puppet::Util::Log.expects(:close).with([])
 
       @agent.run
     end
@@ -179,23 +181,11 @@ describe Puppet::Configurer do
     end
 
     it "should send the report" do
-      report = Puppet::Transaction::Report.new("apply")
-      Puppet::Transaction::Report.expects(:new).at_least_once.returns(report)
-      @agent.expects(:send_report).with { |r, trans| r == report }
-
-      @agent.run
-    end
-
-    it "should send the transaction report with a reference to the transaction if a run was actually made" do
       report = Puppet::Transaction::Report.new("apply")
       Puppet::Transaction::Report.expects(:new).returns(report)
+      @agent.expects(:send_report).with(report)
 
-      trans = stub 'transaction'
-      @catalog.expects(:apply).returns trans
-
-      @agent.expects(:send_report).with { |r, t| t == trans }
-
-      @agent.run :catalog => @catalog
+      @agent.run
     end
 
     it "should send the transaction report even if the catalog could not be retrieved" do
@@ -215,12 +205,12 @@ describe Puppet::Configurer do
       Puppet::Transaction::Report.expects(:new).returns(report)
       @agent.expects(:send_report)
 
-      lambda { @agent.run }.should raise_error
+      @agent.run.should be_nil
     end
 
     it "should remove the report as a log destination when the run is finished" do
       report = Puppet::Transaction::Report.new("apply")
-      Puppet::Transaction::Report.expects(:new).at_least_once.returns(report)
+      Puppet::Transaction::Report.expects(:new).returns(report)
 
       Puppet::Util::Log.expects(:close).with(report)
 
@@ -229,11 +219,100 @@ describe Puppet::Configurer do
 
     it "should return the report as the result of the run" do
       report = Puppet::Transaction::Report.new("apply")
-      Puppet::Transaction::Report.expects(:new).at_least_once.returns(report)
+      Puppet::Transaction::Report.expects(:new).returns(report)
 
       @agent.run.should equal(report)
     end
 
+    it "should send the transaction report even if the pre-run command fails" do
+      report = Puppet::Transaction::Report.new("apply")
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
+      Puppet.settings[:prerun_command] = "/my/command"
+      Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      @agent.expects(:send_report)
+
+      @agent.run.should be_nil
+    end
+
+    it "should include the pre-run command failure in the report" do
+      report = Puppet::Transaction::Report.new("apply")
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
+      Puppet.settings[:prerun_command] = "/my/command"
+      Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+
+      report.expects(:<<).with { |log| log.message.start_with?("Could not run command from prerun_command") }
+
+      @agent.run.should be_nil
+    end
+
+    it "should send the transaction report even if the post-run command fails" do
+      report = Puppet::Transaction::Report.new("apply")
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
+      Puppet.settings[:postrun_command] = "/my/command"
+      Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      @agent.expects(:send_report)
+
+      @agent.run.should be_nil
+    end
+
+    it "should include the post-run command failure in the report" do
+      report = Puppet::Transaction::Report.new("apply")
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
+      Puppet.settings[:postrun_command] = "/my/command"
+      Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+
+      report.expects(:<<).with { |log| log.message.start_with?("Could not run command from postrun_command") }
+
+      @agent.run.should be_nil
+    end
+
+    it "should execute post-run command even if the pre-run command fails" do
+      Puppet.settings[:prerun_command] = "/my/precommand"
+      Puppet.settings[:postrun_command] = "/my/postcommand"
+      Puppet::Util.expects(:execute).with(["/my/precommand"]).raises(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util.expects(:execute).with(["/my/postcommand"])
+
+      @agent.run.should be_nil
+    end
+
+    it "should finalize the report" do
+      report = Puppet::Transaction::Report.new("apply")
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
+      report.expects(:finalize_report)
+      @agent.run
+    end
+
+    it "should not apply the catalog if the pre-run command fails" do
+      report = Puppet::Transaction::Report.new("apply")
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
+      Puppet.settings[:prerun_command] = "/my/command"
+      Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+
+      @catalog.expects(:apply).never()
+      @agent.expects(:send_report)
+
+      @agent.run.should be_nil
+    end
+
+    it "should apply the catalog, send the report, and return nil if the post-run command fails" do
+      report = Puppet::Transaction::Report.new("apply")
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
+      Puppet.settings[:postrun_command] = "/my/command"
+      Puppet::Util.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+
+      @catalog.expects(:apply)
+      @agent.expects(:send_report)
+
+      @agent.run.should be_nil
+    end
+
     describe "when not using a REST terminus for catalogs" do
       it "should not pass any facts when retrieving the catalog" do
         Puppet::Resource::Catalog.terminus_class = :compiler
@@ -268,12 +347,6 @@ describe Puppet::Configurer do
       Puppet[:lastrunfile] = tmpfile('last_run_file')
 
       @report = Puppet::Transaction::Report.new("apply")
-      @trans = stub 'transaction'
-    end
-
-    it "should finalize the report" do
-      @report.expects(:finalize_report)
-      @configurer.send_report(@report, @trans)
     end
 
     it "should print a report summary if configured to do so" do
@@ -282,42 +355,42 @@ describe Puppet::Configurer do
       @report.expects(:summary).returns "stuff"
 
       @configurer.expects(:puts).with("stuff")
-      @configurer.send_report(@report, nil)
+      @configurer.send_report(@report)
     end
 
     it "should not print a report summary if not configured to do so" do
       Puppet.settings[:summarize] = false
 
       @configurer.expects(:puts).never
-      @configurer.send_report(@report, nil)
+      @configurer.send_report(@report)
     end
 
     it "should save the report if reporting is enabled" do
       Puppet.settings[:report] = true
 
       @report.expects(:save)
-      @configurer.send_report(@report, nil)
+      @configurer.send_report(@report)
     end
 
     it "should not save the report if reporting is disabled" do
       Puppet.settings[:report] = false
 
       @report.expects(:save).never
-      @configurer.send_report(@report, nil)
+      @configurer.send_report(@report)
     end
 
     it "should save the last run summary if reporting is enabled" do
       Puppet.settings[:report] = true
 
       @configurer.expects(:save_last_run_summary).with(@report)
-      @configurer.send_report(@report, nil)
+      @configurer.send_report(@report)
     end
 
     it "should save the last run summary if reporting is disabled" do
       Puppet.settings[:report] = false
 
       @configurer.expects(:save_last_run_summary).with(@report)
-      @configurer.send_report(@report, nil)
+      @configurer.send_report(@report)
     end
 
     it "should log but not fail if saving the report fails" do
@@ -326,7 +399,7 @@ describe Puppet::Configurer do
       @report.expects(:save).raises "whatever"
 
       Puppet.expects(:err)
-      lambda { @configurer.send_report(@report, nil) }.should_not raise_error
+      lambda { @configurer.send_report(@report) }.should_not raise_error
     end
   end
 
@@ -506,7 +579,6 @@ describe Puppet::Configurer do
       @agent.stubs(:dostorage)
       @agent.stubs(:download_fact_plugins)
       @agent.stubs(:download_plugins)
-      @agent.stubs(:execute_prerun_command)
       @facts = {"one" => "two", "three" => "four"}
     end
 
@@ -527,10 +599,5 @@ describe Puppet::Configurer do
 
       @agent.prepare({})
     end
-
-    it "should perform the pre-run commands" do
-      @agent.expects(:execute_prerun_command)
-      @agent.prepare({})
-    end
   end
 end
diff --git a/spec/unit/resource/catalog_spec.rb b/spec/unit/resource/catalog_spec.rb
index 942721464..a15a912ef 100755
--- a/spec/unit/resource/catalog_spec.rb
+++ b/spec/unit/resource/catalog_spec.rb
@@ -595,7 +595,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
     before :each do
       @catalog = Puppet::Resource::Catalog.new("host")
 
-      @transaction = mock 'transaction'
+      @transaction = Puppet::Transaction.new(@catalog)
       Puppet::Transaction.stubs(:new).returns(@transaction)
       @transaction.stubs(:evaluate)
       @transaction.stubs(:add_times)
-- 
cgit 


From 381fa409207a1b0d26e7e55ea8cbe45a7e132fdf Mon Sep 17 00:00:00 2001
From: Dominic Maraglia <dominic@puppetlabs.com>
Date: Fri, 10 Jun 2011 14:27:39 -0700
Subject: (#6418) Make test 64118 more portable

Test used a bash command negation to negate the a grep:
'! grep ensure.*directory /var/opt/lib/pe-puppet/state/state.yaml'
which only works on newer bash shells only. Removed the shell
negation and use the harnesses ":acceptable_exit_codes" parameter.
---
 .../tests/ticket_6418_file_recursion_and_audit.rb       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/acceptance/tests/ticket_6418_file_recursion_and_audit.rb b/acceptance/tests/ticket_6418_file_recursion_and_audit.rb
index f0a55d029..b21e57ddb 100644
--- a/acceptance/tests/ticket_6418_file_recursion_and_audit.rb
+++ b/acceptance/tests/ticket_6418_file_recursion_and_audit.rb
@@ -2,11 +2,9 @@
 #
 # AffectedVersion: 2.6.0-2.6.5
 # FixedVersion:
-#
 
 test_name "#6418: file recursion and audit"
 
-on agents, "rm -f /var/lib/puppet/state/state.yaml "
 manifest = %q{
     file { "/tmp/6418": ensure => directory }
     file { "/tmp/6418/dir": ensure => directory}
@@ -17,6 +15,19 @@ manifest = %q{
     File["/tmp/6418"] -> File["/tmp/6418/dir"] -> File["/tmp/6418/dir/dir"] -> File["/tmp/6418/dir/dir/dir"] -> File["/tmp/6418-copy"]
 }
 
+step "Query agent for statefile"
+agent=agents.first
+on agent, puppet_agent('--configprint statefile')
+statefile=stdout.chomp
+
+step "Remove the statefile on all Agents"
+on agents, "rm -f #{statefile}"
+
 step "Apply the manifest"
 apply_manifest_on agents, manifest
-on agents, "! grep ensure.*directory /var/lib/puppet/state/state.yaml"
+
+
+step "Verify corecct file recursion and audit state"
+agents.each do |agent|
+  on(agent, "grep ensure.*directory #{statefile}", :acceptable_exit_codes => [ 1 ])
+end
-- 
cgit 


From de064693c3b6846718497bcfb42ef0b9e44ab90b Mon Sep 17 00:00:00 2001
From: nfagerlund <nick.fagerlund@gmail.com>
Date: Mon, 13 Jun 2011 17:19:52 -0700
Subject: (#5641) Help text: document that puppet doc takes modulepath,
 manifestdir, and environment options

Puppet doc didn't have the usual subcommand caveat about configuration settings
being valid command line options, nor did it explicitly call out the three
settings that it actually cares about.

I opted to do the latter, since the number of relevant settings was so small.
Note that --environment is currently broken; this is filed as bug #7907.
---
 lib/puppet/application/doc.rb | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb
index a88f27c78..65cd37da8 100644
--- a/lib/puppet/application/doc.rb
+++ b/lib/puppet/application/doc.rb
@@ -87,29 +87,40 @@ puppet doc will output a single manifest's documentation on stdout.
 OPTIONS
 -------
 * --all:
-  Output the docs for all of the reference types. In 'rdoc'
-  modes, this also outputs documentation for all resources
+  Output the docs for all of the reference types. In 'rdoc' mode, 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.
+  Used only in 'rdoc' mode. The directory to which the rdoc output should
+  be written.
 
 * --mode:
-  Determine the output mode. Valid modes are 'text', 'pdf' and
-  'rdoc'. The 'pdf' mode creates PDF formatted files in the
-  /tmp directory. The default mode is 'text'. In 'rdoc' mode
-  you must provide 'manifests-path'
+  Determine the output mode. Valid modes are 'text', 'pdf' and 'rdoc'. The 'pdf'
+  mode creates PDF formatted files in the /tmp directory. 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 'puppet doc --list'.
+  Build a particular reference. Get a list of references by running
+  'puppet doc --list'.
 
 * --charset:
-  Used only in 'rdoc' mode. It sets the charset used in the
-  html files produced.
+  Used only in 'rdoc' mode. It sets the charset used in the html files produced.
+
+* --manifestdir:
+  Used only in 'rdoc' mode. The directory to scan for stand-alone manifests.
+  If not supplied, puppet doc will use the manifestdir from puppet.conf.
+
+* --modulepath:
+  Used only in 'rdoc' mode. The directory or directories to scan for modules.
+  If not supplied, puppet doc will use the modulepath from puppet.conf.
+
+* --environment:
+  Used only in 'rdoc' mode. The configuration environment from which
+  to read the modulepath and manifestdir settings, when reading said settings
+  from puppet.conf. Due to a known bug, this option is not currently effective.
 
 
 EXAMPLE
-- 
cgit 


From 1a33bf86b74053f7978bddb6b1f715d04db9f2ba Mon Sep 17 00:00:00 2001
From: nfagerlund <nick.fagerlund@gmail.com>
Date: Tue, 14 Jun 2011 13:35:31 -0700
Subject: (#7506) Specify supported Ruby versions in README.md

The README was not specific enough about the current state of our Ruby support.
This commit lays out our current status as discussed in issue #7506 and in
greater detail on the internal mailing list around April 8, 2011 under the
subject "Statler Ruby Versions Support."

Paired-With: Matt Robinson <matt@puppetlabs.com>
---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4d17a752a..c3a6c9483 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Puppet, an automated administrative engine for your Linux and Unix systems, perf
 administrative tasks (such as adding users, installing packages, and updating server
 configurations) based on a centralized specification.
 
-Documentation (and detailed installation instructions) can be found online at the 
+Documentation (and detailed installation instructions) can be found online at the
 [Puppet Docs site](http://docs.puppetlabs.com).
 
 Installation
@@ -13,7 +13,11 @@ Installation
 
 Generally, you need the following things installed:
 
-* Ruby >= 1.8.1 (earlier releases might work but probably not)
+* A supported Ruby version. Ruby 1.8.5, 1.8.7, and 1.9.2 are fully supported
+  (with a handful of known issues under 1.9.2); Ruby 1.8.1 is supported on a
+  best-effort basis for agent use only. Other versions of Ruby are used at your
+  own risk, and Ruby 1.8.6, 1.9.0, and 1.9.1 are not recommended for
+  compatibility reasons.
 
 * The Ruby OpenSSL library.  For some reason, this often isn't included
   in the main ruby distributions.  You can test for it by running
-- 
cgit 


From db1a392e3fce0d616b6d1061a123b60f61470f20 Mon Sep 17 00:00:00 2001
From: nfagerlund <nick.fagerlund@gmail.com>
Date: Tue, 14 Jun 2011 13:56:23 -0700
Subject: (#7506) Organize READMEs; specify supported Ruby versions in
 README.md

The README was not specific enough about the current state of our Ruby support.
This commit lays out our current status as discussed in issue #7506 and in
greater detail on the internal mailing list around April 8, 2011 under the
subject "Statler Ruby Versions Support."

This commit also consolidates two redundant README files into one.

Paired-With: Matt Robinson <matt@puppetlabs.com>
---
 README     | 31 -------------------------------
 README.md  | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 README.rst | 41 -----------------------------------------
 3 files changed, 48 insertions(+), 72 deletions(-)
 delete mode 100644 README
 create mode 100644 README.md
 delete mode 100644 README.rst

diff --git a/README b/README
deleted file mode 100644
index d6b7d66bc..000000000
--- a/README
+++ /dev/null
@@ -1,31 +0,0 @@
-Documentation (and detailed install instructions) can be found
-online at http://docs.puppetlabs.com/.
-
-Additional documentation can also be found at the Puppet Wiki:
-
-http://projects.puppetlabs.com/projects/puppet/wiki/
-
-Generally, you need the following things installed:
-
-* Ruby >= 1.8.1 (earlier releases might work but probably not)
-
-* 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.
-
-  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.
-
-* 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.
-
-* Facter => 1.5.1
-  You can get this from < http://puppetlabs.com/projects/facter >
-
-$Id$
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..75678d167
--- /dev/null
+++ b/README.md
@@ -0,0 +1,48 @@
+Puppet
+======
+
+Puppet, an automated administrative engine for your Linux and Unix systems, performs
+administrative tasks (such as adding users, installing packages, and updating server
+configurations) based on a centralized specification.
+
+Documentation (and detailed installation instructions) can be found online at the
+[Puppet Docs site](http://docs.puppetlabs.com).
+
+Installation
+------------
+
+Generally, you need the following things installed:
+
+* A supported Ruby version. Ruby 1.8.5 and 1.8.7 are fully supported; Ruby 1.8.1
+  is supported on a best-effort basis for agent use only. Other versions of Ruby
+  are used at your own risk, and Ruby 1.8.6 is not recommended for compatibility
+  reasons.
+
+* 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.
+
+  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.
+
+* 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.
+
+* Facter => 1.5.1 (available via your package manager or from the [Facter site](http://puppetlabs.com/projects/facter).
+
+License
+-------
+
+See LICENSE file.
+
+Support
+-------
+
+Please log tickets and issues at our [Projects site](http://projects.puppetlabs.com)
+
diff --git a/README.rst b/README.rst
deleted file mode 100644
index 63452ef91..000000000
--- a/README.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-Puppet
-======
-
-Puppet, an automated administrative engine for your Linux and Unix systems, performs
-administrative tasks (such as adding users, installing packages, and updating server
-configurations) based on a centralized specification.
-
-Documentation (and detailed install instructions) can be found online at the 
-`Puppet Documentation`_ site.
-
-Additional documentation can also be found at the `Puppet Wiki`_.
-
-Installation
-------------
-
-Generally, you need the following things installed:
-
-* Ruby >= 1.8.1 (earlier releases might work but probably not)
-
-* 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.
-
-  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.
-
-* 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.
-
-* Facter => 1.5.1
-  You can get this from your package management system or the `Facter site`_
-
-.. _Puppet Documentation: http://docs.puppetlabs.com
-.. _Puppet Wiki: http://projects.puppetlabs.com/projects/puppet/wiki/
-.. _Facter site: http://puppetlabs.com/projects/facter
-- 
cgit 


From 1d867b026dbfa38d44f042680acf708b42295882 Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@puppetlabs.com>
Date: Tue, 14 Jun 2011 14:42:21 -0700
Subject: (#7224) Add a helper to Puppet::SSL::Certificate to retrieve
 alternate names

Alternate names, if present, are specified in the subjectAltName extension of
the certificate. The values are in the form:

"DNS:alternate_name1, DNS:alternate_name2"

This helper will retrieve the value of the subjectAltName extension and extract
the alternate names, returning and empty list if the extension is absent. This
will make it easier to access the entire list of possible names for a
certificate, rather than just the common name; this is helpful for generating
more detailed SSL error messages.

Paired-With: Jacob Helwig <jacob@puppetlabs.com>
---
 lib/puppet/ssl/certificate.rb     |  6 ++++++
 spec/unit/ssl/certificate_spec.rb | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/lib/puppet/ssl/certificate.rb b/lib/puppet/ssl/certificate.rb
index a0e600291..d57ac1a06 100644
--- a/lib/puppet/ssl/certificate.rb
+++ b/lib/puppet/ssl/certificate.rb
@@ -27,6 +27,12 @@ class Puppet::SSL::Certificate < Puppet::SSL::Base
     [:s]
   end
 
+  def alternate_names
+    alts = content.extensions.find{|ext| ext.oid == "subjectAltName"}
+    return [] unless alts
+    alts.value.split(/,\s+/).map{|al| al.sub(/^DNS:/,'')}
+  end
+
   def expiration
     return nil unless content
     content.not_after
diff --git a/spec/unit/ssl/certificate_spec.rb b/spec/unit/ssl/certificate_spec.rb
index 0b635f2bc..de5cedf59 100755
--- a/spec/unit/ssl/certificate_spec.rb
+++ b/spec/unit/ssl/certificate_spec.rb
@@ -89,6 +89,31 @@ describe Puppet::SSL::Certificate do
       @certificate.should respond_to(:content)
     end
 
+    describe "#alternate_names" do
+      before do
+        Puppet[:certdnsnames] = 'foo:bar:baz'
+        @csr            = OpenSSL::X509::Request.new
+        @csr.subject    = OpenSSL::X509::Name.new([['CN', 'quux']])
+        @csr.public_key = OpenSSL::PKey::RSA.generate(Puppet[:keylength]).public_key
+      end
+
+      it "should list all alternate names when the extension is present" do
+        cert = Puppet::SSL::CertificateFactory.new('server', @csr, @csr, 14).result
+
+        @certificate = @class.from_s(cert.to_pem)
+
+        @certificate.alternate_names.should =~ ['foo', 'bar', 'baz', 'quux']
+      end
+
+      it "should return an empty list of names if the extension is absent" do
+        cert = Puppet::SSL::CertificateFactory.new('client', @csr, @csr, 14).result
+
+        @certificate = @class.from_s(cert.to_pem)
+
+        @certificate.alternate_names.should == []
+      end
+    end
+
     it "should return a nil expiration if there is no actual certificate" do
       @certificate.stubs(:content).returns nil
 
-- 
cgit 


From 99330fa56d5f2a459fe560d7f7506d42d4a98d14 Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@puppetlabs.com>
Date: Tue, 14 Jun 2011 15:31:13 -0700
Subject: (#7224) Reword 'hostname was not match' error message

This error message is grammatically incorrect and unhelpful, so we replace it
with a message that explains more correctly what went wrong and what was
expected. This message happens when making an authenticated connection to a
server where the certificate doesn't match its hostname. This happens in the
REST terminuses, so we wrap their HTTP methods with a helper that will catch
the appropriate SSLError and re-raise it with the better message stating the
hostname used, and the list of hostnames that we were expecting it to be a part
of.

Unfortunately, because the certificate in question isn't available at error
time, we have to use the Net::HTTP#verify_callback to capture it.

Paired-With: Jacob Helwig <jacob@puppetlabs.com>
Reviewed-By: Dominic Maraglia <dominic@puppetlabs.com>
---
 ...e_when_hostname_not_match_server_certificate.rb | 12 ++++++
 ...ket_3360_allow_duplicate_csr_with_option_set.rb |  4 +-
 lib/puppet/indirector/rest.rb                      | 47 ++++++++++++++++++----
 spec/unit/indirector/certificate/rest_spec.rb      |  1 +
 spec/unit/indirector/rest_spec.rb                  | 47 +++++++++++++++++++---
 5 files changed, 97 insertions(+), 14 deletions(-)
 create mode 100644 acceptance/tests/helpful_error_message_when_hostname_not_match_server_certificate.rb

diff --git a/acceptance/tests/helpful_error_message_when_hostname_not_match_server_certificate.rb b/acceptance/tests/helpful_error_message_when_hostname_not_match_server_certificate.rb
new file mode 100644
index 000000000..c3b5b6795
--- /dev/null
+++ b/acceptance/tests/helpful_error_message_when_hostname_not_match_server_certificate.rb
@@ -0,0 +1,12 @@
+test_name "generate a helpful error message when hostname doesn't match server certificate"
+
+step "Clear any existing SSL directories"
+on(hosts, "rm -r #{config['puppetpath']}/ssl")
+
+# Start the master with a certname not matching its hostname
+with_master_running_on(master, "--certname foobar_not_my_hostname --certdnsnames one_cert:two_cert:red_cert:blue_cert --autosign true") do
+  run_agent_on(agents, "--no-daemonize --verbose --onetime --server #{master}", :acceptable_exit_codes => (1..255)) do
+    msg = "Server hostname '#{master}' did not match server certificate; expected one of foobar_not_my_hostname, one_cert, two_cert, red_cert, blue_cert"
+    assert_match(msg, stdout)
+  end
+end
diff --git a/acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb b/acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb
index 9eaf4c224..a34a3e718 100644
--- a/acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb
+++ b/acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb
@@ -2,8 +2,8 @@ test_name "#3360: Allow duplicate CSR when allow_duplicate_certs is on"
 
 agent_hostnames = agents.map {|a| a.to_s}
 
-step "Remove existing SSL directory for agents"
-on agents, "rm -r #{config['puppetpath']}/ssl"
+step "Remove existing SSL directory for hosts"
+on hosts, "rm -r #{config['puppetpath']}/ssl"
 
 with_master_running_on master, "--allow_duplicate_certs --certdnsnames=\"puppet:$(hostname -s):$(hostname -f)\" --verbose --noop" do
   step "Generate a certificate request for the agent"
diff --git a/lib/puppet/indirector/rest.rb b/lib/puppet/indirector/rest.rb
index 0d3997221..8018fe8e3 100644
--- a/lib/puppet/indirector/rest.rb
+++ b/lib/puppet/indirector/rest.rb
@@ -71,16 +71,49 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     Puppet::Network::HttpPool.http_instance(request.server || self.class.server, request.port || self.class.port)
   end
 
+  [:get, :post, :head, :delete, :put].each do |method|
+    define_method "http_#{method}" do |request, *args|
+      http_request(method, request, *args)
+    end
+  end
+
+  def http_request(method, request, *args)
+    http_connection = network(request)
+    peer_certs = []
+
+    # We add the callback to collect the certificates for use in constructing
+    # the error message if the verification failed.  This is necessary since we
+    # don't have direct access to the cert that we expected the connection to
+    # use otherwise.
+    #
+    http_connection.verify_callback = proc do |preverify_ok, ssl_context|
+      peer_certs << Puppet::SSL::Certificate.from_s(ssl_context.current_cert.to_pem)
+      preverify_ok
+    end
+
+    http_connection.send(method, *args)
+  rescue OpenSSL::SSL::SSLError => error
+    if error.message.include? "hostname was not match"
+      raise unless cert = peer_certs.find { |c| c.name !~ /^puppet ca/i }
+
+      valid_certnames = [cert.name, *cert.alternate_names].uniq
+      msg = valid_certnames.length > 1 ? "one of #{valid_certnames.join(', ')}" : valid_certnames.first
+
+      raise Puppet::Error, "Server hostname '#{http_connection.address}' did not match server certificate; expected #{msg}"
+    else
+      raise
+    end
+  end
+
   def find(request)
     uri, body = request_to_uri_and_body(request)
     uri_with_query_string = "#{uri}?#{body}"
-    http_connection = network(request)
     # WEBrick in Ruby 1.9.1 only supports up to 1024 character lines in an HTTP request
     # http://redmine.ruby-lang.org/issues/show/3991
     response = if "GET #{uri_with_query_string} HTTP/1.1\r\n".length > 1024
-      http_connection.post(uri, body, headers)
+      http_post(request, uri, body, headers)
     else
-      http_connection.get(uri_with_query_string, headers)
+      http_get(request, uri_with_query_string, headers)
     end
     result = deserialize response
     result.name = request.key if result.respond_to?(:name=)
@@ -88,7 +121,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def head(request)
-    response = network(request).head(indirection2uri(request), headers)
+    response = http_head(request, indirection2uri(request), headers)
     case response.code
     when "404"
       return false
@@ -101,7 +134,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def search(request)
-    unless result = deserialize(network(request).get(indirection2uri(request), headers), true)
+    unless result = deserialize(http_get(request, indirection2uri(request), headers), true)
       return []
     end
     result
@@ -109,12 +142,12 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
 
   def destroy(request)
     raise ArgumentError, "DELETE does not accept options" unless request.options.empty?
-    deserialize network(request).delete(indirection2uri(request), headers)
+    deserialize http_delete(request, indirection2uri(request), headers)
   end
 
   def save(request)
     raise ArgumentError, "PUT does not accept options" unless request.options.empty?
-    deserialize network(request).put(indirection2uri(request), request.instance.render, headers.merge({ "Content-Type" => request.instance.mime }))
+    deserialize http_put(request, indirection2uri(request), request.instance.render, headers.merge({ "Content-Type" => request.instance.mime }))
   end
 
   private
diff --git a/spec/unit/indirector/certificate/rest_spec.rb b/spec/unit/indirector/certificate/rest_spec.rb
index 21e10e316..870d9e437 100755
--- a/spec/unit/indirector/certificate/rest_spec.rb
+++ b/spec/unit/indirector/certificate/rest_spec.rb
@@ -47,6 +47,7 @@ rn/G
     response = stub 'response', :code => "200", :body => cert_string
     response.stubs(:[]).with('content-type').returns "text/plain"
     response.stubs(:[]).with('content-encoding')
+    network.stubs(:verify_callback=)
     network.expects(:get).returns response
 
     request = Puppet::Indirector::Request.new(:certificate, :find, "foo.com")
diff --git a/spec/unit/indirector/rest_spec.rb b/spec/unit/indirector/rest_spec.rb
index 5637080e8..ee0111a77 100755
--- a/spec/unit/indirector/rest_spec.rb
+++ b/spec/unit/indirector/rest_spec.rb
@@ -90,6 +90,43 @@ describe Puppet::Indirector::REST do
     @rest_class.port.should == 543
   end
 
+	describe "when making http requests" do
+		it "should provide a helpful error message when hostname was not match with server certificate" do
+			Puppet[:certdnsnames] = 'foo:bar:baz'
+			csr            = OpenSSL::X509::Request.new
+			csr.subject    = OpenSSL::X509::Name.new([['CN', 'not_my_server']])
+			csr.public_key = OpenSSL::PKey::RSA.generate(Puppet[:keylength]).public_key
+			cert = Puppet::SSL::CertificateFactory.new('server', csr, csr, 14).result
+
+			connection = Net::HTTP.new('my_server', 8140)
+			@searcher.stubs(:network).returns(connection)
+			ssl_context = OpenSSL::SSL::SSLContext.new
+			ssl_context.stubs(:current_cert).returns(cert)
+			connection.stubs(:get).with do
+				connection.verify_callback.call(true, ssl_context)
+			end.raises(OpenSSL::SSL::SSLError.new('hostname was not match with server certificate'))
+
+			msg = /Server hostname 'my_server' did not match server certificate; expected one of (.+)/
+			expect { @searcher.http_request(:get, stub('request')) }.to(
+				raise_error(Puppet::Error, msg) do |error|
+					error.message =~ msg
+					$1.split(', ').should =~ ['foo', 'bar', 'baz', 'not_my_server']
+				end
+			)
+		end
+
+		it "should pass along the error message otherwise" do
+			connection = Net::HTTP.new('my_server', 8140)
+			@searcher.stubs(:network).returns(connection)
+
+			connection.stubs(:get).raises(OpenSSL::SSL::SSLError.new('certificate verify failed'))
+
+			expect do
+				@searcher.http_request(:get, stub('request'))
+			end.to raise_error(/certificate verify failed/)
+		end
+	end
+
   describe "when deserializing responses" do
     it "should return nil if the response code is 404" do
       response = mock 'response'
@@ -219,7 +256,7 @@ describe Puppet::Indirector::REST do
 
   describe "when doing a find" do
     before :each do
-      @connection = stub('mock http connection', :get => @response)
+      @connection = stub('mock http connection', :get => @response, :verify_callback= => nil)
       @searcher.stubs(:network).returns(@connection)    # neuter the network connection
 
       # Use a key with spaces, so we can test escaping
@@ -313,7 +350,7 @@ describe Puppet::Indirector::REST do
 
   describe "when doing a head" do
     before :each do
-      @connection = stub('mock http connection', :head => @response)
+      @connection = stub('mock http connection', :head => @response, :verify_callback= => nil)
       @searcher.stubs(:network).returns(@connection)
 
       # Use a key with spaces, so we can test escaping
@@ -349,7 +386,7 @@ describe Puppet::Indirector::REST do
 
   describe "when doing a search" do
     before :each do
-      @connection = stub('mock http connection', :get => @response)
+      @connection = stub('mock http connection', :get => @response, :verify_callback= => nil)
       @searcher.stubs(:network).returns(@connection)    # neuter the network connection
 
       @model.stubs(:convert_from_multiple)
@@ -397,7 +434,7 @@ describe Puppet::Indirector::REST do
 
   describe "when doing a destroy" do
     before :each do
-      @connection = stub('mock http connection', :delete => @response)
+      @connection = stub('mock http connection', :delete => @response, :verify_callback= => nil)
       @searcher.stubs(:network).returns(@connection)    # neuter the network connection
 
       @request = Puppet::Indirector::Request.new(:foo, :destroy, "foo bar")
@@ -453,7 +490,7 @@ describe Puppet::Indirector::REST do
 
   describe "when doing a save" do
     before :each do
-      @connection = stub('mock http connection', :put => @response)
+      @connection = stub('mock http connection', :put => @response, :verify_callback= => nil)
       @searcher.stubs(:network).returns(@connection)    # neuter the network connection
 
       @instance = stub 'instance', :render => "mydata", :mime => "mime"
-- 
cgit 


From 43027deaef488f85f560a995354236e6adb2a01d Mon Sep 17 00:00:00 2001
From: stahnma <stahnma@websages.com>
Date: Tue, 14 Jun 2011 17:49:43 -0700
Subject: Bumping RPM spec file to 2.6.9rc1.

I will bump the RPM spec file for each release, that way
as soon as we cut a release candidate, we won't get a patch
that updates the spec.

Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
---
 conf/redhat/puppet.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index e51af0a6b..8a17c46e1 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -5,7 +5,7 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        2.6.0
+Version:        2.6.9rc1
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
@@ -223,6 +223,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jun 14 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.6.9rc1-1
+- Update to 2.6.9rc1
+
 * Tue Jul 20 2010 Todd Zullinger <tmz@pobox.com> - 2.6.0-1
 - Update to 2.6.0
 - Create and own /usr/share/puppet/modules (#615432)
-- 
cgit 


From cba645c8b8a2c5293d50829c18cd753bcea34e81 Mon Sep 17 00:00:00 2001
From: Michael Stahnke <stahnma@puppetlabs.com>
Date: Tue, 14 Jun 2011 17:52:24 -0700
Subject: Bumping release in lib/puppet.rb and updating CHANGELOG.

This is for release 2.6.9rc1.

Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
---
 CHANGELOG     | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/puppet.rb |  2 +-
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4d0c8d27c..755235f90 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,72 @@
+2.6.9rc1
+====
+c6909a6 Merge branch '2.6.x' into 2.6rc
+fc530ac Merge branch 'ticket/2.6.x/7506' into 2.6.x
+db1a392 (#7506) Organize READMEs; specify supported Ruby versions in README.md
+4fb7cfe Merge branch 'ticket/2.6.x/6418' into 2.6.x
+381fa40 (#6418) Make test 64118 more portable
+f8c1132 Merge branch 'ticket/2.6.x/7127-prerun-command-failures-dont-stop-puppet' into 2.6.x
+98ba407 (#7127) Stop puppet if a prerun command fails
+6996e0b Do not needlessly create multiple reports when creating a transaction
+01c1142 Merge branch 'ticket/2.6.x/4416' into 2.6.x
+caca469 (#4416) Ensure types are providified after reloading
+413b136 (#4416) Always remove old provider before recreating it
+d866ce1 Cleanup indentation, comment, and unused code
+b1a506c Merge branch 'ticket/2.6.x/2128_docstrings' into 2.6.x
+98f58ce (#2128) Add WARNING for node_name_{fact,value} descriptions
+1cd848c (#2128) Whitespace only reflow commit
+d9b5c1a (#2128) In-line docs for node_name_{fact,value}
+e62734c Merge branch 'ticket/2.6.x/650' into 2.6.x
+3f0dbb5 (#650) Allow symlinks for configuration directories
+c260cf1 Fix acceptance tests not managing their masters
+3d09ca8 Merge branch 'ticket/2.6.x/2128' into 2.6.x
+1c70f0c (#2128) Add support for setting node name based on a fact
+c629958 (#2128) Get facts before retrieving catalog
+cd4fe14 (#2128) Add the ability to specify a node name
+8ebec1e (#7193) Fix path issues with acceptance tests that call old shell tests
+9660f5e Merge branch 'ticket/2.6.x/6885-puppet-agent-fingerprint-requires---verbose-to-return-a-value' into 2.6.x
+16b2311 (#6885) puppet agent fingerprint requires --verbose to return a value.
+a00fd25 maint: Refactor specs in preparation for making node name more flexible
+805b287 Merge branch 'bug/2.6.x/5318-minimal-fix' into 2.6.x
+75e2764 (#5318) Always notice changes to manifests when compiling.
+6a00289 Merge branch 'ticket/2.6.x/7681' into 2.6.x
+4a5e99d (#7681) Add an acceptance test for resource refs with array variables
+d7ce922 Merge branch 'test/2.6.x/4123' into 2.6.x
+646919e (4123) Fix test for 4123/4 on old egrep in cent4
+cbc123c Merge branch '2.6.next' into 2.6.x
+25eab1a Merge branch 'ticket/2.6.next/3836' into 2.6.next
+8b76be3 (#3836) External nodes should only capture stdout
+1f438da Merge branch '2.6.next' into 2.6.x
+1f438da Merge branch '2.6.next' into 2.6.x
+8f907f2 adding test for ticket 7139
+97e8ef3 Merge branch 'ticket/2.6.next/7139' into 2.6.next
+90eb937 (#7139) Accept '/' as a valid path in filesets
+37c86dd Merge remote-tracking branch 'toddz/feature/2.6.next/vim-indenting' into 2.6.next
+2892068 Merge branch 'ticket/2.6.next/6844' into 2.6.next
+1b2a7d9 case seems needless here as there is only two opts, also the rest of the file seems to use if so this should make thin
+c4a2647 Merge branch 'ticket/2.6.x/6845' into 2.6.next
+729336e (#6845) Mount writes incorrect vfstab entries
+6ab2243 Merge branch 'ticket/2.6.next/6442-agent_doesnt_need_namespaceauth' into 2.6.next
+16cf1ac (#6442) Be able to start agents --listen without namespaceauth.conf
+361d6a3 Merge branch 'tickets/2.6.next/3420' into 2.6.next
+0352402 (#3420) Nagios "name" attribute does not output correctly
+ddc4e14 Merge branch 'tickets/2.6.next/4487' into 2.6.next
+f656818 (#4487) When setting environment on a host, ensure it is a string.
+2cce326 add test for ticket 7101
+1ee6f94 Merge branch 'tickets/2.6.x/6487-help-directoryservice-provider-work-on-future-OSX-versions' into 2.6.next
+c306db2 (#6487) Add some testing for OS X version support in DirectoryService provider
+0008b63 (#6487) Directoryservice provider will fail in future OS releases
+0b9c7ad Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.next
+34f9f41 Maint: Fix a #4655 introduced log inconsistency
+6b18f8f Move acceptance tests from puppet-acceptance repo
+f6afa87 Merge branch 'ticket/2.6.next/7166' into 2.6.next
+9a5bf6e Fixed #7166 - Replaced deprecated stomp "send" method with "publish"
+72cd6fb Merge branch 'tickets/2.6.x/4655-parameterized-classes-default-stages' into 2.6.next
+656eff8 (#4655) Allow stage to be set using a default class parameter
+16d1f78 Merge remote branch 'james/tickets/2.6.x/6681' into 2.6.next
+7f658e6 vim: Initial ftplugin and indent support
+ccbe9f3 Fixed #6681 - Remove --force-yes option from aptitude is used
+
 2.6.8
 =====
 c1edcb2 add test for ticket 7101
diff --git a/lib/puppet.rb b/lib/puppet.rb
index f97d28642..b4650a245 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -24,7 +24,7 @@ require 'puppet/util/run_mode'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.6.8'
+  PUPPETVERSION = '2.6.9'
 
   def Puppet.version
     PUPPETVERSION
-- 
cgit 


From 31554c086eb2bf3afab37daba58704eca3fab16c Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Fri, 25 Mar 2011 15:38:24 -0400
Subject: (#6854) Update Red Hat spec file

Sync the spec file with Fedora/EPEL and pull in the following changes:

- Ensure %%pre exits cleanly
- Fix License tag, puppet is now GPLv2 only
- Properly restart puppet agent/master daemons on upgrades from 0.25.x
- Require libselinux-utils when selinux support is enabled
- Support tmpfiles.d for Fedora >= 15 (#656677)
---
 conf/redhat/puppet.spec | 111 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 88 insertions(+), 23 deletions(-)

diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index 8a17c46e1..d5be1f88e 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -5,13 +5,13 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        2.6.9rc1
-Release:        1%{?dist}
+Version:        2.6.9
+Release:        0.1.rc1%{?dist}
 Summary:        A network tool for managing many disparate systems
-License:        GPLv2+
+License:        GPLv2
 URL:            http://puppetlabs.com
-Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
-Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
+Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz
+#Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
 
 Group:          System Environment/Base
 
@@ -27,11 +27,11 @@ Requires:       ruby-shadow
 %endif
 
 # Pull in ruby selinux bindings where available
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-%{!?_without_selinux:Requires: ruby(selinux)}
+%if 0%{?fedora} || 0%{?rhel} >= 6
+%{!?_without_selinux:Requires: ruby(selinux), libselinux-utils}
 %else
-%if 0%{?fedora} || 0%{?rhel} >= 5
-%{!?_without_selinux:Requires: libselinux-ruby}
+%if 0%{?rhel} && 0%{?rhel} == 5
+%{!?_without_selinux:Requires: libselinux-ruby, libselinux-utils}
 %endif
 %endif
 
@@ -65,8 +65,8 @@ Provides the central puppet server daemon which provides manifests to clients.
 The server can also function as a certificate authority and file server.
 
 %prep
-%setup -q
-patch -p1 < conf/redhat/rundir-perms.patch
+%setup -q -n %{name}-%{version}rc1
+patch -s -p1 < conf/redhat/rundir-perms.patch
 
 
 %build
@@ -102,7 +102,6 @@ install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/syscon
 install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
 install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
 install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
-install -Dp -m0644 conf/auth.conf %{buildroot}%{_sysconfdir}/puppet/auth.conf
 install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 
 # We need something for these ghosted files, otherwise rpmbuild
@@ -128,9 +127,16 @@ vimdir=%{buildroot}%{_datadir}/vim/vimfiles
 install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim
 install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 
+%if 0%{?fedora} >= 15
+# Setup tmpfiles.d config
+mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
+    %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+%endif
+
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGELOG COPYING LICENSE README README.queueing examples
+%doc CHANGELOG COPYING LICENSE README.md README.queueing examples
 %{_bindir}/pi
 %{_bindir}/puppet
 %{_bindir}/ralsh
@@ -141,6 +147,9 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
 %dir %{_sysconfdir}/puppet
+%if 0%{?fedora} >= 15
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%endif
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
 %config(noreplace) %{_sysconfdir}/puppet/auth.conf
@@ -185,27 +194,48 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null
 getent passwd puppet &>/dev/null || \
 useradd -r -u 52 -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \
-    -c "Puppet" puppet &>/dev/null || :
+    -c "Puppet" puppet &>/dev/null
 # ensure that old setups have the right puppet home dir
 if [ $1 -gt 1 ] ; then
-  usermod -d %{_localstatedir}/lib/puppet puppet &>/dev/null || :
+  usermod -d %{_localstatedir}/lib/puppet puppet &>/dev/null
 fi
+exit 0
 
 %post
 /sbin/chkconfig --add puppet || :
+if [ "$1" -ge 1 ]; then
+  # The pidfile changed from 0.25.x to 2.6.x, handle upgrades without leaving
+  # the old process running.
+  oldpid="%{_localstatedir}/run/puppet/puppetd.pid"
+  newpid="%{_localstatedir}/run/puppet/agent.pid"
+  if [ -s "$oldpid" -a ! -s "$newpid" ]; then
+    (kill $(< "$oldpid") && rm -f "$oldpid" && \
+      /sbin/service puppet start) >/dev/null 2>&1 || :
+  fi
+fi
 
 %post server
 /sbin/chkconfig --add puppetmaster || :
+if [ "$1" -ge 1 ]; then
+  # The pidfile changed from 0.25.x to 2.6.x, handle upgrades without leaving
+  # the old process running.
+  oldpid="%{_localstatedir}/run/puppet/puppetmasterd.pid"
+  newpid="%{_localstatedir}/run/puppet/master.pid"
+  if [ -s "$oldpid" -a ! -s "$newpid" ]; then
+    (kill $(< "$oldpid") && rm -f "$oldpid" && \
+      /sbin/service puppetmaster start) >/dev/null 2>&1 || :
+  fi
+fi
 
 %preun
 if [ "$1" = 0 ] ; then
-  /sbin/service puppet stop > /dev/null 2>&1
+  /sbin/service puppet stop >/dev/null 2>&1
   /sbin/chkconfig --del puppet || :
 fi
 
 %preun server
 if [ "$1" = 0 ] ; then
-  /sbin/service puppetmaster stop > /dev/null 2>&1
+  /sbin/service puppetmaster stop >/dev/null 2>&1
   /sbin/chkconfig --del puppetmaster || :
 fi
 
@@ -216,30 +246,65 @@ fi
 
 %postun server
 if [ "$1" -ge 1 ]; then
-  /sbin/service puppetmaster condrestart > /dev/null 2>&1 || :
+  /sbin/service puppetmaster condrestart >/dev/null 2>&1 || :
 fi
 
 %clean
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jun 15 2011 Todd Zullinger <tmz@pobox.com> - 2.6.9-0.1.rc1
+- Update rc versioning to ensure 2.6.9 final is newer to rpm
+- sync changes with Fedora/EPEL
+
 * Tue Jun 14 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.6.9rc1-1
 - Update to 2.6.9rc1
 
-* Tue Jul 20 2010 Todd Zullinger <tmz@pobox.com> - 2.6.0-1
-- Update to 2.6.0
+* Thu Apr 14 2011 Todd Zullinger <tmz@pobox.com> - 2.6.8-1
+- Update to 2.6.8
+
+* Thu Mar 24 2011 Todd Zullinger <tmz@pobox.com> - 2.6.7-1
+- Update to 2.6.7
+
+* Wed Mar 16 2011 Todd Zullinger <tmz@pobox.com> - 2.6.6-1
+- Update to 2.6.6
+- Ensure %%pre exits cleanly
+- Fix License tag, puppet is now GPLv2 only
 - Create and own /usr/share/puppet/modules (#615432)
+- Properly restart puppet agent/master daemons on upgrades from 0.25.x
+- Require libselinux-utils when selinux support is enabled
+- Support tmpfiles.d for Fedora >= 15 (#656677)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.25.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Mon May 03 2010 Todd Zullinger <tmz@pobox.com> - 0.25.5-1
+* Mon May 17 2010 Todd Zullinger <tmz@pobox.com> - 0.25.5-1
 - Update to 0.25.5
 - Adjust selinux conditional for EL-6
 - Apply rundir-perms patch from tarball rather than including it separately
+- Update URL's to reflect the new puppetlabs.com domain
+
+* Fri Jan 29 2010 Todd Zullinger <tmz@pobox.com> - 0.25.4-1
+- Update to 0.25.4
+
+* Tue Jan 19 2010 Todd Zullinger <tmz@pobox.com> - 0.25.3-2
+- Apply upstream patch to fix cron resources (upstream #2845)
 
-* Fri Jan 01 2010 Todd Zullinger <tmz@pobox.com> - 0.25.2-1
+* Mon Jan 11 2010 Todd Zullinger <tmz@pobox.com> - 0.25.3-1
+- Update to 0.25.3
+
+* Tue Jan 05 2010 Todd Zullinger <tmz@pobox.com> - 0.25.2-1.1
+- Replace %%define with %%global for macros
+
+* Tue Jan 05 2010 Todd Zullinger <tmz@pobox.com> - 0.25.2-1
 - Update to 0.25.2
+- Fixes CVE-2010-0156, tmpfile security issue (#502881)
 - Install auth.conf, puppetqd manpage, and queuing examples/docs
 
-* Tue Oct 20 2009 Todd Zullinger <tmz@pobox.com> - 0.25.1-1
+* Wed Nov 25 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 0.25.1-1
+- New upstream version
+
+* Tue Oct 27 2009 Todd Zullinger <tmz@pobox.com> - 0.25.1-0.3
 - Update to 0.25.1
 - Include the pi program and man page (R.I.Pienaar)
 
-- 
cgit 


From 36d8caff18964841b6e6c33ebf595ca39e8b0871 Mon Sep 17 00:00:00 2001
From: Michael Stahnke <stahnma@puppetlabs.com>
Date: Thu, 16 Jun 2011 17:34:42 -0700
Subject: Updating CHANGELOG for 2.7.0

---
 CHANGELOG | 74 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 885504615..e6e7ee5ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
-2.7.0rc4
+2.7.0
 ===
+1a33bf8 (#7506) Specify supported Ruby versions in README.md
+d4c499d Updated CHANGELOG for 2.7.0rc4
 dbe2310 Maint: Update static man pages for 2.7.0
 50d188c Maint: Update static man page generator for Faces.
 f370d5a (#7833) Several help text/template edits
@@ -46,9 +48,7 @@ ebc642b (#6962) Add "arguments" method to help API
 9f6dec2 (#7681) Allow array variables as resource references
 76ad2bb (#7507) Add exclude filter for ruby 1.9 spec failures
 3682025 maint: move trap call to Signal so we can stub it for specs
-
-2.7.0rc3
-===
+fc0add1 Updated CHANGELOG for 2.7.0rc3
 83c7563 (#7259) Remove ActiveRecord requirement from indirector face spec
 aad2fd7 (#7259) Do not try to load all Terminus classes when configuring the Indirector
 3378841 Adding a sleep state post starting master
@@ -66,9 +66,7 @@ a44cbb1 (#7264) Docs: Clarify that subscribe/notify imply require/before
 9377507 (#7468) Stub spec that tries to connect to pypi.python.org
 5db214c Prevent spec failure caused by network device mock leak
 3722520 Fix #7299 - do not require net/ssh for running rake spec
-
-2.7.0rc2
-===
+b983386 Updated CHANGELOG for 2.7.0rc2
 61edff9 (#7353) Remove :for_humans format entirely.
 d2b5ec6 Adding test for ticket 7139
 6f2a129 add clean-up step to test for ticket_5477 to prevent site.pp from leaking to other tests
@@ -200,38 +198,7 @@ ca9d68f (#6408) Update puppet cert help for new subcommand action syntax.
 174e87a (#4258) Fix pkgutil spec test to have the correct provider
 e119739 (#6928) Add a notice to Parser#validate action when using default
 9bc4bce (#7103) Fix HEAD requests in the HTTP handler
-cb552af (#4258) Remove superfluous command check that called pkgutil
-fd98341 (#4258) Fix fd leak opening pkgutil config files
-7726dc3 (#4258) Permit variations of -nv in both pkgutil.conf files
-f8c2f1a (#4258) Stop file and config checks from breaking spec
-ef86105 (#4258) Check wgetopts in pkgutil.conf
-557ed85 (#4258) Fix hash duplication affecting canonical provider instance
-7c99dd9 (#4258) Use pkgutil -a to reliably determine package common names/aliases
-ab5bc35 (#4258) Update pkgutil spec for recent impl changes
-e582709 (#4258) pkgutil: bug fix: if shortname is not equal to package name
-58ac7d3 (#4258) pkgutil provider: better handling of short package names
-15a53f0 (#4258) pkgutil provider: misc enhancements
-15e225b Add spec tests for pkgutil package provider
-8462acd * Fix exception on parse failure of pkgutil output * Fix exception when querying latest version for unknown package
-3eace85 Fixing indentation
-f8e9155 Removing blastwave references and unused PAGER
-485ac38 Changing indentation to 2-spaces as per 2.6+ style
-9d63171 Single package queries made more robust when dealing with pkgutil noise
-f50fac7 Fixing wget verbose regex
-3003719 These regular expressions will not match anything.  pkgutil doesn't output anything that can be matched.
-2725fb3 Add comments that explain what we are ignoring in the package and remove legacy output
-143fc74 Ignoring lines from use_gpg and catalog fetching
-69a3451 Adding patch from Rudy Gevaert to fix not installed detection
-d026bb7 pkgutil provider: Using the --single option which speeds up execution.
-ec2a03c pkgutil provider: The path to the admin file is /var/opt/csw/pkgutil/admin
-0fc2aa6 pkgutil provider: Correcting a typo in a message.
-e02ba01 Using --single in the pkgutil provider.
-fc18591 Adding pkgutil support.
-9f365b1 Fixed #4258 - Added pkgutil package provider
-
-
-2.7.0rc1
-====
+97e9e5f Updated CHANGELOG & version for 2.7.0rc1
 5915814 Revert "(#6928) Removed --ignoreimport"
 24a277c (#6928) Removed --ignoreimport
 fc36e8d (#6928) Remove --parseonly
@@ -242,6 +209,11 @@ a688461 (#6928) Add a Parser face with Validate action
 78e181e (#7059) handle inherited action binding scope
 cc0f414 maint: ensure we handle '-foo=' options correctly in faces.
 f78ab09 (#2150) Fix File const lookup when configuring routes
+cb552af (#4258) Remove superfluous command check that called pkgutil
+fd98341 (#4258) Fix fd leak opening pkgutil config files
+7726dc3 (#4258) Permit variations of -nv in both pkgutil.conf files
+f8c2f1a (#4258) Stop file and config checks from breaking spec
+ef86105 (#4258) Check wgetopts in pkgutil.conf
 e852580 maint: install erb templates under lib/
 db11770 maint: clean up the spec test headers in bulk.
 4dd6a77 (#7056) Use 'face' rather than 'faces' in the production code.
@@ -416,6 +388,7 @@ a1ce253 Adding Certficate#generate
 af79d3c maint: Fix order-dependent spec failures
 847ac20 maint: Implement an InterfaceCollection class to manage interfaces
 6180397 (#6527) Fix pip tests
+557ed85 (#4258) Fix hash duplication affecting canonical provider instance
 0170ceb (#6527) Fix uninstall problem and refactor
 af42367 (#6527) Added pip package provider.
 ee66f36 (#6814) Add missing require for specs
@@ -439,11 +412,14 @@ ba67cc8 (#6785) Internal consistency for `--terminus`.
 a7173dc (#6786) Fixing a number of failing tests.
 9c85d70 (#6785) Rename the --from option to --terminus.
 b187e07 (#6786) Removing the #interface method.
+7c99dd9 (#4258) Use pkgutil -a to reliably determine package common names/aliases
+ab5bc35 (#4258) Update pkgutil spec for recent impl changes
 cf873c6 maint: Silence test output in the spec run
 f4401d3 (#6722) load all functions before testing...
 4905956 (5909) Function to dyncamically generate resources.
 1a55c7a (#5479) Test that we auto-require the zone dataset.
 0a2a58c (#5479) Autorequire zfs filesystem when zone dataset is configured
+e582709 (#4258) pkgutil: bug fix: if shortname is not equal to package name
 682686f (#6441) Add mount fixture for AIX's /etc/filesystems
 349f6f2 (#6641) Make it easier to add future platforms to the suite.
 6a96584 (#6441) Mark solaris tests pending, because we can't stub it.
@@ -451,6 +427,7 @@ b4f1b98 (#6641) fix mount provider tests broken in the 2.6 merge.
 3b89f32 maint: use chdir rather than depend on bash for win32
 2a91572 (#4798) Make rdoc work if moduledir & manifestdir overlap
 28ce355 maint: Fix rdoc when documenting manifest files
+58ac7d3 (#4258) pkgutil provider: better handling of short package names
 9a1c3b5 maint: spec/integration/configurer has races in time checking.
 75af582 maint: Move puppetdoc settings to defaults so we can use them in tests
 124ff3c maint: Fix a randomization test failure
@@ -492,9 +469,12 @@ c2715c0 Splitting the Application base class
 0cbdbce Renaming 'data_baseclass' to 'interface_base'
 ef289e5 Fixing indentation
 cf79349 Updating readme to reflect requirements
+15a53f0 (#4258) pkgutil provider: misc enhancements
 cde1baa Fixing Interface listing
 eff4eec (#3) Base application should catch SYSINT
 a54ee1e (#2) Should not assume interfaces have indirectors
+15e225b Add spec tests for pkgutil package provider
+8462acd * Fix exception on parse failure of pkgutil output * Fix exception when querying latest version for unknown package
 7639d5f Fix non-existent method called in SMF manifest import exception message, updated spec
 f5e21f0 (#6324) Use real service resource object instead of a stub
 ef9e929 (#6324) Add spec for SMF service provider
@@ -575,6 +555,11 @@ beb85d6 Maint: Moved auto-signing logic into an indirector extension
 8766efe Maint: Make http handler code call the indirector through ".indirection"
 71ecad9 Maint: Refactor code to use <class>.indirection.<method>
 14f8160 Maint: Refactor tests to use <class>.indirection.<method>
+3eace85 Fixing indentation
+f8e9155 Removing blastwave references and unused PAGER
+485ac38 Changing indentation to 2-spaces as per 2.6+ style
+9d63171 Single package queries made more robust when dealing with pkgutil noise
+f50fac7 Fixing wget verbose regex
 0f00bf4 Maint: Removed unused monkey patch that connected OpenSSL::PKey::RSA to indirector
 c5a1ca0 (#5391) Include additional zfs properties
 3a815e1 (#5375) Rework puppet apply to use configurer.run
@@ -596,8 +581,12 @@ cd8126f maint: Fix intermittent parser spec failures
 ee7d2f9 (#5274) New comment property for the hosttype
 8efdc76 (#5274) Tests for hostprovider removes comments
 28e5772 (#5304) Use internal_name rather than real_name for maillist provider
+3003719 These regular expressions will not match anything.  pkgutil doesn't output anything that can be matched.
 6c7290b (#5079) Refactor and cleanup mcxcontent provider
 c643e98 (#5079) Move methods around to make it clearer whether they're public or private
+2725fb3 Add comments that explain what we are ignoring in the package and remove legacy output
+143fc74 Ignoring lines from use_gpg and catalog fetching
+69a3451 Adding patch from Rudy Gevaert to fix not installed detection
 b753d83 Fixed #5288 - Changed report default to true
 ccc944f Fix #4339 - Locally save the last report to $lastrunreport
 8ab1aba Fix #4339 - Allow puppet apply to save last run summary
@@ -643,6 +632,12 @@ df088c9 [4638] Cleanup of plurals and inheritance relationships in AST
 caca187 Moved perform_initial_import from Puppet::Resource::TypeCollection to Puppet::Node::Environment.
 6b1dd81 [#4472]+[#4483] Moved type-name resolution out of Puppet::Parser::TypeLoader.
 6dbd477 [#4397]+[#4344] Move type-name resolution out of Puppet::Resource into the AST resources.
+d026bb7 pkgutil provider: Using the --single option which speeds up execution.
+ec2a03c pkgutil provider: The path to the admin file is /var/opt/csw/pkgutil/admin
+0fc2aa6 pkgutil provider: Correcting a typo in a message.
+e02ba01 Using --single in the pkgutil provider.
+fc18591 Adding pkgutil support.
+9f365b1 Fixed #4258 - Added pkgutil package provider
 83d9874 Use the name in the search path for looking for metadata
 70c293a Fix for environments in startup script. - Dropped the forced --manifest switch in the   suse startup script to allow for environments   to re-define this. Otherwise, environments will   not work as puppet override configuration with   command line arguments.
 62bc09e Redmine: 2474 - Fix for mount fstype documentation
@@ -735,7 +730,6 @@ d532e6d Fixing #3185 Rakefile is loading puppet.rb twice
 5aa596c Fix #3150 - require function doesn't like ::class syntax
 3457b87 Added time module to tagmail report
 
-
 2.6.8rc1
 ====
 8b7444d (#2331) Remove darwinports pkg provider, replace with rewritten macports provider
-- 
cgit 


From bbde5b599b9cfec4e7eee3f96848c0ef1e574208 Mon Sep 17 00:00:00 2001
From: Michael Stahnke <stahnma@puppetlabs.com>
Date: Tue, 21 Jun 2011 14:58:22 -0700
Subject: Readying for release of 2.6.9

Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
---
 CHANGELOG               | 30 +-----------------------------
 conf/redhat/puppet.spec |  5 ++++-
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 755235f90..4f51f77ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,69 +1,41 @@
-2.6.9rc1
+2.6.9
 ====
-c6909a6 Merge branch '2.6.x' into 2.6rc
-fc530ac Merge branch 'ticket/2.6.x/7506' into 2.6.x
 db1a392 (#7506) Organize READMEs; specify supported Ruby versions in README.md
-4fb7cfe Merge branch 'ticket/2.6.x/6418' into 2.6.x
 381fa40 (#6418) Make test 64118 more portable
-f8c1132 Merge branch 'ticket/2.6.x/7127-prerun-command-failures-dont-stop-puppet' into 2.6.x
 98ba407 (#7127) Stop puppet if a prerun command fails
 6996e0b Do not needlessly create multiple reports when creating a transaction
-01c1142 Merge branch 'ticket/2.6.x/4416' into 2.6.x
 caca469 (#4416) Ensure types are providified after reloading
 413b136 (#4416) Always remove old provider before recreating it
 d866ce1 Cleanup indentation, comment, and unused code
-b1a506c Merge branch 'ticket/2.6.x/2128_docstrings' into 2.6.x
 98f58ce (#2128) Add WARNING for node_name_{fact,value} descriptions
 1cd848c (#2128) Whitespace only reflow commit
 d9b5c1a (#2128) In-line docs for node_name_{fact,value}
-e62734c Merge branch 'ticket/2.6.x/650' into 2.6.x
 3f0dbb5 (#650) Allow symlinks for configuration directories
 c260cf1 Fix acceptance tests not managing their masters
-3d09ca8 Merge branch 'ticket/2.6.x/2128' into 2.6.x
 1c70f0c (#2128) Add support for setting node name based on a fact
 c629958 (#2128) Get facts before retrieving catalog
 cd4fe14 (#2128) Add the ability to specify a node name
 8ebec1e (#7193) Fix path issues with acceptance tests that call old shell tests
-9660f5e Merge branch 'ticket/2.6.x/6885-puppet-agent-fingerprint-requires---verbose-to-return-a-value' into 2.6.x
 16b2311 (#6885) puppet agent fingerprint requires --verbose to return a value.
 a00fd25 maint: Refactor specs in preparation for making node name more flexible
-805b287 Merge branch 'bug/2.6.x/5318-minimal-fix' into 2.6.x
 75e2764 (#5318) Always notice changes to manifests when compiling.
-6a00289 Merge branch 'ticket/2.6.x/7681' into 2.6.x
 4a5e99d (#7681) Add an acceptance test for resource refs with array variables
-d7ce922 Merge branch 'test/2.6.x/4123' into 2.6.x
 646919e (4123) Fix test for 4123/4 on old egrep in cent4
-cbc123c Merge branch '2.6.next' into 2.6.x
-25eab1a Merge branch 'ticket/2.6.next/3836' into 2.6.next
 8b76be3 (#3836) External nodes should only capture stdout
-1f438da Merge branch '2.6.next' into 2.6.x
-1f438da Merge branch '2.6.next' into 2.6.x
 8f907f2 adding test for ticket 7139
-97e8ef3 Merge branch 'ticket/2.6.next/7139' into 2.6.next
 90eb937 (#7139) Accept '/' as a valid path in filesets
-37c86dd Merge remote-tracking branch 'toddz/feature/2.6.next/vim-indenting' into 2.6.next
-2892068 Merge branch 'ticket/2.6.next/6844' into 2.6.next
 1b2a7d9 case seems needless here as there is only two opts, also the rest of the file seems to use if so this should make thin
-c4a2647 Merge branch 'ticket/2.6.x/6845' into 2.6.next
 729336e (#6845) Mount writes incorrect vfstab entries
-6ab2243 Merge branch 'ticket/2.6.next/6442-agent_doesnt_need_namespaceauth' into 2.6.next
 16cf1ac (#6442) Be able to start agents --listen without namespaceauth.conf
-361d6a3 Merge branch 'tickets/2.6.next/3420' into 2.6.next
 0352402 (#3420) Nagios "name" attribute does not output correctly
-ddc4e14 Merge branch 'tickets/2.6.next/4487' into 2.6.next
 f656818 (#4487) When setting environment on a host, ensure it is a string.
 2cce326 add test for ticket 7101
-1ee6f94 Merge branch 'tickets/2.6.x/6487-help-directoryservice-provider-work-on-future-OSX-versions' into 2.6.next
 c306db2 (#6487) Add some testing for OS X version support in DirectoryService provider
 0008b63 (#6487) Directoryservice provider will fail in future OS releases
-0b9c7ad Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.next
 34f9f41 Maint: Fix a #4655 introduced log inconsistency
 6b18f8f Move acceptance tests from puppet-acceptance repo
-f6afa87 Merge branch 'ticket/2.6.next/7166' into 2.6.next
 9a5bf6e Fixed #7166 - Replaced deprecated stomp "send" method with "publish"
-72cd6fb Merge branch 'tickets/2.6.x/4655-parameterized-classes-default-stages' into 2.6.next
 656eff8 (#4655) Allow stage to be set using a default class parameter
-16d1f78 Merge remote branch 'james/tickets/2.6.x/6681' into 2.6.next
 7f658e6 vim: Initial ftplugin and indent support
 ccbe9f3 Fixed #6681 - Remove --force-yes option from aptitude is used
 
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index d5be1f88e..17f94830d 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -6,7 +6,7 @@
 
 Name:           puppet
 Version:        2.6.9
-Release:        0.1.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2
 URL:            http://puppetlabs.com
@@ -253,6 +253,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jun 21 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.6.9-1
+- Release of 2.6.9 
+
 * Wed Jun 15 2011 Todd Zullinger <tmz@pobox.com> - 2.6.9-0.1.rc1
 - Update rc versioning to ensure 2.6.9 final is newer to rpm
 - sync changes with Fedora/EPEL
-- 
cgit 


From a49d5b885a62aa9bd3a686d411739723a67c399c Mon Sep 17 00:00:00 2001
From: Michael Stahnke <stahnma@puppetlabs.com>
Date: Wed, 22 Jun 2011 14:57:03 -0700
Subject: (#8048) Gem install puppet no longer fails if rdoc enabled.

Rdoc wouldn't parse lib/puppet/interface/options.rb
The offending code has been removed.

This was causing issues for users wishing to upgrade puppet,
via gem or puppet.

Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
---
 lib/puppet/interface/option.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/puppet/interface/option.rb b/lib/puppet/interface/option.rb
index b68bdeb12..3cd930acf 100644
--- a/lib/puppet/interface/option.rb
+++ b/lib/puppet/interface/option.rb
@@ -2,8 +2,6 @@ require 'puppet/interface'
 
 class Puppet::Interface::Option
   include Puppet::Interface::TinyDocs
-  # For compatibility, deprecated, and should go fairly soon...
-  ['', '='].each { |x| alias :"desc#{x}" :"description#{x}" }
 
   def initialize(parent, *declaration, &block)
     @parent   = parent
-- 
cgit 


From a23e39165a9509a9fa40370929a50fcd1709f4a2 Mon Sep 17 00:00:00 2001
From: Michael Stahnke <stahnma@puppetlabs.com>
Date: Wed, 22 Jun 2011 15:25:50 -0700
Subject: Updating for 2.7.1 release.

Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
---
 CHANGELOG     | 4 ++++
 lib/puppet.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index e6e7ee5ab..02e86acc9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2.7.1
+===
+a49d5b8 (#8048) Gem install puppet no longer fails if rdoc enabled.
+
 2.7.0
 ===
 1a33bf8 (#7506) Specify supported Ruby versions in README.md
diff --git a/lib/puppet.rb b/lib/puppet.rb
index e20874b61..054948b7c 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -24,7 +24,7 @@ require 'puppet/util/run_mode'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.7.0'
+  PUPPETVERSION = '2.7.1'
 
   def Puppet.version
     PUPPETVERSION
-- 
cgit 


From 534ccfe8d8cac382f91eea1047bca2b183e937ca Mon Sep 17 00:00:00 2001
From: Josh Cooper <josh@puppetlabs.com>
Date: Wed, 22 Jun 2011 16:51:01 -0700
Subject: (#8048) Gem install puppet no longer fails if rdoc enabled.

Pre-released versions of faces may have used the "desc" option, which
was later changed to "description", and an alias provided for "desc". The
previous fix for 8048 removed this backwards compatibility (since it was
never released to customers). This commit fixes the test case that
assumed the "desc" option was still available.

Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
---
 spec/shared_behaviours/things_that_declare_options.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/shared_behaviours/things_that_declare_options.rb b/spec/shared_behaviours/things_that_declare_options.rb
index 6e7056157..ebf1b2071 100755
--- a/spec/shared_behaviours/things_that_declare_options.rb
+++ b/spec/shared_behaviours/things_that_declare_options.rb
@@ -27,13 +27,12 @@ shared_examples_for "things that declare options" do
 
     thing = add_options_to do
       option "--foo" do
-        desc text
         description text
         summary text
       end
     end
 
-    thing.get_option(:foo).desc.should == text
+    thing.get_option(:foo).description.should == text
   end
 
   it "should list all the options" do
-- 
cgit 


From 3e3fc693c2a96f6cf56e670f6d5ae5cd70f6a523 Mon Sep 17 00:00:00 2001
From: Dominic Maraglia <dominic@puppetlabs.com>
Date: Mon, 27 Jun 2011 13:58:44 -0700
Subject: (#7956) Port resource acceptance tests

Many of the Puppet resource acceptance tests were RHEL/Centos
specifc.  These tests were ported under the enterptise-dist
repo; move the tests into 2.6.x for merging.
---
 .../tests/resource/cron/should_create_cron.rb      |  6 ++--
 .../tests/resource/cron/should_match_existing.rb   | 13 ++++----
 .../tests/resource/cron/should_remove_cron.rb      | 12 ++++----
 .../tests/resource/cron/should_remove_matching.rb  |  8 ++---
 .../tests/resource/cron/should_update_existing.rb  | 14 ++++-----
 .../tests/resource/file/content_attribute.rb       | 35 +++++++++++++++-------
 .../tests/resource/file/should_create_directory.rb |  4 +--
 .../tests/resource/file/should_create_empty.rb     |  6 ++--
 .../tests/resource/file/should_create_symlink.rb   |  5 ++--
 .../tests/resource/file/should_remove_dir.rb       |  2 +-
 .../tests/resource/file/should_remove_file.rb      |  2 +-
 .../tests/resource/file/source_attribtute.rb       | 30 +++++++++++--------
 acceptance/tests/resource/group/should_create.rb   |  4 +--
 .../tests/resource/group/should_modify_gid.rb      | 19 ++++++------
 acceptance/tests/resource/host/should_create.rb    |  2 +-
 .../tests/resource/host/should_create_aliases.rb   |  2 +-
 acceptance/tests/resource/host/should_destroy.rb   |  2 +-
 .../tests/resource/host/should_modify_alias.rb     |  2 +-
 acceptance/tests/resource/host/should_modify_ip.rb |  2 +-
 .../resource/host/should_not_create_existing.rb    |  2 +-
 acceptance/tests/resource/host/should_query.rb     |  2 +-
 acceptance/tests/resource/host/should_query_all.rb |  2 +-
 .../ticket_4123_should_list_all_running_redhat.rb  |  7 +++--
 acceptance/tests/resource/user/should_create.rb    | 14 +++++----
 .../tests/resource/user/should_create_with_gid.rb  |  6 ++--
 acceptance/tests/resource/user/should_destroy.rb   |  2 +-
 .../tests/resource/user/should_modify_gid.rb       |  6 ++--
 .../resource/user/should_not_destoy_unexisting.rb  |  2 +-
 acceptance/tests/resource/user/should_query.rb     |  2 +-
 29 files changed, 119 insertions(+), 96 deletions(-)

diff --git a/acceptance/tests/resource/cron/should_create_cron.rb b/acceptance/tests/resource/cron/should_create_cron.rb
index e45561491..5badac05f 100644
--- a/acceptance/tests/resource/cron/should_create_cron.rb
+++ b/acceptance/tests/resource/cron/should_create_cron.rb
@@ -1,6 +1,6 @@
 test_name "should create cron"
 
-tmpuser = "cron-test-#{Time.new.to_i}"
+tmpuser = "pl#{rand(999999).to_i}"
 tmpfile = "/tmp/cron-test-#{Time.new.to_i}"
 
 create_user = "user { '#{tmpuser}': ensure => present, managehome => false }"
@@ -18,13 +18,13 @@ agents.each do |host|
     end
 
     step "verify that crontab -l contains what you expected"
-    on host, "crontab -l -u #{tmpuser}" do
+    run_cron_on(host, :list, tmpuser) do
         fail_test "didn't find the command as expected" unless
             stdout.include? "* * * * * /bin/true"
     end
 
     step "remove the crontab file for that user"
-    on host, "crontab -r -u #{tmpuser}"
+    run_cron_on(host, :remove, tmpuser)
 
     step "remove the user from the system"
     apply_manifest_on host, delete_user
diff --git a/acceptance/tests/resource/cron/should_match_existing.rb b/acceptance/tests/resource/cron/should_match_existing.rb
index b34a0498c..b5c5d359d 100755
--- a/acceptance/tests/resource/cron/should_match_existing.rb
+++ b/acceptance/tests/resource/cron/should_match_existing.rb
@@ -1,6 +1,6 @@
+test_name "puppet should match existing job"
 
-
-tmpuser = "cron-test-#{Time.new.to_i}"
+tmpuser = "pl#{rand(999999).to_i}"
 tmpfile = "/tmp/cron-test-#{Time.new.to_i}"
 
 create_user = "user { '#{tmpuser}': ensure => present, managehome => false }"
@@ -11,14 +11,11 @@ agents.each do |host|
     apply_manifest_on host, create_user
 
     step "create the existing job by hand..."
-    on host, "echo '* * * * * /bin/true' | crontab -u #{tmpuser} -"
+    run_cron_on(host,:add,tmpuser,"* * * * * /bin/true")
 
     step "apply the resource on the host using puppet resource"
     on(host, puppet_resource("cron", "crontest", "user=#{tmpuser}",
                   "command=/bin/true", "ensure=present")) do
-        # REVISIT: This is ported from the original test, which seems to me a
-        # weak test, but I don't want to improve it now.  --daniel 2010-12-23
-        # 
         # This is a weak/fragile test.  The output has changed
         # causing this test to fail erronously.  Changed to the correct
         # output to match, but this code should be re-feactored.
@@ -27,13 +24,13 @@ agents.each do |host|
     end
 
     step "verify that crontab -l contains what you expected"
-    on host, "crontab -l -u #{tmpuser}" do
+    run_cron_on(host, :list, tmpuser) do
         fail_test "didn't find the command as expected" unless
             stdout.include? "* * * * * /bin/true"
     end
 
     step "remove the crontab file for that user"
-    on host, "crontab -r -u #{tmpuser}"
+    run_cron_on(host, :remove, tmpuser)
 
     step "remove the user from the system"
     apply_manifest_on host, delete_user
diff --git a/acceptance/tests/resource/cron/should_remove_cron.rb b/acceptance/tests/resource/cron/should_remove_cron.rb
index 035a0f7b9..9956d0d71 100755
--- a/acceptance/tests/resource/cron/should_remove_cron.rb
+++ b/acceptance/tests/resource/cron/should_remove_cron.rb
@@ -1,6 +1,6 @@
 test_name "puppet should remove a crontab entry as expected"
 
-tmpuser = "cron-test-#{Time.new.to_i}"
+tmpuser = "pl#{rand(999999).to_i}"
 tmpfile = "/tmp/cron-test-#{Time.new.to_i}"
 
 create_user = "user { '#{tmpuser}': ensure => present, managehome => false }"
@@ -11,7 +11,7 @@ agents.each do |host|
     apply_manifest_on host, create_user
 
     step "create the existing job by hand..."
-    on host, "printf '# Puppet Name: crontest\n* * * * * /bin/true\n' | crontab -u #{tmpuser} -"
+    run_cron_on(host,:add,tmpuser,"* * * * * /bin/true")
 
     step "apply the resource on the host using puppet resource"
     on(host, puppet_resource("cron", "crontest", "user=#{tmpuser}",
@@ -23,13 +23,13 @@ agents.each do |host|
     end
 
     step "verify that crontab -l contains what you expected"
-    on host, "crontab -l -u #{tmpuser}" do
-        fail_test "didn't found the command we tried to remove" if
-            stdout.include? "/bin/true"
+    run_cron_on(host, :list, tmpuser) do
+      fail_test "didn't found the command we tried to remove" if
+        stdout.include? "/bin/true"
     end
 
     step "remove the crontab file for that user"
-    on host, "crontab -r -u #{tmpuser}"
+    run_cron_on(host, :remove, tmpuser)
 
     step "remove the user from the system"
     apply_manifest_on host, delete_user
diff --git a/acceptance/tests/resource/cron/should_remove_matching.rb b/acceptance/tests/resource/cron/should_remove_matching.rb
index e669f2959..f4de0de0c 100755
--- a/acceptance/tests/resource/cron/should_remove_matching.rb
+++ b/acceptance/tests/resource/cron/should_remove_matching.rb
@@ -1,6 +1,6 @@
 test_name "puppet should remove a crontab entry based on command matching"
 
-tmpuser = "cron-test-#{Time.new.to_i}"
+tmpuser = "pl#{rand(999999).to_i}"
 tmpfile = "/tmp/cron-test-#{Time.new.to_i}"
 
 cron = '# Puppet Name: crontest\n* * * * * /bin/true\n1 1 1 1 1 /bin/true\n'
@@ -13,7 +13,7 @@ agents.each do |host|
     apply_manifest_on host, create_user
 
     step "create the existing job by hand..."
-    on host, "printf '#{cron}' | crontab -u #{tmpuser} -"
+    run_cron_on(host,:add,tmpuser,"* * * * * /bin/true")
 
     step "apply the resource change on the host"
     on(host, puppet_resource("cron", "bogus", "user=#{tmpuser}",
@@ -23,13 +23,13 @@ agents.each do |host|
     end
 
     step "verify that crontab -l contains what you expected"
-    on host, "crontab -l -u #{tmpuser}" do
+    run_cron_on(host,:list,tmpuser) do
         count = stdout.scan("/bin/true").length
         fail_test "found /bin/true the wrong number of times (#{count})" unless count == 1
     end
 
     step "remove the crontab file for that user"
-    on host, "crontab -r -u #{tmpuser}"
+    run_cron_on(host,:remove,tmpuser)
 
     step "remove the user from the system"
     apply_manifest_on host, delete_user
diff --git a/acceptance/tests/resource/cron/should_update_existing.rb b/acceptance/tests/resource/cron/should_update_existing.rb
index 3a2a53769..ff179307f 100755
--- a/acceptance/tests/resource/cron/should_update_existing.rb
+++ b/acceptance/tests/resource/cron/should_update_existing.rb
@@ -1,10 +1,8 @@
 test_name "puppet should update existing crontab entry"
 
-tmpuser = "cron-test-#{Time.new.to_i}"
+tmpuser = "pl#{rand(999999).to_i}"
 tmpfile = "/tmp/cron-test-#{Time.new.to_i}"
 
-cron = '# Puppet Name: crontest\n* * * * * /bin/true\n'
-
 create_user = "user { '#{tmpuser}': ensure => present, managehome => false }"
 delete_user = "user { '#{tmpuser}': ensure => absent,  managehome => false }"
 
@@ -13,10 +11,10 @@ agents.each do |host|
     apply_manifest_on host, create_user
 
     step "create the existing job by hand..."
-    on host, "printf '#{cron}' | crontab -u #{tmpuser} -"
+    run_cron_on(host,:add,tmpuser,"* * * * * /bin/true")
 
     step "verify that crontab -l contains what you expected"
-    on host, "crontab -l -u #{tmpuser}" do
+    run_cron_on(host,:list,tmpuser) do
         fail_test "didn't find the content in the crontab" unless
             stdout.include? '* * * * * /bin/true'
     end
@@ -25,17 +23,17 @@ agents.each do |host|
     on(host, puppet_resource("cron", "crontest", "user=#{tmpuser}",
                   "command=/bin/true", "ensure=present", "hour='0-6'")) do
         fail_test "didn't update the time as expected" unless
-            stdout.include? "defined 'hour' as '0-6'"
+            stdout.include? "hour => ['0-6']"
     end
 
     step "verify that crontab -l contains what you expected"
-    on host, "crontab -l -u #{tmpuser}" do
+    run_cron_on(host,:list,tmpuser) do
         fail_test "didn't find the content in the crontab" unless
             stdout.include? '* 0-6 * * * /bin/true'
     end
 
     step "remove the crontab file for that user"
-    on host, "crontab -r -u #{tmpuser}"
+    run_cron_on(host,:remove,tmpuser)
 
     step "remove the user from the system"
     apply_manifest_on host, delete_user
diff --git a/acceptance/tests/resource/file/content_attribute.rb b/acceptance/tests/resource/file/content_attribute.rb
index 4458e07a4..31dbac151 100644
--- a/acceptance/tests/resource/file/content_attribute.rb
+++ b/acceptance/tests/resource/file/content_attribute.rb
@@ -1,25 +1,33 @@
-test_name "The content attribute"
-pass_test "Pass forced pending test failure investigation"
+test_name "Content Attribute"
 
 step "Ensure the test environment is clean"
 on agents, 'rm -f /tmp/content_file_test.txt'
 
-step "When using raw content"
+step "Content Attribute: using raw content"
 
 manifest = "file { '/tmp/content_file_test.txt': content => 'This is the test file content', ensure => present }"
 apply_manifest_on agents, manifest
 
-on agents, 'test "$(cat /tmp/content_file_test.txt)" = "This is the test file content"'
+agents.each do |host|
+  on host, "cat /tmp/content_file_test.txt" do
+    assert_match(/This is the test file content/, stdout, "File content not matched on #{host}")
+  end
+end
 
 step "Ensure the test environment is clean"
 on agents, 'rm -f /tmp/content_file_test.txt'
 
-step "When using a filebucket checksum from filebucket"
-
+step "Content Attribute: using a checksum from filebucket"
 on agents, "echo 'This is the checksum file contents' > /tmp/checksum_test_file.txt"
-on agents, "puppet filebucket backup --local /tmp/checksum_test_file.txt"
+step "Backup file into the filebucket"
+on agents, puppet_filebucket("backup --local /tmp/checksum_test_file.txt")
+
+agents.each do |agent|
+  bucketdir="not set"
+  on agent, puppet_filebucket("--configprint bucketdir") do 
+    bucketdir = stdout.chomp
+  end
 
-get_remote_option(agents, 'filebucket', 'bucketdir') do |bucketdir|
   manifest = %Q|
     filebucket { 'local':
       path => '#{bucketdir}',
@@ -31,7 +39,14 @@ get_remote_option(agents, 'filebucket', 'bucketdir') do |bucketdir|
       backup => local,
     }
   |
-  apply_manifest_on agents, manifest
+
+  step "Applying Manifest on Agents"
+  apply_manifest_on agent, manifest
 end
 
-on agents, 'test "$(cat /tmp/content_file_test.txt)" = "This is the checksum file contents"'
+step "Validate filebucket checksum file contents"
+agents.each do |host|
+  on host, "cat /tmp/content_file_test.txt" do
+    assert_match(/This is the checksum file content/, stdout, "File content not matched on #{host}")
+  end
+end
diff --git a/acceptance/tests/resource/file/should_create_directory.rb b/acceptance/tests/resource/file/should_create_directory.rb
index 859ebb3ba..37ad9dbf8 100755
--- a/acceptance/tests/resource/file/should_create_directory.rb
+++ b/acceptance/tests/resource/file/should_create_directory.rb
@@ -3,7 +3,7 @@ test_name "should create directory"
 target = "/tmp/test-#{Time.new.to_i}"
 
 step "clean up the system before we begin"
-on agents, "rm -vrf #{target}"
+on agents, "rm -rf #{target}"
 
 step "verify we can create a directory"
 on(agents, puppet_resource("file", target, 'ensure=directory'))
@@ -12,4 +12,4 @@ step "verify the directory was created"
 on agents, "test -d #{target}"
 
 step "clean up after the test run"
-on agents, "rm -vrf #{target}"
+on agents, "rm -rf #{target}"
diff --git a/acceptance/tests/resource/file/should_create_empty.rb b/acceptance/tests/resource/file/should_create_empty.rb
index a38c35c2d..e9d9d8e27 100755
--- a/acceptance/tests/resource/file/should_create_empty.rb
+++ b/acceptance/tests/resource/file/should_create_empty.rb
@@ -3,13 +3,13 @@ test_name "should create empty file for 'present'"
 target = "/tmp/test-#{Time.new.to_i}"
 
 step "clean up the system before we begin"
-on agents, "rm -vrf #{target}"
+on agents, "rm -rf #{target}"
 
 step "verify we can create an empty file"
 on(agents, puppet_resource("file", target, 'ensure=present'))
 
 step "verify the target was created"
-on agents, "test -f #{target} && ! test -s #{target}"
+on agents, "test -f #{target} && test ! -s #{target}"
 
 step "clean up after the test run"
-on agents, "rm -vrf #{target}"
+on agents, "rm -rf #{target}"
diff --git a/acceptance/tests/resource/file/should_create_symlink.rb b/acceptance/tests/resource/file/should_create_symlink.rb
index 0e58d213b..81fe4b4e3 100755
--- a/acceptance/tests/resource/file/should_create_symlink.rb
+++ b/acceptance/tests/resource/file/should_create_symlink.rb
@@ -5,7 +5,7 @@ target  = "/tmp/test-#{Time.new.to_i}"
 source  = "/tmp/test-#{Time.new.to_i}-source"
 
 step "clean up the system before we begin"
-on agents, "rm -vrf #{target}"
+on agents, "rm -rf #{target}"
 on agents, "echo '#{message}' > #{source}"
 
 step "verify we can create a symlink"
@@ -13,6 +13,7 @@ on(agents, puppet_resource("file", target, "ensure=#{source}"))
 
 step "verify the symlink was created"
 on agents, "test -L #{target} && test -f #{target}"
+step "verify source file"
 on agents, "test -f #{source}"
 
 step "verify the content is identical on both sides"
@@ -24,4 +25,4 @@ on(agents, "cat #{target}") do
 end
 
 step "clean up after the test run"
-on agents, "rm -vrf #{target} #{source}"
+on agents, "rm -rf #{target} #{source}"
diff --git a/acceptance/tests/resource/file/should_remove_dir.rb b/acceptance/tests/resource/file/should_remove_dir.rb
index 943410d20..36fa1adee 100755
--- a/acceptance/tests/resource/file/should_remove_dir.rb
+++ b/acceptance/tests/resource/file/should_remove_dir.rb
@@ -3,7 +3,7 @@ test_name "should remove directory, but force required"
 target = "/tmp/test-#{Time.new.to_i}"
 
 step "clean up the system before we begin"
-on agents, "test -e #{target} && rm -vrf #{target} ; mkdir -p #{target}"
+on agents, "rm -rf #{target} ; mkdir -p #{target}"
 
 step "verify we can't remove a directory without 'force'"
 on(agents, puppet_resource("file", target, 'ensure=absent')) do
diff --git a/acceptance/tests/resource/file/should_remove_file.rb b/acceptance/tests/resource/file/should_remove_file.rb
index 3ad7510ad..aadb82971 100755
--- a/acceptance/tests/resource/file/should_remove_file.rb
+++ b/acceptance/tests/resource/file/should_remove_file.rb
@@ -3,7 +3,7 @@ test_name "should remove file"
 target = "/tmp/test-#{Time.new.to_i}"
 
 step "clean up the system before we begin"
-on agents, "rm -vrf #{target} && touch #{target}"
+on agents, "rm -rf #{target} && touch #{target}"
 
 step "verify we can remove a file"
 on(agents, puppet_resource("file", target, 'ensure=absent'))
diff --git a/acceptance/tests/resource/file/source_attribtute.rb b/acceptance/tests/resource/file/source_attribtute.rb
index 95a7f36b3..3fa447a8a 100644
--- a/acceptance/tests/resource/file/source_attribtute.rb
+++ b/acceptance/tests/resource/file/source_attribtute.rb
@@ -4,35 +4,41 @@ step "Ensure the test environment is clean"
 on agents, 'rm -f /tmp/source_file_test.txt'
 
 # TODO: Add tests for puppet:// URIs with master/agent setups.
-step "when using a puppet:/// URI with a master/agent setup"
-step "when using a puppet://$server/ URI with a master/agent setup"
-
-step "when using a local file path"
+# step "when using a puppet:/// URI with a master/agent setup"
+# step "when using a puppet://$server/ URI with a master/agent setup"
 
+step "Using a local file path"
 on agents, "echo 'Yay, this is the local file.' > /tmp/local_source_file_test.txt"
-
 manifest = "file { '/tmp/source_file_test.txt': source => '/tmp/local_source_file_test.txt', ensure => present }"
 
 apply_manifest_on agents, manifest
-
-on agents, 'test "$(cat /tmp/source_file_test.txt)" = "Yay, this is the local file."'
+agents.each do |host|
+  on host, "cat /tmp/source_file_test.txt" do
+    assert_match(/Yay, this is the local file./, stdout, "FIRST: File contents not matched on #{host}")
+  end
+end
 
 step "Ensure the test environment is clean"
 on agents, 'rm -f /tmp/source_file_test.txt'
 
-step "when using a puppet:/// URI with puppet apply"
+step "Using a puppet:/// URI with puppet apply"
 
-on agents, 'puppet agent --configprint modulepath' do
+on agents, puppet_agent("--configprint modulepath") do
   modulepath = stdout.split(':')[0]
   modulepath = modulepath.chomp
   on agents, "mkdir -p #{modulepath}/test_module/files"
-  on agents, "echo 'Yay, this is the puppet:/// file.' > #{modulepath}/test_module/files/test_file.txt"
+  #on agents, "echo 'Yay, this is the puppet:/// file.' > #{modulepath}/test_module/files/test_file.txt"
+  on agents, "echo 'Yay, this is the puppetfile.' > #{modulepath}/test_module/files/test_file.txt"
 end
 
 on agents, %q{echo "file { '/tmp/source_file_test.txt': source => 'puppet:///modules/test_module/test_file.txt', ensure => present }" > /tmp/source_test_manifest.pp}
-on agents, "puppet apply /tmp/source_test_manifest.pp"
+on agents, puppet_apply("/tmp/source_test_manifest.pp") 
 
-on agents, 'test "$(cat /tmp/source_file_test.txt)" = "Yay, this is the puppet:/// file."'
+agents.each do |host|
+  on host, "cat /tmp/source_file_test.txt" do
+    assert_match(/Yay, this is the puppetfile./, stdout, "SECOND: File contents not matched on #{host}")
+  end
+end
 
 # Oops. We (Jesse & Jacob) ended up writing this before realizing that you
 # can't actually specify "source => 'http://...'".  However, we're leaving it
diff --git a/acceptance/tests/resource/group/should_create.rb b/acceptance/tests/resource/group/should_create.rb
index 122c31a8f..efb80a4bc 100755
--- a/acceptance/tests/resource/group/should_create.rb
+++ b/acceptance/tests/resource/group/should_create.rb
@@ -1,6 +1,6 @@
 test_name "should create group"
 
-name = "test-group-#{Time.new.to_i}"
+name = "pl#{rand(999999).to_i}"
 
 def cleanup(name)
     step "remove group #{name} if it exists"
@@ -14,7 +14,7 @@ on(agents, puppet_resource('group', name, 'ensure=present'))
 
 step "verify the group #{name} was created"
 on(agents, "getent group #{name}") do
-    fail_test "group information is not sensible" unless stdout =~ /^#{name}:x:[0-9]+:/
+    fail_test "group information is not sensible" unless stdout =~ /^#{name}:.*:[0-9]+:/
 end
 
 cleanup(name)
diff --git a/acceptance/tests/resource/group/should_modify_gid.rb b/acceptance/tests/resource/group/should_modify_gid.rb
index 95405b24c..b54d40118 100755
--- a/acceptance/tests/resource/group/should_modify_gid.rb
+++ b/acceptance/tests/resource/group/should_modify_gid.rb
@@ -1,22 +1,23 @@
 test_name "should modify gid of existing group"
 
-name = "test-group-#{Time.new.to_i}"
-gid  = 12345
+name = "pl#{rand(999999).to_i}"
+gid1  = rand(999999).to_i
+gid2  = rand(999999).to_i
 
-step "ensure that the group exists with gid #{gid}"
-on(agents, puppet_resource('group', name, 'ensure=present', "gid=#{gid}")) do
-    fail_test "missing gid notice" unless stdout =~ /gid +=> +'#{gid}'/
+step "ensure that the group exists with gid #{gid1}"
+on(agents, puppet_resource('group', name, 'ensure=present', "gid=#{gid1}")) do
+    fail_test "missing gid notice" unless stdout =~ /gid +=> +'#{gid1}'/
 end
 
-step "ensure that we can modify the GID of the group to #{gid*2}"
-on(agents, puppet_resource('group', name, 'ensure=present', "gid=#{gid*2}")) do
-    fail_test "missing gid notice" unless stdout =~ /gid +=> +'#{gid*2}'/
+step "ensure that we can modify the GID of the group to #{gid2}"
+on(agents, puppet_resource('group', name, 'ensure=present', "gid=#{gid2}")) do
+    fail_test "missing gid notice" unless stdout =~ /gid +=> +'#{gid2}'/
 end
 
 step "verify that the GID changed"
 on(agents, "getent group #{name}") do
     fail_test "gid is wrong through getent output" unless
-        stdout =~ /^#{name}:x:#{gid*2}:/
+        stdout =~ /^#{name}:.*:#{gid2}:/
 end
 
 step "clean up the system after the test run"
diff --git a/acceptance/tests/resource/host/should_create.rb b/acceptance/tests/resource/host/should_create.rb
index d5bd9e6e7..f5c0a17a5 100755
--- a/acceptance/tests/resource/host/should_create.rb
+++ b/acceptance/tests/resource/host/should_create.rb
@@ -3,7 +3,7 @@ test_name "host should create"
 target = "/tmp/host-#{Time.new.to_i}"
 
 step "clean up for the test"
-on agents, "rm -vf #{target}"
+on agents, "rm -f #{target}"
 
 step "create the host record"
 on(agents, puppet_resource("host", "test", "ensure=present",
diff --git a/acceptance/tests/resource/host/should_create_aliases.rb b/acceptance/tests/resource/host/should_create_aliases.rb
index 4cc0014f6..71e92aef9 100755
--- a/acceptance/tests/resource/host/should_create_aliases.rb
+++ b/acceptance/tests/resource/host/should_create_aliases.rb
@@ -3,7 +3,7 @@ test_name "host should create aliases"
 target  = "/tmp/host-#{Time.new.to_i}"
 
 step "clean up the system for testing"
-on agents, "rm -vf #{target}"
+on agents, "rm -f #{target}"
 
 step "create the record"
 on(agents, puppet_resource('host', 'test', "ensure=present",
diff --git a/acceptance/tests/resource/host/should_destroy.rb b/acceptance/tests/resource/host/should_destroy.rb
index 451b2d061..69c74b824 100755
--- a/acceptance/tests/resource/host/should_destroy.rb
+++ b/acceptance/tests/resource/host/should_destroy.rb
@@ -16,4 +16,4 @@ on(agents, "cat #{file}; rm -f #{file}") do
 end
 
 step "clean up after the test"
-on agents, "rm -vf #{file}"
+on agents, "rm -f #{file}"
diff --git a/acceptance/tests/resource/host/should_modify_alias.rb b/acceptance/tests/resource/host/should_modify_alias.rb
index 312078fef..1ebbf3339 100755
--- a/acceptance/tests/resource/host/should_modify_alias.rb
+++ b/acceptance/tests/resource/host/should_modify_alias.rb
@@ -16,4 +16,4 @@ on(agents, "cat #{file}; rm -f #{file}") do
 end
 
 step "clean up after the test"
-on agents, "rm -vf #{file}"
+on agents, "rm -f #{file}"
diff --git a/acceptance/tests/resource/host/should_modify_ip.rb b/acceptance/tests/resource/host/should_modify_ip.rb
index b16db5979..cf3c3f12d 100755
--- a/acceptance/tests/resource/host/should_modify_ip.rb
+++ b/acceptance/tests/resource/host/should_modify_ip.rb
@@ -16,4 +16,4 @@ on(agents, "cat #{file}; rm -f #{file}") do
 end
 
 step "clean up after the test"
-on agents, "rm -vf #{file}"
+on agents, "rm -f #{file}"
diff --git a/acceptance/tests/resource/host/should_not_create_existing.rb b/acceptance/tests/resource/host/should_not_create_existing.rb
index c8a40df93..a8f902286 100755
--- a/acceptance/tests/resource/host/should_not_create_existing.rb
+++ b/acceptance/tests/resource/host/should_not_create_existing.rb
@@ -13,5 +13,5 @@ on(agents, puppet_resource('host', 'test', "target=#{file}",
 end
 
 step "clean up after we created things"
-on agents, "rm -vf #{file}"
+on agents, "rm -f #{file}"
 
diff --git a/acceptance/tests/resource/host/should_query.rb b/acceptance/tests/resource/host/should_query.rb
index 983812ce0..76f84e498 100755
--- a/acceptance/tests/resource/host/should_query.rb
+++ b/acceptance/tests/resource/host/should_query.rb
@@ -12,4 +12,4 @@ on(agents, puppet_resource('host', 'localhost', "target=#{file}")) do
 end
 
 step "clean up the system"
-on agents, "rm -vf #{file}"
+on agents, "rm -f #{file}"
diff --git a/acceptance/tests/resource/host/should_query_all.rb b/acceptance/tests/resource/host/should_query_all.rb
index 654883aa0..bf1f1b89a 100755
--- a/acceptance/tests/resource/host/should_query_all.rb
+++ b/acceptance/tests/resource/host/should_query_all.rb
@@ -23,4 +23,4 @@ on(agents, puppet_resource('host')) do
 end
 
 step "clean up the system afterwards"
-on agents, "mv -vf #{backup} /etc/hosts"
+on agents, "mv -f #{backup} /etc/hosts"
diff --git a/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb b/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
index 9bedd6e04..127e943a9 100755
--- a/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
+++ b/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
@@ -4,9 +4,10 @@ step "Validate services running agreement ralsh vs. OS service count"
 # ticket_4123_should_list_all_running_redhat.sh
 
 hosts.each do |host|
-  unless host['platform'].include? 'centos' or host['platform'].include? 'redhat'
-    skip_test "Test not supported on this plaform" 
-  else
+  if host['platform'].include?('centos') or host['platform'].include?('redhat')
+    puts "XXX #{host['platform']}"
     run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4123_should_list_all_running_redhat.sh')
+  else
+    skip_test "Test not supported on this plaform" 
   end
 end
diff --git a/acceptance/tests/resource/user/should_create.rb b/acceptance/tests/resource/user/should_create.rb
index 062883da3..0b2b0c65f 100755
--- a/acceptance/tests/resource/user/should_create.rb
+++ b/acceptance/tests/resource/user/should_create.rb
@@ -1,9 +1,6 @@
 test_name "should create a user, and the default matching group"
-# REVISIT: This is a direct port of the original test, but it contains a
-# non-portable assumption that "user private groups" are used by default by
-# everything that we target. --daniel 2010-12-24
 
-name = "test-user-#{Time.new.to_i}"
+name = "pl#{rand(999999).to_i}"
 
 step "ensure that the user and group #{name} do not exist"
 on agents, "if getent passwd #{name}; then userdel #{name}; fi"
@@ -13,7 +10,14 @@ step "ask puppet to create the user"
 on(agents, puppet_resource('user', name, 'ensure=present'))
 
 step "verify that the user and group now exist"
-on agents, "getent passwd #{name} && getent group #{name}"
+agents.each do |agent|
+  if agent['platform'].include? 'sles' or agent['platform'].include? 'solaris'  # no private user groups by default
+    on agent, "getent passwd #{name}"
+  else
+    on agent, "getent passwd #{name} && getent group #{name}"
+  end
+end
+
 
 step "ensure that the user and group #{name} do not exist"
 on agents, "if getent passwd #{name}; then userdel #{name}; fi"
diff --git a/acceptance/tests/resource/user/should_create_with_gid.rb b/acceptance/tests/resource/user/should_create_with_gid.rb
index be36bf4e6..c92d5c95d 100755
--- a/acceptance/tests/resource/user/should_create_with_gid.rb
+++ b/acceptance/tests/resource/user/should_create_with_gid.rb
@@ -1,14 +1,14 @@
 test_name "verifies that puppet resource creates a user and assigns the correct group"
 
-user  = "test-user-#{Time.new.to_i}"
-group = "test-user-#{Time.new.to_i}-group"
+user = "pl#{rand(999999).to_i}"
+group = "gp#{rand(999999).to_i}"
 
 agents.each do |host|
     step "user should not exist"
     on host, "if getent passwd #{user}; then userdel #{user}; fi"
 
     step "group should exist"
-    on host, "if ! getent group #{group}; then groupadd #{group}; fi"
+    on host, "getent group #{group} || groupadd #{group}"
 
     step "create user with group"
     on(host, puppet_resource('user', user, 'ensure=present', "gid=#{group}"))
diff --git a/acceptance/tests/resource/user/should_destroy.rb b/acceptance/tests/resource/user/should_destroy.rb
index 8ba7ace41..655501231 100755
--- a/acceptance/tests/resource/user/should_destroy.rb
+++ b/acceptance/tests/resource/user/should_destroy.rb
@@ -1,6 +1,6 @@
 test_name "verify that puppet resource correctly destroys users"
 
-user  = "test-user-#{Time.new.to_i}"
+user = "pl#{rand(999999).to_i}"
 group = user
 
 step "ensure that the user and associated group exist"
diff --git a/acceptance/tests/resource/user/should_modify_gid.rb b/acceptance/tests/resource/user/should_modify_gid.rb
index 6aba4aa7a..d8bc60fc1 100755
--- a/acceptance/tests/resource/user/should_modify_gid.rb
+++ b/acceptance/tests/resource/user/should_modify_gid.rb
@@ -1,8 +1,8 @@
 test_name "verify that we can modify the gid"
 
-user   = "test-user-#{Time.new.to_i}"
-group1 = "#{user}-old"
-group2 = "#{user}-new"
+user = "pl#{rand(99999).to_i}"
+group1 = "#{user}old"
+group2 = "#{user}new"
 
 agents.each do |host|
     step "ensure that the groups both exist"
diff --git a/acceptance/tests/resource/user/should_not_destoy_unexisting.rb b/acceptance/tests/resource/user/should_not_destoy_unexisting.rb
index ceeea7da1..133d51395 100755
--- a/acceptance/tests/resource/user/should_not_destoy_unexisting.rb
+++ b/acceptance/tests/resource/user/should_not_destoy_unexisting.rb
@@ -1,6 +1,6 @@
 test_name "ensure that puppet does not report removing a user that does not exist"
 
-name = "test-user-#{Time.new.to_i}"
+name = "pl#{rand(999999).to_i}"
 
 step "verify that user #{name} does not exist"
 on agents, "getent passwd #{name}", :acceptable_exit_codes => [2]
diff --git a/acceptance/tests/resource/user/should_query.rb b/acceptance/tests/resource/user/should_query.rb
index 6e2df534d..c976c878f 100755
--- a/acceptance/tests/resource/user/should_query.rb
+++ b/acceptance/tests/resource/user/should_query.rb
@@ -1,6 +1,6 @@
 test_name "test that we can query and find a user that exists."
 
-name = "test-user-#{Time.new.to_i}"
+name = "pl#{rand(999999).to_i}"
 
 step "ensure that our test user exists"
 on(agents, puppet_resource('user', name, 'ensure=present'))
-- 
cgit 


From 243aaa9929aec91b2ede05ccf30553d328afd55c Mon Sep 17 00:00:00 2001
From: Dominic Maraglia <dominic@puppetlabs.com>
Date: Mon, 27 Jun 2011 16:21:39 -0700
Subject: (#7956) Porting cron tests

Ported cron tests were still weak. Coverted tests to use
Ruby asserts for better debugging of subsequent failures.

Add stronger regex's to look for expected output when applying puppet
resource manifests.
---
 acceptance/tests/resource/cron/should_create_cron.rb     |  6 ++----
 acceptance/tests/resource/cron/should_match_existing.rb  | 15 +++++----------
 acceptance/tests/resource/cron/should_remove_cron.rb     |  8 ++------
 acceptance/tests/resource/cron/should_remove_matching.rb |  5 ++---
 acceptance/tests/resource/cron/should_update_existing.rb | 11 ++++-------
 5 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/acceptance/tests/resource/cron/should_create_cron.rb b/acceptance/tests/resource/cron/should_create_cron.rb
index 5badac05f..d40228070 100644
--- a/acceptance/tests/resource/cron/should_create_cron.rb
+++ b/acceptance/tests/resource/cron/should_create_cron.rb
@@ -13,14 +13,12 @@ agents.each do |host|
     step "apply the resource on the host using puppet resource"
     on(host, puppet_resource("cron", "crontest", "user=#{tmpuser}",
                   "command=/bin/true", "ensure=present")) do
-        fail_test "didn't notice creation of the cron stuff" unless
-            stdout.include? 'created'
+      assert_match(/created/, stdout, "Did not create crontab for #{tmpuser} on #{host}")
     end
 
     step "verify that crontab -l contains what you expected"
     run_cron_on(host, :list, tmpuser) do
-        fail_test "didn't find the command as expected" unless
-            stdout.include? "* * * * * /bin/true"
+      assert_match(/\* \* \* \* \* \/bin\/true/, stdout, "Incorrect crontab for #{tmpuser} on #{host}")
     end
 
     step "remove the crontab file for that user"
diff --git a/acceptance/tests/resource/cron/should_match_existing.rb b/acceptance/tests/resource/cron/should_match_existing.rb
index b5c5d359d..92e7dc2cc 100755
--- a/acceptance/tests/resource/cron/should_match_existing.rb
+++ b/acceptance/tests/resource/cron/should_match_existing.rb
@@ -10,23 +10,18 @@ agents.each do |host|
     step "ensure the user exist via puppet"
     apply_manifest_on host, create_user
 
-    step "create the existing job by hand..."
+    step "Create the existing cron job by hand..."
     run_cron_on(host,:add,tmpuser,"* * * * * /bin/true")
 
-    step "apply the resource on the host using puppet resource"
+    step "Apply the resource on the host using puppet resource"
     on(host, puppet_resource("cron", "crontest", "user=#{tmpuser}",
                   "command=/bin/true", "ensure=present")) do
-        # This is a weak/fragile test.  The output has changed
-        # causing this test to fail erronously.  Changed to the correct
-        # output to match, but this code should be re-feactored.
-        fail_test "didn't see the output we expected..." unless
-            stdout.include? 'present'
+      assert_match(/present/, stdout, "Failed creating crontab for #{tmpuser} on #{host}")
     end
 
-    step "verify that crontab -l contains what you expected"
+    step "Verify that crontab -l contains what you expected"
     run_cron_on(host, :list, tmpuser) do
-        fail_test "didn't find the command as expected" unless
-            stdout.include? "* * * * * /bin/true"
+      assert_match(/\* \* \* \* \* \/bin\/true/, stdout, "Did not find crontab for #{tmpuser} on #{host}")
     end
 
     step "remove the crontab file for that user"
diff --git a/acceptance/tests/resource/cron/should_remove_cron.rb b/acceptance/tests/resource/cron/should_remove_cron.rb
index 9956d0d71..d6b8822d6 100755
--- a/acceptance/tests/resource/cron/should_remove_cron.rb
+++ b/acceptance/tests/resource/cron/should_remove_cron.rb
@@ -16,16 +16,12 @@ agents.each do |host|
     step "apply the resource on the host using puppet resource"
     on(host, puppet_resource("cron", "crontest", "user=#{tmpuser}",
                   "command=/bin/true", "ensure=absent")) do
-        # REVISIT: This is ported from the original test, which seems to me a
-        # weak test, but I don't want to improve it now.  --daniel 2010-12-23
-        fail_test "didn't see the output we expected..." unless
-            stdout.include? 'removed'
+      assert_match(/crontest\D+ensure:\s+removed/, stdout, "Didn't remove crobtab entry for #{tmpuser} on #{host}")
     end
 
     step "verify that crontab -l contains what you expected"
     run_cron_on(host, :list, tmpuser) do
-      fail_test "didn't found the command we tried to remove" if
-        stdout.include? "/bin/true"
+      assert_match(/\/bin\/true/, stdout, "Error: Found entry for #{tmpuser} on #{host}")
     end
 
     step "remove the crontab file for that user"
diff --git a/acceptance/tests/resource/cron/should_remove_matching.rb b/acceptance/tests/resource/cron/should_remove_matching.rb
index f4de0de0c..59042c7a8 100755
--- a/acceptance/tests/resource/cron/should_remove_matching.rb
+++ b/acceptance/tests/resource/cron/should_remove_matching.rb
@@ -15,11 +15,10 @@ agents.each do |host|
     step "create the existing job by hand..."
     run_cron_on(host,:add,tmpuser,"* * * * * /bin/true")
 
-    step "apply the resource change on the host"
+    step "Remove cron resource"
     on(host, puppet_resource("cron", "bogus", "user=#{tmpuser}",
                   "command=/bin/true", "ensure=absent")) do
-        fail_test "didn't see the output we expected..." unless
-            stdout.include? 'removed'
+      assert_match(/bogus\D+ensure: removed/, stdout, "Removing cron entry failed for #{tmpuser} on #{host}")
     end
 
     step "verify that crontab -l contains what you expected"
diff --git a/acceptance/tests/resource/cron/should_update_existing.rb b/acceptance/tests/resource/cron/should_update_existing.rb
index ff179307f..b37952a63 100755
--- a/acceptance/tests/resource/cron/should_update_existing.rb
+++ b/acceptance/tests/resource/cron/should_update_existing.rb
@@ -15,21 +15,18 @@ agents.each do |host|
 
     step "verify that crontab -l contains what you expected"
     run_cron_on(host,:list,tmpuser) do
-        fail_test "didn't find the content in the crontab" unless
-            stdout.include? '* * * * * /bin/true'
+      assert_match(/\* \* \* \* \* \/bin\/true/, stdout, "Didn't find correct crobtab entry for #{tmpuser} on #{host}")
     end
 
     step "apply the resource change on the host"
     on(host, puppet_resource("cron", "crontest", "user=#{tmpuser}",
-                  "command=/bin/true", "ensure=present", "hour='0-6'")) do
-        fail_test "didn't update the time as expected" unless
-            stdout.include? "hour => ['0-6']"
+      "command=/bin/true", "ensure=present", "hour='0-6'")) do
+        assert_match(/hour\s+=>\s+\['0-6'\]/, stdout, "Modifying cron entry failed for #{tmpuser} on #{host}")
     end
 
     step "verify that crontab -l contains what you expected"
     run_cron_on(host,:list,tmpuser) do
-        fail_test "didn't find the content in the crontab" unless
-            stdout.include? '* 0-6 * * * /bin/true'
+      assert_match(/\* 0-6 \* \* \* \/bin\/true/, stdout, "Didn't find correctly modified time entry in crobtab entry for #{tmpuser} on #{host}")
     end
 
     step "remove the crontab file for that user"
-- 
cgit 


From 014d952883246f8919d4b1935d84b301c63a34d0 Mon Sep 17 00:00:00 2001
From: Jacob Helwig <jacob@puppetlabs.com>
Date: Fri, 17 Jun 2011 11:23:21 -0700
Subject: Remove order dependency from functions integration spec

The test in spec/integration/parser/functions_spec.rb would fail when
the spec tests were run in the order (among other orderings):

  spec/unit/parser/functions/tag_spec.rb
  spec/unit/parser/templatewrapper_spec.rb
  spec/integration/parser/functions_spec.rb

There are tests that would cause the "template" function to be loaded
into the root environment.
Puppet::Parser::Functions.function("template") would then detect its
presence and P::P::F.rmfunction("template") would fail since #function(...)
looks in more than just the current environment to see if a function
is defined, while #rmfunction(...) only looks in the current
environment to see if a function can be removed.

In the test ordering specified earlier, tag_spec.rb would load the
"template" function, and templatewrapper_spec.rb would create a
current environment that would mask the root environment for #rmfunction(...),
but not for #function(...)

Since #rmfunction(...) only looks in the current environment, we
should be using #functions.include?("template") since that matches the
check that #rmfunction(...) itself uses.

Paired-with: Nick Lewis <nick@puppetlabs.com>
---
 spec/integration/parser/functions_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/integration/parser/functions_spec.rb b/spec/integration/parser/functions_spec.rb
index 6791987d7..6a8fbca9c 100755
--- a/spec/integration/parser/functions_spec.rb
+++ b/spec/integration/parser/functions_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Puppet::Parser::Functions do
   before :each do
-    Puppet::Parser::Functions.rmfunction("template") if Puppet::Parser::Functions.function("template")
+    Puppet::Parser::Functions.rmfunction("template") if Puppet::Parser::Functions.functions.include?("template")
   end
 
   it "should support multiple threads autoloading the same function" do
-- 
cgit 


From 7ad1b04244e0b6252d7fea7ca76e8bb708caa66a Mon Sep 17 00:00:00 2001
From: Jacob Helwig <jacob@puppetlabs.com>
Date: Fri, 17 Jun 2011 11:26:58 -0700
Subject: Clean up indentation, whitespace, and commented out code

The mis-indented code, extra newlines, and commented out code were
noticed while investigating the order dependent test failure fixed in
4365c8ba.

Reviewed-by: Max Martin <max@puppetlabs.com>
---
 lib/puppet/parser/functions.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index 5807c0bbe..e19ac127f 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -16,11 +16,9 @@ module Puppet::Parser::Functions
 
   def self.autoloader
     unless defined?(@autoloader)
-
-            @autoloader = Puppet::Util::Autoload.new(
+      @autoloader = Puppet::Util::Autoload.new(
         self,
         "puppet/parser/functions",
-
         :wrap => false
       )
     end
@@ -88,7 +86,6 @@ module Puppet::Parser::Functions
     ret = ""
 
     functions.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, hash|
-      #ret += "#{name}\n#{hash[:type]}\n"
       ret += "#{name}\n#{"-" * name.to_s.length}\n"
       if hash[:doc]
         ret += Puppet::Util::Docs.scrub(hash[:doc])
@@ -114,11 +111,9 @@ module Puppet::Parser::Functions
   end
 
   # Runs a newfunction to create a function for each of the log levels
-
   Puppet::Util::Log.levels.each do |level|
     newfunction(level, :doc => "Log a message on the server at level #{level.to_s}.") do |vals|
       send(level, vals.join(" "))
     end
   end
-
 end
-- 
cgit