puppet 0.16.0 → 0.18.4

data/lib/puppet/type/exec.rb

@@ -13,7 +13,7 @@ module Puppet
             share their commands with other instances as a dependency, since
             Puppet has no way of knowing which instance you mean.
 
-            For example::
+            For example:
 
                 # defined in the production class
                 exec { \"make\":
@@ -47,8 +47,8 @@ module Puppet
         require 'open3'
         require 'puppet/type/state'
 
-        # Create a new check mechanism.  It's basically just a parameter that provides
-        # one extra 'check' method.
+        # Create a new check mechanism.  It's basically just a parameter that
+        # provides one extra 'check' method.
         def self.newcheck(name, &block)
             @checks ||= {}
 
@@ -268,7 +268,7 @@ module Puppet
             desc "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
-                other object; it is useful for triggering an action::
+                other object; it is useful for triggering an action:
                     
                     # Pull down the main aliases file
                     file { \"/etc/aliases\":
@@ -278,11 +278,12 @@ module Puppet
                     # Rebuild the database, but only when the file changes
                     exec { newaliases:
                         path => [\"/usr/bin\", \"/usr/sbin\"],
-                        require => file[\"/etc/aliases\"],
+                        subscribe => file[\"/etc/aliases\"],
                         refreshonly => true
                     }
                 
-                "
+                Note that only ``subscribe`` can trigger actions, not ``require``,
+                so it only makes sense to use ``refreshonly`` with ``subscribe``."
 
             newvalues(:true, :false)
 
@@ -297,8 +298,6 @@ module Puppet
             desc "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.
-                
-                ::
 
                     exec { \"tar xf /my/tar/file.tar\":
                         cwd => \"/var/tmp\",
@@ -330,16 +329,16 @@ module Puppet
         end
 
         newcheck(:unless) do
-            desc "If this parameter is set, then this +exec+ will run unless
-                the command returns 0.  For example::
+            desc "If this parameter is set, then this ``exec`` will run unless
+                the command returns 0.  For example:
                     
                     exec { \"/bin/echo root >> /usr/lib/cron/cron.allow\":
                         path => \"/usr/bin:/usr/sbin:/bin\",
                         unless => \"grep root /usr/lib/cron/cron.allow 2>/dev/null\"
                     }
 
-                This would add +root+ to the cron.allow file (on Solaris) unless
-                +grep+ determines it's already there.
+                This would add ``root`` to the cron.allow file (on Solaris) unless
+                ``grep`` determines it's already there.
 
                 Note that this command follows the same rules as the main command,
                 which is to say that it must be fully qualified if the path is not set.
@@ -362,15 +361,15 @@ module Puppet
         end
 
         newcheck(:onlyif) do
-            desc "If this parameter is set, then this +exec+ will only run if
-                the command returns 0.  For example::
+            desc "If this parameter is set, then this ``exec`` will only run if
+                the command returns 0.  For example:
                     
                     exec { \"logrotate\":
                         path => \"/usr/bin:/usr/sbin:/bin\",
                         onlyif => \"test `du /var/log/messages | cut -f1` -gt 100000\"
                     }
 
-                This would run +logrotate+ only if that test returned true.
+                This would run ``logrotate`` only if that test returned true.
 
                 Note that this command follows the same rules as the main command,
                 which is to say that it must be fully qualified if the path is not set.
@@ -542,4 +541,4 @@ module Puppet
     end
 end
 
-# $Id: exec.rb 1125 2006-04-20 19:38:48Z luke $
+# $Id: exec.rb 1422 2006-07-22 03:32:56Z luke $

data/lib/puppet/type/group.rb

@@ -171,6 +171,14 @@ module Puppet
             isnamevar
         end
 
+        newparam(:allowdupe) do
+            desc "Whether to allow duplicate GIDs."
+                
+            newvalues(:true, :false)
+
+            defaultto false
+        end
+
         # List all groups
         def self.listbyname
             groups = []
@@ -222,4 +230,4 @@ module Puppet
     end
 end
 
-# $Id: group.rb 1125 2006-04-20 19:38:48Z luke $
+# $Id: group.rb 1416 2006-07-21 19:05:30Z luke $

data/lib/puppet/type/nameservice.rb

@@ -25,9 +25,7 @@ class Type
 
                     next unless obj # In case there was an error somewhere
                     
-                    obj.retrieve
-
-
+                    #obj.retrieve
                     obj
                 end
             end
@@ -120,7 +118,6 @@ class State
         # cases.
         def retrieve
             if obj = @parent.getinfo(true)
-
                 if method = self.class.posixmethod || self.class.name
                     @is = obj.send(method)
                 else
@@ -264,4 +261,4 @@ else
 end
 
 
-# $Id: nameservice.rb 1125 2006-04-20 19:38:48Z luke $
+# $Id: nameservice.rb 1156 2006-05-01 01:07:47Z luke $

data/lib/puppet/type/nameservice/netinfo.rb

@@ -82,6 +82,8 @@ module Puppet
                 end
 
                 # Retrieve the data, yo.
+                # FIXME This should retrieve as much information as possible,
+                # rather than retrieving it one at a time.
                 def retrieve
                     NetInfo.flush
                     dir = @parent.class.netinfodir
@@ -144,6 +146,7 @@ module Puppet
                 # This is really lame.  We have to iterate over each
                 # of the groups and add us to them.
                 def setgrouplist(groups)
+                    groups = groups.split(/\s*,\s*/)
                     # Get just the groups we need to modify
                     diff = groups - @is
 

data/lib/puppet/type/nameservice/objectadd.rb

@@ -65,6 +65,9 @@ module Puppet
                             cmd << @parent.state(:gid).class.objectaddflag << gid 
                         end
                     end
+                    if @parent[:allowdupe] == :true
+                        cmd << "-o"
+                    end
                     cmd << @parent[:name]
 
                     return cmd.join(" ")
@@ -75,12 +78,15 @@ module Puppet
                 end
 
                 def modifycmd
-                    [
-                        "groupmod",
+                    cmd = ["groupmod",
                         self.class.objectaddflag,
-                        "'%s'" % self.should,
-                        @parent[:name]
-                    ].join(" ")
+                        "'%s'" % self.should]
+                    if @parent[:allowdupe]  == :true
+                        cmd << "-o"
+                    end
+                    cmd << @parent[:name]
+
+                    return cmd.join(" ")
                 end
             end
 
@@ -110,6 +116,10 @@ module Puppet
                         cmd << "-M"
                     else
                     end
+                    if @parent[:allowdupe]  == :true
+                        cmd << "-o"
+                    end
+
                     cmd << @parent[:name]
 
                     cmd.join(" ")
@@ -120,12 +130,15 @@ module Puppet
                 end
 
                 def modifycmd
-                    cmd = [
-                        "usermod",
+                    cmd = ["usermod",
                         self.class.objectaddflag,
-                        "'%s'" % self.should,
-                        @parent[:name]
-                    ].join(" ")
+                        "'%s'" % self.should]
+                    if @parent[:allowdupe]  == :true
+                        cmd << "-o"
+                    end
+                    cmd << @parent[:name]
+
+                    return cmd.join(" ")
                 end
             end
         end

data/lib/puppet/type/nameservice/pw.rb

@@ -37,6 +37,12 @@ module Puppet
                         end
                     end
 
+                    # Apparently, contrary to the man page, groupadd does
+                    # not accept -o.
+                    #if @parent[:allowdupe] == :true
+                    #    cmd << "-o"
+                    #end
+
                     return cmd.join(" ")
                 end
 
@@ -45,13 +51,14 @@ module Puppet
                 end
 
                 def modifycmd
-                    [
+                    cmd = [
                         "pw",
                         "groupmod",
                         @parent[:name],
                         self.class.objectaddflag,
                         "'%s'" % self.should
-                    ].join(" ")
+                    ]
+                    return cmd.join(" ")
                 end
             end
 
@@ -71,6 +78,10 @@ module Puppet
                         cmd << "-M"
                     end
 
+                    if @parent[:allowdupe] == :true
+                        cmd << "-o"
+                    end
+
                     cmd.join(" ")
                 end
                 
@@ -86,7 +97,9 @@ module Puppet
                         "-w", "no",
                         self.class.objectaddflag,
                         "'%s'" % self.should
-                    ].join(" ")
+                    ]
+
+                    return cmd.join(" ")
                 end
             end
         end

data/lib/puppet/type/package.rb

@@ -60,6 +60,10 @@ module Puppet
 
             mod.module_eval(&block)
 
+            class << mod
+                include Puppet::Util
+            end
+
             # It's at least conceivable that a module would not define this method
             # "module_function" makes the :list method private, so if the parent
             # method also called module_function, then it's already private
@@ -108,11 +112,10 @@ module Puppet
         end
 
         ensurable do
-            desc "What state the package should be in.  The primary options
-                are *installed* (also called *present*), *uninstalled* (also
-                called *absent*), and *latest*.  *latest* only makes sense for
-                those packaging formats that can retrieve new packages on
-                their own."
+            desc "What state the package should be in.
+                *latest* only makes sense for those packaging formats that can
+                retrieve new packages on their own and will throw an error on
+                those that cannot."
 
             attr_accessor :latest
 
@@ -134,19 +137,26 @@ module Puppet
                         @parent[:type]
                     )
                 end
+
+                # Because yum always exits with a 0 exit code, there's a retrieve
+                # in the "install" method.  So, check the current state now,
+                # to compare against later.
+                current = self.is
                 begin
                     @parent.update
                 rescue => detail
                     self.fail "Could not update: %s" % detail
                 end
 
-                if self.is == :absent
+                if current == :absent
                     return :package_created
                 else
                     return :package_changed
                 end
             end
 
+            defaultto :installed
+
             # Override the parent method, because we've got all kinds of
             # funky definitions of 'in sync'.
             def insync?
@@ -214,9 +224,7 @@ module Puppet
 
             # This retrieves the current state
             def retrieve
-                #unless defined? @is
                 @parent.retrieve
-                #end
             end
 
             def sync
@@ -244,7 +252,7 @@ module Puppet
             system uses internally, which is sometimes (especially on Solaris)
             a name that is basically useless to humans.  If you want to
             abstract package installation, then you can use aliases to provide
-            a common name to packages::
+            a common name to packages:
 
                 # In the 'openssl' class
                 $ssl = $operationgsystem ? {
@@ -371,6 +379,13 @@ module Puppet
             desc "A read-only parameter set by the package."
         end
 
+        newparam(:allowcdrom) do
+            desc "Tells apt to allow cdrom sources in the sources.list file.
+                Normally apt will bail if you try this."
+
+            newvalues(:true, :false)
+        end
+
         autorequire(:file) do
             autos = []
             [:responsefile, :adminfile].each { |param|
@@ -446,27 +461,6 @@ module Puppet
             end
         end
 
-        # Return a list of valid package types
-#        def self.getpkglist
-#            if @types.nil?
-#                if @default.nil?
-#                    self.init
-#                end
-#                @types = [@default]
-#            end
-#
-#            list = @types.collect { |type|
-#                if typeobj = Puppet::PackagingType[type]
-#                    # pull all of the objects
-#                    typeobj.list
-#                else
-#                    raise Puppet::Error, "Could not find package type '%s'" % type
-#                end
-#            }.flatten
-#            @listed = true
-#            return list
-#        end
-
         # Create a new package object from listed information
         def self.installedpkg(hash)
             unless hash.include? :type
@@ -592,50 +586,6 @@ module Puppet
             end
         end
     end # Puppet.type(:package)
-
-    # this is how we retrieve packages
-    class PackageSource
-        attr_accessor :uri
-        attr_writer :retrieve
-
-        @@sources = Hash.new(false)
-
-        def PackageSource.get(file)
-            type = file.sub(%r{:.+},'')
-            source = nil
-            if source = @@sources[type]
-                return source.retrieve(file)
-            else
-                raise Puppet::Error, "Unknown package source: %s" % type
-            end
-        end
-
-        def initialize(name)
-            if block_given?
-                yield self
-            end
-
-            @@sources[name] = self
-        end
-
-        def retrieve(path)
-            @retrieve.call(path)
-        end
-
-    end
-
-    PackageSource.new("file") { |obj|
-        obj.retrieve = proc { |path|
-            # this might not work for windows...
-            file = path.sub(%r{^file://},'')
-
-            if FileTest.exists?(file)
-                return file
-            else
-                raise Puppet::Error, "File %s does not exist" % file
-            end
-        }
-    }
 end
 
-# $Id: package.rb 1129 2006-04-21 19:14:59Z luke $
+# $Id: package.rb 1417 2006-07-21 19:33:36Z luke $

data/lib/puppet/type/package/apple.rb

@@ -21,7 +21,21 @@ module Puppet
                 raise Puppet::PackageError.new(output)
             end
         end
+
+        def list
+            packages = []
+
+            Dir.entries("/Library/Receipts").find { |f|
+                f =~ /\.pkg$/
+            }.collect { |f|
+                Puppet.type(:package).installedpkg(
+                    :name => f.sub(/\.pkg/, ''),
+                    :type => :apple,
+                    :ensure => :installed
+                )
+            }
+        end
     end
 end
 
-# $Id: apple.rb 1055 2006-04-03 17:08:21Z luke $
+# $Id: apple.rb 1156 2006-05-01 01:07:47Z luke $