puppet 2.7.18 → 2.7.19

data/lib/puppet/resource/catalog.rb

@@ -400,7 +400,8 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph
   # references to the resource instances.
   def remove_resource(*resources)
     resources.each do |resource|
-      @resource_table.delete(resource.ref)
+      title_key = title_key_for_ref(resource.ref)
+      @resource_table.delete(title_key)
       if aliases = @aliases[resource.ref]
         aliases.each { |res_alias| @resource_table.delete(res_alias) }
         @aliases.delete(resource.ref)

data/lib/puppet/resource/type_collection.rb

@@ -1,3 +1,5 @@
+require 'puppet/parser/type_loader'
+
 class Puppet::Resource::TypeCollection
   attr_reader :environment
   attr_accessor :parse_failed
@@ -68,7 +70,6 @@ class Puppet::Resource::TypeCollection
   end
 
   def loader
-    require 'puppet/parser/type_loader'
     @loader ||= Puppet::Parser::TypeLoader.new(environment)
   end
 

data/lib/puppet/ssl/base.rb

@@ -1,3 +1,4 @@
+require 'openssl/digest'
 require 'puppet/ssl'
 
 # The base class for wrapping SSL instances.
@@ -63,8 +64,6 @@ class Puppet::SSL::Base
   end
 
   def fingerprint(md = :MD5)
-    require 'openssl/digest'
-
     # ruby 1.8.x openssl digest constants are string
     # but in 1.9.x they are symbols
     mds = md.to_s.upcase

data/lib/puppet/ssl/certificate_authority/interface.rb

@@ -28,6 +28,7 @@ module Puppet
           rescue => detail
             puts detail.backtrace if Puppet[:trace]
             Puppet.err "Could not call #{method}: #{detail}"
+            raise
           end
         end
 

data/lib/puppet/test/test_helper.rb

@@ -79,6 +79,7 @@ module Puppet::Test
       Puppet[:req_bits]  = 512
       Puppet[:keylength] = 512
 
+      Puppet.clear_deprecation_warnings
     end
 
     # Call this method once per test, after execution of each individual test.
@@ -135,4 +136,4 @@ module Puppet::Test
     end
     private_class_method :clear_settings_after_each
   end
-end
+end

data/lib/puppet/type.rb

@@ -503,7 +503,7 @@ class Type
 
     if provider and ! provider.class.supports_parameter?(klass)
       missing = klass.required_features.find_all { |f| ! provider.class.feature?(f) }
-      info "Provider %s does not support features %s; not managing attribute %s" % [provider.class.name, missing.join(", "), name]
+      debug "Provider %s does not support features %s; not managing attribute %s" % [provider.class.name, missing.join(", "), name]
       return nil
     end
 

data/lib/puppet/type/augeas.rb

@@ -149,7 +149,7 @@ Puppet::Type.newtype(:augeas) do
   end
 
   newparam(:load_path) do
-    desc "Optional colon-separated list of directories; these directories are searched for schema definitions."
+    desc "Optional colon-separated list or array of directories; these directories are searched for schema definitions. The agent's `$libdir/augeas/lenses` path will always be added to support pluginsync."
     defaultto ""
   end
 

data/lib/puppet/type/file.rb

@@ -202,7 +202,7 @@ Puppet::Type.newtype(:file) do
       whose content doesn't match what the `source` or `content` attribute
       specifies.  Setting this to false allows file resources to initialize files
       without overwriting future changes.  Note that this only affects content;
-      Puppet will still manage ownership and permissions."
+      Puppet will still manage ownership and permissions. Defaults to `true`."
     newvalues(:true, :false)
     aliasvalue(:yes, :true)
     aliasvalue(:no, :false)
@@ -437,7 +437,7 @@ Puppet::Type.newtype(:file) do
     # from it.
     unless self[:ensure]
       if self[:target]
-        self[:ensure] = :symlink
+        self[:ensure] = :link
       elsif self[:content]
         self[:ensure] = :file
       end
@@ -724,6 +724,8 @@ Puppet::Type.newtype(:file) do
       ::File.send(method, self[:path])
     rescue Errno::ENOENT => error
       nil
+    rescue Errno::ENOTDIR => error
+      nil
     rescue Errno::EACCES => error
       warning "Could not stat; permission denied"
       nil

data/lib/puppet/type/scheduled_task.rb

@@ -33,6 +33,12 @@ Puppet::Type.newtype(:scheduled_task) do
     validate do |value|
       raise Puppet::Error.new('Must be specified using an absolute path.') unless absolute_path?(value)
     end
+    munge do |value|
+      # windows converts slashes to backslashes, so the *is* value
+      # has backslashes. Do the same for the *should* value, so that
+      # we are slash-insensitive. See #13009
+      File.expand_path(value).gsub(/\//, '\\')
+    end
   end
 
   newproperty(:working_dir) do
@@ -43,9 +49,9 @@ Puppet::Type.newtype(:scheduled_task) do
     end
   end
 
-  newproperty(:arguments, :array_matching => :all) do
+  newproperty(:arguments) do
     desc "Any arguments or flags that should be passed to the command. Multiple arguments
-      can be specified as an array or as a space-separated string."
+      should be specified as a space-separated string."
   end
 
   newproperty(:user) do
@@ -157,12 +163,4 @@ Puppet::Type.newtype(:scheduled_task) do
       self.class.format_value_for_display(current_value)
     end
   end
-
-  validate do
-    return true if self[:ensure] == :absent
-
-    if self[:arguments] and !(self[:arguments].is_a?(Array) and self[:arguments].length == 1)
-      self.fail('Parameter arguments failed: Must be specified as a single string')
-    end
-  end
 end

data/lib/puppet/type/tidy.rb

@@ -187,7 +187,7 @@ Puppet::Type.newtype(:tidy) do
   end
 
   newparam(:type) do
-    desc "Set the mechanism for determining age."
+    desc "Set the mechanism for determining age. Default: atime."
 
     newvalues(:atime, :mtime, :ctime)
 

data/lib/puppet/util.rb

@@ -9,6 +9,7 @@ require 'sync'
 require 'monitor'
 require 'tempfile'
 require 'pathname'
+require 'ostruct'
 require 'puppet/util/platform'
 
 module Puppet
@@ -417,11 +418,13 @@ module Util
     # well.
     2.times do |try|
       if File.exists?(stdout.path)
-        output = stdout.open.read
-
-        stdout.close(true)
-
-        return output
+        stdout.open
+        begin
+          return stdout.read
+        ensure
+          stdout.close
+          stdout.unlink
+        end
       else
         time_to_sleep = try / 2.0
         Puppet.warning "Waiting for output; will sleep #{time_to_sleep} seconds"
@@ -521,34 +524,31 @@ module Util
   # across.
   def replace_file(file, default_mode, &block)
     raise Puppet::DevError, "replace_file requires a block" unless block_given?
-    raise Puppet::DevError, "replace_file is non-functional on Windows" if Puppet.features.microsoft_windows?
 
     file     = Pathname(file)
     tempfile = Tempfile.new(file.basename.to_s, file.dirname.to_s)
 
     file_exists = file.exist?
 
-    # If the file exists, use its current mode/owner/group. If it doesn't, use
-    # the supplied mode, and default to current user/group.
-    if file_exists
-      stat = file.lstat
-
-      # We only care about the four lowest-order octets. Higher octets are
-      # filesystem-specific.
-      mode = stat.mode & 07777
-      uid = stat.uid
-      gid = stat.gid
-    else
-      mode = default_mode
-      uid = Process.euid
-      gid = Process.egid
-    end
-
     # Set properties of the temporary file before we write the content, because
     # Tempfile doesn't promise to be safe from reading by other people, just
     # that it avoids races around creating the file.
-    tempfile.chmod(mode)
-    tempfile.chown(uid, gid)
+    #
+    # Our Windows emulation is pretty limited, and so we have to carefully
+    # and specifically handle the platform, which has all sorts of magic.
+    # So, unlike Unix, we don't pre-prep security; we use the default "quite
+    # secure" tempfile permissions instead.  Magic happens later.
+    unless Puppet.features.microsoft_windows?
+      # Grab the current file mode, and fall back to the defaults.
+      stat = file.lstat rescue OpenStruct.new(:mode => default_mode,
+                                              :uid  => Process.euid,
+                                              :gid  => Process.egid)
+
+      # We only care about the bottom four slots, which make the real mode,
+      # and not the rest of the platform stat call fluff and stuff.
+      tempfile.chmod(stat.mode & 07777)
+      tempfile.chown(stat.uid, stat.gid)
+    end
 
     # OK, now allow the caller to write the content of the file.
     yield tempfile
@@ -569,7 +569,45 @@ module Util
 
     tempfile.close
 
-    File.rename(tempfile.path, file)
+    if Puppet.features.microsoft_windows?
+      # This will appropriately clone the file, but only if the file we are
+      # replacing exists.  Which is kind of annoying; thanks Microsoft.
+      #
+      # So, to avoid getting into an infinite loop we will retry once if the
+      # file doesn't exist, but only the once...
+      have_retried = false
+
+      begin
+        # Yes, the arguments are reversed compared to the rename in the rest
+        # of the world.
+        Puppet::Util::Windows::File.replace_file(file, tempfile.path)
+      rescue Puppet::Util::Windows::Error => e
+        # This might race, but there are enough possible cases that there
+        # isn't a good, solid "better" way to do this, and the next call
+        # should fail in the same way anyhow.
+        raise if have_retried or File.exist?(file)
+        have_retried = true
+
+        # OK, so, we can't replace a file that doesn't exist, so let us put
+        # one in place and set the permissions.  Then we can retry and the
+        # magic makes this all work.
+        #
+        # This is the least-worst option for handling Windows, as far as we
+        # can determine.
+        File.open(file, 'a') do |fh|
+          # this space deliberately left empty for auto-close behaviour,
+          # append mode, and not actually changing any of the content.
+        end
+
+        # Set the permissions to what we want.
+        Puppet::Util::Windows::Security.set_mode(default_mode, file.to_s)
+
+        # ...and finally retry the operation.
+        retry
+      end
+    else
+      File.rename(tempfile.path, file)
+    end
 
     # Ideally, we would now fsync the directory as well, but Ruby doesn't
     # have support for that, and it doesn't matter /that/ much...

data/lib/puppet/util/autoload.rb

@@ -107,8 +107,8 @@ class Puppet::Util::Autoload
       name = File.basename(file).chomp(".rb").intern
       next if loaded?(name)
       begin
-        Kernel.require file
         loaded(name, file)
+        Kernel.require file
       rescue SystemExit,NoMemoryError
         raise
       rescue Exception => detail
@@ -128,9 +128,11 @@ class Puppet::Util::Autoload
   end
 
   def module_directories(env=nil)
-    # We have to require this late in the process because otherwise we might have
-    # load order issues.
-    require 'puppet/node/environment'
+    # We have to require this late in the process because otherwise we might
+    # have load order issues. Since require is much slower than defined?, we
+    # can skip that - and save some 2,155 invocations of require in my real
+    # world testing. --daniel 2012-07-10
+    require 'puppet/node/environment' unless defined?(Puppet::Node::Environment)
 
     real_env = Puppet::Node::Environment.new(env)
 

data/lib/puppet/util/checksums.rb

@@ -1,3 +1,6 @@
+require 'digest/md5'
+require 'digest/sha1'
+
 # A stand-alone module for calculating checksums
 # in a generic way.
 module Puppet::Util::Checksums
@@ -24,7 +27,6 @@ module Puppet::Util::Checksums
 
   # Calculate a checksum using Digest::MD5.
   def md5(content)
-    require 'digest/md5'
     Digest::MD5.hexdigest(content)
   end
 
@@ -35,8 +37,6 @@ module Puppet::Util::Checksums
 
   # Calculate a checksum of a file's content using Digest::MD5.
   def md5_file(filename, lite = false)
-    require 'digest/md5'
-
     digest = Digest::MD5.new
     checksum_file(digest, filename,  lite)
   end
@@ -47,7 +47,6 @@ module Puppet::Util::Checksums
   end
 
   def md5_stream(&block)
-    require 'digest/md5'
     digest = Digest::MD5.new
     yield digest
     digest.hexdigest
@@ -74,7 +73,6 @@ module Puppet::Util::Checksums
 
   # Calculate a checksum using Digest::SHA1.
   def sha1(content)
-    require 'digest/sha1'
     Digest::SHA1.hexdigest(content)
   end
 
@@ -85,8 +83,6 @@ module Puppet::Util::Checksums
 
   # Calculate a checksum of a file's content using Digest::SHA1.
   def sha1_file(filename, lite = false)
-    require 'digest/sha1'
-
     digest = Digest::SHA1.new
     checksum_file(digest, filename, lite)
   end
@@ -97,7 +93,6 @@ module Puppet::Util::Checksums
   end
 
   def sha1_stream
-    require 'digest/sha1'
     digest = Digest::SHA1.new
     yield digest
     digest.hexdigest

data/lib/puppet/util/diff.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 # Provide a diff between two strings.
 module Puppet::Util::Diff
   include Puppet::Util
@@ -64,7 +66,6 @@ module Puppet::Util::Diff
   end
 
   def string_file_diff(path, string)
-    require 'tempfile'
     tempfile = Tempfile.new("puppet-diffing")
     tempfile.open
     tempfile.print string

data/lib/puppet/util/filetype.rb

@@ -2,6 +2,7 @@
 # to see here.
 
 require 'puppet/util/selinux'
+require 'tempfile'
 require 'fileutils'
 
 class Puppet::Util::FileType
@@ -103,7 +104,6 @@ class Puppet::Util::FileType
 
     # Overwrite the file.
     def write(text)
-      require "tempfile"
       tf = Tempfile.new("puppet")
       tf.print text; tf.flush
       FileUtils.cp(tf.path, @path)
@@ -223,7 +223,6 @@ class Puppet::Util::FileType
     # and the text with which to create the cron tab.
     def write(text)
       puts text
-      require "tempfile"
       output_file = Tempfile.new("puppet")
       fh = output_file.open
       fh.print text
@@ -262,7 +261,6 @@ class Puppet::Util::FileType
     # Overwrite a specific @path's cron tab; must be passed the @path name
     # and the text with which to create the cron tab.
     def write(text)
-      require "tempfile"
       output_file = Tempfile.new("puppet")
       fh = output_file.open
       fh.print text

data/lib/puppet/util/run_mode.rb

@@ -1,3 +1,5 @@
+require 'etc'
+
 module Puppet
   module Util
     class RunMode
@@ -71,7 +73,6 @@ module Puppet
       end
 
       def expand_path( dir )
-        require 'etc'
         ENV["HOME"] ||= Etc.getpwuid(Process.uid).dir
         File.expand_path(dir)
       end

data/lib/puppet/util/suidmanager.rb

@@ -1,3 +1,4 @@
+require 'facter'
 require 'puppet/util/warnings'
 require 'forwardable'
 require 'etc'
@@ -17,7 +18,6 @@ module Puppet::Util::SUIDManager
 
   def osx_maj_ver
     return @osx_maj_ver unless @osx_maj_ver.nil?
-    require 'facter'
     # 'kernel' is available without explicitly loading all facts
     if Facter.value('kernel') != 'Darwin'
       @osx_maj_ver = false

data/lib/puppet/util/windows.rb

@@ -3,4 +3,5 @@ module Puppet::Util::Windows
   require 'puppet/util/windows/security'
   require 'puppet/util/windows/user'
   require 'puppet/util/windows/process'
+  require 'puppet/util/windows/file'
 end

data/lib/puppet/util/windows/file.rb

@@ -0,0 +1,27 @@
+require 'puppet/util/windows'
+
+module Puppet::Util::Windows::File
+  require 'windows/api'
+  require 'windows/wide_string'
+
+  ReplaceFileWithoutBackupW = Windows::API.new('ReplaceFileW', 'PPVLVV', 'B')
+  def replace_file(target, source)
+    result = ReplaceFileWithoutBackupW.call(WideString.new(target.to_s),
+                                   WideString.new(source.to_s),
+                                   0, 0x1, 0, 0)
+    return true unless result == 0
+    raise Puppet::Util::Windows::Error.new("ReplaceFile(#{target}, #{source})")
+  end
+  module_function :replace_file
+
+  MoveFileEx = Windows::API.new('MoveFileExW', 'PPL', 'B')
+  def move_file_ex(source, target, flags = 0)
+    result = MoveFileEx.call(WideString.new(source.to_s),
+                             WideString.new(target.to_s),
+                             flags)
+    return true unless result == 0
+    raise Puppet::Util::Windows::Error.
+      new("MoveFileEx(#{source}, #{target}, #{flags.to_s(8)})")
+  end
+  module_function :move_file_ex
+end