puppet 0.23.2 → 0.24.0

data/lib/puppet/provider/interface/sunos.rb

@@ -1,88 +1,22 @@
 require 'puppet/provider/parsedfile'
 require 'erb'
 
-Puppet::Type.type(:interface).provide(:sunos,
-	:default_target => "/etc/hostname.lo0",
-	:parent => Puppet::Provider::ParsedFile,
-	:filetype => :flat
-) do
-	
+Puppet::Type.type(:interface).provide(:sunos) do
     confine :kernel => "SunOS"
 
-    # Two types of lines:
-    #   the first line does not start with 'addif'
-    #   the rest do
-	record_line :sunos, :fields => %w{interface_type name ifopts onboot}, :rts => true, :absent => "", :block_eval => :instance do
-        # Parse our interface line
-        def process(line)
-            details = {:ensure => :present}
-
-            values = line.split(/\s+/)
-
-            # Are we the primary interface?
-            if values[0] == "addif"
-                details[:interface_type] = :alias
-                values.shift
-            else
-                details[:interface_type] = :normal
-            end
-
-            # Should the interface be up by default?
-            if values[-1] == "up"
-                details[:onboot] = :true
-                values.pop
-            else
-                details[:onboot] = :false
-            end
-
-            # Set the interface name.
-            details[:name] = values.shift
-
-            # Handle any interface options
-            unless values.empty?
-                details[:ifopts] = values.join(" ")
-            end
-
-            return details
-        end
-
-        # Turn our record into a line.
-        def to_line(details)
-            ret = []
-            if details[:interface_type] != :normal
-                ret << "addif"
-            end
-            ret << details[:name]
-
-            if details[:ifopts] and details[:ifopts] != :absent
-                if details[:ifopts].is_a?(Array)
-                    ret << details[:ifopts].join(" ")
-                else
-                    ret << details[:ifopts]
-                end
-            end
-
-            if details[:onboot] and details[:onboot] != :false
-                ret << "up"
-            end
-
-            return ret.join(" ")
-        end
-    end
-
-	def self.header
-		# over-write the default puppet behaviour of adding a header
-		# because on further investigation this breaks the solaris
-		# init scripts
-		%{}
-	end
+    # Add accessor/getter methods for each property/parameter; these methods
+    # modify @property_hash.
+    mk_resource_methods
 
     # Get a list of interface instances.
     def self.instances
 		Dir.glob("/etc/hostname.*").collect do |file|
-            # We really only expect one record from each file
-            parse(file).shift
-        end.collect { |record| new(record) }
+            device = File.basename(file).split(".").pop
+
+            instance = new(:interface => device)
+            instance.parse
+            instance
+        end
     end
 
 	def self.match(hash)
@@ -103,14 +37,97 @@ Puppet::Type.type(:interface).provide(:sunos,
         end
     end
 
+    def initialize(*args)
+        @property_hash = {}
+        super
+    end
+
+    def create
+        self.class.resource_type.validproperties.each do |property|
+            if value = resource.should(property)
+                @property_hash[property] = value
+            end
+        end
+        @property_hash[:name] = resource.name
+
+        return (@resource.class.name.to_s + "_created").intern
+    end
+
+    def destroy
+        File.unlink(file_path)
+        @property_hash[:ensure] = :absent
+    end
+
+    def exists?
+        FileTest.exist?(file_path)
+    end
+
     # Where should the file be written out?  Can be overridden by setting
     # :target in the model.
     def file_path
-        unless @resource[:interface]
-            raise ArgumentError, "You must provide the interface name on Solaris"
+        self.fail("Could not determine interface") unless interface = @property_hash[:interface] || (resource and resource[:interface])
+       	return File.join("/etc", "hostname." + interface)
+    end
+
+    def flush
+        return if self.ensure == :absent
+        File.open(file_path, "w") { |f| f.print generate() + "\n" }
+    end
+
+    # Turn our record into a line.
+    def generate
+        ret = []
+        if self.interface_type == :alias
+            ret << "addif"
+        end
+        ret << self.name
+
+        if self.ifopts != :absent
+            if @property_hash[:ifopts].is_a?(Array)
+                ret << @property_hash[:ifopts].join(" ")
+            else
+                ret << @property_hash[:ifopts]
+            end
+        end
+
+        if self.onboot and ! [:absent, :false].include?(self.onboot)
+            ret << "up"
         end
-       	return File.join("/etc", "hostname." + @resource[:interface])
+
+        return ret.join(" ")
     end
-end
 
-# $Id: sunos.rb 2747 2007-08-05 19:01:39Z luke $
+    # Parse our interface file.
+    def parse
+        (@property_hash = {:ensure => :absent} and return) unless FileTest.exist?(file_path)
+
+        values = File.read(file_path).chomp.split(/\s+/)
+
+        @property_hash[:ensure] = :present
+        #@property_hash = {:ensure => :present}
+
+        # Are we the primary interface?
+        if values[0] == "addif"
+            @property_hash[:interface_type] = :alias
+            values.shift
+        else
+            @property_hash[:interface_type] = :normal
+        end
+
+        # Should the interface be up by default?
+        if values[-1] == "up"
+            @property_hash[:onboot] = :true
+            values.pop
+        else
+            @property_hash[:onboot] = :false
+        end
+
+        # Set the interface name.
+        @property_hash[:name] = values.shift
+
+        # Handle any interface options
+        unless values.empty?
+            @property_hash[:ifopts] = values.join(" ")
+        end
+    end
+end

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

@@ -28,4 +28,3 @@ Puppet::Type.type(:mailalias).provide(:aliases,
     end
 end
 
-# $Id: aliases.rb 2676 2007-07-10 23:24:34Z luke $

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

@@ -101,13 +101,12 @@ Puppet::Type.type(:maillist).provide(:mailman) do
     # 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|
+        self.class.instances.each do |list|
             if list.name == self.name or list.name.downcase == self.name
-                return list.property_hash
+                return list.properties
             end
         end
         nil
     end
 end
 
-# $Id: mailman.rb 2719 2007-07-20 03:24:04Z luke $

data/lib/puppet/provider/mount.rb

@@ -14,7 +14,7 @@ module Puppet::Provider::Mount
         if self.options and self.options != :absent
             args << "-o" << self.options
         end
-        args << @resource[:name]
+        args << resource[:name]
 
         if respond_to?(:flush)
             flush
@@ -24,8 +24,8 @@ module Puppet::Provider::Mount
 
     def remount
         info "Remounting"
-        if @resource[:remounts] == :true
-            mountcmd "-o", "remount", @resource[:name]
+        if resource[:remounts] == :true
+            mountcmd "-o", "remount", resource[:name]
         else
             unmount()
             mount()
@@ -34,21 +34,22 @@ module Puppet::Provider::Mount
 
     # This only works when the mount point is synced to the fstab.
     def unmount
-        umount @resource[:name]
+        umount resource[:name]
     end
 
     # Is the mount currently mounted?
     def mounted?
-        platform = Facter["operatingsystem"].value
-        name = @resource[:name]
+        platform = Facter.value("operatingsystem")
+        name = resource[:name]
         mounts = mountcmd.split("\n").find do |line|
-            if platform == "Darwin"
+            case platform
+            when "Darwin"
                 line =~ / on #{name} / or line =~ %r{ on /private/var/automount#{name}}
+            when "Solaris"
+                line =~ /^#{name} on /
             else
                 line =~ / on #{name} /
             end
         end
     end
 end
-
-# $Id: mount.rb 2745 2007-08-05 17:49:23Z luke $

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

@@ -35,4 +35,3 @@ require 'puppet/provider/mount'
 #     end
 # end
 
-# $Id: netinfo.rb 2501 2007-05-09 23:08:42Z luke $

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

@@ -34,4 +34,3 @@ Puppet::Type.type(:mount).provide(:parsed,
     record_line self.name, :fields => @fields, :separator => /\s+/, :joiner => "\t", :optional => [:pass, :dump]
 end
 
-# $Id: parsed.rb 2707 2007-07-18 20:40:11Z luke $

data/lib/puppet/provider/nameservice.rb

@@ -329,4 +329,3 @@ class Puppet::Provider::NameService < Puppet::Provider
     end
 end
 
-# $Id: nameservice.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -207,4 +207,3 @@ class NetInfo < Puppet::Provider::NameService
 end
 end
 
-# $Id: netinfo.rb 2552 2007-06-05 01:17:00Z luke $

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

@@ -42,4 +42,3 @@ class ObjectAdd < Puppet::Provider::NameService
 end
 end
 
-# $Id: objectadd.rb 2501 2007-05-09 23:08:42Z luke $

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

@@ -19,4 +19,3 @@ class PW < ObjectAdd
 end
 end
 
-# $Id: pw.rb 2501 2007-05-09 23:08:42Z luke $

data/lib/puppet/provider/package.rb

@@ -27,5 +27,3 @@ class Puppet::Provider::Package < Puppet::Provider
         @property_hash.dup
     end
 end
-
-# $Id: package.rb 2559 2007-06-11 20:48:06Z luke $

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

@@ -114,4 +114,3 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
     end
 end
 
-# $Id: appdmg.rb 2647 2007-07-04 22:25:23Z luke $

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

@@ -52,4 +52,3 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
     end
 end
 
-# $Id: apple.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -116,4 +116,3 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     end
 end
 
-# $Id: apt.rb 2708 2007-07-18 23:48:58Z luke $

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

@@ -29,4 +29,3 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg
 	end
 end
 
-# $Id: aptitude.rb 2618 2007-06-18 21:18:48Z luke $

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

@@ -84,4 +84,3 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
     end
 end
 
-# $Id: aptrpm.rb 2701 2007-07-16 23:43:50Z luke $

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

@@ -113,4 +113,3 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
     end
 end
 
-# $Id: blastwave.rb 2656 2007-07-08 16:26:51Z luke $

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

@@ -86,4 +86,3 @@ Puppet::Type.type(:package).provide :darwinport, :parent => Puppet::Provider::Pa
     end
 end
 
-# $Id: darwinport.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -56,9 +56,18 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         dpkg "-i", file
     end
 
+    def update
+        self.install
+    end
+
     # Return the version from the package.
     def latest
         output = dpkg_deb "--show", @resource[:source]
+        matches = /^(\S+)\t(\S+)$/.match(output).captures
+        unless matches[0].match(@resource[:name])
+            Puppet.warning "source doesn't contain named package, but %s" % matches[0]
+        end
+        matches[1]
     end
 
     def query
@@ -122,4 +131,3 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     end
 end
 
-# $Id: dpkg.rb 2753 2007-08-07 02:38:45Z luke $

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

@@ -84,4 +84,3 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
      end
 end
 
-# $Id: fink.rb 2617 2007-06-18 21:07:01Z luke $

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

@@ -39,4 +39,3 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
     end
 end
 
-# $Id: freebsd.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -101,4 +101,3 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     end
 end
 
-# $Id: gem.rb 2618 2007-06-18 21:18:48Z luke $

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

@@ -47,7 +47,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     end
 
     def self.listcmd
-        [command(:info), "-a"]
+        [command(:pkginfo), " -a"]
     end
 
     def install
@@ -85,4 +85,3 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     end
 end
 
-# $Id: openbsd.rb 2753 2007-08-07 02:38:45Z luke $

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

@@ -41,9 +41,9 @@ the DMG file system. Sub directories are not checked for packages.
 This provider always assumes the label (formerly called 'name') attribute
 declared in the manifest will always exactly match the file name (without
 path) of the DMG file itself. Therefore, if you want to install packages in
-'Foobar.pkg.dmg' you must explicitly specify the label:
+'Foobar.pkg.dmg' you must explicitly specify the label::
 
- package { Foobar.pkg.dmg: ensure => installed, provider => pkgdmg }
+    package { Foobar.pkg.dmg: ensure => installed, provider => pkgdmg }
 
 Only the dmg file name itself is used when puppet determines if the packages
 contained within are currently installed. For example, if a package resource
@@ -57,9 +57,9 @@ will not update or re-install the packages contained within unless you change
 the file name of the DMG wrapper itself. Therefore, if you use this provider,
 I recommend you name the DMG wrapper files in a manner that lends itself to
 incremental version changes. I include some version or date string in the DMG
-name, like so:
+name, like so::
 
- Firefox-2.0.0.3-1.pkg.dmg
+    Firefox-2.0.0.3-1.pkg.dmg
 
 If I realize I've mis-packaged this DMG, then I have the option to increment
 the package version, yielding Firefox-2.0.0.3-2.pkg.dmg.
@@ -76,18 +76,18 @@ file into a temporary directory. If no URL is present, the provider skips
 straight to step 2. In step two, the source file is mounted, then packages
 installed, and finally the DMG file is removed.
 
-WARNING: Because I assume files will be downloaded to /tmp, the current
-implementation attempts to delete DMG files if you install directly from the
-file system and not via a URL method.
-
 If this is a problem for you, please patch the code, or bug Jeff to fix this.
 
-Example usage:
+Example usage::
 
-package { Thunderbird-2.0.0.4-1.pkg.dmg:
-  provider => pkgdmg, ensure => present
-  source => 'http://0.0.0.0:8000/packages/Thunderbird-2.0.0.4-1.pkg.dmg',
-}
+    package { Thunderbird-2.0.0.4-1.pkg.dmg:
+      provider => pkgdmg, ensure => present
+      source => 'http://0.0.0.0:8000/packages/Thunderbird-2.0.0.4-1.pkg.dmg',
+    }
+
+**WARNING**: Because I assume files will be downloaded to /tmp, the current
+implementation attempts to delete DMG files if you install directly from the
+file system and not via a URL method.
 "
   
 
@@ -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", "-noidme", "/tmp", dmg.path
+                xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/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,3 @@ package { Thunderbird-2.0.0.4-1.pkg.dmg:
     end
 end
 
-# $Id: pkgdmg.rb 2650 2007-07-05 12:58:23Z mccune $