puppet 0.24.9 → 0.25.0

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

@@ -7,7 +7,7 @@
 # and are easier to manage.
 #
 # Note: the 'apple' Provider checks for the package name
-# in /L/Receipts.  Since we possibly install multiple apps's from 
+# in /L/Receipts.  Since we possibly install multiple apps's from
 # a single source, we treat the source .app.dmg file as the package name.
 # As a result, we store installed .app.dmg file names
 # in /var/db/.puppet_appdmg_installed_<name>
@@ -16,11 +16,12 @@ require 'puppet/provider/package'
 Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Package) do
     desc "Package management which copies application bundles to a target."
 
-    confine :exists => "/Library/Receipts"
+    confine :operatingsystem => :darwin
+    
     commands :hdiutil => "/usr/bin/hdiutil"
     commands :curl => "/usr/bin/curl"
     commands :ditto => "/usr/bin/ditto"
-	
+
     # JJM We store a cookie for each installed .app.dmg in /var/db
     def self.instances_by_name
         Dir.entries("/var/db").find_all { |f|
@@ -37,10 +38,10 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
             new(:name => name, :provider => :appdmg, :ensure => :installed)
         end
     end
-    
+
     def self.installapp(source, name, orig_source)
       appname = File.basename(source);
-	  ditto "--rsrc", source, "/Applications/#{appname}"
+      ditto "--rsrc", source, "/Applications/#{appname}"
       File.open("/var/db/.puppet_appdmg_installed_#{name}", "w") do |t|
           t.print "name: '#{name}'\n"
           t.print "source: '#{orig_source}'\n"
@@ -64,7 +65,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
                 cached_source = source
             end
         end
-        
+
         begin
             open(cached_source) do |dmg|
                 xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-mountrandom", "/tmp", dmg.path
@@ -77,9 +78,9 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
                         mounts.each do |fspath|
                             Dir.entries(fspath).select { |f|
                                 f =~ /\.app$/i
-                                }.each do |pkg|
-					    			installapp("#{fspath}/#{pkg}", name, source)
-				 			   end
+                            }.each do |pkg|
+                                installapp("#{fspath}/#{pkg}", name, source)
+                            end
                         end # mounts.each do
                     ensure
                         hdiutil "eject", mounts[0]

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

@@ -8,11 +8,9 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
         automatically add the ``.pkg`` extension, so leave that off when specifying
         the package name."
 
-    confine :exists => "/Library/Receipts"
+    confine :operatingsystem => :darwin
     commands :installer => "/usr/sbin/installer"
 
-    defaultfor :operatingsystem => :darwin
-
     def self.instances
         instance_by_name.collect do |name|
             self.new(

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

@@ -69,7 +69,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
         end
 
         cmd << :install << str
-        
+
         aptget(*cmd)
     end
 
@@ -85,15 +85,15 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
         end
     end
 
-	#
-	# preseeds answers to dpkg-set-selection from the "responsefile"
-	#
+    #
+    # preseeds answers to dpkg-set-selection from the "responsefile"
+    #
     def run_preseed
         if response = @resource[:responsefile] and FileTest.exist?(response)
             self.info("Preseeding %s to debconf-set-selections" % response)
 
             preseed response
-        else 
+        else
             self.info "No responsefile specified or non existant, not preseeding anything"
         end
     end

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

@@ -26,6 +26,6 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg
 
     def purge
         aptitude '-y', 'purge', @resource[:name]
-	end
+    end
 end
 

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

@@ -36,7 +36,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
         cmd = %w{-q -y}
 
         cmd << 'install' << str
-        
+
         aptget(*cmd)
     end
 

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

@@ -3,8 +3,8 @@ require 'puppet/provider/package'
 Puppet::Type.type(:package).provide :darwinport, :parent => Puppet::Provider::Package do
     desc "Package management using DarwinPorts on OS X."
 
+    confine :operatingsystem => :darwin
     commands :port => "/opt/local/bin/port"
-    confine :operatingsystem => "Darwin"
 
     def self.eachpkgashash
         # list out all of the packages

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

@@ -8,7 +8,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     commands :dpkg => "/usr/bin/dpkg"
     commands :dpkg_deb => "/usr/bin/dpkg-deb"
     commands :dpkgquery => "/usr/bin/dpkg-query"
-    
+
     def self.instances
         packages = []
 
@@ -62,7 +62,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         unless file = @resource[:source]
             raise ArgumentError, "You cannot install dpkg packages without a source"
         end
-        
+
         args = []
 
         if @resource[:configfiles] == :keep

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

@@ -3,7 +3,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
     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"
@@ -40,7 +40,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
         keep = ""
 
         cmd << :install << str
-        
+
         finkcmd(cmd)
     end
 
@@ -56,15 +56,15 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
                 end
                 end
 
-	#
-	# preseeds answers to dpkg-set-selection from the "responsefile"
-	#
+    #
+    # 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 
+        else
             self.info "No responsefile specified or non existant, not preseeding anything"
         end
     end

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

@@ -8,7 +8,7 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
     commands :pkginfo => "/usr/sbin/pkg_info",
              :pkgadd => "/usr/sbin/pkg_add",
              :pkgdelete => "/usr/sbin/pkg_delete"
-    
+
     confine :operatingsystem => :freebsd
 
     def self.listcmd

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

@@ -83,14 +83,14 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
             end
 
             case uri.scheme
-            when nil: 
+            when nil
                 # no URI scheme => interpret the source as a local file
                 command << source
             when /file/i
                 command << uri.path
             when 'puppet'
                 # we don't support puppet:// URLs (yet)
-                raise Puppet::Error.new("puppet:// URLs are not supported as gem sources")              
+                raise Puppet::Error.new("puppet:// URLs are not supported as gem sources")
             else
                 # interpret it as a gem repository
                 command << "--source" << "#{source}" << resource[:name]

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

@@ -13,19 +13,19 @@ Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package
     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]
@@ -34,12 +34,12 @@ Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package
             {:ensure => :absent}
         end
     end
-    
+
     def uninstall
         args = standard_args + [resource[:name]]
         swremove(*args)
     end
-    
+
     def standard_args
         return ["-x", "mount_all_filesystems=false"]
     end

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

@@ -26,11 +26,13 @@
 # in /var/db/.puppet_pkgdmg_installed_<name>
 
 require 'puppet/provider/package'
+require 'facter/util/plist'
 
 Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do
     desc "Package management based on Apple's Installer.app and DiskUtility.app.  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.  See `the wiki docs </trac/puppet/wiki/DmgPackages>` for more detail."
-  
-    confine :exists => "/Library/Receipts"
+    
+    confine :operatingsystem => :darwin
+    defaultfor :operatingsystem => :darwin
     commands :installer => "/usr/sbin/installer"
     commands :hdiutil => "/usr/bin/hdiutil"
     commands :curl => "/usr/bin/curl"
@@ -64,13 +66,12 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
           t.print "source: '#{orig_source}'\n"
       end
     end
-    
+
     def self.installpkgdmg(source, name)
         unless source =~ /\.dmg$/i
-            self.fail "Mac OS X PKG DMG's must specificy a source string ending in .dmg"
+            raise Puppet::Error.new("Mac OS X PKG DMG's must specificy a source string ending in .dmg")
         end
         require 'open-uri'
-        require 'facter/util/plist'
         cached_source = source
         if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
             cached_source = "/tmp/#{name}"
@@ -82,29 +83,36 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
                 cached_source = source
             end
         end
-        
+
         begin
-            open(cached_source) do |dmg|
+            File.open(cached_source) do |dmg|
                 xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", dmg.path
-                # JJM THIS IS A HORRIBLE HACK (Well, actually it's not so bad...)
-                mounts = xml_str.scan(/<string>(\/tmp.*?)<\/string>/)[0]
+                hdiutil_info = Plist::parse_xml(xml_str)
+                unless hdiutil_info.has_key?("system-entities")
+                    raise Puppet::Error.new("No disk entities returned by mount at %s" % dmg.path)
+                end
+                mounts = hdiutil_info["system-entities"].collect { |entity|
+                    entity["mount-point"]
+                }.compact
                 begin
-                    mounts.each do |fspath|
-                        Dir.entries(fspath).select { |f|
+                    mounts.each do |mountpoint|
+                        Dir.entries(mountpoint).select { |f|
                             f =~ /\.m{0,1}pkg$/i
-                            }.each do |pkg|
-                                installpkg("#{fspath}/#{pkg}", name, source)
-                            end
-                    end # mounts.each do
+                        }.each do |pkg|
+                            installpkg("#{mountpoint}/#{pkg}", name, source)
+                        end
+                    end
                 ensure
-                    hdiutil "eject", mounts[0]
-                end # begin
-            end # open() do
+                    mounts.each do |mountpoint|
+                        hdiutil "eject", mountpoint
+                    end
+                end
+            end
         ensure
             # JJM Remove the file if open-uri didn't already do so.
             File.unlink(cached_source) if File.exist?(cached_source)
-        end # begin
-    end # def self.installpkgdmg
+        end
+    end
 
     def query
         if FileTest.exists?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
@@ -117,10 +125,10 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
     def install
         source = nil
         unless source = @resource[:source]
-            self.fail "Mac OS X PKG DMG's must specify a package source."
+            raise Puppet::Error.new("Mac OS X PKG DMG's must specify a package source.")
         end
         unless name = @resource[:name]
-            self.fail "Mac OS X PKG DMG's must specify a package name."
+            raise Puppet::Error.new("Mac OS X PKG DMG's must specify a package name.")
         end
         self.class.installpkgdmg(source,name)
     end

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

@@ -100,7 +100,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
             case packages.size
                 when 0
-		    not_found_value = "%s/%s" % [@resource[:category] ? @resource[:category] : "<unspecified category>", @resource[:name]]
+                    not_found_value = "%s/%s" % [@resource[:category] ? @resource[:category] : "<unspecified category>", @resource[:name]]
                     raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
                 when 1
                     return packages[0]

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

@@ -53,7 +53,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
 
         name, version = $1, $2
 
-        if match == "=" or match == ">" 
+        if match == "=" or match == ">"
             # we're up to date or more recent
             return version
         end

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

@@ -49,12 +49,12 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     end
 
     # Find the fully versioned package name and the version alone. Returns
-    # a hash with entries :instance => fully versioned package name, and 
+    # a hash with entries :instance => fully versioned package name, and
     # :ensure => version-release
     def query
         #NOTE: Prior to a fix for issue 1243, this method potentially returned a cached value
         #IF YOU CALL THIS METHOD, IT WILL CALL RPM
-        #Use get(:property) to check if cached values are available 
+        #Use get(:property) to check if cached values are available
         cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"]
 
         begin
@@ -62,7 +62,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
         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))
@@ -75,7 +75,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
         unless source = @resource[:source]
             @resource.fail "RPMs must specify a package source"
         end
-        
+
         cmd = [command(:rpm), "-q", "--qf", "#{NEVRAFORMAT}\n", "-p", "#{@resource[:source]}"]
         h = self.class.nevra_to_hash(execfail(cmd, Puppet::Error))
         return h[:ensure]
@@ -86,7 +86,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
         unless source = @resource[:source]
             @resource.fail "RPMs must specify a package source"
         end
-        # RPM gets pissy if you try to install an already 
+        # RPM gets pissy if you try to install an already
         # installed package
         if @resource.should(:ensure) == @property_hash[:ensure] or
             @resource.should(:ensure) == :latest && @property_hash[:ensure] == latest

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

@@ -1,4 +1,4 @@
-Puppet.type(:package).provide :rug, :parent => :rpm do
+Puppet::Type.type(:package).provide :rug, :parent => :rpm do
     desc "Support for suse ``rug`` package manager."
 
     has_feature :versionable

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

@@ -41,12 +41,12 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
             # piece of information
             process.each { |line|
                 case line
-                when /^$/:
+                when /^$/
                     hash[:provider] = :sun
 
                     packages << new(hash)
                     hash = {}
-                when /\s*(\w+):\s+(.+)/:
+                when /\s*(\w+):\s+(.+)/
                     name = $1
                     value = $2
                     if names.include?(name)
@@ -54,7 +54,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
                             hash[names[name]] = value
                         end
                     end
-                when /\s+\d+.+/:
+                when /\s+\d+.+/
                     # nothing; we're ignoring the FILES info
                 end
             }
@@ -96,8 +96,8 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
                 # piece of information
                 process.each { |line|
                     case line
-                    when /^$/:  # ignore
-                    when /\s*([A-Z]+):\s+(.+)/:
+                    when /^$/  # ignore
+                    when /\s*([A-Z]+):\s+(.+)/
                         name = $1
                         value = $2
                         if names.include?(name)
@@ -105,7 +105,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
                                 hash[names[name]] = value
                             end
                         end
-                    when /\s+\d+.+/:
+                    when /\s+\d+.+/
                         # nothing; we're ignoring the FILES info
                     end
                 }
@@ -121,7 +121,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
             raise Puppet::Error, "Sun packages must specify a package source"
         end
         cmd = []
-        
+
         if @resource[:adminfile]
             cmd << "-a" << @resource[:adminfile]
         end