puppet 3.2.4 → 3.3.0.rc2

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

@@ -35,8 +35,6 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
     end
     cmd = %w{-b -q -y}
 
-    keep = ""
-
     cmd << :install << str
 
     finkcmd(cmd)

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

@@ -16,8 +16,6 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
   end
 
   def install
-    should = @resource.should(:ensure)
-
     if @resource[:source] =~ /\/$/
       if @resource[:source] =~ /^(ftp|https?):/
         Puppet::Util.withenv :PACKAGESITE => @resource[:source] do

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

@@ -10,6 +10,8 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
   confine :operatingsystem => :openbsd
 
   has_feature :versionable
+  has_feature :install_options
+  has_feature :uninstall_options
 
   def self.instances
     packages = []
@@ -17,7 +19,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     begin
       execpipe(listcmd) do |process|
         # our regex for matching pkg_info output
-        regex = /^(.*)-(\d[^-]*)[-]?(\D*)(.*)$/
+        regex = /^(.*)-(\d[^-]*)[-]?(\w*)(.*)$/
         fields = [:name, :ensure, :flavor ]
         hash = {}
 
@@ -27,8 +29,6 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
             fields.zip(match.captures) { |field,value|
               hash[field] = value
             }
-            yup = nil
-            name = hash[:name]
 
             hash[:provider] = self.name
 
@@ -52,15 +52,18 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     [command(:pkginfo), "-a"]
   end
 
-  def install
-    should = @resource.should(:ensure)
-
+  def parse_pkgconf
     unless @resource[:source]
       if File.exist?("/etc/pkg.conf")
         File.open("/etc/pkg.conf", "rb").readlines.each do |line|
           if matchdata = line.match(/^installpath\s*=\s*(.+)\s*$/i)
             @resource[:source] = matchdata[1]
-            break
+          elsif matchdata = line.match(/^installpath\s*\+=\s*(.+)\s*$/i)
+            if @resource[:source].nil?
+              @resource[:source] = matchdata[1]
+            else
+              @resource[:source] += ":" + matchdata[1]
+            end
           end
         end
 
@@ -73,6 +76,12 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
         "You must specify a package source or configure an installpath in /etc/pkg.conf"
       end
     end
+  end
+
+  def install
+    cmd = []
+
+    parse_pkgconf
 
     if @resource[:source][-1,1] == ::File::SEPARATOR
       e_vars = { 'PKG_PATH' => @resource[:source] }
@@ -82,14 +91,16 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
       full_name = @resource[:source]
     end
 
-     Puppet::Util.withenv(e_vars) { pkgadd full_name }
+    cmd << install_options
+    cmd << full_name
+
+    Puppet::Util.withenv(e_vars) { pkgadd cmd.flatten.compact.join(' ') }
   end
 
   def get_version
     execpipe([command(:pkginfo), "-I", @resource[:name]]) do |process|
       # our regex for matching pkg_info output
       regex = /^(.*)-(\d[^-]*)[-]?(\D*)(.*)$/
-      fields = [ :name, :version, :flavor ]
       master_version = 0
       version = -1
 
@@ -120,7 +131,43 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     end
   end
 
+  def install_options
+    join_options(resource[:install_options])
+  end
+
+  def uninstall_options
+    join_options(resource[:uninstall_options])
+  end
+
+  # Turns a array of options into flags to be passed to pkg_add(8) and
+  # pkg_delete(8). The options can be passed as a string or hash. Note
+  # that passing a hash should only be used in case -Dfoo=bar must be passed,
+  # which can be accomplished with:
+  #     install_options => [ { '-Dfoo' => 'bar' } ]
+  # Regular flags like '-L' must be passed as a string.
+  # @param options [Array]
+  # @return Concatenated list of options
+  # @api private
+  def join_options(options)
+    return unless options
+
+    options.collect do |val|
+      case val
+      when Hash
+        val.keys.sort.collect do |k|
+          "#{k}=#{val[k]}"
+        end.join(' ')
+      else
+        val
+      end
+    end
+  end
+
   def uninstall
-    pkgdelete @resource[:name]
+    pkgdelete uninstall_options.flatten.compact.join(' '), @resource[:name]
+  end
+
+  def purge
+    pkgdelete "-c", "-q", @resource[:name]
   end
 end

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

@@ -18,7 +18,6 @@ Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::
       process.each_line { |line|
         if match = regex.match(line)
           fields.zip(match.captures) { |field,value| hash[field] = value }
-          name = hash[:name]
           hash[:provider] = self.name
           packages << new(hash)
           hash = {}

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

@@ -84,7 +84,6 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
               hash[field] = value
             }
 
-            name = hash[:name]
             hash[:provider] = self.name
 
             packages << new(hash)

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

@@ -48,7 +48,7 @@ Puppet::Type.type(:package).provide :pip,
   # it is not installed or `pip` itself is not available.
   def query
     self.class.instances.each do |provider_pip|
-      return provider_pip.properties if @resource[:name] == provider_pip.name
+      return provider_pip.properties if @resource[:name].downcase == provider_pip.name.downcase
     end
     return nil
   end

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

@@ -10,6 +10,7 @@
 
 require 'puppet/provider/package'
 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
@@ -53,20 +54,30 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
   end
 
   def self.installpkgdmg(source, name)
+    http_proxy_host = Puppet::Util::HttpProxy.http_proxy_host
+    http_proxy_port = Puppet::Util::HttpProxy.http_proxy_port
+
     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'
     cached_source = source
     tmpdir = Dir.mktmpdir
+    ext = /(\.dmg|\.pkg)$/i.match(source)[0]
     begin
       if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
-        cached_source = File.join(tmpdir, name)
-        begin
-          curl "-o", cached_source, "-C", "-", "-k", "-L", "-s", "--url", source
-          Puppet.debug "Success: curl transfered [#{name}]"
+        cached_source = File.join(tmpdir, "#{name}#{ext}")
+        args = [ "-o", cached_source, "-C", "-", "-k", "-L", "-s", "--fail", "--url", source ]
+        if http_proxy_host and http_proxy_port
+          args << "--proxy" << "#{http_proxy_host}:#{http_proxy_port}"
+        elsif http_proxy_host and not http_proxy_port
+          args << "--proxy" << http_proxy_host
+        end
+      begin
+        curl *args
+          Puppet.debug "Success: curl transfered [#{name}] (via: curl #{args.join(" ")})"
         rescue Puppet::ExecutionFailure
-          Puppet.debug "curl did not transfer [#{name}].  Falling back to slower open-uri transfer methods."
+          Puppet.debug "curl #{args.join(" ")} did not transfer [#{name}].  Falling back to slower open-uri transfer methods."
           cached_source = source
         end
       end
@@ -97,7 +108,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
         installpkg(cached_source, name, source)
       end
     ensure
-      FileUtils.remove_entry_secure(tmpdir, force=true)
+      FileUtils.remove_entry_secure(tmpdir, true)
     end
   end
 

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

@@ -63,7 +63,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
   def self.availlist
     output = pkguti ["-a"]
 
-    list = output.split("\n").collect do |line|
+    output.split("\n").collect do |line|
       next if line =~ /^common\s+package/  # header of package list
       next if noise?(line)
 

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

@@ -6,7 +6,15 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
   has_feature :versionable
 
-  commands :emerge => "/usr/bin/emerge", :eix => "/usr/bin/eix", :update_eix => "/usr/bin/eix-update"
+  {
+    :emerge => "/usr/bin/emerge",
+    :eix => "/usr/bin/eix",
+    :update_eix => "/usr/bin/eix-update",
+  }.each_pair do |name, path|
+    has_command(name, path) do
+      environment :HOME => '/'
+    end
+  end
 
   confine :operatingsystem => :gentoo
 

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

@@ -44,12 +44,12 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
     match = $2
     info = $3
 
-    unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
+    unless pkgstuff =~ /^\S+-([^-\s]+)$/
       raise Puppet::Error,
         "Could not match package info '#{pkgstuff}'"
     end
 
-    name, version = $1, $2
+    version = $1
 
     if match == "=" or match == ">"
       # we're up to date or more recent

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

@@ -7,9 +7,13 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
   has_feature :versionable
 
+  # Note: self:: is required here to keep these constants in the context of what will
+  # eventually become this Puppet:Type::Package::ProviderRpm class.
+  self::RPM_DESCRIPTION_DELIMITER = ':DESC:'
   # The query format by which we identify installed packages
-  NEVRAFORMAT = "%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}"
-  NEVRA_FIELDS = [:name, :epoch, :version, :release, :arch]
+  self::NEVRA_FORMAT = %Q{'%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH} #{self::RPM_DESCRIPTION_DELIMITER} %{SUMMARY}\\n'}
+  self::NEVRA_REGEX  = %r{^(\S+) (\S+) (\S+) (\S+) (\S+)(?: #{self::RPM_DESCRIPTION_DELIMITER} ?(.*))?$}
+  self::NEVRA_FIELDS = [:name, :epoch, :version, :release, :arch, :description]
 
   commands :rpm => "rpm"
 
@@ -44,11 +48,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 '#{NEVRAFORMAT}\n'") { |process|
+      execpipe("#{command(:rpm)} -qa #{nosignature} #{nodigest} --qf #{self::NEVRA_FORMAT}") { |process|
         # now turn each returned line into a package object
         process.each_line { |line|
           hash = nevra_to_hash(line)
-          packages << new(hash)
+          packages << new(hash) unless hash.empty?
         }
       }
     rescue Puppet::ExecutionFailure
@@ -65,7 +69,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", "#{NEVRAFORMAT}\n"]
+    cmd = ["-q", @resource[:name], "#{self.class.nosignature}", "#{self.class.nodigest}", "--qf", self.class::NEVRA_FORMAT]
 
     begin
       output = rpm(*cmd)
@@ -74,7 +78,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     end
 
     # FIXME: We could actually be getting back multiple packages
-    # for multilib
+    # for multilib and this will only return the first such package
     @property_hash.update(self.class.nevra_to_hash(output))
 
     @property_hash.dup
@@ -86,7 +90,7 @@ 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", "#{NEVRAFORMAT}\n", "-p", "#{@resource[:source]}"]
+    cmd = [command(:rpm), "-q", "--qf", self.class::NEVRA_FORMAT, "-p", source]
     h = self.class.nevra_to_hash(execfail(cmd, Puppet::Error))
     h[:ensure]
   end
@@ -135,12 +139,25 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     self.install
   end
 
+  private
+
+  # @param line [String] one line of rpm package query information
+  # @return [Hash] of NEVRA_FIELDS strings parsed from package info
+  # if we failed to parse
+  # @note warns if failed to match a line, and returns an empty Hash.
+  # @api private
   def self.nevra_to_hash(line)
-    line.chomp!
+    line.strip!
     hash = {}
-    NEVRA_FIELDS.zip(line.split) { |f, v| hash[f] = v }
-    hash[:provider] = self.name
-    hash[:ensure] = "#{hash[:version]}-#{hash[:release]}"
-    hash
+
+    if match = self::NEVRA_REGEX.match(line)
+      self::NEVRA_FIELDS.zip(match.captures) { |f, v| hash[f] = v }
+      hash[:provider] = self.name
+      hash[:ensure] = "#{hash[:version]}-#{hash[:release]}"
+    else
+      Puppet.warning "Failed to match rpm line #{line}"
+    end
+
+    return hash
   end
 end

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

@@ -22,7 +22,7 @@ Puppet::Type.type(:package).provide :rug, :parent => :rpm do
       # Add the package version
       wanted += "-#{should}"
     end
-    output = rug "--quiet", :install, "-y", wanted
+    rug "--quiet", :install, "-y", wanted
 
     unless self.query
       raise Puppet::ExecutionFailure.new(

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

@@ -1,16 +1,6 @@
 Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
   desc "Support via `urpmi`."
-  commands :urpmi => "urpmi", :urpmq => "urpmq", :rpm => "rpm"
-
-  if command('rpm')
-    confine :true => begin
-      rpm('-ql', 'rpm')
-      rescue Puppet::ExecutionFailure
-        false
-      else
-        true
-      end
-  end
+  commands :urpmi => "urpmi", :urpmq => "urpmq", :rpm => "rpm", :urpme => "urpme"
 
   defaultfor :operatingsystem => [:mandriva, :mandrake]
 
@@ -30,12 +20,10 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
       wanted += "-#{should}"
     end
 
-    output = urpmi "--auto", wanted
+    urpmi "--auto", wanted
 
     unless self.query
-      raise Puppet::Error.new(
-        "Could not find package #{self.name}"
-      )
+      raise Puppet::Error, "Package #{self.name} was not present after trying to install it"
     end
   end
 
@@ -56,4 +44,12 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
     # Install in urpmi can be used for update, too
     self.install
   end
+
+  # For normal package removal the urpmi provider will delegate to the RPM
+  # provider. If the package to remove has dependencies then uninstalling via
+  # rpm will fail, but `urpme` can be used to remove a package and its
+  # dependencies.
+  def purge
+    urpme '--auto', @resource[:name]
+  end
 end

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

@@ -41,7 +41,7 @@ class Puppet::Provider::Package::Windows
     end
 
     def self.install_command(resource)
-      ['cmd.exe', '/c', 'start', '/w', quote(resource[:source])]
+      ['cmd.exe', '/c', 'start', '"puppet-install"', '/w', quote(resource[:source])]
     end
 
     def uninstall_command

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

@@ -1,29 +1,4 @@
-# 'puppet/type/package' is being required here to avoid a load order issue that
-# manifests as 'uninitialized constant Puppet::Util::Windows::MsiPackage' or
-# 'uninitialized constant Puppet::Util::Windows::Package' (or similar case
-# where Puppet::Provider::Package::Windows somehow ends up pointing to
-# Puppet:Util::Windows) if puppet/provider/package/windows/package is loaded
-# before the puppet/type/package.
-#
-# Example:
-#
-#  jpartlow@percival:~/work/puppet$ bundle exec rspec spec/unit/provider/package/windows/package_spec.rb spec/unit/provider/package/rpm_spec.rb 
-#  Run options: exclude {:broken=>true}
-#  ..F..FFF........................
-#  
-#  Failures:
-#  
-#    1) Puppet::Util::Package::Windows::Package::each should yield each package it finds
-#       Failure/Error: Puppet::Provider::Package::Windows::MsiPackage.expects(:from_registry).with('Google', {}).returns(package)
-#       NameError:
-#         uninitialized constant Puppet::Util::Windows::MsiPackage
-#       # ./spec/unit/provider/package/windows/package_spec.rb:24:in `block (3 levels) in <top (required)>'
-#
-# ---
-#
-# Needs more investigation to pinpoint what's going on.
-#
-require 'puppet/type/package'
+require 'puppet/provider/package'
 require 'puppet/util/windows'
 
 class Puppet::Provider::Package::Windows