puppet 0.22.4 → 0.23.0

data/lib/puppet/type/resources.rb

@@ -31,10 +31,10 @@ Puppet::Type.newtype(:resources) do
         
         validate do |value|
             if [:true, true, "true"].include?(value)
-                unless @parent.resource_type.respond_to?(:list)
-                    raise ArgumentError, "Purging resources of type %s is not supported, since they cannot be listed" % @parent[:name]
+                unless @resource.resource_type.respond_to?(:instances)
+                    raise ArgumentError, "Purging resources of type %s is not supported, since they cannot be queried from the system" % @resource[:name]
                 end
-                unless @parent.resource_type.validproperty?(:ensure)
+                unless @resource.resource_type.validproperty?(:ensure)
                     raise ArgumentError, "Purging is only supported on types that accept 'ensure'"
                 end
             end
@@ -63,7 +63,7 @@ Puppet::Type.newtype(:resources) do
         end
         
         defaultto {
-            if @parent[:name] == "user"
+            if @resource[:name] == "user"
                 500
             else
                 nil
@@ -91,7 +91,7 @@ Puppet::Type.newtype(:resources) do
         return [] unless self.purge?
         hascheck = false
         method = 
-        resource_type.list.find_all do |resource|
+        resource_type.instances.find_all do |resource|
             ! resource.managed?
         end.find_all do |resource|
             check(resource)
@@ -124,18 +124,22 @@ Puppet::Type.newtype(:resources) do
         @resource_type
     end
     
+    # Make sure we don't purge users below a certain uid, if the check
+    # is enabled.
     def user_check(resource)
         return true unless self[:name] == "user"
         return true unless self[:unless_system_user]
         
         resource[:check] = :uid
-        resource.retrieve
+        current_values = resource.retrieve
         
         if system_users().include?(resource[:name])
             return false
         end
+
+        resource.info current_values.inspect
         
-        if resource.is(:uid) <= self[:unless_system_user]
+        if current_values[resource.property(:uid)] <= self[:unless_system_user]
             return false
         else
             return true
@@ -147,4 +151,4 @@ Puppet::Type.newtype(:resources) do
     end
 end
 
-# $Id: resources.rb 2286 2007-03-17 23:16:37Z luke $
+# $Id: resources.rb 2551 2007-06-04 20:37:14Z luke $

data/lib/puppet/type/schedule.rb

@@ -249,7 +249,7 @@ module Puppet
                 return false if value == :never
 
                 value = self.value
-                case @parent[:periodmatch]
+                case @resource[:periodmatch]
                 when :number
                     method = @@methods[value]
                     if method.is_a?(Proc)
@@ -266,7 +266,7 @@ module Puppet
                     # than the unit of time, we match.  We divide the scale
                     # by the repeat, so that we'll repeat that often within
                     # the scale.
-                    return (now.to_i - previous.to_i) >= (scale / @parent[:repeat])
+                    return (now.to_i - previous.to_i) >= (scale / @resource[:repeat])
                 end
             end
         end
@@ -285,12 +285,12 @@ module Puppet
 
                 # This implicitly assumes that 'periodmatch' is distance -- that
                 # is, if there's no value, we assume it's a valid value.
-                return unless @parent[:periodmatch]
+                return unless @resource[:periodmatch]
 
-                if value != 1 and @parent[:periodmatch] != :distance
+                if value != 1 and @resource[:periodmatch] != :distance
                     raise Puppet::Error,
                         "Repeat must be 1 unless periodmatch is 'distance', not '%s'" %
-                            @parent[:periodmatch]
+                            @resource[:periodmatch]
                 end
             end
 
@@ -307,8 +307,8 @@ module Puppet
             end
         end
 
-        def self.list
-            self.collect do |obj| obj end
+        def self.instances
+            []
         end
 
         def self.mkdefaultschedules
@@ -358,4 +358,4 @@ module Puppet
     end
 end
 
-# $Id: schedule.rb 2408 2007-04-24 02:41:16Z luke $
+# $Id: schedule.rb 2551 2007-06-04 20:37:14Z luke $

data/lib/puppet/type/service.rb

@@ -37,7 +37,7 @@ module Puppet
             newvalue(:true, :event => :service_enabled) do
                 unless provider.respond_to?(:enable)
                     raise Puppet::Error, "Service %s does not support enabling" %
-                        @parent.name
+                        @resource.name
                 end
                 provider.enable
             end
@@ -45,7 +45,7 @@ module Puppet
             newvalue(:false, :event => :service_disabled) do
                 unless provider.respond_to?(:disable)
                     raise Puppet::Error, "Service %s does not support enabling" %
-                        @parent.name
+                        @resource.name
                 end
                 provider.disable
             end
@@ -53,9 +53,9 @@ module Puppet
             def retrieve
                 unless provider.respond_to?(:enabled?)
                     raise Puppet::Error, "Service %s does not support enabling" %
-                        @parent.name
+                        @resource.name
                 end
-                @is = provider.enabled?
+                return provider.enabled?
             end
 
             validate do |value|
@@ -67,15 +67,15 @@ module Puppet
             munge do |should|
                 @runlevel = nil
                 if should =~ /^\d+$/
-                    arity = @parent.method(:enable)
+                    arity = @resource.method(:enable)
                     if @runlevel and arity != 1
                         raise Puppet::Error,
                             "Services on %s do not accept runlevel specs" %
-                                @parent.type
+                                @resource.type
                     elsif arity != 0
                         raise Puppet::Error,
                             "Services on %s must specify runlevels" %
-                                @parent.type
+                                @resource.type
                     end
                     @runlevel = should
                     return :true
@@ -116,7 +116,7 @@ module Puppet
             aliasvalue(:true, :running)
 
             def retrieve
-                self.is = provider.status
+                return provider.status
             end
 
             def sync
@@ -133,9 +133,9 @@ module Puppet
 #                        self
 #                end
 
-                if property = @parent.property(:enable)
-                    property.retrieve
-                    unless property.insync?
+                if property = @resource.property(:enable)
+                    val = property.retrieve
+                    unless property.insync?(val)
                         property.sync
                     end
                 end
@@ -152,8 +152,8 @@ module Puppet
                 warning."
 
             munge do |value|
-                @parent.warning "'running' is deprecated; please use 'ensure'"
-                @parent[:ensure] = value
+                @resource.warning "'running' is deprecated; please use 'ensure'"
+                @resource[:ensure] = value
             end
         end
 
@@ -188,7 +188,7 @@ module Puppet
 
             munge do |value|
                 warning "'type' is deprecated; use 'provider' instead"
-                @parent[:provider] = value
+                @resource[:provider] = value
             end
         end
 
@@ -211,11 +211,11 @@ module Puppet
                     end
                     if FileTest.exists?(path)
                         unless FileTest.directory?(path)
-                            @parent.debug "Search path %s is not a directory" %
+                            @resource.debug "Search path %s is not a directory" %
                                 [path]
                         end
                     else
-                        @parent.debug("Search path %s does not exist" % [path])
+                        @resource.debug("Search path %s does not exist" % [path])
                     end
                     paths.delete(path)
                 end
@@ -236,7 +236,7 @@ module Puppet
                 The pattern can be a simple string or any legal Ruby pattern."
 
             defaultto {
-                @parent[:binary] || @parent[:name]
+                @resource[:binary] || @resource[:name]
             }
         end
         newparam(:restart) do
@@ -265,20 +265,6 @@ module Puppet
             newvalues(:true, :false)
         end
 
-        # List all available services
-        def self.list
-            defprov = defaultprovider
-
-            names = []
-            if defprov.respond_to? :list
-                defprov.list(defprov.name)
-            else
-                Puppet.debug "Type %s does not respond to list" % defprov.name
-            end
-
-            self.collect { |s| s }
-        end
-
         # Add a new path to our list of paths that services could be in.
         def self.newpath(type, path)
             type = type.intern if type.is_a? String
@@ -307,17 +293,24 @@ module Puppet
             if self.respond_to?(:configchk)
                 self.configchk
             end
+
+            unless @parameters.include?(:ensure) or @parameters.include?(:enable)
+                warning "No properties specified; 'enable' or 'ensure' should be specified"
+            end
         end
 
         # Basically just a synonym for restarting.  Used to respond
         # to events.
         def refresh
             # Only restart if we're supposed to be running
-            if ens = @parameters[:ensure] and ens.should == :running and ens.is == :running
+            
+            if ens = @parameters[:ensure] and ens.should == :running and ens.retrieve == :running
                 provider.restart
+            else
+                debug "Skipping restart; 'ensure' is not set to 'running'"
             end
         end
     end
 end
 
-# $Id: service.rb 2409 2007-04-24 06:20:21Z luke $
+# $Id: service.rb 2555 2007-06-08 17:20:00Z luke $

data/lib/puppet/type/sshkey.rb

@@ -28,11 +28,10 @@ module Puppet
                 make those aliases available in your Puppet scripts."
 
             attr_accessor :meta
-            
-            def insync?
-                @is == @should
-            end
 
+            def insync?(is)
+                is == @should
+            end
             # We actually want to return the whole array here, not just the first
             # value.
             def should
@@ -63,8 +62,8 @@ module Puppet
             desc "The file in which to store the mount table.  Only used by
                 those providers that write to disk (i.e., not NetInfo)."
 
-            defaultto { if @parent.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
-                    @parent.class.defaultprovider.default_target
+            defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
+                    @resource.class.defaultprovider.default_target
                 else
                     nil
                 end
@@ -73,4 +72,4 @@ module Puppet
     end
 end
 
-# $Id: sshkey.rb 2169 2007-02-07 06:47:10Z luke $
+# $Id: sshkey.rb 2500 2007-05-09 22:05:32Z luke $

data/lib/puppet/type/tidy.rb

@@ -27,21 +27,21 @@ module Puppet
             
             defaultto :anything # just so we always get this property
 
-            def change_to_s
+            def change_to_s(currentvalue, newvalue)
                 start = "Tidying"
                 if @out.include?(:age)
-                    start += ", older than %s seconds" % @parent.should(:age)
+                    start += ", older than %s seconds" % @resource.should(:age)
                 end
                 if @out.include?(:size)
-                    start += ", larger than %s bytes" % @parent.should(:size)
+                    start += ", larger than %s bytes" % @resource.should(:size)
                 end
 
                 start
             end
 
-            def insync?
-                if @is.is_a?(Symbol)
-                    if [:absent, :notidy].include?(@is)
+            def insync?(is)
+                if is.is_a?(Symbol)
+                    if [:absent, :notidy].include?(is)
                         return true
                     else
                         return false
@@ -49,12 +49,14 @@ module Puppet
                 else
                     @out = []
                     TATTRS.each do |param|
-                        if property = @parent.property(param)
-                            unless property.insync?
+                        if property = @resource.property(param)
+                            self.debug "No is value for %s", [param] if is[property].nil?
+                            unless property.insync?(is[property])
                                 @out << param
                             end
                         end
                     end
+                    
                     if @out.length > 0
                         return false
                     else
@@ -62,47 +64,47 @@ module Puppet
                     end
                 end
             end
-
+            
             def retrieve
                 stat = nil
-                unless stat = @parent.stat
-                    @is = :absent
-                    return
+                unless stat = @resource.stat
+                    return { self => :absent}
                 end
                 
-                if stat.ftype == "directory" and ! @parent[:rmdirs]
-                    @is = :notidy
-                    return
+                if stat.ftype == "directory" and ! @resource[:rmdirs]
+                    return {self => :notidy}
                 end
 
-                TATTRS.each { |param|
-                    if property = @parent.property(param)
-                        property.is = property.assess(stat)
+                allprops = TATTRS.inject({}) { |prophash, param|
+                    if property = @resource.property(param)
+                        prophash[property] = property.assess(stat)
                     end
+                    prophash
                 }
+                return { self => allprops } 
             end
 
             def sync
-                file = @parent[:path]
+                file = @resource[:path]
                 case File.lstat(file).ftype
                 when "directory":
-                    if @parent[:rmdirs]
-                        subs = Dir.entries(@parent[:path]).reject { |d|
+                    if @resource[:rmdirs]
+                        subs = Dir.entries(@resource[:path]).reject { |d|
                             d == "." or d == ".."
                         }.length
                         if subs > 0
                             self.info "%s has %s children; not tidying" %
-                                [@parent[:path], subs]
-                            self.info Dir.entries(@parent[:path]).inspect
+                                [@resource[:path], subs]
+                            self.info Dir.entries(@resource[:path]).inspect
                         else
-                            Dir.rmdir(@parent[:path])
+                            Dir.rmdir(@resource[:path])
                         end
                     else
                         self.debug "Not tidying directories"
                         return nil
                     end
                 when "file":
-                    @parent.handlebackup(file)
+                    @resource.handlebackup(file)
                     File.unlink(file)
                 when "link":
                     File.unlink(file)
@@ -135,7 +137,7 @@ module Puppet
                 if stat.ftype == "directory"
                     type = :mtime
                 else
-                    type = @parent[:type] || :atime
+                    type = @resource[:type] || :atime
                 end
                 
                 #return Integer(Time.now - stat.send(type))
@@ -150,8 +152,8 @@ module Puppet
                 end
             end
 
-            def insync?
-                if (Time.now.to_i - @is) > self.should
+            def insync?(is)
+                if (Time.now.to_i - is) > self.should
                     return false
                 end
 
@@ -204,8 +206,8 @@ module Puppet
                 end
             end
             
-            def insync?
-                if @is > self.should
+            def insync?(is)
+                if is > self.should
                     return false
                 end
 
@@ -252,8 +254,8 @@ module Puppet
         validate do
         end
 
-        def self.list
-            self.collect { |t| t }
+        def self.instances
+            []
         end
 
         @depthfirst = true
@@ -270,14 +272,18 @@ module Puppet
             end
 
             # only allow backing up into filebuckets
-            unless self[:backup].is_a? Puppet::Network::Client::Dipper
+            unless self[:backup].is_a? Puppet::Network::Client.dipper
                 self[:backup] = false
             end
         end
         
         def retrieve
             # Our ensure property knows how to retrieve everything for us.
-            obj = @parameters[:ensure] and obj.retrieve
+            if obj = @parameters[:ensure] 
+                return obj.retrieve
+            else
+                return {}
+            end
         end
         
         # Hack things a bit so we only ever check the ensure property.
@@ -287,4 +293,4 @@ module Puppet
     end
 end
 
-# $Id: tidy.rb 2179 2007-02-08 01:39:39Z luke $
+# $Id: tidy.rb 2551 2007-06-04 20:37:14Z luke $