puppet 0.16.0 → 0.18.4

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

@@ -0,0 +1,7 @@
+module Puppet
+    # At this point, it's an exact copy of the Blastwave stuff.
+    Puppet.type(:package).newpkgtype(:sunfreeware, :blastwave) do
+    end
+end
+
+# $Id: sunfreeware.rb 1357 2006-07-04 06:06:09Z luke $

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

@@ -1,25 +1,32 @@
 module Puppet
     Puppet.type(:package).newpkgtype(:yum, :rpm) do
+        include Puppet::Util
         # Install a package using 'yum'.
         def install
             cmd = "yum -y install %s" % self[:name]
 
-            self.info "Executing %s" % cmd.inspect
-            output = %x{#{cmd} 2>&1}
+            begin
+                output = execute(cmd)
+            rescue Puppet::ExecutionFailure => detail
+                raise Puppet::PackageError.new(detail)
+            end
 
-            unless $? == 0
-                raise Puppet::PackageError.new(output)
+            @states[:ensure].retrieve
+            if @states[:ensure].is == :absent
+                raise Puppet::PackageError.new(
+                    "Could not find package %s" % self.name
+                )
             end
         end
 
         # What's the latest package version available?
         def latest
             cmd = "yum list available %s" % self[:name] 
-            self.info "Executing %s" % cmd.inspect
-            output = %x{#{cmd} 2>&1}
 
-            unless $? == 0
-                raise Puppet::PackageError.new(output)
+            begin
+                output = execute(cmd)
+            rescue Puppet::ExecutionFailure => detail
+                raise Puppet::PackageError.new(detail)
             end
 
             if output =~ /#{self[:name]}\S+\s+(\S+)\s/
@@ -42,4 +49,4 @@ module Puppet
     end
 end
 
-# $Id: yum.rb 1128 2006-04-21 03:06:54Z luke $
+# $Id: yum.rb 1421 2006-07-21 23:12:51Z luke $

data/lib/puppet/type/parsedtype.rb

@@ -221,7 +221,7 @@ module Puppet
                 @fileobj ||= @filetype.new(@path)
                 text = @fileobj.read
                 if text.nil? or text == ""
-                    # there is no host file
+                    # there is no file
                     return nil
                 else
                     # First we mark all of our objects absent; any objects
@@ -278,7 +278,7 @@ module Puppet
                 end
             end
 
-            # Return the last time the hosts file was loaded.  Could
+            # Return the last time the file was loaded.  Could
             # be used for reducing writes, but currently is not.
             def self.loaded?(user)
                 @fileobj ||= @filetype.new(@path)
@@ -305,10 +305,12 @@ module Puppet
             def retrieve
                 self.class.retrieve()
 
-                self.eachstate { |st| st.retrieve }
+                self.eachstate { |st|
+                    st.retrieve
+                }
             end
 
-            # Write the entire host file out.
+            # Write the entire file out.
             def store
                 self.class.store()
             end
@@ -339,4 +341,4 @@ require 'puppet/type/parsedtype/port'
 require 'puppet/type/parsedtype/mount'
 require 'puppet/type/parsedtype/sshkey'
 
-# $Id: parsedtype.rb 1125 2006-04-20 19:38:48Z luke $
+# $Id: parsedtype.rb 1223 2006-05-25 06:08:11Z luke $

data/lib/puppet/type/parsedtype/mount.rb

@@ -6,7 +6,12 @@ require 'puppet/type/state'
 module Puppet
     newtype(:mount, Puppet::Type::ParsedType) do
         ensurable do
-            desc "Create, remove, or mount a filesystem mount."
+            desc "Control what to do with this mount. If the value is 
+                  ``present``, the mount is entered into the mount table, 
+                  but not mounted, if it is ``absent``, the entry is removed 
+                  from the mount table and the filesystem is unmounted if 
+                  currently mounted, if it is ``mounted``, the filesystem 
+                  is entered into the mount table and mounted."
 
             newvalue(:present) do
                 @parent.create()
@@ -101,39 +106,50 @@ module Puppet
         end
 
         @doc = "Manages mounted mounts, including putting mount
-            information into the mount table."
-
-        @instances = []
-
-        @platform = Facter["operatingsystem"].value
-        case @platform
-        when "Solaris":
-            @path = "/etc/vfstab"
-            @fields = [:device, :blockdevice, :path, :fstype, :pass, :atboot,
-                :options]
-        when "Darwin":
-            @filetype = Puppet::FileType.filetype(:netinfo)
-            @filetype.format = "fstab"
-            @path = "mounts"
-            @fields = [:device, :path, :fstype, :options, :dump, :pass]
-
-            # How to map the dumped table to what we want
-            @fieldnames = {
-                "name" => :device,
-                "dir" => :path,
-                "dump_freq" => :dump,
-                "passno" => :pass,
-                "vfstype" => :fstype,
-                "opts" => :options
-            }
-        else
-            @path = "/etc/fstab"
-            @fields = [:device, :path, :fstype, :options, :dump, :pass]
+            information into the mount table. The actual behavior depends 
+            on the value of the 'ensure' parameter."
+
+        def self.init
+            @platform = Facter["operatingsystem"].value
+            case @platform
+            when "Solaris":
+                    @path = "/etc/vfstab"
+                @fields = [:device, :blockdevice, :path, :fstype, :pass, :atboot,
+                           :options]
+                @defaults = [ nil ] * @fields.size
+            when "Darwin":
+                    @filetype = Puppet::FileType.filetype(:netinfo)
+                @filetype.format = "fstab"
+                @path = "mounts"
+                @fields = [:device, :path, :fstype, :options, :dump, :pass]
+                @defaults = [ nil ] * @fields.size
+
+                # How to map the dumped table to what we want
+                @fieldnames = {
+                    "name" => :device,
+                    "dir" => :path,
+                    "dump_freq" => :dump,
+                    "passno" => :pass,
+                    "vfstype" => :fstype,
+                    "opts" => :options
+                }
+            else
+                @path = "/etc/fstab"
+                @fields = [:device, :path, :fstype, :options, :dump, :pass]
+                @defaults = [ nil ] * 4 + [ "0", "2" ]
+            end
+
+            # Allow Darwin to override the default filetype
+            unless defined? @filetype
+                @filetype = Puppet::FileType.filetype(:flat)
+            end
         end
 
-        # Allow Darwin to override the default filetype
-        unless defined? @filetype
-            @filetype = Puppet::FileType.filetype(:flat)
+        init
+
+        def self.clear
+            init
+            super
         end
 
         # Parse a mount tab.
@@ -156,10 +172,15 @@ module Puppet
                     comment(line)
                 else
                     values = line.split(/\s+/)
-                    unless @fields.length == values.length
+                    if @fields.length < values.length
                         raise Puppet::Error, "Could not parse line %s" % line
                     end
 
+                    values = @defaults.zip(values).collect { |d, v| v || d }
+                    unless @fields.length == values.length
+                        raise Puppet::Error, "Could not parse line %s" % line
+                    end
+                    
                     @fields.zip(values).each do |field, value|
                         hash[field] = value
                     end
@@ -247,4 +268,4 @@ module Puppet
     end
 end
 
-# $Id: mount.rb 1113 2006-04-17 16:15:33Z luke $
+# $Id: mount.rb 1380 2006-07-10 23:13:06Z lutter $

data/lib/puppet/type/parsedtype/port.rb

@@ -172,6 +172,12 @@ module Puppet
                             end
                         end
                     else
+                        if line =~ /^\s+\d+/ and
+                            Facter["operatingsystem"].value == "Darwin"
+                                #Puppet.notice "Skipping wonky OS X port entry %s" %
+                                #    line.inspect
+                                next
+                        end
                         raise Puppet::Error, "Could not match '%s'" % line
                     end
 
@@ -252,4 +258,4 @@ module Puppet
     end
 end
 
-# $Id: port.rb 1129 2006-04-21 19:14:59Z luke $
+# $Id: port.rb 1156 2006-05-01 01:07:47Z luke $

data/lib/puppet/type/parsedtype/sshkey.rb

@@ -5,8 +5,6 @@ require 'puppet/type/state'
 
 module Puppet
     newtype(:sshkey, Puppet::Type::ParsedType) do
-        isaggregatable
-
         newstate(:type) do
             desc "The encryption type used.  Probably ssh-dss or ssh-rsa."
         end
@@ -21,8 +19,7 @@ module Puppet
             desc "Any alias the host might have.  Multiple values must be
                 specified as an array.  Note that this state has the same name
                 as one of the metaparams; using this state to set aliases will
-                make those aliases available in your Puppet scripts and also on
-                disk."
+                make those aliases available in your Puppet scripts."
 
             # We actually want to return the whole array here, not just the first
             # value.
@@ -57,12 +54,13 @@ module Puppet
             isnamevar
         end
 
-        @doc = "Installs and manages host entries.  For most systems, these
-            entries will just be in /etc/hosts, but some systems (notably OS X)
-            will have different solutions."
+        @doc = "Installs and manages ssh host keys.  At this point, this type
+            only knows how to install keys into /etc/ssh/ssh_known_hosts, and
+            it cannot manage user authorized keys yet."
 
         @instances = []
 
+        # FIXME This should be configurable.
         @path = "/etc/ssh/ssh_known_hosts"
         @fields = [:name, :type, :key]
 
@@ -99,14 +97,6 @@ module Puppet
                         hash[:alias] = names
                     end
 
-                    #if match = /^(\S+)\s+(\S+)\s*(\S*)$/.match(line)
-                    #    fields().zip(match.captures).each { |param, value|
-                    #        hash[param] = value
-                    #    }
-                    #else
-                    #    raise Puppet::Error, "Could not match '%s'" % line
-                    #end
-
                     if hash[:alias] == ""
                         hash.delete(:alias)
                     end
@@ -130,4 +120,4 @@ module Puppet
     end
 end
 
-# $Id: sshkey.rb 910 2006-02-15 07:20:36Z luke $
+# $Id: sshkey.rb 1279 2006-06-14 15:30:25Z luke $

data/lib/puppet/type/pfile.rb

@@ -32,21 +32,22 @@ module Puppet
 
         newparam(:backup) do
             desc "Whether files should be backed up before
-                being replaced.  If a filebucket_ is specified, files will be
+                being replaced.  If a filebucket is specified, files will be
                 backed up there; else, they will be backed up in the same directory
-                with a ``.puppet-bak`` extension.
+                with a ``.puppet-bak`` extension,, and no backups
+                will be made if backup is ``false``.
                 
                 To use filebuckets, you must first create a filebucket in your
-                configuration::
+                configuration:
                     
                     filebucket { main:
                         server => puppet
                     }
 
-                ``puppetmasterd`` creates a filebucket by default, so you can
-                usually back up to your main server with this configuration.  Once
-                you've described the bucket in your configuration, you can use
-                it in any file::
+                The ``puppetmasterd`` daemon creates a filebucket by default,
+                so you can usually back up to your main server with this
+                configuration.  Once you've described the bucket in your
+                configuration, you can use it in any file:
 
                     file { \"/my/file\":
                         source => \"/path/in/nfs/or/something\",
@@ -64,19 +65,20 @@ module Puppet
                 "
 
             attr_reader :bucket
-            defaultto true
+            defaultto ".puppet-bak"
 
             munge do |value|
                 case value
-                when false, "false":
+                when false, "false", :false:
                     false
-                when true, "true", ".puppet-bak":
+                when true, "true", ".puppet-bak", :true:
                     ".puppet-bak"
                 when String:
                     # We can't depend on looking this up right now,
                     # we have to do it after all of the objects
                     # have been instantiated.
                     @bucket = value
+                    value
                 else
                     self.fail "Invalid backup type %s" %
                         value.inspect
@@ -97,10 +99,17 @@ module Puppet
 
         newparam(:recurse) do
             desc "Whether and how deeply to do recursive
-                management.  **false**/*true*/*inf*/*number*"
+                management."
 
+            newvalues(:true, :false, :inf, /^[0-9]+$/)
             munge do |value|
-                value
+                newval = super(value)
+                case newval
+                when :true, :inf: true
+                when :false: false
+                else
+                    newval
+                end
             end
         end
 
@@ -216,7 +225,8 @@ module Puppet
             if @parameters.include?(:backup) and bucket = @parameters[:backup].bucket
                 case bucket
                 when String:
-                    if obj = @@filebuckets.include?(bucket)
+                    if obj = @@filebuckets[bucket]
+                        # This sets the @value on :backup, too
                         @parameters[:backup].bucket = obj
                     elsif obj = Puppet.type(:filebucket).bucket(bucket)
                         @@filebuckets[bucket] = obj
@@ -248,9 +258,57 @@ module Puppet
 
             case File.stat(file).ftype
             when "directory":
-                self.info :bc
-                # we don't need to backup directories
-                return true
+                if self[:recurse]
+                    # we don't need to backup directories when recurse is on
+                    return true
+                else
+                    backup = self[:backup]
+                    case backup
+                    when Puppet::Client::Dipper:
+                        notice "Recursively backing up to filebucket"
+                        require 'find'
+                        Find.find(self[:path]) do |f|
+                            if File.file?(f)
+                                sum = backup.backup(f)
+                                self.info "Filebucketed %s to %s with sum %s" %
+                                    [f, backup.name, sum]
+                            end
+                        end
+
+                        require 'fileutils'
+                        FileUtils.rmtree(self[:path])
+                        return true
+                    when String:
+                        newfile = file + backup
+                        # Just move it, since it's a directory.
+                        if FileTest.exists?(newfile)
+                            begin
+                                File.unlink(newfile)
+                            rescue => detail
+                                puts detail.backtrace
+                                self.err "Could not remove old backup: %s" %
+                                    detail
+                                return false
+                            end
+                        end
+                        begin
+                            bfile = file + backup
+
+                            # Ruby 1.8.1 requires the 'preserve' addition, but
+                            # later versions do not appear to require it.
+                            FileUtils.cp_r(file, bfile, :preserve => true)
+                            return true
+                        rescue => detail
+                            # since they said they want a backup, let's error out
+                            # if we couldn't make one
+                            self.fail "Could not back %s up: %s" %
+                                [file, detail.message]
+                        end
+                    else
+                        self.err "Invalid backup type %s" % backup.inspect
+                        return false
+                    end
+                end
             when "file":
                 backup = self[:backup]
                 case backup
@@ -271,8 +329,13 @@ module Puppet
                         end
                     end
                     begin
-                        FileUtils.cp(file,
-                            file + backup)
+                        # FIXME Shouldn't this just use a Puppet object with
+                        # 'source' specified?
+                        bfile = file + backup
+
+                        # Ruby 1.8.1 requires the 'preserve' addition, but
+                        # later versions do not appear to require it.
+                        FileUtils.cp(file, bfile, :preserve => true)
                         return true
                     rescue => detail
                         # since they said they want a backup, let's error out
@@ -281,7 +344,7 @@ module Puppet
                             [file, detail.message]
                     end
                 else
-                    self.err "Invalid backup type %s" % backup
+                    self.err "Invalid backup type %s" % backup.inspect
                     return false
                 end
             else
@@ -662,6 +725,9 @@ module Puppet
                 unless @states.include?(:checksum)
                     self[:checksum] = "md5"
                 end
+
+                # We have to retrieve the source info before the recursion happens,
+                # although I'm not exactly clear on why.
                 @states[:source].retrieve
             end
 
@@ -678,10 +744,19 @@ module Puppet
                     next if name == :source
                     state.is = :absent
                 }
+
                 return
             end
 
-            super
+            states().each { |state|
+                # We don't want to call 'describe()' twice, so only do a local
+                # retrieve on the source.
+                if state.name == :source
+                    state.retrieve(false)
+                else
+                    state.retrieve
+                end
+            }
         end
 
         # Set the checksum, from another state.  There are multiple states that
@@ -710,6 +785,12 @@ module Puppet
             if self.class.name == :file and self[:links] != :follow
                 method = :lstat
             end
+            path = self[:path]
+            # Just skip them when they don't exist at all.
+            unless FileTest.exists?(path) or FileTest.symlink?(path)
+                @stat = nil
+                return @stat
+            end
             if @stat.nil? or refresh == true
                 begin
                     @stat = File.send(method, self[:path])
@@ -727,8 +808,11 @@ module Puppet
         def uri2obj(source)
             sourceobj = FileSource.new
             path = nil
+            unless source
+                devfail "Got a nil source"
+            end
             if source =~ /^\//
-                source = "file://localhost/%s" % source
+                source = "file://localhost/%s" % URI.escape(source)
                 sourceobj.mount = "localhost"
                 sourceobj.local = true
             end
@@ -785,9 +869,15 @@ module Puppet
         def write(usetmp = true)
             mode = self.should(:mode)
 
-            if FileTest.exists?(self[:path])
+            #if FileTest.exists?(self[:path])
+            if s = stat(false)
                 # this makes sure we have a copy for posterity
                 @backed = self.handlebackup
+
+                if s.ftype == "link" and self[:links] != :follow
+                    # Remove existing links, since we're writing out a file
+                    File.unlink(self[:path])
+                end
             end
 
             # The temporary file
@@ -834,6 +924,8 @@ module Puppet
             end
 
             # And then update our checksum, so the next run doesn't find it.
+            # FIXME This is extra work, because it's going to read the whole
+            # file back in again.
             self.setchecksum
         end
     end # Puppet.type(:pfile)
@@ -857,4 +949,4 @@ module Puppet
     require 'puppet/type/pfile/mode'
     require 'puppet/type/pfile/type'
 end
-# $Id: pfile.rb 1125 2006-04-20 19:38:48Z luke $
+# $Id: pfile.rb 1355 2006-07-03 23:15:15Z luke $