puppet 2.7.19 → 2.7.20.rc1

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
@@ -389,7 +389,7 @@ Puppet::Type.newtype(:cron) do
   attr_accessor :uid
 
   def value(name)
-    name = symbolize(name)
+    name = name.intern
     ret = nil
     if obj = @parameters[name]
       ret = obj.should

data/lib/puppet/type/exec.rb

@@ -218,8 +218,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 0 to disable the timeout.
-        The time is specified in seconds."
+        and will be stopped. The timeout is specified in seconds. The default
+        timeout is 300 seconds and you can set it to 0 to disable the timeout."
 
       munge do |value|
         value = value.shift if value.is_a?(Array)
@@ -274,7 +274,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 +311,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 +336,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 +378,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

@@ -35,11 +35,11 @@ Puppet::Type.newtype(:file) do
     parent directories of a file, the file resource will autorequire them."
 
   def self.title_patterns
-    [ [ /^(.*?)\/*\Z/m, [ [ :path, lambda{|x| x} ] ] ] ]
+    [ [ /^(.*?)\/*\Z/m, [ [ :path ] ] ] ]
   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
@@ -53,20 +53,8 @@ Puppet::Type.newtype(:file) do
       end
     end
 
-    # convert the current path in an index into the collection and the last
-    # path name. The aim is to use less storage for all common paths in a hierarchy
     munge do |value|
-      # We know the value is absolute, so expanding it will just standardize it.
-      path, name = ::File.split(::File.expand_path(value))
-
-      { :index => Puppet::FileCollection.collection.index(path), :name => name }
-    end
-
-    # and the reverse
-    unmunge do |value|
-      basedir = Puppet::FileCollection.collection.path(value[:index])
-
-      ::File.join( basedir, value[:name] )
+      ::File.expand_path(value)
     end
   end
 
@@ -521,6 +509,7 @@ Puppet::Type.newtype(:file) do
     # remote system.
     mark_children_for_purging(children) if self.purge?
 
+    # REVISIT: sort_by is more efficient?
     result = children.values.sort { |a, b| a[:path] <=> b[:path] }
     remove_less_specific_files(result)
   end
@@ -530,6 +519,7 @@ Puppet::Type.newtype(:file) do
   # not likely to have many actual conflicts, which is good, because
   # this is a pretty inefficient implementation.
   def remove_less_specific_files(files)
+    # REVISIT: is this Windows safe?  AltSeparator?
     mypath = self[:path].split(::File::Separator)
     other_paths = catalog.vertices.
       select  { |r| r.is_a?(self.class) and r[:path] != self[:path] }.

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

@@ -15,7 +15,7 @@ module Puppet
 
     attr_reader :actual_content
 
-    desc <<-EOT
+    desc <<-'EOT'
       The desired contents of a file, as a string. This attribute is mutually
       exclusive with `source` and `target`.
 

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

@@ -5,7 +5,7 @@ module Puppet
     require 'puppet/util/symbolic_file_mode'
     include Puppet::Util::SymbolicFileMode
 
-    desc <<-EOT
+    desc <<-'EOT'
       Whether to create files that don't currently exist.
       Possible values are *absent*, *present*, *file*, and *directory*.
       Specifying `present` will match any form of file existence, and

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

@@ -6,7 +6,7 @@ module Puppet
     require 'puppet/util/symbolic_file_mode'
     include Puppet::Util::SymbolicFileMode
 
-    desc <<-EOT
+    desc <<-'EOT'
       The desired permissions mode for the file, in symbolic or numeric
       notation. Puppet uses traditional Unix permission schemes and translates
       them to equivalent permissions for systems which represent permissions

data/lib/puppet/type/file/selcontext.rb

@@ -48,9 +48,13 @@ module Puppet
     def insync?(value)
       if not selinux_support?
         debug("SELinux bindings not found. Ignoring parameter.")
-        return true
+        true
+      elsif not selinux_label_support?(@resource[:path])
+        debug("SELinux not available for this filesystem. Ignoring parameter.")
+        true
+      else
+        super
       end
-      super
     end
 
     def sync

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

@@ -12,7 +12,7 @@ module Puppet
     include Puppet::Util::Diff
 
     attr_accessor :source, :local
-    desc <<-EOT
+    desc <<-'EOT'
       A source file, which will be copied into place on the local system.
       Values can be URIs pointing to remote files, or fully qualified paths to
       files available on the local system (including files on NFS shares or

data/lib/puppet/type/mount.rb

@@ -231,7 +231,7 @@ module Puppet
     end
 
     def value(name)
-      name = symbolize(name)
+      name = name.intern
       ret = nil
       if property = @parameters[name]
         return property.value

data/lib/puppet/type/package.rb

@@ -306,7 +306,7 @@ module Puppet
     end
 
     newparam(:install_options, :required_features => :install_options) do
-      desc <<-EOT
+      desc <<-'EOT'
         A hash of additional options to pass when installing a package. These
         options are package-specific, and should be documented by the software
         vendor. The most commonly implemented option is `INSTALLDIR`:

data/lib/puppet/type/schedule.rb

@@ -1,6 +1,6 @@
 module Puppet
   newtype(:schedule) do
-    @doc = <<-EOT
+    @doc = <<-'EOT'
       Define schedules for Puppet. Resources can be limited to a schedule by using the
       [`schedule`](http://docs.puppetlabs.com/references/latest/metaparameter.html#schedule)
       metaparameter.

data/lib/puppet/type/scheduled_task.rb

@@ -80,7 +80,7 @@ Puppet::Type.newtype(:scheduled_task) do
   end
 
   newproperty(:trigger, :array_matching => :all) do
-    desc <<-EOT
+    desc <<-'EOT'
       One or more triggers defining when the task should run. A single trigger is
       represented as a hash, and multiple triggers can be specified with an array of
       hashes.

data/lib/puppet/type/tidy.rb

@@ -43,7 +43,7 @@ Puppet::Type.newtype(:tidy) do
   end
 
   newparam(:matches) do
-    desc <<-EOT
+    desc <<-'EOT'
       One or more (shell type) file glob patterns, which restrict
       the list of files to be tidied to those whose basenames match
       at least one of the patterns specified. Multiple patterns can

data/lib/puppet/type/whit.rb

@@ -10,18 +10,25 @@ Puppet::Type.newtype(:whit) do
   end
 
 
-  # Hide the fact that we're a whit from logs
+  # Hide the fact that we're a whit from logs.
+  #
+  # I hate you, milkman whit.  You are so painful, so often.
+  #
+  # In this case the memoized version means we generate a new string about 1.9
+  # percent of the time, and we allocate about 1.6MB less memory, and generate
+  # a whole lot less GC churn.
+  #
+  # That number probably goes up at least O(n) with the complexity of your
+  # catalog, and I suspect beyond that, because that is, like, 10,000 calls
+  # for 200 distinct objects.  Even with just linear, that is a constant
+  # factor of, like, 50n. --daniel 2012-07-17
   def to_s
-    name.sub(/^completed_|^admissible_/, "")
-  end
-
-  def path
-    to_s
+    @to_s ||= name.sub(/^completed_|^admissible_/, "")
   end
+  alias path to_s
 
   def refresh
-    # We don't do anything with them, but we need this to
-    #   show that we are "refresh aware" and not break the
-    #   chain of propagation.
+    # We don't do anything with them, but we need this to show that we are
+    # "refresh aware" and not break the chain of propagation.
   end
 end

data/lib/puppet/util.rb

@@ -195,17 +195,23 @@ module Util
 
   # Determine in a platform-specific way whether a path is absolute. This
   # defaults to the local platform if none is specified.
+  #
+  # Escape once for the string literal, and once for the regex.
+  slash = '[\\\\/]'
+  label = '[^\\\\/]+'
+  AbsolutePathWindows = %r!^(?:(?:[A-Z]:#{slash})|(?:#{slash}#{slash}#{label}#{slash}#{label})|(?:#{slash}#{slash}\?#{slash}#{label}))!io
+  AbsolutePathPosix   = %r!^/!
   def absolute_path?(path, platform=nil)
-    # Escape once for the string literal, and once for the regex.
-    slash = '[\\\\/]'
-    name = '[^\\\\/]+'
-    regexes = {
-      :windows => %r!^(([A-Z]:#{slash})|(#{slash}#{slash}#{name}#{slash}#{name})|(#{slash}#{slash}\?#{slash}#{name}))!i,
-      :posix   => %r!^/!,
-    }
-
-    # Due to weird load order issues, I was unable to remove this require.
-    # This is fixed in Telly so it can be removed there.
+    # When running an internal subcommand (Application), the app requires puppet
+    # which loads features, which creates an autoloader, which calls this method.
+    # In that case, it isn't necessary to require puppet. When running an external
+    # subcommand or if none was specified, then the CommandLine will call the
+    # `which` method to resolve the external executable, and that requires features.
+    # Rather then moving this require to handle the external subcommand case, or
+    # no subcommand case, I'm undoing the performance change from 20efe94. This
+    # code has been eliminated in 3.x since puppet can be required before loading
+    # the application (since the default vardir/confdir locations are solely
+    # based on user vs. system user, and not the application's run_mode).
     require 'puppet'
 
     # Ruby only sets File::ALT_SEPARATOR on Windows and the Ruby standard
@@ -214,8 +220,16 @@ module Util
     # be called during the initialization of features so it can't depend on
     # that.
     platform ||= Puppet::Util::Platform.windows? ? :windows : :posix
+    regex = case platform
+            when :windows
+              AbsolutePathWindows
+            when :posix
+              AbsolutePathPosix
+            else
+              raise Puppet::DevError, "unknown platform #{platform} in absolute_path"
+            end
 
-    !! (path =~ regexes[platform])
+    !! (path =~ regex)
   end
   module_function :absolute_path?
 
@@ -457,6 +471,7 @@ module Util
   end
 
   def symbolize(value)
+    Puppet.deprecation_warning "symbolize is deprecated. Call the intern method on the object instead."
     if value.respond_to? :intern
       value.intern
     else
@@ -477,6 +492,7 @@ module Util
   end
 
   def symbolizehash!(hash)
+    Puppet.deprecation_warning "symbolizehash! is deprecated. Use the non-destructive symbolizehash method instead."
     # this is not the most memory-friendly way to accomplish this, but the
     #  code re-use and clarity seems worthwhile.
     newhash = symbolizehash(hash)

data/lib/puppet/util/adsi.rb

@@ -45,20 +45,18 @@ module Puppet::Util::ADSI
       "#{computer_uri}/#{resource_name},#{resource_type}"
     end
 
+    def wmi_connection
+      connect(wmi_resource_uri)
+    end
+
     def execquery(query)
-      connect(wmi_resource_uri).execquery(query)
+      wmi_connection.execquery(query)
     end
 
     def sid_for_account(name)
-      sid = nil
-      if name =~ /\\/
-        domain, name = name.split('\\', 2)
-        query = "SELECT Sid from Win32_Account WHERE Name = '#{name}' AND Domain = '#{domain}' AND LocalAccount = true"
-      else
-        query = "SELECT Sid from Win32_Account WHERE Name = '#{name}' AND LocalAccount = true"
-      end
-      execquery(query).each { |u| sid ||= u.Sid }
-      sid
+      Puppet.deprecation_warning "Puppet::Util::ADSI.sid_for_account is deprecated and will be removed in 3.0, use Puppet::Util::Windows::SID.name_to_account instead."
+
+      Puppet::Util::Windows::Security.name_to_sid(name)
     end
   end
 
@@ -85,19 +83,7 @@ module Puppet::Util::ADSI
     end
 
     def self.logon(name, password)
-      fLOGON32_LOGON_NETWORK = 3
-      fLOGON32_PROVIDER_DEFAULT = 0
-
-      logon_user = Win32API.new("advapi32", "LogonUser", ['P', 'P', 'P', 'L', 'L', 'P'], 'L')
-      close_handle = Win32API.new("kernel32", "CloseHandle", ['P'], 'V')
-
-      token = ' ' * 4
-      if logon_user.call(name, "", password, fLOGON32_LOGON_NETWORK, fLOGON32_PROVIDER_DEFAULT, token) != 0
-        close_handle.call(token.unpack('L')[0])
-        true
-      else
-        false
-      end
+      Puppet::Util::Windows::User.password_is?(name, password)
     end
 
     def [](attribute)
@@ -200,6 +186,22 @@ module Puppet::Util::ADSI
     end
   end
 
+  class UserProfile
+    def self.delete(sid)
+      begin
+        Puppet::Util::ADSI.wmi_connection.Delete("Win32_UserProfile.SID='#{sid}'")
+      rescue => e
+        # http://social.technet.microsoft.com/Forums/en/ITCG/thread/0f190051-ac96-4bf1-a47f-6b864bfacee5
+        # Prior to Vista SP1, there's no builtin way to programmatically
+        # delete user profiles (except for delprof.exe). So try to delete
+        # but warn if we fail
+        raise e unless e.message.include?('80041010')
+
+        Puppet.warning "Cannot delete user profile for '#{sid}' prior to Vista SP1"
+      end
+    end
+  end
+
   class Group
     extend Enumerable
 

data/lib/puppet/util/autoload.rb

@@ -75,7 +75,7 @@ class Puppet::Util::Autoload
       next unless file_exist?(file)
       begin
         Kernel.load file, @wrap
-        name = symbolize(name)
+        name = name.intern
         loaded name, file
         return true
       rescue SystemExit,NoMemoryError

data/lib/puppet/util/classgen.rb

@@ -83,7 +83,7 @@ module Puppet::Util::ClassGen
   def genthing(name, type, options, block)
     options = symbolize_options(options)
 
-    name = symbolize(name.to_s.downcase)
+    name = name.to_s.downcase.intern
 
     if type == Module
       #evalmethod = :module_eval

data/lib/puppet/util/feature.rb

@@ -23,7 +23,9 @@ class Puppet::Util::Feature
     end
 
     meta_def(method) do
-      @results[name] = test(name, options) unless @results.include?(name)
+      # Positive cache only, except blocks which are executed just once above
+      final = @results[name] || block_given?
+      @results[name] = test(name, options) unless final
       @results[name]
     end
   end

data/lib/puppet/util/fileparsing.rb

@@ -42,14 +42,14 @@ module Puppet::Util::FileParsing
     # Customize this so we can do a bit of validation.
     def fields=(fields)
       @fields = fields.collect do |field|
-        r = symbolize(field)
+        r = field.intern
         raise ArgumentError.new("Cannot have fields named #{r}") if INVALID_FIELDS.include?(r)
         r
       end
     end
 
     def initialize(type, options = {}, &block)
-      @type = symbolize(type)
+      @type = type.intern
       raise ArgumentError, "Invalid record type #{@type}" unless [:record, :text].include?(@type)
 
       set_options(options)
@@ -97,7 +97,7 @@ module Puppet::Util::FileParsing
     # Customize this so we can do a bit of validation.
     def optional=(optional)
       @optional = optional.collect do |field|
-        symbolize(field)
+        field.intern
       end
     end
 
@@ -269,7 +269,7 @@ module Puppet::Util::FileParsing
     raise ArgumentError, "Must include a list of fields" unless options.include?(:fields)
 
     record = FileRecord.new(:record, options, &block)
-    record.name = symbolize(name)
+    record.name = name.intern
 
     new_line_type(record)
   end
@@ -284,7 +284,7 @@ module Puppet::Util::FileParsing
     raise ArgumentError, "You must provide a :match regex for text lines" unless options.include?(:match)
 
     record = FileRecord.new(:text, options, &block)
-    record.name = symbolize(name)
+    record.name = name.intern
 
     new_line_type(record)
   end
@@ -338,11 +338,11 @@ module Puppet::Util::FileParsing
   end
 
   def valid_attr?(type, attr)
-    type = symbolize(type)
-    if record = record_type(type) and record.fields.include?(symbolize(attr))
+    type = type.intern
+    if record = record_type(type) and record.fields.include?(attr.intern)
       return true
     else
-      if symbolize(attr) == :ensure
+      if attr.intern == :ensure
         return true
       else
         false
@@ -367,7 +367,7 @@ module Puppet::Util::FileParsing
 
   # Retrieve the record object.
   def record_type(type)
-    @record_types[symbolize(type)]
+    @record_types[type.intern]
   end
 end