puppet 0.24.4 → 0.24.5

data/lib/puppet/rails/resource.rb

@@ -98,6 +98,7 @@ class Puppet::Rails::Resource < ActiveRecord::Base
         hash.delete("host_id")
         hash.delete("updated_at")
         hash.delete("source_file_id")
+        hash.delete("created_at")
         hash.delete("id")
         hash.each do |p, v|
             hash.delete(p) if v.nil?

data/lib/puppet/reference/providers.rb

@@ -63,14 +63,20 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
                     case test
                     when :exists:
                         details += "  - Missing files %s\n" % values.join(", ")
-                    when :facter:
+                    when :variable:
                         values.each do |name, facts|
-                            details += "  - Fact %s (currently %s) not in list %s\n" % [name, Facter.value(name).inspect, facts.join(", ")]
+                            if Puppet.settings.valid?(name)
+                                details += "  - Setting %s (currently %s) not in list %s\n" % [name, Puppet.settings.value(name).inspect, facts.join(", ")]
+                            else
+                                details += "  - Fact %s (currently %s) not in list %s\n" % [name, Facter.value(name).inspect, facts.join(", ")]
+                            end
                         end
                     when :true:
                         details += "  - Got %s true tests that should have been false\n" % values
                     when :false:
                         details += "  - Got %s false tests that should have been true\n" % values
+                    when :feature:
+                        details += "  - Missing features %s\n" % values.collect { |f| f.to_s }.join(",")
                     end
                 end
                 notes << details

data/lib/puppet/reference/report.rb

@@ -0,0 +1,23 @@
+require 'puppet/reports'
+
+report = Puppet::Util::Reference.newreference :report, :doc => "All available transaction reports" do
+    Puppet::Reports.reportdocs
+end
+
+report.header = "
+Puppet clients can report back to the server after each transaction.  This
+transaction report is sent as a YAML dump of the
+``Puppet::Transaction::Report`` class and includes every log message that was
+generated during the transaction along with as many metrics as Puppet knows how
+to collect.  See `ReportsAndReporting Reports and Reporting`:trac:
+for more information on how to use reports.
+
+Currently, clients default to not sending in reports; you can enable reporting
+by setting the ``report`` parameter to true.
+
+To use a report, set the ``reports`` parameter on the server; multiple
+reports must be comma-separated.  You can also specify ``none`` to disable
+reports entirely.
+
+Puppet provides multiple report handlers that will process client reports:
+"

data/lib/puppet/reports/rrdgraph.rb

@@ -1,8 +1,10 @@
 Puppet::Reports.register_report(:rrdgraph) do
     desc "Graph all available data about hosts using the RRD library.  You
         must have the Ruby RRDtool library installed to use this report, which
-        you can get from `the RubyRRDTool RubyForge page`_.  This package requires
-        the binary rrdtool2 package to be installed.
+        you can get from `the RubyRRDTool RubyForge page`_.  This package may also
+        be available as ``ruby-rrd`` or ``rrdtool-ruby`` in your distribution's package
+        management system.  The library and/or package will both require the binary 
+        ``rrdtool`` package from your distribution to be installed.
 
         .. _the RubyRRDTool RubyForge page: http://rubyforge.org/projects/rubyrrdtool/
         

data/lib/puppet/sslcertificates/ca.rb

@@ -97,7 +97,7 @@ class Puppet::SSLCertificates::CA
         if @config[:capass] and File.readable?(@config[:capass])
             return File.read(@config[:capass])
         else
-            raise Puppet::Error, "Could not read CA passfile %s" % @config[:capass]
+            raise Puppet::Error, "Could not decrypt CA key with password: %s" % detail
         end
     end
 
@@ -379,9 +379,14 @@ class Puppet::SSLCertificates::CA
     def sign_with_key(signable, digest = OpenSSL::Digest::SHA1.new)
         cakey = nil
         if @config[:password]
-            cakey = OpenSSL::PKey::RSA.new(
-                File.read(@config[:cakey]), @config[:password]
-            )
+            begin
+                cakey = OpenSSL::PKey::RSA.new(
+                    File.read(@config[:cakey]), @config[:password]
+                )
+            rescue
+                raise Puppet::Error,
+                    "Decrypt of CA private key with password stored in @config[:capass] not possible"
+            end
         else
             cakey = OpenSSL::PKey::RSA.new(
                 File.read(@config[:cakey])

data/lib/puppet/sslcertificates/support.rb

@@ -28,7 +28,8 @@ module Puppet::SSLCertificates::Support
 
         # Define the reading method.
         define_method(reader) do
-            return nil unless FileTest.exists?(Puppet[param])
+            return nil unless FileTest.exists?(Puppet[param]) or rename_files_with_uppercase(Puppet[param])
+
             begin
                 instance_variable_set(var, klass.new(File.read(Puppet[param])))
             rescue => detail
@@ -121,5 +122,28 @@ module Puppet::SSLCertificates::Support
         end
         return retrieved
     end
-end
 
+    # A hack method to deal with files that exist with a different case.
+    # Just renames it; doesn't read it in or anything.
+    def rename_files_with_uppercase(file)
+        dir = File.dirname(file)
+        short = File.basename(file)
+
+        # If the dir isn't present, we clearly don't have the file.
+        #return nil unless FileTest.directory?(dir)
+
+        raise ArgumentError, "Tried to fix SSL files to a file containing uppercase" unless short.downcase == short
+        real_file = Dir.entries(dir).reject { |f| f =~ /^\./ }.find do |other|
+            other.downcase == short
+        end
+
+        return nil unless real_file
+
+        full_file = File.join(dir, real_file)
+
+        Puppet.notice "Fixing case in %s; renaming to %s" % [full_file, file]
+        File.rename(full_file, file)
+
+        return true
+    end
+end

data/lib/puppet/transaction.rb

@@ -2,10 +2,12 @@
 # and performs them
 
 require 'puppet'
-require 'puppet/propertychange'
 
 module Puppet
 class Transaction
+    require 'puppet/transaction/change'
+    require 'puppet/transaction/event'
+
     attr_accessor :component, :catalog, :ignoreschedules
     attr_accessor :sorted_resources, :configurator
 
@@ -96,7 +98,7 @@ class Transaction
                 # Create an edge with this resource as both the source and
                 # target.  The triggering method treats these specially for
                 # logging.
-                events = resourceevents.collect { |e| e.event }
+                events = resourceevents.collect { |e| e.name }
                 set_trigger(Puppet::Relationship.new(resource, resource, :callback => :refresh, :event => events))
             end
         end
@@ -109,7 +111,6 @@ class Transaction
         changes.collect { |change|
             @changes << change
             @count += 1
-            change.transaction = self
             events = nil
             begin
                 # use an array, so that changes can return more than one
@@ -278,7 +279,7 @@ class Transaction
             # of course, bad.
             edge = orig_edge.class.new(orig_edge.source, orig_edge.target)
             label = orig_edge.label.dup
-            label[:event] = events.collect { |e| e.event }
+            label[:event] = events.collect { |e| e.name }
             edge.label = label
             set_trigger(edge)
         end
@@ -499,10 +500,12 @@ class Transaction
     
     # Prepare to evaluate the resources in a transaction.
     def prepare
-        prefetch()
-    
         # Now add any dynamically generated resources
         generate()
+
+        # Then prefetch.  It's important that we generate and then prefetch,
+        # so that any generated resources also get prefetched.
+        prefetch()
         
         # This will throw an error if there are cycles in the graph.
         @sorted_resources = relationship_graph.topsort
@@ -678,11 +681,7 @@ class Transaction
                     [callback, subs.length]
 
                 # And then add an event for it.
-                return [Puppet::Event.new(
-                    :event => :noop,
-                    :transaction => self,
-                    :source => resource
-                )]
+                return [Puppet::Transaction::Event.new(:noop, resource)]
             end
 
             if subs.length == 1 and subs[0].source == resource
@@ -710,11 +709,7 @@ class Transaction
             end
 
             # And then add an event for it.
-            trigged << Puppet::Event.new(
-                :event => :triggered,
-                :transaction => self,
-                :source => resource
-            )
+            trigged << Puppet::Transaction::Event.new(:triggered, resource)
 
             triggered(resource, callback)
         end

data/lib/puppet/transaction/change.rb

@@ -0,0 +1,94 @@
+require 'puppet/transaction'
+require 'puppet/transaction/event'
+
+# Handle all of the work around performing an actual change,
+# including calling 'sync' on the properties and producing events.
+class Puppet::Transaction::Change
+    attr_accessor :is, :should, :path, :property, :changed, :proxy
+    
+    # Switch the goals of the property, thus running the change in reverse.
+    def backward
+        @is, @should = @should, @is
+        @property.should = @should
+
+        @property.info "Reversing %s" % self
+        return self.go
+    end
+    
+    def changed?
+        self.changed
+    end
+
+    # Create our event object.
+    def event(name)
+        # default to a simple event type
+        unless name.is_a?(Symbol)
+            @property.warning("Property '%s' returned invalid event '%s'; resetting to default" %
+                [@property.class, name])
+
+            name = @property.event(should)
+        end
+        
+        Puppet::Transaction::Event.new(name, self.resource)
+    end
+
+    def initialize(property, currentvalue)
+        @property = property
+        @path = [property.path,"change"].flatten
+        @is = currentvalue
+
+        @should = property.should
+
+        @changed = false
+    end
+
+    # Perform the actual change.  This method can go either forward or
+    # backward, and produces an event.
+    def go
+        if self.noop?
+            @property.log "is %s, should be %s (noop)" % [property.is_to_s(@is), property.should_to_s(@should)]
+            return [event(:noop)]
+        end
+
+        # The transaction catches any exceptions here.
+        events = @property.sync
+        if events.nil?
+            return nil
+        end
+
+        if events.is_a?(Array)
+            if events.empty?
+                return nil
+            end
+        else
+            events = [events]
+        end
+        
+        return events.collect { |name|
+            @report = @property.log(@property.change_to_s(@is, @should))
+            event(name)
+        }
+    end
+
+    def forward
+        return self.go
+    end
+    
+    # Is our property noop?  This is used for generating special events.
+    def noop?
+        return @property.noop
+    end
+    
+    # The resource that generated this change.  This is used for handling events,
+    # and the proxy resource is used for generated resources, since we can't
+    # send an event to a resource we don't have a direct relationship.  If we
+    # have a proxy resource, then the events will be considered to be from
+    # that resource, rather than us, so the graph resolution will still work.
+    def resource
+        self.proxy || @property.resource
+    end
+
+    def to_s
+        return "change %s" % @property.change_to_s(@is, @should)
+    end
+end

data/lib/puppet/transaction/event.rb

@@ -0,0 +1,21 @@
+require 'puppet'
+require 'puppet/util/methodhelper'
+require 'puppet/util/errors'
+
+# events are transient packets of information; they result in one or more (or none)
+# subscriptions getting triggered, and then they get cleared
+# eventually, these will be passed on to some central event system
+class Puppet::Transaction::Event
+    include Puppet::Util::MethodHelper
+    include Puppet::Util::Errors
+    
+    attr_reader :name, :source
+
+    def initialize(name, source)
+        @name, @source = name, source
+    end
+
+    def to_s
+        source.to_s + " -> " + name.to_s
+    end
+end

data/lib/puppet/transaction/report.rb

@@ -34,6 +34,10 @@ class Puppet::Transaction::Report
         end
     end
 
+    def name
+        host
+    end
+
     # Create a new metric.
     def newmetric(name, hash)
         metric = Puppet::Util::Metric.new(name)

data/lib/puppet/type.rb

@@ -1,6 +1,5 @@
 require 'puppet'
 require 'puppet/util/log'
-require 'puppet/event'
 require 'puppet/util/metric'
 require 'puppet/property'
 require 'puppet/parameter'
@@ -415,7 +414,6 @@ class Type
 end # Puppet::Type
 end
 
-require 'puppet/propertychange'
 require 'puppet/provider'
 
 # Always load these types.

data/lib/puppet/type/file/ensure.rb

@@ -138,11 +138,6 @@ module Puppet
         # We have to treat :present specially, because it works with any
         # type of file.
         def insync?(currentvalue)
-            if property = @resource.property(:source) and ! property.described?
-                warning "No specified sources exist"
-                return true
-            end
-
             if self.should == :present
                 if currentvalue.nil? or currentvalue == :absent
                     return false

data/lib/puppet/type/file/group.rb

@@ -11,12 +11,8 @@ module Puppet
         end
 
         def id2name(id)
-            if id > 70000
-                return nil
-            end
-            if id.is_a?(Symbol)
-                return id.to_s
-            end
+            return id.to_s if id.is_a?(Symbol)
+            return nil if id > Puppet[:maximum_uid].to_i
             begin
                 group = Etc.getgrgid(id)
             rescue ArgumentError
@@ -73,7 +69,17 @@ module Puppet
                 @method = :chown
             end
 
-            return stat.gid
+            currentvalue = stat.gid
+
+            # On OS X, files that are owned by -2 get returned as really
+            # large GIDs instead of negative ones.  This isn't a Ruby bug,
+            # it's an OS X bug, since it shows up in perl, too.
+            if currentvalue > Puppet[:maximum_uid].to_i
+                self.warning "Apparently using negative GID (%s) on a platform that does not consistently handle them" % currentvalue
+                currentvalue = :silly
+            end
+
+            return currentvalue
         end
 
         # Determine if the group is valid, and if so, return the GID

data/lib/puppet/type/file/source.rb

@@ -101,8 +101,7 @@ module Puppet
             begin
                 desc = server.describe(path, @resource[:links])
             rescue Puppet::Network::XMLRPCClientError => detail
-                self.err "Could not describe %s: %s" % [path, detail]
-                return nil
+                fail detail, "Could not describe %s: %s" % [path, detail]
             end
 
             return nil if desc == ""
@@ -135,18 +134,8 @@ module Puppet
             return args
         end
         
-        # Have we successfully described the remote source?
-        def described?
-            ! @stats.nil? and ! @stats[:type].nil? #and @is != :notdescribed
-        end
-        
         # Use the info we get from describe() to check if we're in sync.
         def insync?(currentvalue)
-            unless described?
-                warning "No specified sources exist"
-                return true
-            end
-
             if currentvalue == :nocopy
                 return true
             end
@@ -180,7 +169,11 @@ module Puppet
         def pinparams
             [:mode, :type, :owner, :group]
         end
-        
+
+        def found?
+            ! (@stats.nil? or @stats[:type].nil?)
+        end
+
         # This basically calls describe() on our file, and then sets all
         # of the local states appropriately.  If the remote file is a normal
         # file then we set it to copy; if it's a directory, then we just mark
@@ -202,8 +195,8 @@ module Puppet
                 }
             end
 
-            if @stats.nil? or @stats[:type].nil?
-                return nil # :notdescribed
+            if !found?
+                raise Puppet::Error, "No specified source was found from" + @should.inject("") { |s, source| s + " #{source},"}.gsub(/,$/,"")
             end
             
             case @stats[:type]