puppet 0.22.4 → 0.23.0

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

@@ -16,28 +16,27 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
     end
 
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
 
-        if @model[:source]
+        if @resource[:source]
             return super
         end
 
-        pkgadd "-r", @model[:name]
+        pkgadd "-r", @resource[:name]
     end
 
     def query
-        self.class.list
-
-        if @model.is(:ensure)
-            return :listed
-        else
-            return nil
+        self.class.instances.each do |provider|
+            if provider.name == @resource.name
+                return provider.properties
+            end
         end
+        return nil
     end
 
     def uninstall
-        pkgdelete "%s-%s" % [@model[:name], @model.should(:ensure)]
+        pkgdelete "%s-%s" % [@resource[:name], @resource.should(:ensure)]
     end
 end
 
-# $Id: freebsd.rb 1979 2006-12-28 08:06:46Z luke $
+# $Id: freebsd.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -1,8 +1,12 @@
+require 'puppet/provider/package'
+
 # Ruby gems support.
-Puppet::Type.type(:package).provide :gem do
+Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package do
     desc "Ruby Gem support.  By default uses remote gems, but you can specify
         the path to a local gem via ``source``."
 
+    has_feature :versionable
+
     commands :gemcmd => "gem"
 
     def self.gemlist(hash)
@@ -54,24 +58,24 @@ Puppet::Type.type(:package).provide :gem do
         end
     end
 
-    def self.list(justme = false)
+    def self.instances(justme = false)
         gemlist(:local => true).collect do |hash|
-            Puppet::Type.type(:package).installedpkg(hash)
+            new(hash)
         end
     end
 
     def install(useversion = true)
         command = ["install"]
-        if (! @model.should(:ensure).is_a? Symbol) and useversion
-            command << "-v" << @model.should(:ensure)
+        if (! @resource.should(:ensure).is_a? Symbol) and useversion
+            command << "-v" << @resource.should(:ensure)
         end
         # Always include dependencies
         command << "--include-dependencies"
 
-        if source = @model[:source]
+        if source = @resource[:source]
             command << source
         else
-            command << @model[:name]
+            command << @resource[:name]
         end
 
         gemcmd(*command)
@@ -79,26 +83,22 @@ Puppet::Type.type(:package).provide :gem do
 
     def latest
         # This always gets the latest version available.
-        hash = self.class.gemlist(:justme => @model[:name])
+        hash = self.class.gemlist(:justme => @resource[:name])
 
         return hash[:ensure]
     end
 
     def query
-        self.class.gemlist(:justme => @model[:name], :local => true)
+        self.class.gemlist(:justme => @resource[:name], :local => true)
     end
 
     def uninstall
-        gemcmd "uninstall", "-x", "-a", @model[:name]
+        gemcmd "uninstall", "-x", "-a", @resource[:name]
     end
 
     def update
         self.install(false)
     end
-
-    def versionable?
-        true
-    end
 end
 
-# $Id: gem.rb 2355 2007-03-27 18:06:50Z luke $
+# $Id: gem.rb 2618 2007-06-18 21:18:48Z luke $

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

@@ -1,5 +1,7 @@
+require 'puppet/provider/package'
+
 # Packaging on OpenBSD.  Doesn't work anywhere else that I know of.
-Puppet::Type.type(:package).provide :openbsd do
+Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Package do
     desc "OpenBSD's form of ``pkg_add`` support."
 
     commands :pkginfo => "pkg_info", :pkgadd => "pkg_add", :pkgdelete => "pkg_delete"
@@ -7,7 +9,7 @@ Puppet::Type.type(:package).provide :openbsd do
     defaultfor :operatingsystem => :openbsd
     confine :operatingsystem => :openbsd
 
-    def self.list
+    def self.instances
         packages = []
 
         begin
@@ -29,8 +31,7 @@ Puppet::Type.type(:package).provide :openbsd do
 
                         hash[:provider] = self.name
 
-                        pkg = Puppet.type(:package).installedpkg(hash)
-                        packages << pkg
+                        packages << new(hash)
                     else
                         # Print a warning on lines we can't match, but move
                         # on, since it should be non-fatal
@@ -38,12 +39,6 @@ Puppet::Type.type(:package).provide :openbsd do
                     end
                 }
             end
-            # Mark as absent any packages we didn't find
-            Puppet.type(:package).each do |pkg|
-                unless packages.include? pkg
-                    pkg.is = [:ensure, :absent] 
-                end
-            end
 
             return packages
         rescue Puppet::ExecutionFailure
@@ -56,22 +51,22 @@ Puppet::Type.type(:package).provide :openbsd do
     end
 
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
 
-        unless @model[:source]
+        unless @resource[:source]
             raise Puppet::Error,
                 "You must specify a package source for BSD packages"
         end
 
-        pkgadd @model[:source]
+        pkgadd @resource[:source]
     end
 
     def query
         hash = {}
-        info = pkginfo @model[:name]
+        info = pkginfo @resource[:name]
 
         # Search for the version info
-        if info =~ /Information for #{@model[:name]}-(\S+)/
+        if info =~ /Information for #{@resource[:name]}-(\S+)/
             hash[:ensure] = $1
         else
             return nil
@@ -86,8 +81,8 @@ Puppet::Type.type(:package).provide :openbsd do
     end
 
     def uninstall
-        pkgdelete @model[:name]
+        pkgdelete @resource[:name]
     end
 end
 
-# $Id: openbsd.rb 1979 2006-12-28 08:06:46Z luke $
+# $Id: openbsd.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -1,6 +1,20 @@
-# Jeff McCune <mccune.jeff@gmail.com>
-# Mac OS X Package Installer which handles .pkg and .mpkg
-# bundles inside an Apple Disk Image.
+#
+# pkgdmg.rb
+#
+# Install Installer.app packages wrapped up inside a DMG image file.
+#
+# Copyright (C) 2007 Jeff McCune Jeff McCune <jeff@northstarlabs.net>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation (version 2 of the License)
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston MA  02110-1301 USA
 #
 # Motivation: DMG files provide a true HFS file system
 # and are easier to manage and .pkg bundles.
@@ -11,11 +25,71 @@
 # As a result, we store installed .pkg.dmg file names
 # in /var/db/.puppet_pkgdmg_installed_<name>
 
-# require 'ruby-debug'
-# Debugger.start
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do
+    desc "Package management based on Apple's Installer.app and DiskUtility.app
+    
+Author: Jeff McCune <jeff@northstarlabs.net>
+
+Please direct questions about this provider to the puppet-users mailing list.
+
+This package works by checking the contents of a DMG image for Apple pkg or
+mpkg files. Any number of pkg or mpkg files may exist in the root directory of
+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:
+
+ 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
+named 'Foobar.pkg.dmg' is named for installation and contains multiple
+packages, this provider will install all packages in the root directory of
+this file system, then create a small cookie for the whole bundle, located at
+/var/db/.puppet_pkgdmg_installed_Foobar.pkg.dmg
+
+As a result, if you change the contents of the DMG file in any way, Puppet
+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:
+
+ 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.
+
+This provider allows you to host DMG files within an FTP or HTTP server. This
+is primarily how the author provider distributes software. Any URL mechanism
+curl or Ruby's open-uri module supports is supported by this provider. Curl
+supported URL's yield much faster data throughput than open-uri, so I
+recommend HTTP, HTTPS, or FTP for source package repositories.
+
+Because the provider assumes packages will be transfered via CURL, a two stage
+process occurs. First, if a URL is detected, curl is invoked to transfer the
+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:
 
-Puppet::Type.type(:package).provide :pkgdmg do
-    desc "Package management based on Apple's Installer.app and DiskUtility.app"
+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',
+}
+"
+  
 
     confine :exists => "/Library/Receipts"
     commands :installer => "/usr/sbin/installer"
@@ -23,7 +97,7 @@ Puppet::Type.type(:package).provide :pkgdmg do
     commands :curl => "/usr/bin/curl"
 
     # JJM We store a cookie for each installed .pkg.dmg in /var/db
-    def self.listbyname
+    def self.instance_by_name
         Dir.entries("/var/db").find_all { |f|
             f =~ /^\.puppet_pkgdmg_installed_/
         }.collect do |f|
@@ -33,9 +107,9 @@ Puppet::Type.type(:package).provide :pkgdmg do
         end
     end
 
-    def self.list
-        listbyname.collect do |name|
-            Puppet.type(:package).installedpkg(
+    def self.instances
+        instance_by_name.collect do |name|
+            new(
                 :name => name,
                 :provider => :pkgdmg,
                 :ensure => :installed
@@ -97,8 +171,8 @@ Puppet::Type.type(:package).provide :pkgdmg do
     end # def self.installpkgdmg
 
     def query
-        if FileTest.exists?("/var/db/.puppet_pkgdmg_installed_#{@model[:name]}")
-            return {:name => @model[:name], :ensure => :present}
+        if FileTest.exists?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
+            return {:name => @resource[:name], :ensure => :present}
         else
             return nil
         end
@@ -106,14 +180,14 @@ Puppet::Type.type(:package).provide :pkgdmg do
 
     def install
         source = nil
-        unless source = @model[:source]
+        unless source = @resource[:source]
             self.fail "Mac OS X PKG DMG's must specify a package source."
         end
-        unless name = @model[:name]
+        unless name = @resource[:name]
             self.fail "Mac OS X PKG DMG's must specify a package name."
         end
         self.class.installpkgdmg(source,name)
     end
 end
 
-# $Id: pkgdmg.rb 2187 2007-02-12 18:55:40Z luke $
+# $Id: pkgdmg.rb 2622 2007-06-18 23:57:28Z mccune $

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

@@ -1,17 +1,24 @@
-Puppet::Type.type(:package).provide :portage do
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
     desc "Provides packaging support for Gentoo's portage system."
 
-    commands :emerge => "/usr/bin/emerge", :eix => "/usr/bin/eix"
+    has_feature :versionable
+
+    commands :emerge => "/usr/bin/emerge", :eix => "/usr/bin/eix", :update_eix => "/usr/bin/update-eix"
 
     defaultfor :operatingsystem => :gentoo
 
-    def self.list
+    def self.instances
         result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/
         result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description]
 
         search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"
 
         begin
+            if !FileUtils.uptodate?("/var/cache/eix", %w(/usr/bin/eix /usr/portage/metadata/timestamp))
+                update_eix
+            end
             search_output = eix "--nocolor", "--format", search_format
 
             packages = []
@@ -26,7 +33,7 @@ Puppet::Type.type(:package).provide :portage do
                     package[:provider] = :portage
                     package[:ensure] = package[:ensure].split.last
 
-                    packages.push(Puppet.type(:package).installedpkg(package))
+                    packages << new(package)
                 end
             end
 
@@ -37,7 +44,7 @@ Puppet::Type.type(:package).provide :portage do
     end
 
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
         name = package_name
         unless should == :present or should == :latest
             # We must install a specific version
@@ -48,7 +55,7 @@ Puppet::Type.type(:package).provide :portage do
 
     # The common package name format.
     def package_name
-        "%s/%s" % [@model[:category], @model[:name]]
+        "%s/%s" % [@resource[:category], @resource[:name]]
     end
 
     def uninstall
@@ -63,11 +70,14 @@ Puppet::Type.type(:package).provide :portage do
         result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/
         result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description]
 
-        search_field = @model[:category] ? "--category-name" : "--name"
-        search_value = @model[:category] ? package_name : @model[:name]
+        search_field = @resource[:category] ? "--category-name" : "--name"
+        search_value = @resource[:category] ? package_name : @resource[:name]
         search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>"
 
         begin
+            if !FileUtils.uptodate?("/var/cache/eix", %w(/usr/bin/eix /usr/portage/metadata/timestamp))
+                update_eix
+            end
             search_output = eix "--nocolor", "--format", search_format, "--exact", search_field, search_value
 
             packages = []
@@ -88,7 +98,7 @@ Puppet::Type.type(:package).provide :portage do
 
             case packages.size
                 when 0
-		    not_found_value = "%s/%s" % [@model[:category] ? @model[:category] : "<unspecified category>", @model[:name]]
+		    not_found_value = "%s/%s" % [@resource[:category] ? @resource[:category] : "<unspecified category>", @resource[:name]]
                     raise Puppet::PackageError.new("No package found with the specified name [#{not_found_value}]")
                 when 1
                     return packages[0]
@@ -103,10 +113,6 @@ Puppet::Type.type(:package).provide :portage do
     def latest
         return self.query[:version_available]
     end
-
-    def versionable?
-        true
-    end
 end
 
-# $Id: portage.rb 2216 2007-02-20 00:35:12Z luke $
+# $Id: portage.rb 2618 2007-06-18 21:18:48Z luke $

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

@@ -1,6 +1,7 @@
-Puppet::Type.type(:package).provide :ports, :parent => :freebsd do
+Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :freebsd do
     desc "Support for FreeBSD's ports.  Again, this still mixes packages
         and ports."
+
     commands :portupgrade => "/usr/local/sbin/portupgrade",
              :portversion => "/usr/local/sbin/portversion",
              :portuninstall => "/usr/local/sbin/pkg_deinstall",
@@ -19,17 +20,18 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd do
         # -p: create a package
         # -N: install if the package is missing, otherwise upgrade
         # -P: prefer binary packages
-        cmd = %w{-p -N -P} << @model[:name]
+        # -M: yes, we're a batch, so don't ask any questions
+        cmd = %w{-p -N -P  -M BATCH=yes} << @resource[:name]
 
         output = portupgrade(*cmd)
         if output =~ /\*\* No such /
-            raise Puppet::ExecutionFailure, "Could not find package %s" % @model[:name]
+            raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
         end
     end
 
     # If there are multiple packages, we only use the last one
     def latest
-        cmd = ["-v", @model[:name]]
+        cmd = ["-v", @resource[:name]]
 
         begin
             output = portversion(*cmd)
@@ -47,7 +49,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd do
         match = $2
         info = $3
 
-        unless pkgstuff =~ /^(\w+)-([0-9].+)$/
+        unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
             raise Puppet::PackageError,
                 "Could not match package info '%s'" % pkgstuff
         end
@@ -73,17 +75,17 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd do
     end
 
     def query
-        self.class.list
-
-        if @model.is(:ensure) and @model.is(:ensure) != :absent
-            return :listed
-        else
-            return nil
+        self.class.instances.each do |instance|
+            if instance.name == self.name
+                return instance.properties
+            end
         end
+
+        return nil
     end
 
     def uninstall
-        portuninstall @model[:name]
+        portuninstall @resource[:name]
     end
 
     def update
@@ -91,4 +93,4 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd do
     end
 end
 
-# $Id: ports.rb 1979 2006-12-28 08:06:46Z luke $
+# $Id: ports.rb 2614 2007-06-18 19:56:19Z luke $