puppet 0.24.9 → 0.25.0

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

@@ -1,5 +1,5 @@
 module Puppet
-    Puppet.type(:file).newproperty(:target) do
+    Puppet::Type.type(:file).newproperty(:target) do
         desc "The target for creating a link.  Currently, symlinks are the
             only type supported."
 
@@ -45,7 +45,7 @@ module Puppet
                     end
                 end
 
-		@resource.send(:property_fix)
+                @resource.send(:property_fix)
 
                 :link_created
             end
@@ -55,7 +55,7 @@ module Puppet
             if [:nochange, :notlink].include?(self.should) or @resource.recurse?
                 return true
             elsif ! @resource.replace? and File.exists?(@resource[:path])
-                return true 
+                return true
             else
                 return super(currentvalue)
             end

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

@@ -1,12 +1,12 @@
 module Puppet
-    Puppet.type(:file).newproperty(:type) do
+    Puppet::Type.type(:file).newproperty(:type) do
         require 'etc'
         desc "A read-only state to check the file type."
 
         #munge do |value|
         #    raise Puppet::Error, ":type is read-only"
         #end
-        
+
         def retrieve
             currentvalue = :absent
             if stat = @resource.stat(false)

data/lib/puppet/type/filebucket.rb

@@ -9,16 +9,16 @@ module Puppet
             can later be used to retrieve the file if restoration becomes
             necessary.  A filebucket does not do any work itself; instead,
             it can be specified as the value of *backup* in a **file** object.
-            
+
             Currently, filebuckets are only useful for manual retrieval of
             accidentally removed files (e.g., you look in the log for the md5
             sum and retrieve the file with that sum from the filebucket), but
             when transactions are fully supported filebuckets will be used to
             undo transactions.
-            
+
             You will normally want to define a single filebucket for your
             whole network and then use that as the default backup location::
-            
+
                 # Define the bucket
                 filebucket { main: server => puppet }
 
@@ -34,80 +34,59 @@ module Puppet
         end
 
         newparam(:server) do
-            desc "The server providing the filebucket.  If this is
-                not specified, then the bucket is local and *path* must be
-                specified."
+            desc "The server providing the remote filebucket.  If this is not
+                  specified then *path* is checked. If it is set, then the
+                  bucket is local.  Otherwise the puppetmaster server specified
+                  in the config or at the commandline is used."
+            defaultto { Puppet[:server] }
         end
 
         newparam(:port) do
             desc "The port on which the remote server is listening.
                 Defaults to the normal Puppet port, %s." % Puppet[:masterport]
 
-            defaultto Puppet[:masterport]
+            defaultto { Puppet[:masterport] }
         end
 
         newparam(:path) do
             desc "The path to the local filebucket.  If this is
-                not specified, then the bucket is remote and *server* must be
-                specified."
+                unset, then the bucket is remote.  The parameter *server* must
+                can be specified to set the remote server."
 
             defaultto { Puppet[:clientbucketdir] }
         end
 
-        # get the actual filebucket object
-        def self.bucket(name)
-            if object = self[name]
-                return object.bucket
-            else
-                return nil
-            end
-        end
-        
         # Create a default filebucket.
         def self.mkdefaultbucket
-            unless default = self["puppet"]
-                return self.create(:name => "puppet", :path => Puppet[:clientbucketdir])
-            end
-            return nil
-        end
-
-        def self.instances
-            []
+            new(:name => "puppet", :path => Puppet[:clientbucketdir])
         end
 
         def bucket
-            unless defined? @bucket
-                mkbucket()
-            end
-
-            @bucket
+            mkbucket() unless defined? @bucket
+            return @bucket
         end
 
+        private
+
         def mkbucket
-            if self[:server]
-                begin
-                    @bucket = Puppet::Network::Client.client(:Dipper).new( 
-                        :Server => self[:server],
-                        :Port => self[:port]
-                    )
-                rescue => detail
-                    self.fail(
-                        "Could not create remote filebucket: %s" % detail
-                    )
-                end
+            # Default is a local filebucket, if no server is given.
+            # If the default path has been removed, too, then
+            # the puppetmaster is used as default server
+
+            type = "local"
+            args = {}
+            if self[:path]
+                args[:Path] = self[:path]
             else
-                begin
-                    @bucket = Puppet::Network::Client.client(:Dipper).new(
-                        :Path => self[:path]
-                    )
-                rescue => detail
-                    if Puppet[:trace]
-                        puts detail.backtrace
-                    end
-                    self.fail(
-                        "Could not create local filebucket: %s" % detail
-                    )
-                end
+                args[:Server] = self[:server]
+                args[:Port] = self[:port]
+            end
+
+            begin
+                @bucket = Puppet::Network::Client.client(:Dipper).new(args)
+            rescue => detail
+                puts detail.backtrace if Puppet[:trace]
+                self.fail("Could not create %s filebucket: %s" % [type, detail])
             end
 
             @bucket.name = self.name

data/lib/puppet/type/group.rb

@@ -5,13 +5,13 @@ require 'facter'
 module Puppet
     newtype(:group) do
         @doc = "Manage groups. On most platforms this can only create groups.
-            Group membership must be managed on individual users.  
-            
+            Group membership must be managed on individual users.
+
             On some platforms such as OS X, group membership is managed as an
-            attribute of the group, not the user record. Providers must have 
+            attribute of the group, not the user record. Providers must have
             the feature 'manages_members' to manage the 'members' property of
             a group record."
-        
+
         feature :manages_members,
             "For directories where membership is an attribute of groups not users."
 
@@ -67,18 +67,18 @@ module Puppet
                 return gid
             end
         end
-        
+
         newproperty(:members, :array_matching => :all, :required_features => :manages_members) do
             desc "The members of the group. For directory services where group
             membership is stored in the group objects, not the users."
-            
+
             def change_to_s(currentvalue, newvalue)
                 currentvalue = currentvalue.join(",") if currentvalue != :absent
                 newvalue = newvalue.join(",")
                 super(currentvalue, newvalue)
             end
         end
-        
+
         newparam(:auth_membership) do
             desc "whether the provider is authoritative for group membership."
             defaultto true
@@ -95,7 +95,7 @@ module Puppet
         newparam(:allowdupe, :boolean => true) do
             desc "Whether to allow duplicate GIDs.  This option does not work on
                 FreeBSD (contract to the ``pw`` man page)."
-                
+
             newvalues(:true, :false)
 
             defaultto false

data/lib/puppet/type/host.rb

@@ -7,7 +7,7 @@ module Puppet
 
         validate do |value|
            unless value =~ /((([0-9a-fA-F]+:){7}[0-9a-fA-F]+)|(([0-9a-fA-F]+:)*[0-9a-fA-F]+)?::(([0-9a-fA-F]+:)*[0-9a-fA-F]+)?)|((25[0-5]|2[0-4][\d]|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3})/
-             raise Puppet::Error, "Invalid IP address"            
+             raise Puppet::Error, "Invalid IP address"
            end
         end
 
@@ -23,7 +23,7 @@ module Puppet
            def insync?(is)
                 is == @should
             end
-            
+
             def is_to_s(currentvalue = @is)
                 currentvalue = [currentvalue] unless currentvalue.is_a? Array
                 currentvalue.join(" ")
@@ -34,7 +34,7 @@ module Puppet
                 case is
                 when String
                     is = is.split(/\s*,\s*/)
-                when Symbol:
+                when Symbol
                     is = [is]
                 when Array
                     # nothing
@@ -71,7 +71,7 @@ module Puppet
 
         newproperty(:target) do
             desc "The file in which to store service information.  Only used by
-                those providers that write to disk (i.e., not NetInfo)."
+                those providers that write to disk."
 
             defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
                     @resource.class.defaultprovider.default_target
@@ -87,13 +87,13 @@ module Puppet
             isnamevar
 
             validate do |value|
-               # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
-               x = value.split('.').each do |hostpart| 
+               # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
+               x = value.split('.').each do |hostpart|
                   unless hostpart =~ /^([\d\w]+|[\d\w][\d\w\-]+[\d\w])$/
                      raise Puppet::Error, "Invalid host name"
                   end
                end
-            end 
+            end
         end
 
         @doc = "Installs and manages host entries.  For most systems, these

data/lib/puppet/type/k5login.rb

@@ -3,7 +3,7 @@
 # Plug-in type for handling k5login files
 
 Puppet::Type.newtype(:k5login) do
-    @doc = "Manage the .k5login file for a user.  Specify the full path to 
+    @doc = "Manage the .k5login file for a user.  Specify the full path to
         the .k5login file as the name and an array of principals as the
         property principals."
 
@@ -33,7 +33,7 @@ Puppet::Type.newtype(:k5login) do
     end
 
     provide(:k5login) do
-        desc "The k5login provider is the only provider for the k5login 
+        desc "The k5login provider is the only provider for the k5login
             type."
 
         # Does this file exist?

data/lib/puppet/type/macauthorization.rb

@@ -1,141 +1,166 @@
 Puppet::Type.newtype(:macauthorization) do
-    
+
     @doc = "Manage the Mac OS X authorization database.
             See:
             http://developer.apple.com/documentation/Security/Conceptual/Security_Overview/Security_Services/chapter_4_section_5.html for more information."
-    
+
     ensurable
-    
+
     autorequire(:file) do
         ["/etc/authorization"]
     end
-    
+
     def munge_boolean(value)
         case value
-        when true, "true", :true:
+        when true, "true", :true
             :true
         when false, "false", :false
             :false
         else
-            raise Puppet::Error("munge_boolean only takes booleans")
+            fail("munge_boolean only takes booleans")
         end
     end
     
+    def munge_integer(value)
+        begin
+          Integer(value)
+        rescue ArgumentError
+          fail("munge_integer only takes integers")
+        end
+    end
+
     newparam(:name) do
         desc "The name of the right or rule to be managed.
-        Corresponds to 'key' in Authorization Services. The key is the name 
-        of a rule. A key uses the same naming conventions as a right. The 
-        Security Server uses a rule’s key to match the rule with a right. 
-        Wildcard keys end with a ‘.’. The generic rule has an empty key value. 
+        Corresponds to 'key' in Authorization Services. The key is the name
+        of a rule. A key uses the same naming conventions as a right. The
+        Security Server uses a rule’s key to match the rule with a right.
+        Wildcard keys end with a ‘.’. The generic rule has an empty key value.
         Any rights that do not match a specific rule use the generic rule."
 
         isnamevar
     end
-    
+
     newproperty(:auth_type) do
-        desc "type - can be a 'right' or a 'rule'. 'comment' has not yet been 
+        desc "type - can be a 'right' or a 'rule'. 'comment' has not yet been
         implemented."
-        
+
         newvalue(:right)
         newvalue(:rule)
         # newvalue(:comment)  # not yet implemented.
     end
-    
+
     newproperty(:allow_root, :boolean => true) do
-        desc "Corresponds to 'allow-root' in the authorization store, renamed 
-        due to hyphens being problematic. Specifies whether a right should be 
-        allowed automatically if the requesting process is running with 
-        uid == 0.  AuthorizationServices defaults this attribute to false if 
+        desc "Corresponds to 'allow-root' in the authorization store, renamed
+        due to hyphens being problematic. Specifies whether a right should be
+        allowed automatically if the requesting process is running with
+        uid == 0.  AuthorizationServices defaults this attribute to false if
         not specified"
-        
+
         newvalue(:true)
         newvalue(:false)
-        
+
         munge do |value|
             @resource.munge_boolean(value)
         end
     end
-    
+
     newproperty(:authenticate_user, :boolean => true) do
-        desc "Corresponds to 'authenticate-user' in the authorization store, 
+        desc "Corresponds to 'authenticate-user' in the authorization store,
         renamed due to hyphens being problematic."
-        
+
         newvalue(:true)
         newvalue(:false)
-        
+
         munge do |value|
             @resource.munge_boolean(value)
         end
     end
 
     newproperty(:auth_class) do
-        desc "Corresponds to 'class' in the authorization store, renamed due 
+        desc "Corresponds to 'class' in the authorization store, renamed due
         to 'class' being a reserved word."
-        
+
         newvalue(:user)
         newvalue(:'evaluate-mechanisms')
+        newvalue(:allow)
+        newvalue(:deny)
+        newvalue(:rule)
     end
-    
+
     newproperty(:comment) do
         desc "The 'comment' attribute for authorization resources."
     end
-    
+
     newproperty(:group) do
-        desc "The user must authenticate as a member of this group. This 
+        desc "The user must authenticate as a member of this group. This
         attribute can be set to any one group."
     end
-    
+
     newproperty(:k_of_n) do
-        desc "k-of-n. Built-in rights only show a value of '1' or absent, 
-        other values may be acceptable. Undocumented."
+        desc "k-of-n describes how large a subset of rule mechanisms must
+        succeed for successful authentication. If there are 'n' mechanisms,
+        then 'k' (the integer value of this parameter) mechanisms must succeed.
+        The most common setting for this parameter is '1'. If k-of-n is not
+        set, then 'n-of-n' mechanisms must succeed."
+        
+        munge do |value|
+            @resource.munge_integer(value)
+        end
     end
-    
+
     newproperty(:mechanisms, :array_matching => :all) do
         desc "an array of suitable mechanisms."
     end
-    
-    newproperty(:rule, :array_match => :all) do
+
+    newproperty(:rule, :array_matching => :all) do
         desc "The rule(s) that this right refers to."
     end
 
     newproperty(:session_owner, :boolean => true) do
-        desc "Corresponds to 'session-owner' in the authorization store, 
-        renamed due to hyphens being problematic.  Whether the session owner 
+        desc "Corresponds to 'session-owner' in the authorization store,
+        renamed due to hyphens being problematic.  Whether the session owner
         automatically matches this rule or right."
-        
+
         newvalue(:true)
         newvalue(:false)
-        
+
         munge do |value|
             @resource.munge_boolean(value)
         end
     end
-    
+
     newproperty(:shared, :boolean => true) do
         desc "If this is set to true, then the Security Server marks the
-        credentials used to gain this right as shared. The Security Server 
-        may use any shared credentials to authorize this right. For maximum 
-        security, set sharing to false so credentials stored by the Security 
+        credentials used to gain this right as shared. The Security Server
+        may use any shared credentials to authorize this right. For maximum
+        security, set sharing to false so credentials stored by the Security
         Server for one application may not be used by another application."
-        
+
         newvalue(:true)
         newvalue(:false)
-        
+
         munge do |value|
             @resource.munge_boolean(value)
         end
     end
-    
+
     newproperty(:timeout) do
-        desc "The credential used by this rule expires in the specified 
-        number of seconds. For maximum security where the user must 
-        authenticate every time, set the timeout to 0. For minimum security, 
-        remove the timeout attribute so the user authenticates only once per 
+        desc "The credential used by this rule expires in the specified
+        number of seconds. For maximum security where the user must
+        authenticate every time, set the timeout to 0. For minimum security,
+        remove the timeout attribute so the user authenticates only once per
         session."
+        
+        munge do |value|
+            @resource.munge_integer(value)
+        end
     end
-    
+
     newproperty(:tries) do
         desc "The number of tries allowed."
+        munge do |value|
+            @resource.munge_integer(value)
+        end
     end
-    
+
 end