puppet 0.22.4 → 0.23.0

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

@@ -1,5 +1,7 @@
+require 'puppet/provider/package'
+
 # OS X Packaging sucks.  We can install packages, but that's about it.
-Puppet::Type.type(:package).provide :apple do
+Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package do
     desc "Package management based on OS X's builtin packaging system.  This is
         essentially the simplest and least functional package system in existence --
         it only supports installation; no deletion or upgrades.  The provider will
@@ -11,7 +13,17 @@ Puppet::Type.type(:package).provide :apple do
 
     defaultfor :operatingsystem => :darwin
 
-    def self.listbyname
+    def self.instances
+        instance_by_name.collect do |name|
+            self.new(
+                :name => name,
+                :provider => :apple,
+                :ensure => :installed
+            )
+        end
+    end
+
+    def self.instance_by_name
         Dir.entries("/Library/Receipts").find_all { |f|
             f =~ /\.pkg$/
         }.collect { |f|
@@ -22,19 +34,9 @@ Puppet::Type.type(:package).provide :apple do
         }
     end
 
-    def self.list
-        listbyname.collect do |name|
-            Puppet.type(:package).installedpkg(
-                :name => name,
-                :provider => :apple,
-                :ensure => :installed
-            )
-        end
-    end
-
     def query
-        if FileTest.exists?("/Library/Receipts/#{@model[:name]}.pkg")
-            return {:name => @model[:name], :ensure => :present}
+        if FileTest.exists?("/Library/Receipts/#{@resource[:name]}.pkg")
+            return {:name => @resource[:name], :ensure => :present}
         else
             return nil
         end
@@ -42,7 +44,7 @@ Puppet::Type.type(:package).provide :apple do
 
     def install
         source = nil
-        unless source = @model[:source]
+        unless source = @resource[:source]
             self.fail "Mac OS X packages must specify a package source"
         end
 
@@ -50,4 +52,4 @@ Puppet::Type.type(:package).provide :apple do
     end
 end
 
-# $Id: apple.rb 2399 2007-04-20 02:22:02Z luke $
+# $Id: apple.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -1,9 +1,11 @@
-Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
+Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     # Provide sorting functionality
     include Puppet::Util::Package
 
     desc "Package management via ``apt-get``."
 
+    has_feature :versionable
+
     commands :aptget => "/usr/bin/apt-get"
     commands :aptcache => "/usr/bin/apt-cache"
     commands :preseed => "/usr/bin/debconf-set-selections"
@@ -31,7 +33,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
             end
         end
 
-        if @@checkedforcdrom and @model[:allowcdrom] != :true
+        if @@checkedforcdrom and @resource[:allowcdrom] != :true
             raise Puppet::Error,
                 "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
         end
@@ -40,14 +42,14 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
     # Install a package using 'apt-get'.  This function needs to support
     # installing a specific version.
     def install
-        if @model[:responsefile]
+        if @resource[:responsefile]
             self.run_preseed
         end
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
 
         checkforcdrom()
 
-        str = @model[:name]
+        str = @resource[:name]
         case should
         when true, false, Symbol
             # pass
@@ -58,7 +60,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
         cmd = %w{-q -y}
 
         keep = ""
-        if config = @model[:configfiles]
+        if config = @resource[:configfiles]
             case config
             when :keep
                 cmd << "-o" << 'DPkg::Options::=--force-confold'
@@ -76,7 +78,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
 
     # What's the latest package version available?
     def latest
-        output = aptcache :policy,  @model[:name]
+        output = aptcache :policy,  @resource[:name]
 
         if output =~ /Candidate:\s+(\S+)\s/
             return $1
@@ -90,7 +92,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
 	# preseeds answers to dpkg-set-selection from the "responsefile"
 	#
     def run_preseed
-        if response = @model[:responsefile] and FileTest.exists?(response)
+        if response = @resource[:responsefile] and FileTest.exists?(response)
             self.info("Preseeding %s to debconf-set-selections" % response)
 
             preseed response
@@ -104,16 +106,12 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
     end
 
     def uninstall
-        aptget "-y", "-q", :remove, @model[:name]
+        aptget "-y", "-q", :remove, @resource[:name]
     end
 
     def purge
-        aptget '-y', '-q', 'remove', '--purge', @model[:name]
-     end
-
-    def versionable?
-        true
+        aptget '-y', '-q', 'remove', '--purge', @resource[:name]
     end
 end
 
-# $Id: apt.rb 2316 2007-03-19 16:42:41Z luke $
+# $Id: apt.rb 2618 2007-06-18 21:18:48Z luke $

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

@@ -1,6 +1,8 @@
-Puppet::Type.type(:package).provide :aptitude, :parent => :apt do
+Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg do
     desc "Package management via ``aptitude``."
 
+    has_feature :versionable
+
     commands :aptitude => "/usr/bin/aptitude"
     commands :aptcache => "/usr/bin/apt-cache"
 
@@ -23,8 +25,8 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt do
     end
 
     def purge
-        aptitude '-y', 'purge', @model[:name]
+        aptitude '-y', 'purge', @resource[:name]
 	end
 end
 
-# $Id: aptitude.rb 2316 2007-03-19 16:42:41Z luke $
+# $Id: aptitude.rb 2618 2007-06-18 21:18:48Z luke $

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

@@ -1,9 +1,11 @@
-Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm do
+Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
     # Provide sorting functionality
     include Puppet::Util::Package
 
     desc "Package management via ``apt-get`` ported to ``rpm``."
 
+    has_feature :versionable
+
     commands :aptget => "/usr/bin/apt-get"
     commands :aptcache => "/usr/bin/apt-cache"
     commands :rpm => "/usr/bin/rpm"
@@ -11,9 +13,9 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm do
     # Install a package using 'apt-get'.  This function needs to support
     # installing a specific version.
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
 
-        str = @model[:name]
+        str = @resource[:name]
         case should
         when true, false, Symbol
             # pass
@@ -30,7 +32,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm do
 
     # What's the latest package version available?
     def latest
-        output = aptcache :showpkg,  @model[:name]
+        output = aptcache :showpkg,  @resource[:name]
 
         if output =~ /Versions:\s*\n((\n|.)+)^$/
             versions = $1
@@ -64,16 +66,12 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm do
     end
 
     def uninstall
-        aptget "-y", "-q", 'remove', @model[:name]
+        aptget "-y", "-q", 'remove', @resource[:name]
     end
 
     def purge
-        aptget '-y', '-q', 'remove', '--purge', @model[:name]
-     end
-
-    def versionable?
-        true
+        aptget '-y', '-q', 'remove', '--purge', @resource[:name]
     end
 end
 
-# $Id: aptrpm.rb 2398 2007-04-19 19:54:37Z luke $
+# $Id: aptrpm.rb 2618 2007-06-18 21:18:48Z luke $

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

@@ -1,5 +1,5 @@
 # Packaging using Blastwave's pkg-get program.
-Puppet::Type.type(:package).provide :blastwave, :parent => :sun do
+Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun do
     desc "Package management using Blastwave.org's ``pkg-get`` command on Solaris."
     pkgget = "pkg-get"
     if FileTest.executable?("/opt/csw/bin/pkg-get")
@@ -23,10 +23,10 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun do
         end
     end
 
-    def self.list(hash = {})
+    def self.instances(hash = {})
         blastlist(hash).collect do |bhash|
             bhash.delete(:avail)
-            Puppet::Type.type(:package).installedpkg(bhash)
+            new(bhash)
         end
     end
 
@@ -86,29 +86,29 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun do
     end
 
     def install
-        pkgget "-f", :install, @model[:name]
+        pkgget "-f", :install, @resource[:name]
     end
 
     # Retrieve the version from the current package file.
     def latest
-        hash = self.class.blastlist(:justme => @model[:name])
+        hash = self.class.blastlist(:justme => @resource[:name])
         hash[:avail]
     end
 
     def query
-        hash = self.class.blastlist(:justme => @model[:name])
+        hash = self.class.blastlist(:justme => @resource[:name])
 
         {:ensure => hash[:ensure]}
     end
 
     # Remove the old package, and install the new one
     def update
-        pkgget "-f", :upgrade, @model[:name]
+        pkgget "-f", :upgrade, @resource[:name]
     end
 
     def uninstall
-        pkgget "-f", :remove, @model[:name]
+        pkgget "-f", :remove, @resource[:name]
     end
 end
 
-# $Id: blastwave.rb 1980 2006-12-28 19:14:11Z luke $
+# $Id: blastwave.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -1,4 +1,6 @@
-Puppet::Type.type(:package).provide :darwinport do
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :darwinport, :parent => Puppet::Provider::Package do
     desc "Package management using DarwinPorts on OS X."
 
     commands :port => "/opt/local/bin/port"
@@ -31,31 +33,30 @@ Puppet::Type.type(:package).provide :darwinport do
         }
     end
 
-    def self.list
+    def self.instances
         packages = []
 
         eachpkgashash do |hash|
-            pkg = Puppet.type(:package).installedpkg(hash)
-            packages << pkg
+            packages << new(hash)
         end
 
         return packages
     end
 
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
 
         # Seems like you can always say 'upgrade'
-        output = port "upgrade", @model[:name]
+        output = port "upgrade", @resource[:name]
         if output =~ /^Error: No port/
-            raise Puppet::ExecutionFailure, "Could not find package %s" % @model[:name]
+            raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
         end
     end
 
     def query
         version = nil
         self.class.eachpkgashash do |hash|
-            if hash[:name] == @model[:name]
+            if hash[:name] == @resource[:name]
                 return hash
             end
         end
@@ -64,7 +65,7 @@ Puppet::Type.type(:package).provide :darwinport do
     end
 
     def latest
-        info = port :search, "^#{@model[:name]}$"
+        info = port :search, "^#{@resource[:name]}$"
 
         if $? != 0 or info =~ /^Error/
             return nil
@@ -77,7 +78,7 @@ Puppet::Type.type(:package).provide :darwinport do
     end
 
     def uninstall
-        port :uninstall, @model[:name]
+        port :uninstall, @resource[:name]
     end
 
     def update
@@ -85,4 +86,4 @@ Puppet::Type.type(:package).provide :darwinport do
     end
 end
 
-# $Id: darwinport.rb 2052 2007-01-05 17:09:04Z luke $
+# $Id: darwinport.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -1,12 +1,15 @@
-Puppet::Type.type(:package).provide :dpkg do
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package do
     desc "Package management via ``dpkg``.  Because this only uses ``dpkg``
         and not ``apt``, you must specify the source of any packages you want
         to manage."
 
     commands :dpkg => "/usr/bin/dpkg"
+    commands :dpkg_deb => "/usr/bin/dpkg-deb"
     commands :dpkgquery => "/usr/bin/dpkg-query"
     
-    def self.list
+    def self.instances
         packages = []
 
         # list out all of the packages
@@ -29,7 +32,7 @@ Puppet::Type.type(:package).provide :dpkg do
 
                     hash[:provider] = self.name
 
-                    packages.push Puppet.type(:package).installedpkg(hash)
+                    packages << new(hash)
                 else
                     Puppet.warning "Failed to match dpkg-query line %s" %
                         line.inspect
@@ -41,12 +44,17 @@ Puppet::Type.type(:package).provide :dpkg do
     end
 
     def install
-        unless file = @model[:source]
+        unless file = @resource[:source]
             raise ArgumentError, "You cannot install dpkg packages without a source"
         end
         dpkg "-i", file
     end
 
+    # Return the version from the package.
+    def latest
+        output = dpkg_deb "--show", @resource[:source]
+    end
+
     def query
         packages = []
 
@@ -57,12 +65,12 @@ Puppet::Type.type(:package).provide :dpkg do
         # list out our specific package
         begin
             output = dpkgquery("-W", "--showformat",
-                '${Status} ${Package} ${Version}\\n', @model[:name]
+                '${Status} ${Package} ${Version}\\n', @resource[:name]
             )
         rescue Puppet::ExecutionFailure
             # dpkg-query exits 1 if the package is not found.
-            return {:ensure => :absent, :status => 'missing',
-                :name => @model[:name], :error => 'ok'}
+            return {:ensure => :purged, :status => 'missing',
+                :name => @resource[:name], :error => 'ok'}
 
         end
         # Our regex for matching dpkg-query output.  We could probably just
@@ -79,7 +87,7 @@ Puppet::Type.type(:package).provide :dpkg do
         else
             notice "Failed to handle dpkg-query line %s" % line.inspect
             return {:ensure => :absent, :status => 'missing',
-                :name => @model[:name], :error => 'ok'}
+                :name => @resource[:name], :error => 'ok'}
         end
 
         if hash[:error] != "ok"
@@ -98,12 +106,12 @@ Puppet::Type.type(:package).provide :dpkg do
     end
 
     def uninstall
-        dpkg "-r", @model[:name]
+        dpkg "-r", @resource[:name]
     end
 
     def purge
-        dpkg "--purge", @model[:name]
-	 end
+        dpkg "--purge", @resource[:name]
+    end
 end
 
-# $Id: dpkg.rb 2224 2007-02-26 01:17:48Z mpalmer $
+# $Id: dpkg.rb 2615 2007-06-18 20:10:35Z luke $

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

@@ -0,0 +1,87 @@
+Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
+    # Provide sorting functionality
+    include Puppet::Util::Package
+
+    desc "Package management via ``fink``."
+    
+	commands :fink => "/sw/bin/fink"
+    commands :aptget => "/sw/bin/apt-get"
+    commands :aptcache => "/sw/bin/apt-cache"
+    commands :dpkgquery => "/sw/bin/dpkg-query"
+
+    defaultfor :operatingsystem => :darwin
+
+    has_feature :versionable
+
+    # A derivative of DPKG; this is how most people actually manage
+    # Debian boxes, and the only thing that differs is that it can
+    # install packages from remote sites.
+
+    def finkcmd(*args)
+        fink(*args)
+    end
+
+    # Install a package using 'apt-get'.  This function needs to support
+    # installing a specific version.
+    def install
+        if @resource[:responsefile]
+            self.run_preseed
+        end
+        should = @resource.should(:ensure)
+
+        str = @resource[:name]
+        case should
+        when true, false, Symbol
+            # pass
+        else
+            # Add the package version
+            str += "=%s" % should
+        end
+        cmd = %w{-b -q -y}
+
+        keep = ""
+
+        cmd << :install << str
+        
+        finkcmd(cmd)
+    end
+
+    # What's the latest package version available?
+    def latest
+        output = aptcache :policy,  @resource[:name]
+
+        if output =~ /Candidate:\s+(\S+)\s/
+            return $1
+                else
+            self.err "Could not find latest version"
+            return nil
+                end
+                end
+
+	#
+	# preseeds answers to dpkg-set-selection from the "responsefile"
+	#
+    def run_preseed
+        if response = @resource[:responsefile] and FileTest.exists?(response)
+            self.info("Preseeding %s to debconf-set-selections" % response)
+
+            preseed response
+        else 
+            self.info "No responsefile specified or non existant, not preseeding anything"
+        end
+    end
+
+    def update
+        self.install
+    end
+
+    def uninstall
+        finkcmd "-y", "-q", :remove, @model[:name]
+    end
+
+    def purge
+        aptget '-y', '-q', 'remove', '--purge', @resource[:name]
+     end
+end
+
+# $Id: fink.rb 2617 2007-06-18 21:07:01Z luke $