puppet 2.7.26 → 3.0.0.rc4

data/lib/puppet/transaction/resource_harness.rb

@@ -117,7 +117,7 @@ class Puppet::Transaction::ResourceHarness
     end
     event
   rescue => detail
-    puts detail.backtrace if Puppet[:trace]
+    Puppet.log_exception(detail)
     event.status = "failure"
 
     event.message = "change from #{property.is_to_s(current_value)} to #{property.should_to_s(property.should)} failed: #{detail}"
@@ -142,8 +142,7 @@ class Puppet::Transaction::ResourceHarness
     return status
   rescue => detail
     resource.fail "Could not create resource status: #{detail}" unless status
-    puts detail.backtrace if Puppet[:trace]
-    resource.err "Could not evaluate: #{detail}"
+    resource.log_exception(detail, "Could not evaluate: #{detail}")
     status.failed = true
     return status
   ensure

data/lib/puppet/type.rb

@@ -40,11 +40,6 @@ class Type
     attr_reader :properties
   end
 
-  def self.states
-    warnonce "The states method is deprecated; use properties"
-    properties
-  end
-
   # All parameters, in the appropriate order.  The key_attributes come first, then
   # the provider, then the properties, and finally the params and metaparams
   # in the order they were specified in the files.
@@ -52,21 +47,6 @@ class Type
     key_attributes | (parameters & [:provider]) | properties.collect { |property| property.name } | parameters | metaparams
   end
 
-  # Retrieve an attribute alias, if there is one.
-  def self.attr_alias(param)
-    # Intern again, because this might be called by someone who doesn't
-    # understand the calling convention and all.
-    @attr_aliases[param.intern]
-  end
-
-  # Create an alias to an existing attribute.  This will cause the aliased
-  # attribute to be valid when setting and retrieving values on the instance.
-  def self.set_attr_alias(hash)
-    hash.each do |new, old|
-      @attr_aliases[new.intern] = old.intern
-    end
-  end
-
   # Find the class associated with any given attribute.
   def self.attrclass(name)
     @attrclasses ||= {}
@@ -262,11 +242,6 @@ class Type
     param
   end
 
-  def self.newstate(name, options = {}, &block)
-    Puppet.warning "newstate() has been deprecrated; use newproperty(#{name})"
-    newproperty(name, options, &block)
-  end
-
   # Create a new property. The first parameter must be the name of the property;
   # this is how users will refer to the property when creating new instances.
   # The second parameter is a hash of options; the options are:
@@ -372,16 +347,6 @@ class Type
     validattr?(name)
   end
 
-  # Return either the attribute alias or the attribute.
-  def attr_alias(name)
-    name = name.intern
-    if synonym = self.class.attr_alias(name)
-      return synonym
-    else
-      return name
-    end
-  end
-
   # Are we deleting this resource?
   def deleting?
     obj = @parameters[:ensure] and obj.should == :absent
@@ -401,18 +366,18 @@ class Type
   # The name_var is the key_attribute in the case that there is only one.
   #
   def name_var
+    return @name_var_cache unless @name_var_cache.nil?
     key_attributes = self.class.key_attributes
-    (key_attributes.length == 1) && key_attributes.first
+    @name_var_cache = (key_attributes.length == 1) && key_attributes.first
   end
 
-  # abstract accessing parameters and properties, and normalize
-  # access to always be symbols, not strings
-  # This returns a value, not an object.  It returns the 'is'
-  # value, but you can also specifically return 'is' and 'should'
-  # values using 'object.is(:property)' or 'object.should(:property)'.
+  # abstract accessing parameters and properties, and normalize access to
+  # always be symbols, not strings This returns a value, not an object.
+  # It returns the 'is' value, but you can also specifically return 'is' and
+  # 'should' values using 'object.is(:property)' or
+  # 'object.should(:property)'.
   def [](name)
-    name = attr_alias(name)
-
+    name = name.intern
     fail("Invalid parameter #{name}(#{name.inspect})") unless self.class.validattr?(name)
 
     if name == :name && nv = name_var
@@ -432,7 +397,7 @@ class Type
   # access to always be symbols, not strings.  This sets the 'should'
   # value on properties, and otherwise just sets the appropriate parameter.
   def []=(name,value)
-    name = attr_alias(name)
+    name = name.intern
 
     fail("Invalid parameter #{name}") unless self.class.validattr?(name)
 
@@ -448,7 +413,7 @@ class Type
         # make sure the parameter doesn't have any errors
         property.value = value
       rescue => detail
-        error = Puppet::Error.new("Parameter #{name} failed on #{ref}: #{detail}")
+        error = Puppet::Error.new("Parameter #{name} failed: #{detail}")
         error.set_backtrace(detail.backtrace)
         raise error
       end
@@ -484,7 +449,7 @@ class Type
 
   # retrieve the 'should' value for a specified property
   def should(name)
-    name = attr_alias(name)
+    name = name.intern
     (prop = @parameters[name] and prop.is_a?(Puppet::Property)) ? prop.should : nil
   end
 
@@ -568,7 +533,7 @@ class Type
 
   # Return a specific value for an attribute.
   def value(name)
-    name = attr_alias(name)
+    name = name.intern
 
     (obj = @parameters[name] and obj.respond_to?(:value)) ? obj.value : nil
   end
@@ -771,115 +736,6 @@ class Type
     noop?
   end
 
-  ###############################
-  # Code related to managing resource instances.
-  require 'puppet/transportable'
-
-  # retrieve a named instance of the current type
-  def self.[](name)
-    raise "Global resource access is deprecated"
-    @objects[name] || @aliases[name]
-  end
-
-  # add an instance by name to the class list of instances
-  def self.[]=(name,object)
-    raise "Global resource storage is deprecated"
-    newobj = nil
-    if object.is_a?(Puppet::Type)
-      newobj = object
-    else
-      raise Puppet::DevError, "must pass a Puppet::Type object"
-    end
-
-    if exobj = @objects[name] and self.isomorphic?
-      msg = "Object '#{newobj.class.name}[#{name}]' already exists"
-
-      msg += ("in file #{object.file} at line #{object.line}") if exobj.file and exobj.line
-      msg += ("and cannot be redefined in file #{object.file} at line #{object.line}") if object.file and object.line
-      error = Puppet::Error.new(msg)
-      raise error
-    else
-      #Puppet.info("adding %s of type %s to class list" %
-      #    [name,object.class])
-      @objects[name] = newobj
-    end
-  end
-
-  # Create an alias.  We keep these in a separate hash so that we don't encounter
-  # the objects multiple times when iterating over them.
-  def self.alias(name, obj)
-    raise "Global resource aliasing is deprecated"
-    if @objects.include?(name)
-      unless @objects[name] == obj
-        raise Puppet::Error.new(
-          "Cannot create alias #{name}: object already exists"
-        )
-      end
-    end
-
-    if @aliases.include?(name)
-      unless @aliases[name] == obj
-        raise Puppet::Error.new(
-          "Object #{@aliases[name].name} already has alias #{name}"
-        )
-      end
-    end
-
-    @aliases[name] = obj
-  end
-
-  # remove all of the instances of a single type
-  def self.clear
-    raise "Global resource removal is deprecated"
-    if defined?(@objects)
-      @objects.each do |name, obj|
-        obj.remove(true)
-      end
-      @objects.clear
-    end
-    @aliases.clear if defined?(@aliases)
-  end
-
-  # Force users to call this, so that we can merge objects if
-  # necessary.
-  def self.create(args)
-    # LAK:DEP Deprecation notice added 12/17/2008
-    Puppet.warning "Puppet::Type.create is deprecated; use Puppet::Type.new"
-    new(args)
-  end
-
-  # remove a specified object
-  def self.delete(resource)
-    raise "Global resource removal is deprecated"
-    return unless defined?(@objects)
-    @objects.delete(resource.title) if @objects.include?(resource.title)
-    @aliases.delete(resource.title) if @aliases.include?(resource.title)
-    if @aliases.has_value?(resource)
-      names = []
-      @aliases.each do |name, otherres|
-        if otherres == resource
-          names << name
-        end
-      end
-      names.each { |name| @aliases.delete(name) }
-    end
-  end
-
-  # iterate across each of the type's instances
-  def self.each
-    raise "Global resource iteration is deprecated"
-    return unless defined?(@objects)
-    @objects.each { |name,instance|
-      yield instance
-    }
-  end
-
-  # does the type have an object with the given name?
-  def self.has_key?(name)
-    raise "Global resource access is deprecated"
-    @objects.has_key?(name)
-  end
-
   # Retrieve all known instances.  Either requires providers or must be overridden.
   def self.instances
     raise Puppet::DevError, "#{self.name} has no providers and has not overridden 'instances'" if provider_hash.empty?
@@ -897,7 +753,7 @@ class Type
         # We always want to use the "first" provider instance we find, unless the resource
         # is already managed and has a different provider set
         if other = provider_instances[instance.name]
-          Puppet.warning "%s %s found in both %s and %s; skipping the %s version" %
+          Puppet.debug "%s %s found in both %s and %s; skipping the %s version" %
             [self.name.to_s.capitalize, instance.name, other.class.name, instance.class.name, instance.class.name]
           next
         end
@@ -1045,16 +901,6 @@ class Type
     end
   end
 
-  newmetaparam(:check) do
-    desc "Audit specified attributes of resources over time, and report if any have changed.
-      This parameter has been deprecated in favor of 'audit'."
-
-    munge do |args|
-      resource.warning "'check' attribute is deprecated; use 'audit' instead"
-      resource[:audit] = args
-    end
-  end
-
   newmetaparam(:loglevel) do
     desc "Sets the level that information will be logged.
       The log levels have the biggest impact when logs are sent to
@@ -1712,8 +1558,6 @@ class Type
     @parameters = []
     @paramhash = {}
 
-    @attr_aliases = {}
-
     @paramdoc = Hash.new { |hash,key|
       key = key.intern if key.is_a?(String)
       if hash.include?(key)
@@ -1776,7 +1620,6 @@ class Type
 
   # initialize the type instance
   def initialize(resource)
-    raise Puppet::DevError, "Got TransObject instead of Resource or hash" if resource.is_a?(Puppet::TransObject)
     resource = self.class.hash2resource(resource) unless resource.is_a?(Puppet::Resource)
 
     # The list of parameter/property instances.
@@ -1928,15 +1771,9 @@ class Type
     self.ref
   end
 
-  # Convert to a transportable object
-  def to_trans(ret = true)
-    trans = TransObject.new(self.title, self.class.name)
-
-    values = retrieve_resource
-    values.each do |name, value|
-      name = name.name if name.respond_to? :name
-      trans[name] = value
-    end
+  def to_resource
+    resource = self.retrieve_resource
+    resource.tag(*self.tags)
 
     @parameters.each do |name, param|
       # Avoid adding each instance name twice
@@ -1944,20 +1781,10 @@ class Type
 
       # We've already got property values
       next if param.is_a?(Puppet::Property)
-      trans[name] = param.value
+      resource[name] = param.value
     end
 
-    trans.tags = self.tags
-
-    # FIXME I'm currently ignoring 'parent' and 'path'
-
-    trans
-  end
-
-  def to_resource
-    # this 'type instance' versus 'resource' distinction seems artificial
-    # I'd like to see it collapsed someday ~JW
-    self.to_trans.to_resource
+    resource
   end
 
   def virtual?;  !!@virtual;  end

data/lib/puppet/type/augeas.rb

@@ -20,7 +20,7 @@ Puppet::Type.newtype(:augeas) do
   feature :need_to_run?, "If the command should run"
   feature :execute_changes, "Actually make the changes"
 
-  @doc = <<-'EOT'
+  @doc = <<-EOT
     Apply a change or an array of changes to the filesystem
     using the augeas tool.
 

data/lib/puppet/type/cron.rb

@@ -3,7 +3,7 @@ require 'facter'
 require 'puppet/util/filetype'
 
 Puppet::Type.newtype(:cron) do
-  @doc = <<-'EOT'
+  @doc = <<-EOT
     Installs and manages cron jobs.  Every cron resource requires a command
     and user attribute, as well as at least one periodic attribute (hour,
     minute, month, monthday, weekday, or special).  While the name of the cron

data/lib/puppet/type/exec.rb

@@ -185,6 +185,8 @@ module Puppet
         log the output when the command reports an error.  Values are
         **true**, *false*, *on_failure*, and any legal log level."
 
+      defaultto :on_failure
+
       newvalues(:true, :false, :on_failure)
     end
 
@@ -274,7 +276,7 @@ module Puppet
 
 
     newcheck(:refreshonly) do
-      desc <<-'EOT'
+      desc <<-EOT
         The command should only be run as a
         refresh mechanism for when a dependent object is changed.  It only
         makes sense to use this option when this command depends on some
@@ -311,7 +313,7 @@ module Puppet
     end
 
     newcheck(:creates, :parent => Puppet::Parameter::Path) do
-      desc <<-'EOT'
+      desc <<-EOT
         A file that this command creates.  If this
         parameter is provided, then the command will only be run
         if the specified file does not exist.
@@ -336,7 +338,7 @@ module Puppet
     end
 
     newcheck(:unless) do
-      desc <<-'EOT'
+      desc <<-EOT
         If this parameter is set, then this `exec` will run unless
         the command returns 0.  For example:
 
@@ -378,7 +380,7 @@ module Puppet
     end
 
     newcheck(:onlyif) do
-      desc <<-'EOT'
+      desc <<-EOT
         If this parameter is set, then this `exec` will only run if
         the command returns 0.  For example:
 

data/lib/puppet/type/file.rb

@@ -5,7 +5,6 @@ require 'uri'
 require 'fileutils'
 require 'enumerator'
 require 'pathname'
-require 'puppet/network/handler'
 require 'puppet/util/diff'
 require 'puppet/util/checksums'
 require 'puppet/util/backups'
@@ -39,7 +38,7 @@ Puppet::Type.newtype(:file) do
   end
 
   newparam(:path) do
-    desc <<-'EOT'
+    desc <<-EOT
       The path to the file to manage.  Must be fully qualified.
 
       On Windows, the path should include the drive letter and should use `/` as
@@ -131,14 +130,10 @@ Puppet::Type.newtype(:file) do
         a few files into a directory containing many
         unmanaged files without scanning all the local files.
       * `false` --- Default of no recursion.
-      * `[0-9]+` --- Same as true, but limit recursion. Warning: this syntax
-        has been deprecated in favor of the `recurselimit` attribute.
     "
 
-    newvalues(:true, :false, :inf, :remote, /^[0-9]+$/)
+    newvalues(:true, :false, :inf, :remote)
 
-    # Replace the validation so that we allow numbers in
-    # addition to string representations of them.
     validate { |arg| }
     munge do |value|
       newval = super(value)
@@ -146,23 +141,6 @@ Puppet::Type.newtype(:file) do
       when :true, :inf; true
       when :false; false
       when :remote; :remote
-      when Integer, Fixnum, Bignum
-        self.warning "Setting recursion depth with the recurse parameter is now deprecated, please use recurselimit"
-
-        # recurse == 0 means no recursion
-        return false if value == 0
-
-        resource[:recurselimit] = value
-        true
-      when /^\d+$/
-        self.warning "Setting recursion depth with the recurse parameter is now deprecated, please use recurselimit"
-        value = Integer(value)
-
-        # recurse == 0 means no recursion
-        return false if value == 0
-
-        resource[:recurselimit] = value
-        true
       else
         self.fail "Invalid recurse value #{value.inspect}"
       end
@@ -580,7 +558,7 @@ Puppet::Type.newtype(:file) do
       result.each { |data| data.source = "#{source}/#{data.relative_path}" }
       break result if result and ! result.empty? and sourceselect == :first
       result
-    end.flatten
+    end.flatten.compact
 
     # This only happens if we have sourceselect == :all
     unless sourceselect == :first
@@ -614,7 +592,8 @@ Puppet::Type.newtype(:file) do
       :recurse => (self[:recurse] == :remote ? true : self[:recurse]),
       :recurselimit => self[:recurselimit],
       :ignore => self[:ignore],
-      :checksum_type => (self[:source] || self[:content]) ? self[:checksum] : :none
+      :checksum_type => (self[:source] || self[:content]) ? self[:checksum] : :none,
+      :environment => catalog.environment
     )
   end
 
@@ -722,13 +701,10 @@ Puppet::Type.newtype(:file) do
     end
   end
 
-  # We have to hack this just a little bit, because otherwise we'll get
-  # an error when the target and the contents are created as properties on
-  # the far side.
-  def to_trans(retrieve = true)
-    obj = super
-    obj.delete(:target) if obj[:target] == :notlink
-    obj
+  def to_resource
+    resource = super
+    resource.delete(:target) if resource[:target] == :notlink
+    resource
   end
 
   # Write out the file.  Requires the property name for logging.
@@ -736,23 +712,36 @@ Puppet::Type.newtype(:file) do
   def write(property)
     remove_existing(:file)
 
+    use_temporary_file = write_temporary_file?
+    if use_temporary_file
+      path = "#{self[:path]}.puppettmp_#{rand(10000)}"
+      path = "#{self[:path]}.puppettmp_#{rand(10000)}" while ::File.exists?(path) or ::File.symlink?(path)
+    else
+      path = self[:path]
+    end
+
     mode = self.should(:mode) # might be nil
-    mode_int = mode ? symbolic_mode_to_int(mode, Puppet::Util::DEFAULT_POSIX_MODE) : nil
-
-    if write_temporary_file?
-      Puppet::Util.replace_file(self[:path], mode_int) do |file|
-        file.binmode
-        content_checksum = write_content(file)
-        file.flush
-        fail_if_checksum_is_wrong(file.path, content_checksum) if validate_checksum?
+    umask = mode ? 000 : 022
+    mode_int = mode ? symbolic_mode_to_int(mode, 0644) : nil
+
+    content_checksum = Puppet::Util.withumask(umask) { ::File.open(path, 'wb', mode_int ) { |f| write_content(f) } }
+
+    # And put our new file in place
+    if use_temporary_file # This is only not true when our file is empty.
+      begin
+        fail_if_checksum_is_wrong(path, content_checksum) if validate_checksum?
+        ::File.rename(path, self[:path])
+      rescue => detail
+        fail "Could not rename temporary file #{path} to #{self[:path]}: #{detail}"
+      ensure
+        # Make sure the created file gets removed
+        ::File.unlink(path) if FileTest.exists?(path)
       end
-    else
-      umask = mode ? 000 : 022
-      Puppet::Util.withumask(umask) { ::File.open(self[:path], 'wb', mode_int ) { |f| write_content(f) } }
     end
 
     # make sure all of the modes are actually correct
     property_fix
+
   end
 
   private