puppet 0.22.4 → 0.23.0

data/lib/puppet/type/pfile/target.rb

@@ -10,12 +10,13 @@ module Puppet
 
         # Anything else, basically
         newvalue(/./) do
-            if ! @parent.should(:ensure)
-                @parent[:ensure] = :link
+            if ! @resource.should(:ensure)
+                @resource[:ensure] = :link
             end
 
             # Only call mklink if ensure() didn't call us in the first place.
-            if @parent.property(:ensure).insync?
+            currentensure  = @resource.property(:ensure).retrieve
+            if @resource.property(:ensure).insync?(currentensure)
                 mklink()
             end
         end
@@ -26,21 +27,21 @@ module Puppet
 
             # Clean up any existing objects.  The argument is just for logging,
             # it doesn't determine what's removed.
-            @parent.remove_existing(target)
+            @resource.remove_existing(target)
 
-            if FileTest.exists?(@parent[:path])
+            if FileTest.exists?(@resource[:path])
                 raise Puppet::Error, "Could not remove existing file"
             end
 
-            Dir.chdir(File.dirname(@parent[:path])) do
-                Puppet::Util::SUIDManager.asuser(@parent.asuser()) do
-                    mode = @parent.should(:mode)
+            Dir.chdir(File.dirname(@resource[:path])) do
+                Puppet::Util::SUIDManager.asuser(@resource.asuser()) do
+                    mode = @resource.should(:mode)
                     if mode
                         Puppet::Util.withumask(000) do
-                            File.symlink(target, @parent[:path])
+                            File.symlink(target, @resource[:path])
                         end
                     else
-                        File.symlink(target, @parent[:path])
+                        File.symlink(target, @resource[:path])
                     end
                 end
 
@@ -48,26 +49,27 @@ module Puppet
             end
         end
 
-        def insync?
-            if [:nochange, :notlink].include?(self.should) or @parent.recurse?
+        def insync?(currentvalue)
+            if [:nochange, :notlink].include?(self.should) or @resource.recurse?
                 return true
             else
-                return super
+                return super(currentvalue)
             end
         end
 
+
         def retrieve
-            if stat = @parent.stat
+            if stat = @resource.stat
                 if stat.ftype == "link"
-                    @is = File.readlink(@parent[:path])
+                    return File.readlink(@resource[:path])
                 else
-                    @is = :notlink
+                    return :notlink
                 end
             else
-                @is = :absent
+                return :absent
             end
         end
     end
 end
 
-# $Id: target.rb 2269 2007-03-08 07:36:46Z luke $
+# $Id: target.rb 2500 2007-05-09 22:05:32Z luke $

data/lib/puppet/type/pfile/type.rb

@@ -8,14 +8,13 @@ module Puppet
         #end
         
         def retrieve
-            if stat = @parent.stat(false)
-                @is = stat.ftype
-            else
-                @is = :absent
+            currentvalue = :absent
+            if stat = @resource.stat(false)
+                currentvalue = stat.ftype
             end
-
             # so this state is never marked out of sync
-            @should = [@is]
+            @should = [currentvalue]
+            return currentvalue
         end
 
 
@@ -25,4 +24,4 @@ module Puppet
     end
 end
 
-# $Id: type.rb 2169 2007-02-07 06:47:10Z luke $
+# $Id: type.rb 2500 2007-05-09 22:05:32Z luke $

data/lib/puppet/type/pfilebucket.rb

@@ -70,8 +70,8 @@ module Puppet
             end
         end
 
-        def self.list
-            self.collect do |obj| obj.name end
+        def self.instances
+            []
         end
 
         def bucket
@@ -114,4 +114,4 @@ module Puppet
     end
 end
 
-# $Id: pfilebucket.rb 2408 2007-04-24 02:41:16Z luke $
+# $Id: pfilebucket.rb 2551 2007-06-04 20:37:14Z luke $

data/lib/puppet/type/port.rb

@@ -1,5 +1,3 @@
-require 'puppet/type/parsedtype'
-
 #module Puppet
 #    newtype(:port) do
 #        @doc = "Installs and manages port entries.  For most systems, these
@@ -90,8 +88,8 @@ require 'puppet/type/parsedtype'
 #            munge do |value|
 #                unless value == "absent" or value == :absent
 #                    # Add the :alias metaparam in addition to the property
-#                    @parent.newmetaparam(
-#                        @parent.class.metaparamclass(:alias), value
+#                    @resource.newmetaparam(
+#                        @resource.class.metaparamclass(:alias), value
 #                    )
 #                end
 #                value
@@ -102,8 +100,8 @@ require 'puppet/type/parsedtype'
 #            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
@@ -118,4 +116,4 @@ require 'puppet/type/parsedtype'
 #    end
 #end
 
-# $Id: port.rb 2169 2007-02-07 06:47:10Z luke $
+# $Id: port.rb 2517 2007-05-15 19:22:36Z luke $

data/lib/puppet/type/property.rb

@@ -1,4 +1,4 @@
-# The virtual base class for properties, which are the self-contained building
+ # The virtual base class for properties, which are the self-contained building
 # blocks for actually doing work on the system.
 
 require 'puppet'
@@ -8,7 +8,6 @@ require 'puppet/parameter'
 
 module Puppet
 class Property < Puppet::Parameter
-    attr_accessor :is
 
     # Because 'should' uses an array, we have a special method for handling
     # it.  We also want to keep copies of the original values, so that
@@ -143,7 +142,7 @@ class Property < Puppet::Parameter
     def call_valuemethod(name, value)
         event = nil
         if method = self.class.value_option(name, :method) and self.respond_to?(method)
-            self.debug "setting %s (currently %s)" % [value, self.is]
+            self.debug "setting %s (currently %s)" % [value, self.retrieve]
 
             begin
                 event = self.send(method)
@@ -154,7 +153,7 @@ class Property < Puppet::Parameter
                     puts detail.backtrace
                 end
                 error = Puppet::Error.new("Could not set %s on %s: %s" %
-                    [value, self.class.name, detail], @parent.line, @parent.file)
+                    [value, self.class.name, detail], @resource.line, @resource.file)
                 error.set_backtrace detail.backtrace
                 raise error
             end
@@ -169,17 +168,17 @@ class Property < Puppet::Parameter
     end
 
     # How should a property change be printed as a string?
-    def change_to_s
+    def change_to_s(currentvalue, newvalue)
         begin
-            if @is == :absent
+            if currentvalue == :absent
                 return "defined '%s' as '%s'" %
-                    [self.name, self.should_to_s]
-            elsif self.should == :absent or self.should == [:absent]
+                    [self.name, self.should_to_s(newvalue)]
+            elsif newvalue == :absent or newvalue == [:absent]
                 return "undefined %s from '%s'" %
-                    [self.name, self.is_to_s]
+                    [self.name, self.is_to_s(currentvalue)]
             else
                 return "%s changed '%s' to '%s'" %
-                    [self.name, self.is_to_s, self.should_to_s]
+                    [self.name, self.is_to_s(currentvalue), self.should_to_s(newvalue)]
             end
         rescue Puppet::Error, Puppet::DevError
             raise
@@ -203,13 +202,13 @@ class Property < Puppet::Parameter
             else
                 if self.class.name == :ensure
                     event = case self.should
-                    when :present: (@parent.class.name.to_s + "_created").intern
-                    when :absent: (@parent.class.name.to_s + "_removed").intern
+                    when :present: (@resource.class.name.to_s + "_created").intern
+                    when :absent: (@resource.class.name.to_s + "_removed").intern
                     else
-                        (@parent.class.name.to_s + "_changed").intern
+                        (@resource.class.name.to_s + "_changed").intern
                     end
                 else
-                    event = (@parent.class.name.to_s + "_changed").intern
+                    event = (@resource.class.name.to_s + "_changed").intern
                 end
             end
         end
@@ -219,17 +218,11 @@ class Property < Puppet::Parameter
     
     # initialize our property
     def initialize(hash = {})
-        @is = nil
         super
     end
 
     def inspect
         str = "Property('%s', " % self.name
-        if self.is
-            str += "@is = '%s', " % [self.is]
-        else
-            str += "@is = nil, "
-        end
 
         if defined? @should and @should
             str += "@should = '%s')" % @should.join(", ")
@@ -244,7 +237,7 @@ class Property < Puppet::Parameter
     # since we cannot fix it.  Otherwise, we expect our should value
     # to be an array, and if @is matches any of those values, then
     # we consider it to be in-sync.
-    def insync?
+    def insync?(is)
         #debug "%s value is '%s', should be '%s'" %
         #    [self,self.is.inspect,self.should.inspect]
         unless defined? @should and @should
@@ -262,7 +255,7 @@ class Property < Puppet::Parameter
 
         # Look for a matching value
         @should.each { |val|
-            if @is == val or @is == val.to_s
+            if is == val or is == val.to_s
                 return true
             end
         }
@@ -275,18 +268,18 @@ class Property < Puppet::Parameter
     # we need to set up a mechanism for pretty printing of the values
     # default to just the values, but this way individual properties can
     # override these methods
-    def is_to_s
-        @is
+    def is_to_s(currentvalue)
+        currentvalue
     end
 
     # Send a log message.
     def log(msg)
-        unless @parent[:loglevel]
+        unless @resource[:loglevel]
             self.devfail "Parent %s has no loglevel" %
-                @parent.name
+                @resource.name
         end
         Puppet::Util::Log.create(
-            :level => @parent[:loglevel],
+            :level => @resource[:loglevel],
             :message => msg,
             :source => self
         )
@@ -305,8 +298,8 @@ class Property < Puppet::Parameter
         unless defined? @noop
             @noop = false
         end
-        if self.parent.respond_to?(:noop)
-            tmp = @noop || self.parent.noop || Puppet[:noop] || false
+        if self.resource.respond_to?(:noop)
+            tmp = @noop || self.resource.noop || Puppet[:noop] || false
         else
             tmp = @noop || Puppet[:noop] || false
         end
@@ -317,7 +310,10 @@ class Property < Puppet::Parameter
     # provider.  In other words, if the property name is 'gid', we'll call
     # 'provider.gid' to retrieve the current value.
     def retrieve
-        @is = provider.send(self.class.name)
+        is = provider.send(self.class.name)
+#        puts "IS is: " + is.to_s
+#       puts "and its an array!!!" if is.is_a? Array
+        return is
     end
 
     # Set our value, using the provider, an associated block, or both.
@@ -332,7 +328,7 @@ class Property < Puppet::Parameter
             event, tmp = call_valuemethod(name, value) 
         end
         unless call == :instead
-            if @parent.provider
+            if @resource.provider
                 call_provider(value)
             else
                 # They haven't provided a block, and our parent does not have
@@ -353,7 +349,7 @@ class Property < Puppet::Parameter
         if defined? @should
             unless @should.is_a?(Array)
                 self.devfail "should for %s on %s is not an array" %
-                    [self.class.name, @parent.name]
+                    [self.class.name, @resource.name]
             end
             return @should[0]
         else
@@ -383,9 +379,10 @@ class Property < Puppet::Parameter
         end
     end
 
-    def should_to_s
-        if defined? @should
-            @should.join(" ")
+    def should_to_s(newvalue)
+        newvalue = [newvalue] unless newvalue.is_a? Array
+        if defined? newvalue
+            newvalue.join(" ")
         else
             return nil
         end
@@ -394,10 +391,10 @@ class Property < Puppet::Parameter
     # The default 'sync' method only selects among a list of registered
     # values.
     def sync
-        if self.insync?
-            self.info "already in sync"
-            return nil
-        end
+#        if self.insync?
+#            self.info "already in sync"
+#            return nil
+#        end
         unless self.class.values
             self.devfail "No values defined for %s" %
                 self.class.name
@@ -415,8 +412,8 @@ class Property < Puppet::Parameter
         unless defined? @tags
             @tags = []
             # This might not be true in testing
-            if @parent.respond_to? :tags
-                @tags = @parent.tags
+            if @resource.respond_to? :tags
+                @tags = @resource.tags
             end
             @tags << self.name
         end
@@ -424,7 +421,7 @@ class Property < Puppet::Parameter
     end
 
     def to_s
-        return "%s(%s)" % [@parent.name,self.name]
+        return "%s(%s)" % [@resource.name,self.name]
     end
 
     # Provide a common hook for setting @should, just like params.
@@ -439,25 +436,25 @@ class Property < Puppet::Parameter
 
         def self.defaultvalues
             newvalue(:present) do
-                if @parent.provider and @parent.provider.respond_to?(:create)
-                    @parent.provider.create
+                if @resource.provider and @resource.provider.respond_to?(:create)
+                    @resource.provider.create
                 else
-                    @parent.create
+                    @resource.create
                 end
                 nil # return nil so the event is autogenerated
             end
 
             newvalue(:absent) do
-                if @parent.provider and @parent.provider.respond_to?(:destroy)
-                    @parent.provider.destroy
+                if @resource.provider and @resource.provider.respond_to?(:destroy)
+                    @resource.provider.destroy
                 else
-                    @parent.destroy
+                    @resource.destroy
                 end
                 nil # return nil so the event is autogenerated
             end
 
             defaultto do
-                if @parent.managed?
+                if @resource.managed?
                     :present
                 else
                     nil
@@ -474,15 +471,15 @@ class Property < Puppet::Parameter
             end
         end
 
-        def change_to_s
+        def change_to_s(currentvalue, newvalue)
             begin
-                if @is == :absent or @is.nil?
+                if currentvalue == :absent or currentvalue.nil?
                     return "created"
-                elsif self.should == :absent
+                elsif newvalue == :absent
                     return "removed"
                 else
                     return "%s changed '%s' to '%s'" %
-                        [self.name, self.is_to_s, self.should_to_s]
+                        [self.name, self.is_to_s(currentvalue), self.should_to_s(newvalue)]
                 end
             rescue Puppet::Error, Puppet::DevError
                 raise
@@ -498,18 +495,18 @@ class Property < Puppet::Parameter
             # to get checked, which means that those other properties do not have
             # @is values set.  This seems to be the source of quite a few bugs,
             # although they're mostly logging bugs, not functional ones.
-            if prov = @parent.provider and prov.respond_to?(:exists?)
+            if prov = @resource.provider and prov.respond_to?(:exists?)
                 result = prov.exists?
-            elsif @parent.respond_to?(:exists?)
-                result = @parent.exists?
+            elsif @resource.respond_to?(:exists?)
+                result = @resource.exists?
             else
                 raise Puppet::DevError, "No ability to determine if %s exists" %
-                    @parent.class.name
+                    @resource.class.name
             end
             if result
-                @is = :present
+                return :present
             else
-                @is = :absent
+                return :absent
             end
         end
 
@@ -517,7 +514,7 @@ class Property < Puppet::Parameter
         # say it should exist.
         #defaultto :present
         defaultto do
-            if @parent.managed?
+            if @resource.managed?
                 :present
             else
                 nil
@@ -527,4 +524,4 @@ class Property < Puppet::Parameter
 end
 end
 
-# $Id: property.rb 2328 2007-03-19 21:29:08Z luke $
+# $Id: property.rb 2500 2007-05-09 22:05:32Z luke $