puppet 0.23.0 → 0.23.1

data/lib/puppet/provider/host/netinfo.rb

@@ -1,7 +1,6 @@
 # Manage NetInfo POSIX objects.  Probably only used on OS X, but I suppose
 # it could be used elsewhere.
 require 'puppet/provider/nameservice/netinfo'
-require 'puppet/provider/host/netinfo'
 
 Puppet::Type.type(:host).provide :netinfo, :parent => Puppet::Provider::NameService::NetInfo,
     :netinfodir => "machines" do
@@ -15,4 +14,4 @@ Puppet::Type.type(:host).provide :netinfo, :parent => Puppet::Provider::NameServ
     defaultfor :operatingsystem => :darwin
 end
 
-# $Id: netinfo.rb 1865 2006-11-13 04:20:57Z luke $
+# $Id: netinfo.rb 2714 2007-07-19 18:12:20Z luke $

data/lib/puppet/provider/mailalias/aliases.rb

@@ -0,0 +1,31 @@
+require 'puppet/provider/parsedfile'
+
+Puppet::Type.type(:mailalias).provide(:aliases,
+    :parent => Puppet::Provider::ParsedFile,
+    :default_target => "/etc/aliases",
+    :filetype => :flat
+) do
+    text_line :comment, :match => /^#/
+    text_line :blank, :match => /^\s*$/
+
+    record_line :aliases, :fields => %w{name recipient}, :separator => /\s*:\s*/, :block_eval => :instance do
+        def post_parse(record)
+            record[:recipient] = record[:recipient].split(/\s*,\s*/).collect { |d| d.gsub(/^['"]|['"]$/, '') }
+            record
+        end
+
+        def to_line(record)
+            dest = record[:recipient].collect do |d|
+                # Quote aliases that have non-alpha chars
+                if d =~ /[^-\w@.]/
+                    '"%s"' % d
+                else
+                    d
+                end
+            end.join(",")
+            return "%s: %s" % [record[:name], dest]
+        end
+    end
+end
+
+# $Id: aliases.rb 2676 2007-07-10 23:24:34Z luke $

data/lib/puppet/provider/maillist/mailman.rb

@@ -0,0 +1,113 @@
+require 'puppet/provider/parsedfile'
+
+Puppet::Type.type(:maillist).provide(:mailman) do
+    commands :list_lists => "list_lists", :rmlist => "rmlist", :newlist => "newlist"
+
+    # This probably won't work for non-Debian installs, but this path is sure not to be in the PATH.
+    commands :mailman => "/var/lib/mailman/mail/mailman"
+
+    mk_resource_methods
+
+    # Return a list of existing mailman instances.
+    def self.instances
+        list_lists.split("\n").reject { |line| line.include?("matching mailing lists") }.collect do |line|
+            name, description = line.sub(/^\s+/, '').sub(/\s+$/, '').split(/\s+-\s+/)
+            if description.include?("no description available")
+                description = :absent
+            end
+            new(:ensure => :present, :name => name, :description => description)
+        end
+    end
+
+    # Prefetch our list list, yo.
+    def self.prefetch(lists)
+        instances.each do |prov|
+            if list = lists[prov.name] || lists[prov.name.downcase]
+                list.provider = prov
+            end
+        end
+    end
+
+    def aliases
+        mailman = self.class.command(:mailman)
+        name = self.name.downcase
+        aliases = {name => "| #{mailman} post #{name}"}
+        %w{admin bounces confirm join leave owner request subscribe unsubscribe}.each do |address|
+            aliases["%s-%s" % [name, address]] = "| %s %s %s" % [mailman, address, name]
+        end
+        aliases
+    end
+
+    # Create the list.
+    def create
+        args = []
+        if val = @resource[:mailserver]
+            args << "--emailhost" << val
+        end
+        if val = @resource[:webserver]
+            args << "--urlhost" << val
+        end
+
+        args << self.name
+        if val = @resource[:admin]
+            args << val
+        else
+            raise ArgumentError, "Mailman lists require an administrator email address"
+        end
+        if val = @resource[:password]
+            args << val
+        else
+            raise ArgumentError, "Mailman lists require an administrator password"
+        end
+        newlist(*args)
+    end
+
+    # Delete the list.
+    def delete(purge = false)
+        args = []
+        if purge
+            args << "--archives"
+        end
+        args << self.name
+        rmlist(*args)
+    end
+
+    # Does our list exist already?
+    def exists?
+        properties[:ensure] != :absent
+    end
+
+    # Clear out the cached values.
+    def flush
+        @property_hash.clear
+    end
+
+    # Look up the current status.
+    def properties
+        if @property_hash.empty?
+            @property_hash = query || {:ensure => :absent}
+            if @property_hash.empty?
+                @property_hash[:ensure] = :absent
+            end
+        end
+        @property_hash.dup
+    end
+
+    # Remove the list and its archives.
+    def purge
+        delete(true)
+    end
+
+    # Pull the current state of the list from the full list.  We're
+    # getting some double entendre here....
+    def query
+        provider.class.instances.each do |list|
+            if list.name == self.name or list.name.downcase == self.name
+                return list.property_hash
+            end
+        end
+        nil
+    end
+end
+
+# $Id: mailman.rb 2719 2007-07-20 03:24:04Z luke $

data/lib/puppet/provider/mount.rb

@@ -37,21 +37,15 @@ module Puppet::Provider::Mount
     # Is the mount currently mounted?
     def mounted?
         platform = Facter["operatingsystem"].value
-        df = [command(:df)]
-        case Facter["operatingsystem"].value
-        # Solaris's df prints in a very weird format
-        when "Solaris": df << "-k"
-        end
-        execute(df).split("\n").find do |line|
-            fs = line.split(/\s+/)[-1]
+        name = @resource[:name]
+        mounts = mountcmd.split("\n").find do |line|
             if platform == "Darwin"
-                fs == "/private/var/automount" + @resource[:name] or
-                    fs == @resource[:name]
+                line =~ / on #{name} / or line =~ %r{ on /private/var/automount#{name}}
             else
-                fs == @resource[:name]
+                line =~ / on #{name} /
             end
         end
     end
 end
 
-# $Id: mount.rb 2501 2007-05-09 23:08:42Z luke $
+# $Id: mount.rb 2707 2007-07-18 20:40:11Z luke $

data/lib/puppet/provider/mount/parsed.rb

@@ -16,7 +16,7 @@ Puppet::Type.type(:mount).provide(:parsed,
     include Puppet::Provider::Mount
     confine :exists => fstab
 
-    commands :mountcmd => "mount", :umount => "umount", :df => "df"
+    commands :mountcmd => "mount", :umount => "umount"
 
     @platform = Facter["operatingsystem"].value
     case @platform
@@ -34,4 +34,4 @@ Puppet::Type.type(:mount).provide(:parsed,
     record_line self.name, :fields => @fields, :separator => /\s+/, :joiner => "\t", :optional => [:pass, :dump]
 end
 
-# $Id: parsed.rb 2564 2007-06-11 22:49:06Z luke $
+# $Id: parsed.rb 2707 2007-07-18 20:40:11Z luke $

data/lib/puppet/provider/package/appdmg.rb

@@ -19,7 +19,6 @@ require 'puppet/provider/package'
 Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Package) do
     desc "Package management which copies application bundles to a target."
 
-    defaultfor :operatingsystem => :darwin
     confine :exists => "/Library/Receipts"
     commands :hdiutil => "/usr/bin/hdiutil"
     commands :curl => "/usr/bin/curl"
@@ -115,4 +114,4 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
     end
 end
 
-# $Id: appdmg.rb 2609 2007-06-18 18:46:00Z luke $
+# $Id: appdmg.rb 2647 2007-07-04 22:25:23Z luke $

data/lib/puppet/provider/package/apt.rb

@@ -111,7 +111,9 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
 
     def purge
         aptget '-y', '-q', 'remove', '--purge', @resource[:name]
+        # workaround a "bug" in apt, that already removed packages are not purged
+        super
     end
 end
 
-# $Id: apt.rb 2618 2007-06-18 21:18:48Z luke $
+# $Id: apt.rb 2708 2007-07-18 23:48:58Z luke $

data/lib/puppet/provider/package/aptrpm.rb

@@ -6,9 +6,19 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
 
     has_feature :versionable
 
-    commands :aptget => "/usr/bin/apt-get"
-    commands :aptcache => "/usr/bin/apt-cache"
-    commands :rpm => "/usr/bin/rpm"
+    commands :aptget => "apt-get"
+    commands :aptcache => "apt-cache"
+    commands :rpm => "rpm"
+
+    if command('rpm')
+        confine :true => begin
+                rpm('-ql', 'rpm')
+           rescue Puppet::ExecutionFailure
+               false
+           else
+               true
+           end
+    end
 
     # Install a package using 'apt-get'.  This function needs to support
     # installing a specific version.
@@ -74,4 +84,4 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
     end
 end
 
-# $Id: aptrpm.rb 2618 2007-06-18 21:18:48Z luke $
+# $Id: aptrpm.rb 2701 2007-07-16 23:43:50Z luke $

data/lib/puppet/provider/package/blastwave.rb

@@ -96,9 +96,11 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
     end
 
     def query
-        hash = self.class.blastlist(:justme => @resource[:name])
-
-        {:ensure => hash[:ensure]}
+        if hash = self.class.blastlist(:justme => @resource[:name])
+            hash
+        else
+            {:ensure => :absent}
+        end
     end
 
     # Remove the old package, and install the new one
@@ -111,4 +113,4 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
     end
 end
 
-# $Id: blastwave.rb 2555 2007-06-08 17:20:00Z luke $
+# $Id: blastwave.rb 2656 2007-07-08 16:26:51Z luke $

data/lib/puppet/provider/package/dpkg.rb

@@ -17,8 +17,8 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         Puppet.debug "Executing '%s'" % cmd
         execpipe(cmd) do |process|
             # our regex for matching dpkg output
-            regex = %r{^(\S+ +\S+ +\S+) (\S+) (\S*)$}
-            fields = [:status, :name, :ensure]
+            regex = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*)$}
+            fields = [:desired, :error, :status, :name, :ensure]
             hash = {}
 
             # now turn each returned line into a package object
@@ -32,6 +32,12 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
                     hash[:provider] = self.name
 
+                    if hash[:status] == 'not-installed'
+                        hash[:ensure] = :purged
+                    elsif hash[:status] != "installed"
+                        hash[:ensure] = :absent
+                    end
+
                     packages << new(hash)
                 else
                     Puppet.warning "Failed to match dpkg-query line %s" %
@@ -98,7 +104,9 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         end
 
         # DPKG can discuss packages that are no longer installed, so allow that.
-        if hash[:status] != "installed"
+        if hash[:status] == "not-installed"
+            hash[:ensure] = :purged
+        elsif hash[:status] != "installed"
             hash[:ensure] = :absent
         end
 
@@ -114,4 +122,4 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     end
 end
 
-# $Id: dpkg.rb 2615 2007-06-18 20:10:35Z luke $
+# $Id: dpkg.rb 2708 2007-07-18 23:48:58Z luke $

data/lib/puppet/provider/package/pkgdmg.rb

@@ -146,7 +146,7 @@ package { Thunderbird-2.0.0.4-1.pkg.dmg:
         
         begin
             open(cached_source) do |dmg|
-                xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-mountrandom", "/tmp", dmg.path
+                xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-mountrandom", "-noidme", "/tmp", dmg.path
                 ptable = Plist::parse_xml xml_str
                 # JJM Filter out all mount-paths into a single array, discard the rest.
                 mounts = ptable['system-entities'].collect { |entity|
@@ -190,4 +190,4 @@ package { Thunderbird-2.0.0.4-1.pkg.dmg:
     end
 end
 
-# $Id: pkgdmg.rb 2622 2007-06-18 23:57:28Z mccune $
+# $Id: pkgdmg.rb 2650 2007-07-05 12:58:23Z mccune $

data/lib/puppet/provider/package/rpm.rb

@@ -11,6 +11,16 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
     commands :rpm => "rpm"
 
+    if command('rpm')
+        confine :true => begin
+                rpm('-ql', 'rpm')
+           rescue Puppet::ExecutionFailure
+               false
+           else
+               true
+           end
+    end
+
     def self.instances
         packages = []
 
@@ -119,4 +129,4 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     end
 end
 
-# $Id: rpm.rb 2595 2007-06-17 00:06:46Z luke $
+# $Id: rpm.rb 2701 2007-07-16 23:43:50Z luke $

data/lib/puppet/provider/package/rug.rb

@@ -4,6 +4,7 @@ Puppet.type(:package).provide :rug, :parent => :rpm do
     has_feature :versionable
 
     commands :rug => "/usr/bin/rug"
+    commands :rpm => "rpm"
     defaultfor :operatingsystem => :suse 
     confine    :operatingsystem => :suse
 

data/lib/puppet/provider/package/urpmi.rb

@@ -2,6 +2,16 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
     desc "Support via ``urpmi``."
     commands :urpmi => "urpmi", :rpm => "rpm"
 
+    if command('rpm')
+        confine :true => begin
+                rpm('-ql', 'rpm')
+           rescue Puppet::ExecutionFailure
+               false
+           else
+               true
+           end
+    end
+
     defaultfor :operatingsystem => [:mandriva, :mandrake]
 
     has_feature :versionable
@@ -48,4 +58,4 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
     end
 end
 
-# $Id: urpmi.rb 2618 2007-06-18 21:18:48Z luke $
+# $Id: urpmi.rb 2701 2007-07-16 23:43:50Z luke $

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

@@ -5,6 +5,16 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
     commands :yum => "yum", :rpm => "rpm"
 
+    if command('rpm')
+        confine :true => begin
+                rpm('-ql', 'rpm')
+           rescue Puppet::ExecutionFailure
+               false
+           else
+               true
+           end
+    end
+
     defaultfor :operatingsystem => [:fedora, :centos, :redhat]
 
     def install
@@ -35,7 +45,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     def latest
         output = yum "-d", "0", "-e", "0", :list, :available, @resource[:name]
 
-        if output =~ /^#{@resource[:name]}\S+\s+(\S+)\s/
+        if output =~ /^#{Regexp.escape(@resource[:name])}\S+\s+(\S+)\s/
             return $1
         else
             # Yum didn't find updates, pretend the current
@@ -53,4 +63,4 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     end
 end
 
-# $Id: yum.rb 2618 2007-06-18 21:18:48Z luke $
+# $Id: yum.rb 2710 2007-07-19 00:48:09Z lutter $

data/lib/puppet/provider/parsedfile.rb

@@ -119,6 +119,15 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         [resource_type.validproperties, resource_type.parameters].flatten.each do |attr|
             attr = symbolize(attr)
             define_method(attr) do
+#                if @property_hash.empty?
+#                    # Note that this swaps the provider out from under us.
+#                    prefetch()
+#                    if @resource.provider == self
+#                        return @property_hash[attr]
+#                    else
+#                        return @resource.provider.send(attr)
+#                    end
+#                end
                 # If it's not a valid field for this record type (which can happen
                 # when different platforms support different fields), then just
                 # return the should value, so the resource shuts up.
@@ -179,13 +188,19 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         end
 
         if resources
+            matchers = resources.dup
             @records.each do |record|
+                # Skip things like comments and blank lines
+                next if record_type(record[:record_type]).text?
+
                 if name = record[:name] and resource = resources[name]
                     resource.provider = new(record)
                 elsif respond_to?(:match)
-                    if instance = match(record, resources)
-                        record[:name] = instance[:name]
-                        instance.provider = new(record)
+                    if resource = match(record, matchers)
+                        # Remove this resource from circulation so we don't unnecessarily try to match
+                        matchers.delete(resource.title)
+                        record[:name] = resource[:name]
+                        resource.provider = new(record)
                     end
                 end
             end
@@ -229,7 +244,10 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
             old = @target
             begin
                 @target = path
-                self.parse(text)
+                return self.parse(text)
+            rescue Puppet::Error => detail
+                detail.file = @target
+                raise detail
             ensure
                 @target = old
             end
@@ -264,7 +282,9 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         # Lastly, check the file from any resource instances
         if resources
             resources.each do |name, resource|
-                targets << resource.value(:target)
+                if value = resource.should(:target)
+                    targets << value
+                end
             end
         end
 
@@ -314,6 +334,8 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         @property_hash[:name] ||= @resource.name
 
         self.class.flush(@property_hash)
+
+        #@property_hash = {}
     end
 
     def initialize(resource)
@@ -327,6 +349,14 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         @property_hash = self.class.record?(resource[:name]) ||
             {:record_type => self.class.name, :ensure => :absent}
     end
+
+    # Retrieve the current state from disk.
+    def prefetch
+        unless @resource
+            raise Puppet::DevError, "Somehow got told to prefetch with no resource set"
+        end
+        self.class.prefetch(@resource[:name] => @resource)
+    end
 end
 
-# $Id: parsedfile.rb 2551 2007-06-04 20:37:14Z luke $
+# $Id: parsedfile.rb 2722 2007-07-20 16:27:44Z luke $