puppet 0.22.4 → 0.23.0

data/lib/puppet/type/cron.rb

@@ -2,7 +2,6 @@ require 'etc'
 require 'facter'
 require 'puppet/type/property'
 require 'puppet/util/filetype'
-require 'puppet/type/parsedtype'
 
 Puppet::Type.newtype(:cron) do
     @doc = "Installs and manages cron jobs.  All fields except the command 
@@ -29,9 +28,7 @@ Puppet::Type.newtype(:cron) do
     ensurable
 
     # A base class for all of the Cron parameters, since they all have
-    # similar argument checking going on.  We're stealing the base class
-    # from parsedtype, and we should probably subclass Cron from there,
-    # but it was just too annoying to do.
+    # similar argument checking going on.
     class CronParam < Puppet::Property
         class << self
             attr_accessor :boundaries, :default
@@ -39,9 +36,9 @@ Puppet::Type.newtype(:cron) do
 
         # We have to override the parent method, because we consume the entire
         # "should" array
-        def insync?
+        def insync?(is)
             if defined? @should and @should
-                self.is_to_s == self.should_to_s
+                self.is_to_s(is) == self.should_to_s
             else
                 true
             end
@@ -93,36 +90,28 @@ Puppet::Type.newtype(:cron) do
             return false
         end
 
-        def should_to_s
-            if @should
-                if self.name == :command or @should[0].is_a? Symbol
-                    @should[0]
+        def should_to_s(newvalue = @should)
+            if newvalue
+                if self.name == :command or newvalue[0].is_a? Symbol
+                    newvalue[0]
                 else
-                    @should.join(",")
+                    newvalue.join(",")
                 end
             else
                 nil
             end
         end
 
-        def is=(val)
-            if val.is_a?(Array)
-                @is = val
-            else
-                @is = [val]
-            end
-        end
-
-        def is_to_s
-            if @is
-                unless @is.is_a?(Array)
-                    return @is
+        def is_to_s(currentvalue = @is)
+            if currentvalue
+                unless currentvalue.is_a?(Array)
+                    return currentvalue
                 end
 
-                if self.name == :command or @is[0].is_a? Symbol
-                    @is[0]
+                if self.name == :command or currentvalue[0].is_a? Symbol
+                    currentvalue[0]
                 else
-                    @is.join(",")
+                    currentvalue.join(",")
                 end
             else
                 nil
@@ -190,7 +179,7 @@ Puppet::Type.newtype(:cron) do
     end
 
     # Somewhat uniquely, this property does not actually change anything -- it
-    # just calls +@parent.sync+, which writes out the whole cron tab for
+    # just calls +@resource.sync+, which writes out the whole cron tab for
     # the user in question.  There is no real way to change individual cron
     # jobs without rewriting the entire cron file.
     #
@@ -206,12 +195,13 @@ Puppet::Type.newtype(:cron) do
             All cron parameters support ``absent`` as a value; this will
             remove any existing values for that field."
 
-        def is
-            if @is
-                @is[0]
-            else
-                nil
-            end
+        def retrieve 
+          return_value = super
+          if return_value && return_value.is_a?(Array)
+            return_value = return_value[0]
+          end
+            
+          return return_value
         end
 
         def should
@@ -286,6 +276,7 @@ Puppet::Type.newtype(:cron) do
             can be no guarantees that other, earlier settings will not also
             affect a given cron job.
 
+
             Also, Puppet cannot automatically determine whether an existing,
             unmanaged environment setting is associated with a given cron
             job.  If you already have cron jobs with environment settings,
@@ -296,23 +287,39 @@ Puppet::Type.newtype(:cron) do
             the crontab, e.g., ``PATH=/bin:/usr/bin:/usr/sbin``."
 
         validate do |value|
-            unless value =~ /^\s*(\w+)\s*=\s*(.+)\s*$/
+            unless value =~ /^\s*(\w+)\s*=\s*(.+)\s*$/ or value == :absent or value == "absent"
                 raise ArgumentError, "Invalid environment setting %s" %
                     value.inspect
             end
         end
 
-        def insync?
-            if @is.is_a? Array
-                return @is.sort == @should.sort
+        def insync?(is)
+            if is.is_a? Array
+                return is.sort == @should.sort
             else
-                return @is == @should
+                return is == @should
+            end
+        end
+
+        def is_to_s(newvalue)
+            if newvalue
+                newvalue.join(",")
+            else
+                nil
             end
         end
 
         def should
             @should
         end
+
+        def should_to_s(newvalue = @should)
+            if newvalue
+                newvalue.join(",")
+            else
+                nil
+            end
+        end
     end
 
     newparam(:name) do
@@ -344,8 +351,8 @@ Puppet::Type.newtype(:cron) do
             Other providers default accordingly."
 
         defaultto {
-            if provider.is_a?(@parent.class.provider(:crontab))
-                if val = @parent.should(:user)
+            if provider.is_a?(@resource.class.provider(:crontab))
+                if val = @resource.should(:user)
                     val
                 else
                     raise ArgumentError,
@@ -370,7 +377,7 @@ Puppet::Type.newtype(:cron) do
             ret = obj.should
 
             if ret.nil?
-                ret = obj.is
+                ret = obj.retrieve
             end
 
             if ret == :absent
@@ -394,4 +401,6 @@ Puppet::Type.newtype(:cron) do
     end
 end
 
-# $Id: cron.rb 2408 2007-04-24 02:41:16Z luke $
+
+# $Id: cron.rb 2621 2007-06-18 21:56:11Z luke $
+

data/lib/puppet/type/exec.rb

@@ -79,7 +79,7 @@ module Puppet
                 executed command returns something else.  Defaults to 0."
 
             # Make output a bit prettier
-            def change_to_s
+            def change_to_s(currentvalue, newvalue)
                 return "executed successfully"
             end
 
@@ -87,10 +87,10 @@ module Puppet
             def retrieve
                 # Default to somethinng
 
-                if @parent.check
-                    self.is = :notrun
+                if @resource.check
+                    return :notrun
                 else
-                    self.is = self.should
+                    return self.should
                 end
             end
 
@@ -99,25 +99,25 @@ module Puppet
                 olddir = nil
 
                 # We need a dir to change to, even if it's just the cwd
-                dir = self.parent[:cwd] || Dir.pwd
+                dir = self.resource[:cwd] || Dir.pwd
 
                 event = :executed_command
 
                 begin
-                    @output, status = @parent.run(self.parent[:command])
+                    @output, status = @resource.run(self.resource[:command])
                 rescue Timeout::Error
                     self.fail "Command exceeded timeout" % value.inspect
                 end
 
-                loglevel = @parent[:loglevel]
+                loglevel = @resource[:loglevel]
                 if status.exitstatus.to_s != self.should.to_s
                     self.fail("%s returned %s instead of %s" %
-                        [self.parent[:command], status.exitstatus, self.should.to_s])
+                        [self.resource[:command], status.exitstatus, self.should.to_s])
                 end
 
-                if log = @parent[:logoutput]
+                if log = @resource[:logoutput]
                     if log == :true
-                        log = @parent[:loglevel]
+                        log = @resource[:loglevel]
                     end
                     unless log == :false
                         @output.split(/\n/).each { |line|
@@ -213,7 +213,7 @@ module Puppet
                 for refreshing."
 
             validate do |command|
-                @parent.validatecmd(command)
+                @resource.validatecmd(command)
             end
         end
 
@@ -236,7 +236,8 @@ module Puppet
         newparam(:timeout) do
             desc "The maximum time the command should take.  If the command takes
                 longer than the timeout, the command is considered to have failed
-                and will be stopped.  Use any negative number to disable the timeout."
+                and will be stopped.  Use any negative number to disable the timeout.
+                The time is specified in seconds."
             
             munge do |value|
                 value = value.shift if value.is_a?(Array)
@@ -342,14 +343,14 @@ module Puppet
                 cmds = [cmds] unless cmds.is_a? Array
 
                 cmds.each do |cmd|
-                    @parent.validatecmd(cmd)
+                    @resource.validatecmd(cmd)
                 end
             end
 
             # Return true if the command does not return 0.
             def check(value)
                 begin
-                    output, status = @parent.run(value, true)
+                    output, status = @resource.run(value, true)
                 rescue Timeout::Error
                     err "Check %s exceeded timeout" % value.inspect
                     return false
@@ -378,14 +379,14 @@ module Puppet
                 cmds = [cmds] unless cmds.is_a? Array
 
                 cmds.each do |cmd|
-                    @parent.validatecmd(cmd)
+                    @resource.validatecmd(cmd)
                 end
             end
 
             # Return true if the command returns 0.
             def check(value)
                 begin
-                    output, status = @parent.run(value, true)
+                    output, status = @resource.run(value, true)
                 rescue Timeout::Error
                     err "Check %s exceeded timeout" % value.inspect
                     return false
@@ -443,8 +444,8 @@ module Puppet
             end
         end
 
-        def self.list
-            self.collect { |i| i }
+        def self.instances
+            []
         end
 
         # Verify that we pass all of the checks.  The argument determines whether
@@ -597,4 +598,4 @@ module Puppet
     end
 end
 
-# $Id: exec.rb 2442 2007-04-30 19:42:58Z luke $
+# $Id: exec.rb 2551 2007-06-04 20:37:14Z luke $

data/lib/puppet/type/group.rb

@@ -40,49 +40,20 @@ module Puppet
             # If they're talking about the thing at all, they generally want to
             # say it should exist.
             defaultto do
-                if @parent.managed?
+                if @resource.managed?
                     :present
                 else
                     nil
                 end
             end
 
-            def change_to_s
-                begin
-                    if @is == :absent
-                        return "created"
-                    elsif self.should == :absent
-                        return "removed"
-                    else
-                        return "%s changed '%s' to '%s'" %
-                            [self.name, self.is_to_s, self.should_to_s]
-                    end
-                rescue Puppet::Error, Puppet::DevError
-                    raise
-                rescue => detail
-                    raise Puppet::DevError,
-                        "Could not convert change %s to string: %s" %
-                        [self.name, detail]
-                end
-            end
-
             def retrieve
-                if provider.exists?
-                    @is = :present
-                else
-                    @is = :absent
-                end
+                return provider.exists? ? :present : :absent
             end
 
             # The default 'sync' method only selects among a list of registered
             # values.
             def sync
-                if self.insync?
-                    self.info "already in sync"
-                    return nil
-                #else
-                    #self.info "%s vs %s" % [self.is.inspect, self.should.inspect]
-                end
                 unless self.class.values
                     self.devfail "No values defined for %s" %
                         self.class.name
@@ -101,7 +72,7 @@ module Puppet
                 GID is picked according to local system standards."
 
             def retrieve
-                @is = provider.gid
+                return provider.gid
             end
 
             def sync
@@ -149,34 +120,14 @@ module Puppet
             defaultto false
         end
 
-        def self.list_by_name
-            users = []
-            defaultprovider.listbyname do |user|
-                users << user
-            end
-            return users
-        end
-
-        def self.list
-            defaultprovider.list
-
-            self.collect do |user|
-                user
-            end
-        end
-
         def retrieve
             if self.provider and @provider.exists?
-                super
+                return super
             else
-                properties().each { |property|
-                    property.is = :absent
-                }
-
-                return
+               return currentpropvalues(:absent) 
             end
         end
     end
 end
 
-# $Id: group.rb 2408 2007-04-24 02:41:16Z luke $
+# $Id: group.rb 2551 2007-06-04 20:37:14Z luke $

data/lib/puppet/type/host.rb

@@ -1,5 +1,3 @@
-require 'puppet/type/parsedtype'
-
 module Puppet
     newtype(:host) do
         ensurable
@@ -15,47 +13,28 @@ module Puppet
                 make those aliases available in your Puppet scripts and also on
                 disk."
 
-            def insync?
-                @is == @should
+           def insync?(is)
+                is == @should
             end
             
-            # Make sure our "is" value is always an array.
-            def is
-                current = super
-                current = [current] unless current.is_a? Array
-                current
-            end
-
-            def is_to_s
-                self.is.join(" ")
+            def is_to_s(currentvalue = @is)
+                currentvalue = [currentvalue] unless currentvalue.is_a? Array
+                currentvalue.join(" ")
             end
 
-            # We have to override the feeding mechanism; it might be nil or 
-            # white-space separated
-            def is=(value)
-                # If it's just whitespace, ignore it
-                case value
-                when /^\s+$/
-                    @is = nil
-                when String
-                    @is = value.split(/\s+/)
-                else
-                    @is = value
-                end
-            end
-            
             def retrieve
-                super
-                case @is
+                is = super
+                case is
                 when String
-                    @is = @is.split(/\s*,\s*/)
+                    is = is.split(/\s*,\s*/)
                 when Symbol:
-                    @is = [@is]
+                    is = [is]
                 when Array
                     # nothing
                 else
-                    raise Puppet::DevError, "Invalid @is type %s" % @is.class
+                    raise Puppet::DevError, "Invalid @is type %s" % is.class
                 end
+                return is
             end
 
             # We actually want to return the whole array here, not just the first
@@ -72,8 +51,8 @@ module Puppet
                 end
             end
 
-            def should_to_s
-                @should.join(" ")
+            def should_to_s(newvalue = @should)
+                newvalue.join(" ")
             end
 
             validate do |value|
@@ -87,8 +66,8 @@ module Puppet
             desc "The file in which to store service information.  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
@@ -107,4 +86,4 @@ module Puppet
     end
 end
 
-# $Id: host.rb 2408 2007-04-24 02:41:16Z luke $
+# $Id: host.rb 2517 2007-05-15 19:22:36Z luke $