puppet 0.22.4 → 0.23.0

data/lib/puppet/propertychange.rb

@@ -14,19 +14,19 @@ module Puppet
         # Switch the goals of the property, thus running the change in reverse.
         def backward
             @property.should = @is
-            @property.retrieve
+            @is = @property.retrieve
 
             unless defined? @transaction
                 raise Puppet::Error,
                     "PropertyChange '%s' tried to be executed outside of transaction" %
                     self
             end
-            unless @property.insync?
+            unless @property.insync?(@is)
                 @property.info "Backing %s" % self
                 return self.go
             else
                 @property.debug "rollback is already in sync: %s vs. %s" %
-                    [@property.is.inspect, @property.should.inspect]
+                    [@is, @property.should.inspect]
                 return nil
             end
         end
@@ -42,7 +42,7 @@ module Puppet
                 @property.warning("Property '%s' returned invalid event '%s'; resetting to default" %
                     [@property.class,event])
 
-                event = @property.parent.class.name.id2name + "_changed"
+                event = @property.resource.class.name.id2name + "_changed"
             end
             
             Puppet::Event.new(
@@ -52,14 +52,14 @@ module Puppet
             )
         end
 
-        def initialize(property)
+        def initialize(property, currentvalue)
             unless property.is_a?(Puppet::Type::Property)
                 raise Puppet::DevError, "Got a %s instead of a property" %
                     property.class
             end
             @property = property
             @path = [property.path,"change"].flatten
-            @is = property.is
+            @is = currentvalue
 
             @should = property.should
 
@@ -92,7 +92,7 @@ module Puppet
             end
             
             return events.collect { |name|
-                @report = @property.log(@property.change_to_s)
+                @report = @property.log(@property.change_to_s(@is, @should))
                 event(name)
             }
         end
@@ -114,14 +114,14 @@ module Puppet
         end
         
         def skip?
-            if @property.insync?
+            if @property.insync?(@is)
                 @property.info "Already in sync"
                 return true
             end
 
             if @property.noop
                 @property.log "is %s, should be %s (noop)" %
-                    [property.is_to_s, property.should_to_s]
+                    [property.is_to_s(@is), property.should_to_s(@should)]
                 #@property.debug "%s is noop" % @property
                 return true
             end
@@ -129,15 +129,15 @@ module Puppet
         end
         
         def source
-            self.proxy || @property.parent
+            self.proxy || @property.resource
         end
 
         def to_s
             return "change %s.%s(%s)" %
-                [@transaction.object_id, self.object_id, @property.change_to_s]
+                [@transaction.object_id, self.object_id, @property.change_to_s(@is, @should)]
             #return "change %s.%s" % [@transaction.object_id, self.object_id]
         end
 	end
 end
 
-# $Id: propertychange.rb 2286 2007-03-17 23:16:37Z luke $
+# $Id: propertychange.rb 2500 2007-05-09 22:05:32Z luke $

data/lib/puppet/provider.rb

@@ -2,6 +2,8 @@
 class Puppet::Provider
     include Puppet::Util
     include Puppet::Util::Errors
+    include Puppet::Util::Warnings
+    extend Puppet::Util::Warnings
 
     Puppet::Util.logmethods(self, true)
 
@@ -10,11 +12,21 @@ class Puppet::Provider
         include Puppet::Util, Puppet::Util::Docs
         include Puppet::Util::Logging
         attr_accessor :name
+
+        # The source parameter exists so that providers using the same
+        # source can specify this, so reading doesn't attempt to read the
+        # same package multiple times.
+        attr_writer :source
+
+        # LAK 2007-05-09: Keep the model stuff around for backward compatibility
         attr_reader :model
+        attr_accessor :resource_type
         attr_writer :doc
     end
 
-    attr_accessor :model
+    # LAK 2007-05-09: Keep the model stuff around for backward compatibility
+    attr_reader :model
+    attr_accessor :resource
     
     def self.command(name)
         name = symbolize(name)
@@ -97,6 +109,12 @@ class Puppet::Provider
         end
     end
 
+    # The method for returning a list of provider instances.  Note that it returns providers, preferably with values already
+    # filled in, not resources.
+    def self.instances
+        raise Puppet::DevError, "Provider %s has not defined the 'instances' class method" % self.name
+    end
+
     # Create the methods for a given command.
     def self.make_command_methods(name)
         # Now define a method for that command
@@ -125,12 +143,21 @@ class Puppet::Provider
         end
     end
 
-    # Create getter/setter methods for each property our model supports.
+    # Create getter/setter methods for each property our resource type supports.
     # They all get stored in @property_hash.  This method is useful
     # for those providers that use prefetch and flush.
     def self.mkmodelmethods
-        [model.validproperties, model.parameters].flatten.each do |attr|
+        warnonce "Provider.mkmodelmethods is deprecated; use Provider.mk_resource_methods"
+        mk_resource_methods
+    end
+
+    # Create getter/setter methods for each property our resource type supports.
+    # They all get stored in @property_hash.  This method is useful
+    # for those providers that use prefetch and flush.
+    def self.mk_resource_methods
+        [resource_type.validproperties, resource_type.parameters].flatten.each do |attr|
             attr = symbolize(attr)
+            next if attr == :name
             define_method(attr) do
                 @property_hash[attr] || :absent
             end
@@ -141,16 +168,6 @@ class Puppet::Provider
         end
     end
 
-    # Add the feature module immediately, so its methods are available to the
-    # providers.
-    def self.model=(model)
-        @model = model
-        #if mod = model.feature_module
-        #    extend(mod)
-        #    include(mod)
-        #end
-    end
-
     self.initvars
 
     # Define one or more binaries we'll be using.  If a block is passed, yield the name
@@ -178,29 +195,48 @@ class Puppet::Provider
         end
     end
 
+    # Retrieve the data source.  Defaults to the provider name.
+    def self.source
+        unless defined? @source
+            @source = self.name
+        end
+        @source
+    end
+
     # Check whether this implementation is suitable for our platform.
-    def self.suitable?
+    def self.suitable?(short = true)
         # A single false result is sufficient to turn the whole thing down.
         # We don't return 'true' until the very end, though, so that every
         # confine is tested.
+        missing = {}
         @confines.each do |check, values|
             case check
             when :exists:
                 values.each do |value|
                     unless value and FileTest.exists? value
                         debug "Not suitable: missing %s" % value
-                        return false
+                        return false if short
+                        missing[:exists] ||= []
+                        missing[:exists] << value
                     end
                 end
             when :true:
                 values.each do |v|
                     debug "Not suitable: false value"
-                    return false unless v
+                    unless v
+                        return false if short
+                        missing[:true] ||= 0
+                        missing[:true] += 1
+                    end
                 end
             when :false:
                 values.each do |v|
                     debug "Not suitable: true value"
-                    return false if v
+                    if v and short
+                        return false if short
+                        missing[:false] ||= 0
+                        missing[:false] += 1
+                    end
                 end
             else # Just delegate everything else to facter
                 if result = Facter.value(check)
@@ -211,15 +247,23 @@ class Puppet::Provider
                     end
                     unless found
                         debug "Not suitable: %s not in %s" % [check, values]
-                        return false
+                        return false if short
+                        missing[:facter] ||= {}
+                        missing[:facter][check] = values
                     end
                 else
-                    return false
+                    return false if short
+                    missing[:facter] ||= {}
+                    missing[:facter][check] = values
                 end
             end
         end
 
-        return true
+        if short
+            return true
+        else
+            return missing
+        end
     end
 
     # Does this provider support the specified parameter?
@@ -227,8 +271,8 @@ class Puppet::Provider
         if param.is_a?(Class)
             klass = param
         else
-            unless klass = @model.attrclass(param)
-                raise Puppet::DevError, "'%s' is not a valid parameter for %s" % [param, @model.name]
+            unless klass = resource_type.attrclass(param)
+                raise Puppet::DevError, "'%s' is not a valid parameter for %s" % [param, resource_type.name]
             end
         end
         return true unless features = klass.required_features
@@ -242,8 +286,8 @@ class Puppet::Provider
 
     def self.to_s
         unless defined? @str
-            if self.model
-                @str = "%s provider %s" % [@model.name, self.name]
+            if self.resource_type
+                @str = "%s provider %s" % [resource_type.name, self.name]
             else
                 @str = "unattached provider %s" % [self.name]
             end
@@ -275,8 +319,9 @@ class Puppet::Provider
         end
     end
 
-    # Remove the reference to the model, so GC can clean up.
+    # Remove the reference to the resource, so GC can clean up.
     def clear
+        @resource = nil
         @model = nil
     end
 
@@ -285,18 +330,44 @@ class Puppet::Provider
         self.class.command(name)
     end
 
-    def initialize(model)
-        @model = model
-        @property_hash = {}
+    # Get a parameter value.
+    def get(param)
+        @property_hash[symbolize(param)] || :absent
+    end
+
+    def initialize(resource = nil)
+        if resource.is_a?(Hash)
+            @property_hash = resource.dup
+        elsif resource
+            @resource = resource if resource
+            # LAK 2007-05-09: Keep the model stuff around for backward compatibility
+            @model = resource
+            @property_hash = {}
+        else
+            @property_hash = {}
+        end
     end
 
     def name
-        @model.name
+        if n = @property_hash[:name]
+            return n
+        elsif self.resource
+            resource.name
+        else
+            raise Puppet::DevError, "No resource and no name in property hash"
+        end
+    end
+
+    # Set passed params as the current values.
+    def set(params)
+        params.each do |param, value|
+            @property_hash[symbolize(param)] = value
+        end
     end
 
     def to_s
-        "%s(provider=%s)" % [@model.to_s, self.class.name]
+        "%s(provider=%s)" % [@resource.to_s, self.class.name]
     end
 end
 
-# $Id: provider.rb 2444 2007-05-01 03:14:09Z luke $
+# $Id: provider.rb 2588 2007-06-15 14:05:10Z luke $

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

@@ -62,7 +62,7 @@ Puppet::Type.type(:cron).provide(:crontab,
             if details[:name]
                 str = "# Puppet Name: %s\n" % details[:name]
             end
-            if details[:environment] and details[:environment] != :absent
+            if details[:environment] and details[:environment] != :absent and details[:environment] != [:absent]
                 details[:environment].each do |env|
                     str += env + "\n"
                 end
@@ -84,10 +84,8 @@ Puppet::Type.type(:cron).provide(:crontab,
     end
 
     # See if we can match the hash against an existing cron job.
-    def self.match(hash)
-        model.find_all { |obj|
-            obj.value(:user) == hash[:user] and obj.value(:command) == hash[:command]
-        }.each do |obj|
+    def self.match(hash, resources)
+        resources.each do |name, obj|
             # we now have a cron job whose command exactly matches
             # let's see if the other fields match
 
@@ -152,9 +150,10 @@ Puppet::Type.type(:cron).provide(:crontab,
                     record[:name] = name
                     name = nil
                 end
-                unless envs.empty?
+                if envs.empty?
+                    record[:environment] = :absent
+                else
                     record[:environment] = envs
-                    envs = []
                 end
             end
         }.reject { |record| record[:skip] }
@@ -184,4 +183,4 @@ Puppet::Type.type(:cron).provide(:crontab,
     end
 end
 
-# $Id: crontab.rb 2440 2007-04-30 19:29:15Z luke $
+# $Id: crontab.rb 2624 2007-06-19 01:49:19Z luke $

data/lib/puppet/provider/group/groupadd.rb

@@ -12,18 +12,18 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
     def addcmd
         cmd = [command(:add)]
-        if gid = @model.should(:gid)
+        if gid = @resource.should(:gid)
             unless gid == :absent
                 cmd << flag(:gid) << gid
             end
         end
-        if @model[:allowdupe] == :true
+        if @resource[:allowdupe] == :true
             cmd << "-o"
         end
-        cmd << @model[:name]
+        cmd << @resource[:name]
 
         return cmd
     end
 end
 
-# $Id: groupadd.rb 1979 2006-12-28 08:06:46Z luke $
+# $Id: groupadd.rb 2501 2007-05-09 23:08:42Z luke $

data/lib/puppet/provider/group/pw.rb

@@ -11,8 +11,8 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
     end
 
     def addcmd
-        cmd = [command(:pw), "groupadd", @model[:name]]
-        if gid = @model.should(:gid)
+        cmd = [command(:pw), "groupadd", @resource[:name]]
+        if gid = @resource.should(:gid)
             unless gid == :absent
                 cmd << flag(:gid) << gid
             end
@@ -28,4 +28,4 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
     end
 end
 
-# $Id: pw.rb 1979 2006-12-28 08:06:46Z luke $
+# $Id: pw.rb 2501 2007-05-09 23:08:42Z luke $

data/lib/puppet/provider/mount.rb

@@ -14,15 +14,15 @@ module Puppet::Provider::Mount
         if self.options and self.options != :absent
             args << "-o" << self.options
         end
-        args << @model[:name]
+        args << @resource[:name]
 
         mountcmd(*args)
     end
 
     def remount
         info "Remounting"
-        if @model[:remounts] == :true
-            mountcmd "-o", "remount", @model[:name]
+        if @resource[:remounts] == :true
+            mountcmd "-o", "remount", @resource[:name]
         else
             unmount()
             mount()
@@ -31,7 +31,7 @@ module Puppet::Provider::Mount
 
     # This only works when the mount point is synced to the fstab.
     def unmount
-        umount @model[:name]
+        umount @resource[:name]
     end
 
     # Is the mount currently mounted?
@@ -45,13 +45,13 @@ module Puppet::Provider::Mount
         execute(df).split("\n").find do |line|
             fs = line.split(/\s+/)[-1]
             if platform == "Darwin"
-                fs == "/private/var/automount" + @model[:name] or
-                    fs == @model[:name]
+                fs == "/private/var/automount" + @resource[:name] or
+                    fs == @resource[:name]
             else
-                fs == @model[:name]
+                fs == @resource[:name]
             end
         end
     end
 end
 
-# $Id: mount.rb 2445 2007-05-01 03:45:09Z luke $
+# $Id: mount.rb 2501 2007-05-09 23:08:42Z luke $