puppet 0.23.2 → 0.24.0

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

@@ -10,8 +10,8 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     defaultfor :operatingsystem => :gentoo
 
     def self.instances
-        result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/
-        result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description]
+        result_format = /(\S+) (\S+) \[([^\[]*)(\[[^\]]*\])?\] \[[^0-9]*([^\s:\[]*)(\[[^\]]*\])?(:\S*)?\] ([\S]*) (.*)/
+        result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :overlay, :slot, :vendor, :description]
 
         search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"
 
@@ -55,7 +55,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
     # The common package name format.
     def package_name
-        "%s/%s" % [@resource[:category], @resource[:name]]
+        @resource[:category] ? "%s/%s" % [@resource[:category], @resource[:name]] : @resource[:name]
     end
 
     def uninstall
@@ -67,11 +67,11 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     end
 
     def query
-        result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/
-        result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description]
+        result_format = /(\S+) (\S+) \[([^\[]*)(\[[^\]]*\])?\] \[[^0-9]*([^\s:\[]*)(\[[^\]]*\])?(:\S*)?\] ([\S]*) (.*)/
+        result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :overlay, :slot, :vendor, :description]
 
         search_field = @resource[:category] ? "--category-name" : "--name"
-        search_value = @resource[:category] ? package_name : @resource[:name]
+        search_value = package_name
         search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>"
 
         begin
@@ -115,4 +115,3 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     end
 end
 
-# $Id: portage.rb 2618 2007-06-18 21:18:48Z luke $

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

@@ -17,11 +17,9 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
     end
 
     def install
-        # -p: create a package
         # -N: install if the package is missing, otherwise upgrade
-        # -P: prefer binary packages
         # -M: yes, we're a batch, so don't ask any questions
-        cmd = %w{-p -N -P  -M BATCH=yes} << @resource[:name]
+        cmd = %w{-N -M BATCH=yes} << @resource[:name]
 
         output = portupgrade(*cmd)
         if output =~ /\*\* No such /
@@ -93,4 +91,3 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
     end
 end
 
-# $Id: ports.rb 2614 2007-06-18 19:56:19Z luke $

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

@@ -5,15 +5,14 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
         binary."
 
     # The query format by which we identify installed packages
-    NVRFORMAT = "%{NAME}-%{VERSION}-%{RELEASE}"
-
-    VERSIONSTRING = "%{VERSION}-%{RELEASE}"
+    NEVRAFORMAT = "%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}"
+    NEVRA_FIELDS = [:name, :epoch, :version, :release, :arch]
 
     commands :rpm => "rpm"
 
     if command('rpm')
         confine :true => begin
-                rpm('-ql', 'rpm')
+                rpm('--version')
            rescue Puppet::ExecutionFailure
                false
            else
@@ -26,23 +25,11 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
         # list out all of the packages
         begin
-            execpipe("#{command(:rpm)} -qa --nosignature --nodigest --qf '%{NAME} #{VERSIONSTRING}\n'") { |process|
-                # our regex for matching dpkg output
-                regex = %r{^(\S+)\s+(\S+)}
-                fields = [:name, :ensure]
-
+            execpipe("#{command(:rpm)} -qa --nosignature --nodigest --qf '#{NEVRAFORMAT}\n'") { |process|
                 # now turn each returned line into a package object
                 process.each { |line|
-                    if match = regex.match(line)
-                        hash = {}
-                        fields.zip(match.captures) { |field,value|
-                            hash[field] = value
-                        }
-                        hash[:provider] = self.name
-                        packages << new(hash)
-                    else
-                        raise "failed to match rpm line %s" % line
-                    end
+                    hash = nevra_to_hash(line)
+                    packages << new(hash)
                 }
             }
         rescue Puppet::ExecutionFailure
@@ -56,30 +43,21 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     # a hash with entries :instance => fully versioned package name, and 
     # :ensure => version-release
     def query
-        cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NVRFORMAT} #{VERSIONSTRING}\n"]
-
-        begin
-            output = rpm(*cmd)
-        rescue Puppet::ExecutionFailure
-            return nil
+        unless @property_hash[:epoch]
+            cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"]
+
+            begin
+                output = rpm(*cmd)
+            rescue Puppet::ExecutionFailure
+                return nil
+            end
+            
+            # FIXME: We could actually be getting back multiple packages
+            # for multilib
+            @property_hash.update(self.class.nevra_to_hash(output))
         end
 
-        regex = %r{^(\S+)\s+(\S+)}
-        fields = [:instance, :ensure]
-        attrs = {}
-        if match = regex.match(output)
-            fields.zip(match.captures) { |field,value|
-                attrs[field] = value
-            }
-        else
-            raise Puppet::DevError,
-                "Failed to match rpm output '%s'" %
-                output
-        end
-
-        @nvr = attrs[:instance]
-
-        return attrs
+        return @property_hash.dup
     end
 
     # Here we just retrieve the version from the file specified in the source.
@@ -88,9 +66,9 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
             @resource.fail "RPMs must specify a package source"
         end
         
-        cmd = [command(:rpm), "-q", "--qf", "#{VERSIONSTRING}", "-p", "#{@resource[:source]}"]
-        version = execfail(cmd, Puppet::Error)
-        return version
+        cmd = [command(:rpm), "-q", "--qf", "#{NEVRAFORMAT}\n", "-p", "#{@resource[:source]}"]
+        h = nevra_to_hash(execfail(cmd, Puppet::Error))
+        return h[:ensure]
     end
 
     def install
@@ -125,6 +103,14 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
         query unless @nvr
         @nvr
     end
+
+    def self.nevra_to_hash(line)
+        line.chomp!
+        hash = {}
+        NEVRA_FIELDS.zip(line.split) { |f, v| hash[f] = v }
+        hash[:provider] = self.name
+        hash[:ensure] = "#{hash[:version]}-#{hash[:release]}"
+        return hash
+    end
 end
 
-# $Id: rpm.rb 2753 2007-08-07 02:38:45Z luke $

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

@@ -51,8 +51,6 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
                         unless names[name].nil?
                             hash[names[name]] = value
                         end
-                    else
-                        raise "Could not find %s" % name
                     end
                 when /\s+\d+.+/:
                     # nothing; we're ignoring the FILES info
@@ -167,4 +165,3 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
     end
 end
 
-# $Id: sun.rb 2753 2007-08-07 02:38:45Z luke $

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

@@ -6,4 +6,3 @@ Puppet::Type.type(:package).provide :sunfreeware, :parent => :blastwave, :source
     commands :pkgget => "pkg-get"
 end
 
-# $Id: sunfreeware.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -38,4 +38,3 @@ Puppet.type(:package).provide :up2date, :parent => :rpm, :source => :rpm do
     end
 end
 
-# $Id: up2date.rb 2582 2007-06-14 06:23:02Z luke $

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

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

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

@@ -3,11 +3,17 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
     has_feature :versionable
 
-    commands :yum => "yum", :rpm => "rpm"
+    commands :yum => "yum", :rpm => "rpm", :python => "python"
+    
+    YUMHELPER = File::join(File::dirname(__FILE__), "yumhelper.py")
+
+    class << self
+        attr_reader :updates
+    end
 
     if command('rpm')
         confine :true => begin
-                rpm('-ql', 'rpm')
+                rpm('--version')
            rescue Puppet::ExecutionFailure
                false
            else
@@ -17,8 +23,26 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
     defaultfor :operatingsystem => [:fedora, :centos, :redhat]
 
-    def install
+    def self.prefetch(packages)
+        @updates = {}
+        if Process.euid != 0
+            raise Puppet::Error, "The yum provider can only be used as root"
+        end
+        super
+        python(YUMHELPER).each_line do |l|
+            l.chomp!
+            next if l.empty?
+            if l[0,4] == "_pkg"
+                hash = nevra_to_hash(l[5..-1])
+                [hash[:name], "#{hash[:name]}.#{hash[:arch]}"].each do |n|
+                    @updates[n] ||= []
+                    @updates[n] << hash
+                end
+            end
+        end
+    end
 
+    def install
         should = @resource.should(:ensure)
         self.debug "Ensuring => #{should}"
         wanted = @resource[:name]
@@ -27,6 +51,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
         case should
         when true, false, Symbol
             # pass
+            should = nil
         else
             # Add the package version
             wanted += "-%s" % should
@@ -34,26 +59,33 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
         output = yum "-d", "0", "-e", "0", "-y", :install, wanted
 
-        unless self.query
-            raise Puppet::Error.new(
-                "Could not find package %s" % self.name
-            )
+        is = self.query
+        unless is
+            raise Puppet::Error, "Could not find package %s" % self.name
+        end
+
+        # FIXME: Should we raise an exception even if should == :latest
+        # and yum updated us to a version other than @param_hash[:ensure] ?
+        if should && should != is[:ensure]
+            raise Puppet::Error, "Failed to update to version #{should}, got version #{is[:ensure]} instead"
         end
     end
 
     # What's the latest package version available?
     def latest
-        output = yum "-d", "0", "-e", "0", :list, :available, @resource[:name]
-
-        if output =~ /^#{Regexp.escape(@resource[:name])}\S+\s+(\S+)\s/
-            return $1
+        upd = self.class.updates[@resource[:name]]
+        unless upd.nil?
+            # FIXME: there could be more than one update for a package
+            # because of multiarch
+            upd = upd[0]
+            return "#{upd[:version]}-#{upd[:release]}"
         else
             # Yum didn't find updates, pretend the current
             # version is the latest
-            unless properties[:ensure] != :absent
+            if properties[:ensure] == :absent
                 raise Puppet::DevError, "Tried to get latest on a missing package"
             end
-            return @property_hash[:ensure]
+            return properties[:ensure]
         end
     end
 
@@ -63,4 +95,3 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     end
 end
 
-# $Id: yum.rb 2710 2007-07-19 00:48:09Z lutter $

data/lib/puppet/provider/package/yumhelper.py

@@ -0,0 +1,37 @@
+# Python helper script to query for the packages that have
+# pending updates. Called by the yum package provider
+#
+# (C) 2007 Red Hat Inc.
+# David Lutterkort <dlutter @redhat.com>
+
+import yum
+import sys
+
+OVERRIDE_OPTS = {
+    'debuglevel': 0,
+    'errorlevel': 0,
+    'logfile': '/dev/null'
+}
+
+def pkg_lists():
+    my = yum.YumBase()
+    my.doConfigSetup()
+
+    for k in OVERRIDE_OPTS.keys():
+        if hasattr(my.conf, k):
+            setattr(my.conf, k, OVERRIDE_OPTS[k])
+        else:
+            my.conf.setConfigOption(k, OVERRIDE_OPTS[k])
+
+    my.doTsSetup()
+    my.doRpmDBSetup()
+    return my.doPackageLists('updates')
+
+try:
+    ypl = pkg_lists()
+except IOError, e:
+    print "_err IOError %d %s" % (e.errno, e)
+    sys.exit(1)
+    
+for pkg in ypl.updates:
+    print "_pkg %s %s %s %s %s" % (pkg.name, pkg.epoch, pkg.version, pkg.release, pkg.arch)

data/lib/puppet/provider/parsedfile.rb

@@ -245,7 +245,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
     # Initialize the object if necessary.
     def self.target_object(target)
-        @target_objects[target] ||= @filetype.new(target)
+        @target_objects[target] ||= filetype.new(target)
 
         @target_objects[target]
     end
@@ -356,10 +356,9 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         if defined? @resource and restarget = @resource.should(:target) and restarget != @property_hash[:target]
             self.class.modified(restarget)
         end
-        if @property_hash[:target] != :absent
+        if @property_hash[:target] != :absent and @property_hash[:target]
             self.class.modified(@property_hash[:target])
         end
     end
 end
 
-# $Id: parsedfile.rb 2750 2007-08-06 17:59:37Z luke $

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

@@ -171,4 +171,3 @@ require 'puppet/provider/parsedfile'
 #    end
 #end
 
-# $Id: parsed.rb 1875 2006-11-13 08:40:35Z luke $

data/lib/puppet/provider/service/base.rb

@@ -8,6 +8,10 @@ Puppet::Type.type(:service).provide :base do
 
     commands :kill => "kill"
 
+    def self.instances
+        []
+    end
+
     # Get the process ID for a running process. Requires the 'pattern'
     # parameter.
     def getpid
@@ -131,4 +135,3 @@ Puppet::Type.type(:service).provide :base do
     end
 end
 
-# $Id: base.rb 2589 2007-06-15 15:37:03Z luke $

data/lib/puppet/provider/service/debian.rb

@@ -7,6 +7,10 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
     commands :update => "/usr/sbin/update-rc.d"
     defaultfor :operatingsystem => :debian
 
+    def self.defpath
+        superclass.defpath
+    end
+
     # Remove the symlinks
     def disable
         update "-f", @resource[:name], "remove"
@@ -17,7 +21,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
         # If it's enabled, then it will print output showing removal of
         # links.
-        if output =~ /etc\/rc[\dS].d|Nothing to do\./
+        if output =~ /etc\/rc[\dS].d|not installed/
             return :true
         else
             return :false
@@ -29,4 +33,3 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
     end
 end
 
-# $Id: debian.rb 2501 2007-05-09 23:08:42Z luke $

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

@@ -0,0 +1,51 @@
+# Manage FreeBSD services.
+Puppet::Type.type(:service).provide :freebsd, :parent => :init do
+    desc "FreeBSD's (and probably NetBSD?) form of ``init``-style service
+        management; uses ``rc.conf.d`` for service enabling and disabling."
+
+    defaultfor :operatingsystem => :freebsd
+
+    @@rcconf_dir = '/etc/rc.conf.d'
+
+    def self.defpath
+        superclass.defpath
+    end
+    
+    # remove service file from rc.conf.d to disable it
+    def disable
+        rcfile = File.join(@@rcconf_dir, @model[:name])
+        if File.exists?(rcfile)
+            File.delete(rcfile)
+        end
+    end
+    
+    # if the service file exists in rc.conf.d then it's already enabled
+    def enabled?
+        rcfile = File.join(@@rcconf_dir, @model[:name])
+        if File.exists?(rcfile)
+            return :true
+        end
+
+        return :false
+    end
+    
+    # enable service by creating a service file under rc.conf.d with the
+    # proper contents
+    def enable
+        if not File.exists?(@@rcconf_dir)
+            Dir.mkdir(@@rcconf_dir)
+        end
+        rcfile = File.join(@@rcconf_dir, @model[:name])
+        open(rcfile, 'w') { |f| f << "%s_enable=\"YES\"\n" % @model[:name] }
+    end
+    
+    # Override stop/start commands to use one<cmd>'s and the avoid race condition
+    # where provider trys to stop/start the service before it is enabled
+    def startcmd
+        [self.initscript, :onestart]
+    end
+
+    def stopcmd
+        [self.initscript, :onestop]
+    end
+end