puppet 0.24.5 → 0.24.6

data/lib/puppet/provider/confine.rb

@@ -25,7 +25,7 @@ class Puppet::Provider::Confine
             begin
                 require "puppet/provider/confine/%s" % name
             rescue LoadError => detail
-                unless detail.to_s.include?("no such file")
+                unless detail.to_s =~ /No such file/i
                     warn "Could not load confine test '%s': %s" % [name, detail]
                 end
                 # Could not find file

data/lib/puppet/provider/confine/variable.rb

@@ -1,11 +1,19 @@
 require 'puppet/provider/confine'
 
+# Require a specific value for a variable, either a Puppet setting
+# or a Facter value.  This class is a bit weird because the name
+# is set explicitly by the ConfineCollection class -- from this class,
+# it's not obvious how the name would ever get set.
 class Puppet::Provider::Confine::Variable < Puppet::Provider::Confine
+    # Provide a hash summary of failing confines -- the key of the hash
+    # is the name of the confine, and the value is the missing yet required values.
+    # Only returns failed values, not all required values.
     def self.summarize(confines)
         result = Hash.new { |hash, key| hash[key] = [] }
-        confines.inject(result) { |total, confine| total[confine.fact] += confine.values unless confine.valid?; total }
+        confines.inject(result) { |total, confine| total[confine.name] += confine.values unless confine.valid?; total }
     end
 
+    # This is set by ConfineCollection.
     attr_accessor :name
 
     # Retrieve the value from facter
@@ -20,6 +28,7 @@ class Puppet::Provider::Confine::Variable < Puppet::Provider::Confine
         "facter value '%s' for '%s' not in required list '%s'" % [value, self.name, values.join(",")]
     end
 
+    # Compare the passed-in value to the retrieved value.
     def pass?(value)
         test_value.downcase.to_s == value.to_s.downcase
     end

data/lib/puppet/provider/nameservice.rb

@@ -179,11 +179,33 @@ class Puppet::Provider::NameService < Puppet::Provider
     end
 
     def create
-        self.ensure = :present
+       if exists?
+            info "already exists"
+            # The object already exists
+            return nil
+        end
+
+        begin
+            execute(self.addcmd)
+        rescue Puppet::ExecutionFailure => detail
+            raise Puppet::Error, "Could not create %s %s: %s" %
+                [@resource.class.name, @resource.name, detail]
+        end
     end
 
     def delete
-        self.ensure = :absent
+        unless exists?
+            info "already absent"
+            # the object already doesn't exist
+            return nil
+        end
+
+        begin
+            execute(self.deletecmd)
+        rescue Puppet::ExecutionFailure => detail
+            raise Puppet::Error, "Could not delete %s %s: %s" %
+                [@resource.class.name, @resource.name, detail]
+        end
     end
 
     def ensure
@@ -194,43 +216,6 @@ class Puppet::Provider::NameService < Puppet::Provider
         end
     end
 
-    # This is only used when creating or destroying the object.
-    def ensure=(value)
-        cmd = nil
-        event = nil
-        case value
-        when :absent
-            # we need to remove the object...
-            unless exists?
-                info "already absent"
-                # the object already doesn't exist
-                return nil
-            end
-
-            # again, needs to be set by the ind. property or its
-            # parent
-            cmd = self.deletecmd
-            type = "delete"
-        when :present
-            if exists?
-                info "already exists"
-                # The object already exists
-                return nil
-            end
-
-            # blah blah, define elsewhere, blah blah
-            cmd = self.addcmd
-            type = "create"
-        end
-
-        begin
-            execute(cmd)
-        rescue Puppet::ExecutionFailure => detail
-            raise Puppet::Error, "Could not %s %s %s: %s" %
-                [type, @resource.class.name, @resource.name, detail]
-        end
-    end
-
     # Does our object exist?
     def exists?
         if getinfo(true)

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

@@ -206,9 +206,18 @@ class DirectoryService < Puppet::Provider::NameService
         if ensure_value == :present
             @resource.class.validproperties.each do |name|
                 next if name == :ensure
-                next unless val = @resource.should(name) || autogen(name)
-                # JJM: This calls the method.
-                self.send(name.to_s + "=", val)
+
+                # LAK: We use property.sync here rather than directly calling
+                # the settor method because the properties might do some kind
+                # of conversion.  In particular, the user gid property might
+                # have a string and need to convert it to a number
+                if @resource.should(name)
+                    @resource.property(name).sync
+                elsif value = autogen(name)
+                    self.send(name.to_s + "=", value)
+                else
+                    next
+                end
             end
         end 
     end

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

@@ -138,8 +138,18 @@ class NetInfo < Puppet::Provider::NameService
         if arg == :present
             @resource.class.validproperties.each do |name|
                 next if name == :ensure
-                next unless val = @resource.should(name) || autogen(name)
-                self.send(name.to_s + "=", val)
+
+                # LAK: We use property.sync here rather than directly calling
+                # the settor method because the properties might do some kind
+                # of conversion.  In particular, the user gid property might
+                # have a string and need to convert it to a number
+                if @resource.should(name)
+                    @resource.property(name).sync
+                elsif value = autogen(name)
+                    self.send(name.to_s + "=", value)
+                else
+                    next
+                end
             end
         end
     end

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

@@ -2,15 +2,6 @@ require 'puppet/provider/nameservice'
 
 class Puppet::Provider::NameService
 class ObjectAdd < Puppet::Provider::NameService
-    # Does the object already exist?
-    def self.exists?(obj)
-        if obj.getinfo(true)
-            return true
-        else
-            return false
-        end
-    end
-    
     def deletecmd
         [command(:delete), @resource[:name]]
     end
@@ -23,7 +14,7 @@ class ObjectAdd < Puppet::Provider::NameService
 
     def modifycmd(param, value)
         cmd = [command(:modify), flag(param), value]
-        if @resource.allowdupe? && ((param == :uid and self.class.name == :useradd) || (param == :gid and self.class.name == :groupadd))
+        if @resource.allowdupe? && ((param == :uid) || (param == :gid and self.class.name == :groupadd))
             cmd << "-o"
         end
         cmd << @resource[:name]

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

@@ -55,7 +55,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
             self.fail "Mac OS X PKG DMG's must specificy a source string ending in .dmg"
         end
         require 'open-uri'
-        require 'puppet/util/plist'
+        require 'facter/util/plist'
         cached_source = source
         if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
             cached_source = "/tmp/#{name}"

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

@@ -10,7 +10,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     commands :aptcache => "/usr/bin/apt-cache"
     commands :preseed => "/usr/bin/debconf-set-selections"
 
-    defaultfor :operatingsystem => :debian
+    defaultfor :operatingsystem => [:debian, :ubuntu]
 
     ENV['DEBIAN_FRONTEND'] = "noninteractive"
 
@@ -45,9 +45,19 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
         if @resource[:responsefile]
             self.run_preseed
         end
-        should = @resource.should(:ensure)
+        should = @resource[:ensure]
 
         checkforcdrom()
+        cmd = %w{-q -y}
+
+        keep = ""
+        if config = @resource[:configfiles]
+            if config == :keep
+                cmd << "-o" << 'DPkg::Options::=--force-confold'
+            else
+                cmd << "-o" << 'DPkg::Options::=--force-confnew'
+            end
+        end
 
         str = @resource[:name]
         case should
@@ -57,19 +67,6 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
             # Add the package version
             str += "=%s" % should
         end
-        cmd = %w{-q -y}
-
-        keep = ""
-        if config = @resource[:configfiles]
-            case config
-            when :keep
-                cmd << "-o" << 'DPkg::Options::=--force-confold'
-            when :replace
-                cmd << "-o" << 'DPkg::Options::=--force-confnew'
-            else
-                raise Puppet::Error, "Invalid 'configfiles' value %s" % config
-            end
-        end
 
         cmd << :install << str
         
@@ -92,7 +89,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
 	# preseeds answers to dpkg-set-selection from the "responsefile"
 	#
     def run_preseed
-        if response = @resource[:responsefile] and FileTest.exists?(response)
+        if response = @resource[:responsefile] and FileTest.exist?(response)
             self.info("Preseeding %s to debconf-set-selections" % response)
 
             preseed response
@@ -101,16 +98,12 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
         end
     end
 
-    def update
-        self.install
-    end
-
     def uninstall
         aptget "-y", "-q", :remove, @resource[:name]
     end
 
     def purge
-        aptget '-y', '-q', 'remove', '--purge', @resource[:name]
+        aptget '-y', '-q', :remove, '--purge', @resource[:name]
         # workaround a "bug" in apt, that already removed packages are not purged
         super
     end

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

@@ -6,6 +6,8 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
         pkgget = "/opt/csw/bin/pkg-get"
     end
 
+    confine :operatingsystem => :solaris
+
     commands :pkgget => pkgget
 
     # This is so stupid, but then, so is blastwave.

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

@@ -23,30 +23,39 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
             # now turn each returned line into a package object
             process.each { |line|
-                if match = regex.match(line)
-                    hash = {}
+                if hash = parse_line(line)
+                    packages << new(hash)
+                end
+            }
+        end
 
-                    fields.zip(match.captures) { |field,value|
-                        hash[field] = value
-                    }
+        return packages
+    end
 
-                    hash[:provider] = self.name
+    REGEX = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*)$}
+    FIELDS = [:desired, :error, :status, :name, :ensure]
 
-                    if hash[:status] == 'not-installed'
-                        hash[:ensure] = :purged
-                    elsif hash[:status] != "installed"
-                        hash[:ensure] = :absent
-                    end
+    def self.parse_line(line)
+        if match = REGEX.match(line)
+            hash = {}
 
-                    packages << new(hash)
-                else
-                    Puppet.warning "Failed to match dpkg-query line %s" %
-                        line.inspect
-                end
+            FIELDS.zip(match.captures) { |field,value|
+                hash[field] = value
             }
+
+            hash[:provider] = self.name
+
+            if hash[:status] == 'not-installed'
+                hash[:ensure] = :purged
+            elsif hash[:status] != "installed"
+                hash[:ensure] = :absent
+            end
+        else
+            Puppet.warning "Failed to match dpkg-query line %s" % line.inspect
+            return nil
         end
 
-        return packages
+        return hash
     end
 
     def install
@@ -56,15 +65,10 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         
         args = []
 
-        if config = @resource[:configfiles]
-            case config
-            when :keep
-                args << '--force-confold'
-            when :replace
-                args << '--force-confnew'
-            else
-                raise Puppet::Error, "Invalid 'configfiles' value %s" % config
-            end
+        if @resource[:configfiles] == :keep
+            args << '--force-confold'
+        else
+            args << '--force-confnew'
         end
         args << '-i' << file
 
@@ -80,7 +84,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         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]
+            warning "source doesn't contain named package, but %s" % matches[0]
         end
         matches[1]
     end
@@ -103,37 +107,16 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
                 :name => @resource[:name], :error => 'ok'}
 
         end
-        # Our regex for matching dpkg-query output.  We could probably just
-        # use split here, but I'm not positive that dpkg-query will never
-        # return whitespace.
-        regex = %r{^(\S+) (\S+) (\S+) (\S+) (\S*)$}
 
-        line = output.split("\n").shift.chomp
-        
-        if match = regex.match(line)
-            fields.zip(match.captures) { |field,value|
-                hash[field] = value
-            }
-        else
-            notice "Failed to handle dpkg-query line %s" % line.inspect
-            return {:ensure => :absent, :status => 'missing',
-                :name => @resource[:name], :error => 'ok'}
-        end
+        hash = self.class.parse_line(output) || {:ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok'}
 
         if hash[:error] != "ok"
-            raise Puppet::PackageError.new(
+            raise Puppet::Error.new(
                 "Package %s, version %s is in error state: %s" %
                     [hash[:name], hash[:ensure], hash[:error]]
             )
         end
 
-        # DPKG can discuss packages that are no longer installed, so allow that.
-        if hash[:status] == "not-installed"
-            hash[:ensure] = :purged
-        elsif hash[:status] != "installed"
-            hash[:ensure] = :absent
-        end
-
         return hash
     end
 
@@ -145,4 +128,3 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         dpkg "--purge", @resource[:name]
     end
 end
-

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

@@ -4,7 +4,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
 
     desc "Package management via ``fink``."
     
-	commands :fink => "/sw/bin/fink"
+    commands :fink => "/sw/bin/fink"
     commands :aptget => "/sw/bin/apt-get"
     commands :aptcache => "/sw/bin/apt-cache"
     commands :dpkgquery => "/sw/bin/dpkg-query"

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

@@ -0,0 +1,46 @@
+# HP-UX packaging.
+
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package do
+
+    desc "HP-UX's packaging system."
+
+    commands :swinstall => "/usr/sbin/swinstall",
+             :swlist => "/usr/sbin/swlist",
+             :swremove => "/usr/sbin/swremove"
+
+    confine :operatingsystem => "hp-ux"
+
+    defaultfor :operatingsystem => "hp-ux"
+    
+    def self.instances
+        # TODO:  This is very hard on HP-UX!
+        []
+    end
+    
+    # source and name are required
+    def install
+        raise ArgumentError, "source must be provided to install HP-UX packages" unless resource[:source]
+        args = standard_args + ["-s", resource[:source], resource[:name]]
+        swinstall(*args)
+    end
+    
+    def query
+        begin
+            swlist resource[:name]
+            {:ensure => :present}
+        rescue
+            {:ensure => :absent}
+        end
+    end
+    
+    def uninstall
+        args = standard_args + [resource[:name]]
+        swremove(*args)
+    end
+    
+    def standard_args
+        return ["-x", "mount_all_filesystems=false"]
+    end
+end