puppet 3.4.3 → 3.5.0.rc1

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

@@ -63,7 +63,7 @@ Puppet::Type.type(:package).provide :pip,
     result = client.call("package_releases", @resource[:name])
     result.first
   rescue Timeout::Error => detail
-    raise Puppet::Error, "Timeout while contacting pypi.python.org: #{detail}";
+    raise Puppet::Error, "Timeout while contacting pypi.python.org: #{detail}", detail.backtrace
   end
 
   # Install a package.  The ensure parameter may specify installed,
@@ -113,7 +113,7 @@ Puppet::Type.type(:package).provide :pip,
       self.class.commands :pip => pathname
       pip *args
     else
-      raise e, 'Could not locate the pip command.'
+      raise e, 'Could not locate the pip command.', e.backtrace
     end
   end
 end

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

@@ -13,13 +13,27 @@ require 'facter/util/plist'
 require 'puppet/util/http_proxy'
 
 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.
-    Subdirectories are not checked for packages.  See
-    [the wiki docs on this provider](http://projects.puppetlabs.com/projects/puppet/wiki/Package_Management_With_Dmg_Patterns)
-    for more detail."
+  desc "Package management based on Apple's Installer.app and DiskUtility.app.
+
+    This provider 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, and Puppet will install all of them. Subdirectories
+    are not checked for packages.
+
+    This provider can also accept plain .pkg (but not .mpkg) files in addition
+    to .dmg files.
+
+    Notes:
+
+    * The `source` attribute is mandatory. It must be either a local disk path
+      or an HTTP, HTTPS, or FTP URL to the package.
+    * The `name` of the resource must be the filename (without path) of the DMG file.
+    * When installing the packages from a DMG, this provider writes a file to
+      disk at `/var/db/.puppet_pkgdmg_installed_NAME`. If that file is present,
+      Puppet assumes all packages from that DMG are already installed.
+    * This provider is not versionable and uses DMG filenames to determine
+      whether a package has been installed. Thus, to install new a version of a
+      package, you must create a new DMG with a different filename."
 
   confine :operatingsystem => :darwin
   defaultfor :operatingsystem => :darwin
@@ -60,7 +74,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
     unless source =~ /\.dmg$/i || source =~ /\.pkg$/i
       raise Puppet::Error.new("Mac OS X PKG DMG's must specify a source string ending in .dmg or flat .pkg file")
     end
-    require 'open-uri'
+    require 'open-uri' # Dead code; this is never used. The File.open call 20-ish lines south of here used to be Kernel.open but changed in '09. -NF
     cached_source = source
     tmpdir = Dir.mktmpdir
     ext = /(\.dmg|\.pkg)$/i.match(source)[0]
@@ -77,12 +91,13 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
         curl *args
           Puppet.debug "Success: curl transfered [#{name}] (via: curl #{args.join(" ")})"
         rescue Puppet::ExecutionFailure
-          Puppet.debug "curl #{args.join(" ")} did not transfer [#{name}].  Falling back to slower open-uri transfer methods."
+          Puppet.debug "curl #{args.join(" ")} did not transfer [#{name}].  Falling back to local file." # This used to fall back to open-uri. -NF
           cached_source = source
         end
       end
 
       if source =~ /\.dmg$/i
+        # If you fix this to use open-uri again, you must update the docs above. -NF
         File.open(cached_source) do |dmg|
           xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", dmg.path
           hdiutil_info = Plist::parse_xml(xml_str)
@@ -113,7 +128,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
   end
 
   def query
-    if Puppet::FileSystem::File.exist?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
+    if Puppet::FileSystem.exist?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
       Puppet.debug "/var/db/.puppet_pkgdmg_installed_#{@resource[:name]} found"
       return {:name => @resource[:name], :ensure => :present}
     else

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

@@ -5,58 +5,83 @@ Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package
 
   commands :pkgin => "pkgin"
 
-  defaultfor :operatingsystem => :dragonfly
+  defaultfor :operatingsystem => [ :dragonfly , :smartos ]
 
-  has_feature :installable, :uninstallable
+  has_feature :installable, :uninstallable, :upgradeable, :versionable
 
-  def self.parse_pkgin_line(package, force_status=nil)
+  def self.parse_pkgin_line(package)
 
     # e.g.
     #   vim-7.2.446 =        Vim editor (vi clone) without GUI
     match, name, version, status = *package.match(/(\S+)-(\S+)(?: (=|>|<))?\s+.+$/)
     if match
-      ensure_status = if force_status
-        force_status
-      elsif status
-        :present
-      else
-        :absent
-      end
-
       {
         :name     => name,
-        :ensure   => ensure_status,
-        :provider => :pkgin
+        :status   => status,
+        :ensure   => version
       }
     end
   end
 
+  def self.prefetch(packages)
+    super
+    # Withouth -f, no fresh pkg_summary files are downloaded
+    pkgin("-yf", :update)
+  end
+
   def self.instances
     pkgin(:list).split("\n").map do |package|
-      new(parse_pkgin_line(package, :present))
+      new(parse_pkgin_line(package))
     end
   end
 
   def query
+    packages = parse_pkgsearch_line
+
+    if packages.empty?
+      if @resource[:ensure] == :absent
+        notice "declared as absent but unavailable #{@resource.file}:#{resource.line}"
+        return false
+      else
+        @resource.fail "No candidate to be installed"
+      end
+    end
+
+    packages.first.update( :ensure => :absent )
+  end
+
+  def parse_pkgsearch_line
     packages = pkgin(:search, resource[:name]).split("\n")
 
-    # Remove the last three lines of help text.
-    packages.slice!(-3, 3)
+    return [] if packages.length == 1
 
-    matching_package = nil
-    packages.detect do |package|
-      properties = self.class.parse_pkgin_line(package)
-      matching_package = properties if properties && resource[:name] == properties[:name]
-    end
+    # Remove the last three lines of help text.
+    packages.slice!(-4, 4)
 
-    matching_package
+    pkglist = packages.map{ |line| self.class.parse_pkgin_line(line) }
+    pkglist.select{ |package| resource[:name] == package[:name] }
   end
 
   def install
-    pkgin("-y", :install, resource[:name])
+    if String === @resource[:ensure]
+      pkgin("-y", :install, "#{resource[:name]}-#{resource[:ensure]}")
+    else
+      pkgin("-y", :install, resource[:name])
+    end
   end
 
   def uninstall
     pkgin("-y", :remove, resource[:name])
   end
+
+  def latest
+    package = parse_pkgsearch_line.detect{ |package| package[:status] == '<' }
+    return properties[:ensure] if not package
+    return package[:ensure]
+  end
+
+  def update
+    pkgin("-y", :install, resource[:name])
+  end
+
 end

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

@@ -14,7 +14,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
   end
 
   def self.healthcheck()
-    unless Puppet::FileSystem::File.exist?("/var/opt/csw/pkgutil/admin")
+    unless Puppet::FileSystem.exist?("/var/opt/csw/pkgutil/admin")
       Puppet.notice "It is highly recommended you create '/var/opt/csw/pkgutil/admin'."
       Puppet.notice "See /var/opt/csw/pkgutil"
     end

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

@@ -31,7 +31,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
     begin
       output = portversion(*cmd)
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output)
+      raise Puppet::Error.new(output, $!)
     end
     line = output.split("\n").pop
 

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

@@ -45,7 +45,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     begin
       output = portinfo(*cmdline)
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output)
+      raise Puppet::Error.new(output, $!)
       return nil
     end
 
@@ -87,7 +87,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     begin
       output = portinstall(*cmdline)
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output)
+      raise Puppet::Error.new(output, $!)
     end
 
     if output =~ /\*\* No such /
@@ -110,7 +110,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     begin
       output = portversion(*cmdline)
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output)
+      raise Puppet::Error.new(output, $!)
     end
 
     # Check: output format.
@@ -175,7 +175,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     begin
       output = portinfo(*cmdline)
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output)
+      raise Puppet::Error.new(output, $!)
     end
 
     # Check: if output isn't in the right format, return nil
@@ -205,7 +205,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     begin
       output = portinfo(*cmdline)
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output)
+      raise Puppet::Error.new(output, $!)
     end
 
     if output =~ /^(\S+)/
@@ -223,7 +223,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     begin
       output = portinfo(*cmdline)
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output)
+      raise Puppet::Error.new(output, $!)
     end
 
     if output =~ /^(\S+)/
@@ -232,7 +232,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
       begin
         output = portupgrade(*cmdline)
       rescue Puppet::ExecutionFailure
-        raise Puppet::Error.new(output)
+        raise Puppet::Error.new(output, $!)
       end
     end
   end

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

@@ -5,14 +5,16 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   desc "RPM packaging support; should work anywhere with a working `rpm`
     binary.
 
-    This provider supports the `install_options` attribute, which allows
-    command-line flags to be passed to the RPM binary. Install options should be
-    specified as an array, where each element is either a string or a
-    `{'--flag' => 'value'}` hash. (That hash example would be equivalent to a
-    `'--flag=value'` string; the hash syntax is available as a convenience.)"
+    This provider supports the `install_options` and `uninstall_options`
+    attributes, which allow command-line flags to be passed to the RPM binary.
+    These options should be specified as an array, where each element is either
+    a string or a `{'--flag' => 'value'}` hash. (That hash example would be
+    equivalent to a `'--flag=value'` string; the hash syntax is available as a
+    convenience.)"
 
   has_feature :versionable
   has_feature :install_options
+  has_feature :uninstall_options
 
   # Note: self:: is required here to keep these constants in the context of what will
   # eventually become this Puppet::Type::Package::ProviderRpm class.
@@ -62,7 +64,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
         }
       }
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error, "Failed to list packages"
+      raise Puppet::Error, "Failed to list packages", $!.backtrace
     end
 
     packages
@@ -75,7 +77,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     #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
-    cmd = ["-q", @resource[:name], "#{self.class.nosignature}", "#{self.class.nodigest}", "--qf", self.class::NEVRA_FORMAT]
+    cmd = ["-q", '--whatprovides',  @resource[:name], "#{self.class.nosignature}", "#{self.class.nodigest}", "--qf", self.class::NEVRA_FORMAT]
 
     begin
       output = rpm(*cmd)
@@ -139,7 +141,9 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
         nvr += ".#{get(:arch)}"
       end
     end
-    rpm "-e", nvr
+
+    flag = ["-e"] + uninstall_options
+    rpm flag, nvr
   end
 
   def update
@@ -150,6 +154,10 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     join_options(resource[:install_options])
   end
 
+  def uninstall_options
+    join_options(resource[:uninstall_options])
+  end
+
   private
 
   # Turns a array of options into flags to be passed to rpm install(8) and

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

@@ -8,7 +8,7 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
     This provider supports either MSI or self-extracting executable installers.
 
     This provider requires a `source` attribute when installing the package.
-    It accepts paths paths to local files, mapped drives, or UNC paths.
+    It accepts paths to local files, mapped drives, or UNC paths.
 
     If the executable requires special arguments to perform a silent install or
     uninstall, then the appropriate arguments should be specified using the

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

@@ -58,7 +58,7 @@ class Puppet::Provider::Package::Windows
         # REMIND: what about msp, etc
         MsiPackage
       when /\.exe"?\Z/i
-        fail("The source does not exist: '#{resource[:source]}'") unless Puppet::FileSystem::File.exist?(resource[:source])
+        fail("The source does not exist: '#{resource[:source]}'") unless Puppet::FileSystem.exist?(resource[:source])
         ExePackage
       else
         fail("Don't know how to install '#{resource[:source]}'")

data/lib/puppet/provider/parsedfile.rb

@@ -303,7 +303,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         @target = path
         return self.parse(text)
       rescue Puppet::Error => detail
-        detail.file = @target
+        detail.file = @target if detail.respond_to?(:file=)
         raise detail
       ensure
         @target = old

data/lib/puppet/provider/selboolean/getsetsebool.rb

@@ -40,7 +40,7 @@ Puppet::Type.type(:selboolean).provide(:getsetsebool) do
         output = out.readlines.join('').chomp!
       end
     rescue Puppet::ExecutionFailure
-      raise Puppet::ExecutionFailure, output.split("\n")[0]
+      raise Puppet::ExecutionFailure, output.split("\n")[0], $!.backtrace
     end
     output
   end

data/lib/puppet/provider/selmodule/semodule.rb

@@ -7,7 +7,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
     begin
       execoutput("#{command(:semodule)} --install #{selmod_name_to_filename}")
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not load policy module: #{detail}";
+      raise Puppet::Error, "Could not load policy module: #{detail}", detail.backtrace
     end
     :true
   end
@@ -15,7 +15,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
   def destroy
       execoutput("#{command(:semodule)} --remove #{@resource[:name]}")
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not remove policy module: #{detail}";
+      raise Puppet::Error, "Could not remove policy module: #{detail}", detail.backtrace
   end
 
   def exists?
@@ -47,7 +47,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
   def syncversion= (dosync)
       execoutput("#{command(:semodule)} --upgrade #{selmod_name_to_filename}")
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not upgrade policy module: #{detail}";
+      raise Puppet::Error, "Could not upgrade policy module: #{detail}", detail.backtrace
   end
 
   # Helper functions
@@ -59,7 +59,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
         output = out.readlines.join('').chomp!
       end
     rescue Puppet::ExecutionFailure
-      raise Puppet::ExecutionFailure, output.split("\n")[0]
+      raise Puppet::ExecutionFailure, output.split("\n")[0], $!.backtrace
     end
     output
   end
@@ -127,7 +127,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
         end
       end
     rescue Puppet::ExecutionFailure
-      raise Puppet::ExecutionFailure, "Could not list policy modules: #{lines.join(' ').chomp!}"
+      raise Puppet::ExecutionFailure, "Could not list policy modules: #{lines.join(' ').chomp!}", $!.backtrace
     end
     nil
   end

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

@@ -93,7 +93,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
       begin
         output = kill pid
       rescue Puppet::ExecutionFailure
-        @resource.fail "Could not kill #{self.name}, PID #{pid}: #{output}"
+        @resource.fail Puppet::Error, "Could not kill #{self.name}, PID #{pid}: #{output}", $!
       end
       return true
     end

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

@@ -20,13 +20,13 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
   # remove service file from rc.conf.d to disable it
   def disable
     rcfile = File.join(rcconf_dir, @model[:name])
-    File.delete(rcfile) if Puppet::FileSystem::File.exist?(rcfile)
+    File.delete(rcfile) if Puppet::FileSystem.exist?(rcfile)
   end
 
   # if the service file exists in rc.conf.d then it's already enabled
   def enabled?
     rcfile = File.join(rcconf_dir, @model[:name])
-    return :true if Puppet::FileSystem::File.exist?(rcfile)
+    return :true if Puppet::FileSystem.exist?(rcfile)
 
     :false
   end
@@ -34,7 +34,7 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
   # enable service by creating a service file under rc.conf.d with the
   # proper contents
   def enable
-    Dir.mkdir(rcconf_dir) if not Puppet::FileSystem::File.exist?(rcconf_dir)
+    Dir.mkdir(rcconf_dir) if not Puppet::FileSystem.exist?(rcconf_dir)
     rcfile = File.join(rcconf_dir, @model[:name])
     open(rcfile, 'w') { |f| f << "%s_enable=\"YES\"\n" % @model[:name] }
   end