puppet 0.23.2 → 0.24.0

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

@@ -324,4 +324,3 @@ module Puppet
     end
 end
 
-# $Id: checksum.rb 2629 2007-06-19 22:18:55Z luke $

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

@@ -1,5 +1,7 @@
 module Puppet
     Puppet.type(:file).newproperty(:content) do
+        include Puppet::Util::Diff
+
         desc "Specify the contents of a file as a string.  Newlines, tabs, and
             spaces can be specified using the escaped syntax (e.g., \\n for a
             newline).  The primary purpose of this parameter is to provide a
@@ -30,6 +32,21 @@ module Puppet
             end
         end
 
+        # Override this method to provide diffs if asked for.
+        # Also, fix #872: when content is used, and replace is true, the file
+        # should be insync when it exists
+        def insync?(is)
+            if ! @resource.replace? and File.exists?(@resource[:path])
+                return true
+            end
+
+            result = super
+            if ! result and Puppet[:show_diff] and File.exists?(@resource[:path])
+                string_file_diff(@resource[:path], self.should)
+            end
+            return result
+        end
+
         # We should probably take advantage of existing md5 sums if they're there,
         # but I really don't feel like dealing with the complexity right now.
         def retrieve
@@ -62,11 +79,9 @@ module Puppet
         def sync
             return_event = @resource.stat ? :file_changed : :file_created
             
-            @resource.write { |f| f.print self.should }
+            @resource.write(:content) { |f| f.print self.should }
 
             return return_event
         end
     end
 end
-
-# $Id: content.rb 2500 2007-05-09 22:05:32Z luke $

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

@@ -2,11 +2,11 @@ module Puppet
     Puppet.type(:file).ensurable do
         require 'etc'
         desc "Whether to create files that don't currently exist.
-            Possible values are *absent*, *present* (equivalent to ``exists`` in
-            most file tests -- will match any form of file existence, and if the
-            file is missing will create an empty file), *file*, and
-            *directory*.  Specifying ``absent`` will delete the file, although
-            currently this will not recursively delete directories.
+            Possible values are *absent*, *present* (will match any form of
+            file existence, and if the file is missing will create an empty
+            file), *file*, and *directory*.  Specifying ``absent`` will delete
+            the file, although currently this will not recursively delete
+            directories.
 
             Anything other than those values will be considered to be a symlink.
             For instance, the following text creates a link::
@@ -172,4 +172,3 @@ module Puppet
     end
 end
 
-# $Id: ensure.rb 2500 2007-05-09 22:05:32Z luke $

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

@@ -6,6 +6,10 @@ module Puppet
             name or group ID."
         @event = :file_changed
 
+        validate do |group|
+            raise(Puppet::Error, "Invalid group name '%s'" % group.inspect) unless group and group != ""
+        end
+
         def id2name(id)
             if id > 70000
                 return nil
@@ -118,4 +122,3 @@ module Puppet
     end
 end
 
-# $Id: group.rb 2741 2007-08-03 23:14:32Z lutter $

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

@@ -132,4 +132,3 @@ module Puppet
     end
 end
 
-# $Id: mode.rb 2500 2007-05-09 22:05:32Z luke $

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

@@ -6,12 +6,9 @@ module Puppet
         @event = :file_changed
 
         def id2name(id)
-            if id.is_a?(Symbol)
-                return id.to_s
-            end
-            if id > 70000
-                return nil
-            end
+            return id.to_s if id.is_a?(Symbol)
+            return nil if id > Puppet[:maximum_uid].to_i
+
             begin
                 user = Etc.getpwuid(id)
             rescue TypeError
@@ -19,6 +16,7 @@ module Puppet
             rescue ArgumentError
                 return nil
             end
+
             if user.uid == ""
                 return nil
             else
@@ -113,8 +111,8 @@ module Puppet
             # On OS X, files that are owned by -2 get returned as really
             # large UIDs 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 > 120000
-                self.warning "current state is silly: %s" % currentvalue
+            if currentvalue > Puppet[:maximum_uid].to_i
+                self.warning "Apparently using negative UID (%s) on a platform that does not consistently handle them" % currentvalue
                 currentvalue = :silly
             end
 
@@ -167,4 +165,3 @@ module Puppet
     end
 end
 
-# $Id: owner.rb 2501 2007-05-09 23:08:42Z luke $

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

@@ -5,6 +5,7 @@ module Puppet
     # this state, during retrieval, modifies the appropriate other states
     # so that things get taken care of appropriately.
     Puppet.type(:file).newproperty(:source) do
+        include Puppet::Util::Diff
 
         attr_accessor :source, :local
         desc "Copy a file over the current file.  Uses ``checksum`` to
@@ -158,7 +159,17 @@ module Puppet
             end
             # Now, we just check to see if the checksums are the same
             parentchecksum = @resource.property(:checksum).retrieve
-            return (!parentchecksum.nil? and (parentchecksum == @stats[:checksum]))
+            result = (!parentchecksum.nil? and (parentchecksum == @stats[:checksum]))
+
+            # Diff the contents if they ask it.  This is quite annoying -- we need to do this in
+            # 'insync?' because they might be in noop mode, but we don't want to do the file
+            # retrieval twice, so we cache the value annoyingly.
+            if ! result and Puppet[:show_diff] and File.exists?(@resource[:path]) and ! @stats[:_diffed]
+                @stats[:_remote_content] = get_remote_content
+                string_file_diff(@resource[:path], @stats[:_remote_content])
+                @stats[:_diffed] = true
+            end
+            return result
         end
 
         def pinparams
@@ -236,6 +247,21 @@ module Puppet
         end
 
         def sync
+            contents = @stats[:_remote_content] || get_remote_content()
+
+            exists = File.exists?(@resource[:path])
+
+            @resource.write(:source) { |f| f.print contents }
+
+            if exists
+                return :file_changed
+            else
+                return :file_created
+            end
+        end
+
+        private
+        def get_remote_content
             unless @stats[:type] == "file"
                 #if @stats[:type] == "directory"
                         #[@resource.name, @should.inspect]
@@ -264,17 +290,8 @@ module Puppet
                 self.notice "Could not retrieve contents for %s" %
                     @source
             end
-            exists = File.exists?(@resource[:path])
 
-            @resource.write { |f| f.print contents }
-
-            if exists
-                return :file_changed
-            else
-                return :file_created
-            end
+            return contents
         end
     end
 end
-
-# $Id: source.rb 2699 2007-07-14 23:04:19Z luke $

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

@@ -45,6 +45,8 @@ module Puppet
                     end
                 end
 
+		@resource.send(:property_fix)
+
                 :link_created
             end
         end
@@ -72,4 +74,3 @@ module Puppet
     end
 end
 
-# $Id: target.rb 2500 2007-05-09 22:05:32Z luke $

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

@@ -24,4 +24,3 @@ module Puppet
     end
 end
 
-# $Id: type.rb 2500 2007-05-09 22:05:32Z luke $

data/lib/puppet/type/pfilebucket.rb

@@ -115,4 +115,3 @@ module Puppet
     end
 end
 
-# $Id: pfilebucket.rb 2679 2007-07-11 20:23:49Z luke $

data/lib/puppet/type/port.rb

@@ -116,4 +116,3 @@
 #    end
 #end
 
-# $Id: port.rb 2517 2007-05-15 19:22:36Z luke $

data/lib/puppet/type/resources.rb

@@ -149,4 +149,3 @@ Puppet::Type.newtype(:resources) do
     end
 end
 
-# $Id: resources.rb 2687 2007-07-12 19:51:57Z luke $

data/lib/puppet/type/schedule.rb

@@ -241,7 +241,7 @@ module Puppet
                 :daily => :day,
                 :monthly => :month,
                 :weekly => proc do |prev, now|
-                    prev.strftime("%U") == now.strftime("%U")
+                    prev.strftime("%U") != now.strftime("%U")
                 end
             }
 
@@ -256,8 +256,7 @@ module Puppet
                         return method.call(previous, now)
                     else
                         # We negate it, because if they're equal we don't run
-                        val = now.send(method) != previous.send(method)
-                        return val
+                        return now.send(method) != previous.send(method)
                     end
                 when :distance
                     scale = @@scale[value]
@@ -266,6 +265,9 @@ 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.
+                    diff = (now.to_i - previous.to_i)
+                    comparison = (scale / @resource[:repeat])
+
                     return (now.to_i - previous.to_i) >= (scale / @resource[:repeat])
                 end
             end
@@ -312,25 +314,27 @@ module Puppet
         end
 
         def self.mkdefaultschedules
-            # Create our default schedule
-            unless self["puppet"]
-                Puppet.debug "Creating default schedules"
-                self.create(
-                    :name => "puppet",
-                    :period => :hourly,
-                    :repeat => "2"
-                )
-            end
+            return [] if self["puppet"]
+
+            result = []
+            Puppet.debug "Creating default schedules"
+            result << self.create(
+                :name => "puppet",
+                :period => :hourly,
+                :repeat => "2"
+            )
 
             # And then one for every period
             @parameters.find { |p| p.name == :period }.values.each { |value|
                 unless self[value.to_s]
-                    self.create(
+                    result << self.create(
                         :name => value.to_s,
                         :period => value
                     )
                 end
             }
+
+            result
         end
 
         def match?(previous = nil, now = nil)
@@ -346,7 +350,6 @@ module Puppet
             self.class.allattrs.each { |param|
                 if @parameters.include?(param) and
                     @parameters[param].respond_to?(:match?)
-                    #self.notice "Trying to match %s" % param
                     return false unless @parameters[param].match?(previous, now)
                 end
             }
@@ -358,4 +361,3 @@ module Puppet
     end
 end
 
-# $Id: schedule.rb 2665 2007-07-09 21:32:33Z luke $

data/lib/puppet/type/service.rb

@@ -28,79 +28,23 @@ module Puppet
         feature :enableable, "The provider can enable and disable the service",
             :methods => [:disable, :enable, :enabled?]
 
-        attr_reader :stat
-
-        newproperty(:enable) do
-            attr_reader :runlevel
+        newproperty(:enable, :required_features => :enableable) do
             desc "Whether a service should be enabled to start at boot.
                 This property behaves quite differently depending on the platform;
                 wherever possible, it relies on local tools to enable or disable
                 a given service."
 
             newvalue(:true, :event => :service_enabled) do
-                unless provider.respond_to?(:enable)
-                    raise Puppet::Error, "Service %s does not support enabling" %
-                        @resource.name
-                end
                 provider.enable
             end
 
             newvalue(:false, :event => :service_disabled) do
-                unless provider.respond_to?(:disable)
-                    raise Puppet::Error, "Service %s does not support enabling" %
-                        @resource.name
-                end
                 provider.disable
             end
 
             def retrieve
-                unless provider.respond_to?(:enabled?)
-                    raise Puppet::Error, "Service %s does not support enabling" %
-                        @resource.name
-                end
                 return provider.enabled?
             end
-
-            validate do |value|
-                unless value =~ /^\d+/
-                    super(value)
-                end
-            end
-
-            munge do |should|
-                @runlevel = nil
-                if should =~ /^\d+$/
-                    arity = @resource.method(:enable)
-                    if @runlevel and arity != 1
-                        raise Puppet::Error,
-                            "Services on %s do not accept runlevel specs" %
-                                @resource.type
-                    elsif arity != 0
-                        raise Puppet::Error,
-                            "Services on %s must specify runlevels" %
-                                @resource.type
-                    end
-                    @runlevel = should
-                    return :true
-                else
-                    super(should)
-                end
-            end
-
-            def sync
-                case self.should
-                when :true
-                    if @runlevel
-                        provider.enable(@runlevel)
-                    else
-                        provider.enable()
-                    end
-                    return :service_enabled
-                when :false
-                    provider.disable
-                    return :service_disabled
-                end
-            end
         end
 
         # Handle whether the service should actually be running right now.
@@ -124,42 +68,16 @@ module Puppet
 
             def sync
                 event = super()
-#                case self.should
-#                when :running
-#                    provider.start
-#                    event = :service_started
-#                when :stopped
-#                    provider.stop
-#                    event = :service_stopped
-#                else
-#                    self.debug "Not running '%s' and shouldn't be running" %
-#                        self
-#                end
 
                 if property = @resource.property(:enable)
                     val = property.retrieve
-                    unless property.insync?(val)
-                        property.sync
-                    end
+                    property.sync unless property.insync?(val)
                 end
 
                 return event
             end
         end
 
-        # Produce a warning, rather than just failing.
-        newparam(:running) do
-            desc "A place-holder parameter that wraps ``ensure``, because
-                ``running`` is deprecated.  You should use ``ensure`` instead
-                of this, but using this will still work, albeit with a
-                warning."
-
-            munge do |value|
-                @resource.warning "'running' is deprecated; please use 'ensure'"
-                @resource[:ensure] = value
-            end
-        end
-
         newparam(:binary) do
             desc "The path to the daemon.  This is only used for
                 systems that do not support init scripts.  This binary will be
@@ -178,53 +96,38 @@ module Puppet
                 
                 If you do not specify anything, then the service name will be
                 looked for in the process table."
+
+            newvalues(:true, :false)
         end
         newparam(:name) do
-            desc "The name of the service to run.  This name
-                is used to find the service in whatever service subsystem it
-                is in."
+            desc "The name of the service to run.  This name is used to find
+                the service in whatever service subsystem it is in."
             isnamevar
         end
 
-        newparam(:type) do
-            desc "Deprecated form of ``provider``."
-
-            munge do |value|
-                warning "'type' is deprecated; use 'provider' instead"
-                @resource[:provider] = value
-            end
-        end
-
         newparam(:path) do
-            desc "The search path for finding init scripts."
+            desc "The search path for finding init scripts.  Multiple values should
+                be separated by colons or provided as an array."
 
             munge do |value|
-                paths = []
-                if value.is_a?(Array)
-                    paths += value.flatten.collect { |p|
-                        p.split(":")
-                    }.flatten
-                else
-                    paths = value.split(":")
-                end
-
-                paths.each do |path|
+                value = [value] unless value.is_a?(Array)
+                paths = value.flatten.collect { |p| p.split(":") }.flatten.find_all do |path|
                     if FileTest.directory?(path)
-                        next
-                    end
-                    if FileTest.exists?(path)
-                        unless FileTest.directory?(path)
-                            @resource.debug "Search path %s is not a directory" %
-                                [path]
-                        end
+                        true
                     else
-                        @resource.debug("Search path %s does not exist" % [path])
+                        if FileTest.exist?(path) and ! FileTest.directory?(path)
+                            @resource.debug "Search path %s is not a directory" % [path]
+                        else
+                            @resource.debug("Search path %s does not exist" % [path])
+                        end
+                        false
                     end
-                    paths.delete(path)
                 end
 
                 paths
             end
+
+            defaultto { provider.class.defpath if provider.class.respond_to?(:defpath) }
         end
         newparam(:pattern) do
             desc "The pattern to search for in the process table.
@@ -238,9 +141,7 @@ module Puppet
                 
                 The pattern can be a simple string or any legal Ruby pattern."
 
-            defaultto {
-                @resource[:binary] || @resource[:name]
-            }
+            defaultto { @resource[:binary] || @resource[:name] }
         end
         newparam(:restart) do
             desc "Specify a *restart* command manually.  If left
@@ -268,52 +169,15 @@ module Puppet
             newvalues(:true, :false)
         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
-            @paths ||= {}
-            @paths[type] ||= []
-
-            unless @paths[type].include? path
-                @paths[type] << path
-            end
-        end
-
-        def self.paths(type)
-            type = type.intern if type.is_a? String
-            @paths ||= {}
-            @paths[type] ||= []
-
-            @paths[type].dup
-        end
-
-        # Initialize the service.  This is basically responsible for merging
-        # in the right module.
-        def initialize(hash)
-            super
-
-            # and then see if it needs to be checked
-            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.retrieve == :running
+            # Only restart if we're actually running
+            if (@parameters[:ensure] || newattr(:ensure)).retrieve == :running
                 provider.restart
             else
-                debug "Skipping restart; 'ensure' is not set to 'running'"
+                debug "Skipping restart; service is not running"
             end
         end
     end
 end
-
-# $Id: service.rb 2696 2007-07-14 20:26:31Z luke $