puppet 0.24.9 → 0.25.0

data/lib/puppet/type/user.rb

@@ -9,7 +9,7 @@ module Puppet
         @doc = "Manage users.  This type is mostly built to manage system
             users, so it is lacking some features useful for managing normal
             users.
-            
+
             This resource type uses the prescribed native tools for creating
             groups and generally uses POSIX APIs for retrieving information
             about them.  It does not directly modify /etc/passwd or anything."
@@ -228,12 +228,9 @@ module Puppet
                 }
                 groups.each { |group|
                     case group
-                    when Integer:
-                        if obj = Puppet.type(:group).find { |gobj|
-                            gobj.should(:gid) == group
-                        }
-                            autos << obj
-
+                    when Integer
+                        if resource = catalog.resources.find { |r| r.is_a?(Puppet::Type.type(:group)) and r.should(:gid) == group }
+                            autos << resource
                         end
                     else
                         autos << group
@@ -248,6 +245,11 @@ module Puppet
             autos
         end
 
+        # Provide an external hook.  Yay breaking out of APIs.
+        def exists?
+            provider.exists?
+        end
+
         def retrieve
             absent = false
             properties().inject({}) { |prophash, property|

data/lib/puppet/type/yumrepo.rb

@@ -30,7 +30,7 @@ module Puppet
         def retrieve
             return resource.section[inikey]
         end
-        
+
         def inikey
             name.to_s
         end
@@ -56,7 +56,7 @@ module Puppet
                 the files indicated by reposdir in that file (see yum.conf(5)
                 for details)
 
-                Most parameters are identical to the ones documented 
+                Most parameters are identical to the ones documented
                 in yum.conf(5)
 
                 Continuation lines that yum supports for example for the
@@ -66,14 +66,15 @@ module Puppet
         class << self
             attr_accessor :filetype
             # The writer is only used for testing, there should be no need
-            # to change yumconf in any other context
+            # to change yumconf or inifile in any other context
             attr_accessor :yumconf
+            attr_writer :inifile
         end
 
         self.filetype = Puppet::Util::FileType.filetype(:flat)
 
         @inifile = nil
-        
+
         @yumconf = "/etc/yum.conf"
 
         # Where to put files for brand new sections
@@ -106,9 +107,9 @@ module Puppet
                 @inifile = read()
                 main = @inifile['main']
                 if main.nil?
-                    raise Puppet::Error, "File #{yumconf} does not contain a main section" 
+                    raise Puppet::Error, "File #{yumconf} does not contain a main section"
                 end
-                reposdir = main['reposdir'] 
+                reposdir = main['reposdir']
                 reposdir ||= "/etc/yum.repos.d, /etc/yum/repos.d"
                 reposdir.gsub!(/[\n,]/, " ")
                 reposdir.split.each do |dir|
@@ -136,7 +137,7 @@ module Puppet
             result.read(yumconf)
             main = result['main']
             if main.nil?
-                raise Puppet::Error, "File #{yumconf} does not contain a main section" 
+                raise Puppet::Error, "File #{yumconf} does not contain a main section"
             end
             reposdir = main['reposdir']
             reposdir ||= "/etc/yum.repos.d, /etc/yum/repos.d"
@@ -183,11 +184,11 @@ module Puppet
             end
         end
 
+        # This is only used during testing.
         def self.clear
             @inifile = nil
             @yumconf = "/etc/yum.conf"
             @defaultrepodir = nil
-            super
         end
 
         # Return the Puppet::Util::IniConfig::Section for this yumrepo resource
@@ -230,13 +231,13 @@ module Puppet
         end
 
         newproperty(:descr, :parent => Puppet::IniProperty) do
-            desc "A human readable description of the repository. 
+            desc "A human readable description of the repository.
                   #{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             newvalue(/.*/) { }
             inikey "name"
         end
-        
+
         newproperty(:mirrorlist, :parent => Puppet::IniProperty) do
             desc "The URL that holds the list of mirrors for this repository.
                   #{ABSENT_DOC}"
@@ -251,9 +252,9 @@ module Puppet
             # Should really check that it's a valid URL
             newvalue(/.*/) { }
         end
-        
+
         newproperty(:enabled, :parent => Puppet::IniProperty) do
-            desc "Whether this repository is enabled or disabled. Possible 
+            desc "Whether this repository is enabled or disabled. Possible
                   values are '0', and '1'.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             newvalue(%r{(0|1)}) { }
@@ -300,7 +301,7 @@ module Puppet
 
         newproperty(:enablegroups, :parent => Puppet::IniProperty) do
             desc "Determines whether yum will allow the use of
-              package groups for this  repository. Possible 
+              package groups for this  repository. Possible
               values are '0', and '1'.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             newvalue(%r{(0|1)}) { }
@@ -313,14 +314,14 @@ module Puppet
         end
 
         newproperty(:keepalive, :parent => Puppet::IniProperty) do
-            desc "Either '1' or '0'. This tells yum whether or not HTTP/1.1 
+            desc "Either '1' or '0'. This tells yum whether or not HTTP/1.1
               keepalive  should  be  used with this repository.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             newvalue(%r{(0|1)}) { }
         end
 
         newproperty(:timeout, :parent => Puppet::IniProperty) do
-            desc "Number of seconds to wait for a connection before timing 
+            desc "Number of seconds to wait for a connection before timing
                   out.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             newvalue(%r{[0-9]+}) { }
@@ -334,7 +335,7 @@ module Puppet
         end
 
         newproperty(:protect, :parent => Puppet::IniProperty) do
-            desc "Enable or disable protection for this repository. Requires 
+            desc "Enable or disable protection for this repository. Requires
                   that the protectbase plugin is installed and enabled.
                   #{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }

data/lib/puppet/type/zone.rb

@@ -15,7 +15,7 @@ Puppet::Type.newtype(:zone) do
     class ZoneMultiConfigProperty < ZoneConfigProperty
         def configtext
             list = @should
-            
+
             current_value = self.retrieve
 
             unless current_value.is_a? Symbol
@@ -77,6 +77,7 @@ Puppet::Type.newtype(:zone) do
             used to stop zones."
 
         @states = {}
+        @parametervalues = []
 
         def self.alias_state(values)
             @state_aliases ||= {}
@@ -211,7 +212,7 @@ Puppet::Type.newtype(:zone) do
             end
 
             interface, address = value.split(':')
-            
+
             begin
                 IPAddr.new(address)
             rescue ArgumentError
@@ -229,7 +230,7 @@ end
 "
         end
 
-        # Convert a string into the component interface and address 
+        # Convert a string into the component interface and address
         def ipsplit(str)
             interface, address = str.split(':')
             return interface, address
@@ -259,7 +260,7 @@ end
     end
 
     newproperty(:pool, :parent => ZoneConfigProperty) do
-        desc "The resource pool for this zone." 
+        desc "The resource pool for this zone."
 
         def configtext
             "set pool=#{self.should}"
@@ -306,7 +307,7 @@ end
     newparam(:sysidcfg) do
         desc %{The text to go into the sysidcfg file when the zone is first
             booted.  The best way is to use a template::
-                
+
                 # $templatedir/sysidcfg
                 system_locale=en_US
                 timezone=GMT
@@ -360,7 +361,7 @@ end
     newparam(:create_args) do
         desc "Arguments to the zonecfg create command.  This can be used to create branded zones."
     end
-    
+
     newparam(:install_args) do
         desc "Arguments to the zoneadm install command.  This can be used to create branded zones."
     end
@@ -399,7 +400,7 @@ end
         hash.each do |param, value|
             next if param == :name
             case self.class.attrtype(param)
-            when :property:
+            when :property
                 # Only try to provide values for the properties we're managing
                 if prop = self.property(param)
                     prophash[prop] = value

data/lib/puppet/util.rb

@@ -1,5 +1,6 @@
 # A module to collect utility functions.
 
+require 'puppet/util/monkey_patches'
 require 'sync'
 require 'puppet/external/lock'
 
@@ -9,7 +10,7 @@ module Puppet
     end
 module Util
     require 'benchmark'
-    
+
     # These are all for backward compatibility -- these are methods that used
     # to be in Puppet::Util but have been moved into external modules.
     require 'puppet/util/posix'
@@ -26,10 +27,6 @@ module Util
 
     # Change the process to a different user
     def self.chuser
-        if Facter["operatingsystem"].value == "Darwin"
-            $stderr.puts "Ruby on darwin is broken; puppetmaster will not set its UID to 'puppet' and must run as root"
-            return
-        end
         if group = Puppet[:group]
             group = self.gid(group)
             unless group
@@ -37,8 +34,8 @@ module Util
             end
             unless Puppet::Util::SUIDManager.gid == group
                 begin
-                    Puppet::Util::SUIDManager.egid = group 
-                    Puppet::Util::SUIDManager.gid = group 
+                    Puppet::Util::SUIDManager.egid = group
+                    Puppet::Util::SUIDManager.gid = group
                 rescue => detail
                     Puppet.warning "could not change to group %s: %s" %
                         [group.inspect, detail]
@@ -58,8 +55,8 @@ module Util
             end
             unless Puppet::Util::SUIDManager.uid == user
                 begin
-                    Puppet::Util::SUIDManager.uid = user 
-                    Puppet::Util::SUIDManager.euid = user 
+                    Puppet::Util::SUIDManager.uid = user
+                    Puppet::Util::SUIDManager.euid = user
                 rescue
                     $stderr.puts "could not change to user %s" % user
                     exit(74)
@@ -255,14 +252,14 @@ module Util
         else
             Puppet.debug "Executing '%s'" % str
         end
-        
+
         if arguments[:uid]
             arguments[:uid] = Puppet::Util::SUIDManager.convert_xid(:uid, arguments[:uid])
         end
         if arguments[:gid]
             arguments[:gid] = Puppet::Util::SUIDManager.convert_xid(:gid, arguments[:gid])
         end
-        
+
         @@os ||= Facter.value(:operatingsystem)
         output = nil
         child_pid, child_status = nil
@@ -282,7 +279,7 @@ module Util
         end
 
         oldverb = $VERBOSE
-        $VERBOSE = false
+        $VERBOSE = nil
         child_pid = Kernel.fork
         $VERBOSE = oldverb
         if child_pid
@@ -300,7 +297,7 @@ module Util
                 $stdout.reopen(output_file)
                 $stderr.reopen(error_file)
 
-                3.upto(256){|fd| IO::new(fd).close rescue nil} 
+                3.upto(256){|fd| IO::new(fd).close rescue nil}
                 if arguments[:gid]
                     Process.egid = arguments[:gid]
                     Process.gid = arguments[:gid] unless @@os == "Darwin"
@@ -320,7 +317,7 @@ module Util
                 exit!(1)
             end # begin; rescue
         end # if child_pid
- 	
+
         # read output in if required
         if ! arguments[:squelch]
 
@@ -429,28 +426,6 @@ module Util
     end
 
     module_function :memory, :thinmark
-
-    def secure_open(file,must_be_w,&block)
-        raise Puppet::DevError,"secure_open only works with mode 'w'" unless must_be_w == 'w'
-        raise Puppet::DevError,"secure_open only requires a block"    unless block_given?
-        Puppet.warning "#{file} was a symlink to #{File.readlink(file)}" if File.symlink?(file)
-        if File.exists?(file) or File.symlink?(file)
-            wait = File.symlink?(file) ? 5.0 : 0.1
-            File.delete(file)
-            sleep wait # give it a chance to reappear, just in case someone is actively trying something.
-        end
-        begin
-            File.open(file,File::CREAT|File::EXCL|File::TRUNC|File::WRONLY,&block)
-        rescue Errno::EEXIST
-            desc = File.symlink?(file) ? "symlink to #{File.readlink(file)}" : File.stat(file).ftype
-            puts "Warning: #{file} was apparently created by another process (as"
-            puts "a #{desc}) as soon as it was deleted by this process.  Someone may be trying"
-            puts "to do something objectionable (such as tricking you into overwriting system"
-            puts "files if you are running as root)."
-            raise
-        end
-    end
-    module_function :secure_open
 end
 end
 

data/lib/puppet/util/autoload.rb

@@ -1,9 +1,14 @@
 require 'puppet/util/warnings'
+require 'puppet/util/cacher'
 
 # Autoload paths, either based on names or all at once.
 class Puppet::Util::Autoload
+    require 'puppet/util/autoload/file_cache'
+
     include Puppet::Util
     include Puppet::Util::Warnings
+    include Puppet::Util::Cacher
+    include Puppet::Util::Autoload::FileCache
 
     @autoloaders = {}
     @loaded = []
@@ -37,6 +42,7 @@ class Puppet::Util::Autoload
     # we can load downloaded plugins if they've already been loaded
     # into memory.
     def self.loaded(file)
+        $" << file + ".rb" unless $".include?(file)
         @loaded << file unless @loaded.include?(file)
     end
 
@@ -68,11 +74,13 @@ class Puppet::Util::Autoload
     # Load a single plugin by name.  We use 'load' here so we can reload a
     # given plugin.
     def load(name)
+        return false if named_file_missing?(name)
+
         path = name.to_s + ".rb"
 
-        eachdir do |dir|
+        searchpath.each do |dir|
             file = File.join(dir, path)
-            next unless FileTest.exists?(file)
+            next unless file_exist?(file)
             begin
                 Kernel.load file, @wrap
                 name = symbolize(name)
@@ -87,10 +95,10 @@ class Puppet::Util::Autoload
                         puts detail.backtrace
                     end
                 end
-                return false
+                return named_file_is_missing(name)
             end
         end
-        return false
+        return named_file_is_missing(name)
     end
 
     # Mark the named object as loaded.  Note that this supports unqualified
@@ -108,7 +116,7 @@ class Puppet::Util::Autoload
     # so that already-loaded files don't get reloaded unnecessarily.
     def loadall
         # Load every instance of everything we can find.
-        eachdir do |dir|
+        searchpath.each do |dir|
             Dir.glob("#{dir}/*.rb").each do |file|
                 name = File.basename(file).sub(".rb", '').intern
                 next if loaded?(name)
@@ -125,22 +133,26 @@ class Puppet::Util::Autoload
         end
     end
 
-    # Yield each subdir in turn.
-    def eachdir
-        searchpath.each do |dir|
-            subdir = File.join(dir, @path)
-            yield subdir if FileTest.directory?(subdir)
+    # The list of directories to search through for loadable plugins.
+    # We have to hard-code the ttl because this library is used by
+    # so many other classes it's hard to get the load-order such that
+    # the defaults load before this.
+    cached_attr(:searchpath, :ttl => 15) do
+        search_directories.collect { |d| File.join(d, @path) }.find_all { |d| FileTest.directory?(d) }
+    end
+
+    def module_directories
+        # We have to require this late in the process because otherwise we might have
+        # load order issues.
+        require 'puppet/node/environment'
+        Puppet::Node::Environment.new.modulepath.collect do |dir|
+            Dir.entries(dir).reject { |f| f =~ /^\./ }.collect { |f| File.join(dir, f) }
+        end.flatten.collect { |d| [File.join(d, "plugins"), File.join(d, "lib")] }.flatten.find_all do |d|
+            FileTest.directory?(d)
         end
     end
 
-    # The list of directories to search through for loadable plugins.
-    def searchpath
-        # JJM: Search for optional lib directories in each module bundle.
-        module_lib_dirs = Puppet[:modulepath].split(":").collect do |d|
-            Dir.glob("%s/*/{plugins,lib}" % d).select do |f|
-                FileTest.directory?(f) 
-            end
-        end.flatten
-        [module_lib_dirs, Puppet[:libdir], $:].flatten
+    def search_directories
+        [module_directories, Puppet[:libdir], $:].flatten
     end
 end