puppet 3.3.2 → 3.4.0.rc1

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

@@ -54,7 +54,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
 
   def parse_pkgconf
     unless @resource[:source]
-      if File.exist?("/etc/pkg.conf")
+      if Puppet::FileSystem::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]

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

@@ -6,7 +6,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
 
   commands :pacman => "/usr/bin/pacman"
   # Yaourt is a common AUR helper which, if installed, we can use to query the AUR
-  commands :yaourt => "/usr/bin/yaourt" if File.exists? '/usr/bin/yaourt'
+  commands :yaourt => "/usr/bin/yaourt" if Puppet::FileSystem::File.exist? '/usr/bin/yaourt'
 
   confine     :operatingsystem => :archlinux
   defaultfor  :operatingsystem => :archlinux
@@ -14,7 +14,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
 
   # If yaourt is installed, we can make use of it
   def yaourt?
-    return File.exists? '/usr/bin/yaourt'
+    return Puppet::FileSystem::File.exist? '/usr/bin/yaourt'
   end
 
   # Install a package using 'pacman', or 'yaourt' if available.

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

@@ -113,7 +113,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
   end
 
   def query
-    if FileTest.exists?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
+    if Puppet::FileSystem::File.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/pkgutil.rb

@@ -14,7 +14,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
   end
 
   def self.healthcheck()
-    unless FileTest.exists?("/var/opt/csw/pkgutil/admin")
+    unless Puppet::FileSystem::File.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/rpm.rb

@@ -3,12 +3,19 @@ require 'puppet/provider/package'
 # RPM packaging.  Should work anywhere that has rpm installed.
 Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Provider::Package do
   desc "RPM packaging support; should work anywhere with a working `rpm`
-    binary."
+    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.)"
 
   has_feature :versionable
+  has_feature :install_options
 
   # Note: self:: is required here to keep these constants in the context of what will
-  # eventually become this Puppet:Type::Package::ProviderRpm class.
+  # eventually become this Puppet::Type::Package::ProviderRpm class.
   self::RPM_DESCRIPTION_DELIMITER = ':DESC:'
   # The query format by which we identify installed packages
   self::NEVRA_FORMAT = %Q{%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH} #{self::RPM_DESCRIPTION_DELIMITER} %{SUMMARY}\\n}
@@ -107,9 +114,10 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       return
     end
 
-    flag = "-i"
+    flag = ["-i"]
     flag = ["-U", "--oldpackage"] if @property_hash[:ensure] and @property_hash[:ensure] != :absent
 
+    flag = flag + install_options
     rpm flag, source
   end
 
@@ -139,8 +147,36 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     self.install
   end
 
+  def install_options
+    join_options(resource[:install_options])
+  end
+
   private
 
+  # Turns a array of options into flags to be passed to rpm install(8) and
+  # 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
+
   # @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

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

@@ -15,7 +15,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
 
   has_feature :install_options
 
-  Namemap = {
+  self::Namemap = {
     "PKGINST"  => :name,
     "CATEGORY" => :category,
     "ARCH"     => :platform,
@@ -26,8 +26,8 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
   }
 
   def self.namemap(hash)
-    Namemap.keys.inject({}) do |hsh,k|
-      hsh.merge(Namemap[k] => hash[k])
+    self::Namemap.keys.inject({}) do |hsh,k|
+      hsh.merge(self::Namemap[k] => hash[k])
     end
   end
 

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

@@ -22,6 +22,7 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
   has_feature :uninstallable
   has_feature :install_options
   has_feature :uninstall_options
+  has_feature :versionable
 
   attr_accessor :package
 
@@ -37,9 +38,7 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
   def self.to_hash(pkg)
     {
       :name     => pkg.name,
-      # we're not versionable, so we can't set the ensure
-      # parameter to the currently installed version
-      :ensure   => :installed,
+      :ensure   => pkg.version || :installed,
       :provider => :windows
     }
   end
@@ -59,26 +58,22 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
     installer = Puppet::Provider::Package::Windows::Package.installer_class(resource)
 
     command = [installer.install_command(resource), install_options].flatten.compact.join(' ')
-    execute(command, :failonfail => false, :combine => true)
+    output = execute(command, :failonfail => false, :combine => true)
 
-    check_result(exit_status)
+    check_result(output.exitstatus)
   end
 
   def uninstall
     command = [package.uninstall_command, uninstall_options].flatten.compact.join(' ')
-    execute(command, :failonfail => false, :combine => true)
+    output = execute(command, :failonfail => false, :combine => true)
 
-    check_result(exit_status)
-  end
-
-  def exit_status
-    $CHILD_STATUS.exitstatus
+    check_result(output.exitstatus)
   end
 
   # http://msdn.microsoft.com/en-us/library/windows/desktop/aa368542(v=vs.85).aspx
-  ERROR_SUCCESS                  = 0
-  ERROR_SUCCESS_REBOOT_INITIATED = 1641
-  ERROR_SUCCESS_REBOOT_REQUIRED  = 3010
+  self::ERROR_SUCCESS                  = 0
+  self::ERROR_SUCCESS_REBOOT_INITIATED = 1641
+  self::ERROR_SUCCESS_REBOOT_REQUIRED  = 3010
 
   # (Un)install may "fail" because the package requested a reboot, the system requested a
   # reboot, or something else entirely. Reboot requests mean the package was installed
@@ -87,13 +82,11 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
     operation = resource[:ensure] == :absent ? 'uninstall' : 'install'
 
     case hr
-    when ERROR_SUCCESS
+    when self.class::ERROR_SUCCESS
       # yeah
-    when 194
-      warning("The package requested a reboot to finish the operation.")
-    when ERROR_SUCCESS_REBOOT_INITIATED
+    when self.class::ERROR_SUCCESS_REBOOT_INITIATED
       warning("The package #{operation}ed successfully and the system is rebooting now.")
-    when ERROR_SUCCESS_REBOOT_REQUIRED
+    when self.class::ERROR_SUCCESS_REBOOT_REQUIRED
       warning("The package #{operation}ed successfully, but the system must be rebooted.")
     else
       raise Puppet::Util::Windows::Error.new("Failed to #{operation}", hr)

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 File.exists?(resource[:source])
+        fail("The source does not exist: '#{resource[:source]}'") unless Puppet::FileSystem::File.exist?(resource[:source])
         ExePackage
       else
         fail("Don't know how to install '#{resource[:source]}'")

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

@@ -11,7 +11,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
   commands :yum => "yum", :rpm => "rpm", :python => "python"
 
-  YUMHELPER = File::join(File::dirname(__FILE__), "yumhelper.py")
+  self::YUMHELPER = File::join(File::dirname(__FILE__), "yumhelper.py")
 
   attr_accessor :latest_info
 
@@ -34,7 +34,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
     # collect our 'latest' info
     updates = {}
-    python(YUMHELPER).each_line do |l|
+    python(self::YUMHELPER).each_line do |l|
       l.chomp!
       next if l.empty?
       if l[0,4] == "_pkg"

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 File.exists?(rcfile)
+    File.delete(rcfile) if Puppet::FileSystem::File.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 File.exists?(rcfile)
+    return :true if Puppet::FileSystem::File.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 File.exists?(rcconf_dir)
+    Dir.mkdir(rcconf_dir) if not Puppet::FileSystem::File.exist?(rcconf_dir)
     rcfile = File.join(rcconf_dir, @model[:name])
     open(rcfile, 'w') { |f| f << "%s_enable=\"YES\"\n" % @model[:name] }
   end

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

@@ -48,7 +48,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     def defpath(dummy_argument=:work_arround_for_ruby_GC_bug)
       unless @defpath
         ["/var/lib/service", "/etc"].each do |path|
-          if FileTest.exist?(path)
+          if Puppet::FileSystem::File.exist?(path)
             @defpath = path
             break
           end
@@ -74,7 +74,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     # or don't contain a run file
     Dir.entries(path).reject { |e|
       fullpath = File.join(path, e)
-      e =~ /^\./ or ! FileTest.directory?(fullpath) or ! FileTest.exist?(File.join(fullpath,"run"))
+      e =~ /^\./ or ! FileTest.directory?(fullpath) or ! Puppet::FileSystem::File.exist?(File.join(fullpath,"run"))
     }.collect do |name|
       new(:name => name, :path => path)
     end
@@ -89,7 +89,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   def servicedir
     unless @servicedir
       ["/service", "/etc/service","/var/lib/svscan"].each do |path|
-        if FileTest.exist?(path)
+        if Puppet::FileSystem::File.exist?(path)
           @servicedir = path
           break
         end
@@ -142,7 +142,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
       return :true
     else
       # the service is enabled if it is linked
-      return FileTest.symlink?(self.service) ? :true : :false
+      return Puppet::FileSystem::File.new(self.service).symlink? ? :true : :false
     end
   end
 
@@ -152,9 +152,9 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         self.setupservice
       end
       if self.daemon
-        if ! FileTest.symlink?(self.service)
+        if ! Puppet::FileSystem::File.new(self.service).symlink?
           Puppet.notice "Enabling #{self.service}: linking #{self.daemon} -> #{self.service}"
-          File.symlink(self.daemon, self.service)
+          Puppet::FileSystem::File.new(self.daemon).symlink(self.service)
         end
       end
   rescue Puppet::ExecutionFailure
@@ -168,9 +168,9 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         self.setupservice
       end
       if self.daemon
-        if FileTest.symlink?(self.service)
+        if Puppet::FileSystem::File.new(self.service).symlink?
           Puppet.notice "Disabling #{self.service}: removing link #{self.daemon} -> #{self.service}"
-          File.unlink(self.service)
+          Puppet::FileSystem::File.unlink(self.service)
         end
       end
     rescue Puppet::ExecutionFailure

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

@@ -71,7 +71,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     success = false
     # Replace in all files, not just in the first found with a match
     [rcconf, rcconf_local, rcconf_dir + "/#{service}"].each do |filename|
-      if File.exists?(filename)
+      if Puppet::FileSystem::File.exist?(filename)
         s = File.read(filename)
         if s.gsub!(/^(#{rcvar}(_enable)?)=\"?(YES|NO)\"?/, "\\1=\"#{yesno}\"")
           File.open(filename, File::WRONLY) { |f| f << s }
@@ -87,14 +87,14 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   def rc_add(service, rcvar, yesno)
     append = "\# Added by Puppet\n#{rcvar}_enable=\"#{yesno}\"\n"
     # First, try the one-file-per-service style
-    if File.exists?(rcconf_dir)
+    if Puppet::FileSystem::File.exist?(rcconf_dir)
       File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) {
         |f| f << append
         self.debug("Appended to #{f.path}")
       }
     else
       # Else, check the local rc file first, but don't create it
-      if File.exists?(rcconf_local)
+      if Puppet::FileSystem::File.exist?(rcconf_local)
         File.open(rcconf_local, File::WRONLY | File::APPEND) {
           |f| f << append
           self.debug("Appended to #{f.path}")

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

@@ -99,7 +99,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
       if File.directory?(path)
         true
       else
-        if File.exist?(path)
+        if Puppet::FileSystem::File.exist?(path)
           self.debug "Search path #{path} is not a directory"
         else
           self.debug "Search path #{path} does not exist"
@@ -112,7 +112,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   def search(name)
     paths.each do |path|
       fqname = File.join(path,name)
-      if File.exist? fqname
+      if Puppet::FileSystem::File.exist? fqname
         return fqname
       else
         self.debug("Could not find #{name} in #{path}")
@@ -121,7 +121,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
     paths.each do |path|
       fqname_sh = File.join(path,"#{name}.sh")
-      if File.exist? fqname_sh
+      if Puppet::FileSystem::File.exist? fqname_sh
         return fqname_sh
       else
         self.debug("Could not find #{name}.sh in #{path}")
@@ -154,7 +154,8 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 private
 
   def self.is_init?(script = initscript)
-    !File.symlink?(script) || File.readlink(script) != "/lib/init/upstart-job"
+    file = Puppet::FileSystem::File.new(script)
+    !file.symlink? || file.readlink != "/lib/init/upstart-job"
   end
 end
 

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

@@ -112,40 +112,51 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     array_of_files.compact
   end
 
+  # Get a hash of all launchd plists, keyed by label.  This value is cached, but
+  # the cache will be refreshed if refresh is true.
+  #
+  # @api private
+  def self.make_label_to_path_map(refresh=false)
+    return @label_to_path_map if @label_to_path_map and not refresh
+    @label_to_path_map = {}
+    launchd_paths.each do |path|
+      return_globbed_list_of_file_paths(path).each do |filepath|
+        job = read_plist(filepath)
+        next if job.nil?
+        if job.has_key?("Label")
+          @label_to_path_map[job["Label"]] = filepath
+        else
+          Puppet.warning("The #{filepath} plist does not contain a 'label' key; " +
+                       "Puppet is skipping it")
+          next
+        end
+      end
+    end
+    @label_to_path_map
+  end
+
   # Sets a class instance variable with a hash of all launchd plist files that
   # are found on the system. The key of the hash is the job id and the value
   # is the path to the file. If a label is passed, we return the job id and
   # path for that specific job.
   def self.jobsearch(label=nil)
-    @label_to_path_map ||= {}
-    if @label_to_path_map.empty?
-      launchd_paths.each do |path|
-        return_globbed_list_of_file_paths(path).each do |filepath|
-          job = read_plist(filepath)
-          next if job.nil?
-          if job.has_key?("Label")
-            if job["Label"] == label
-              return { label => filepath }
-            else
-              @label_to_path_map[job["Label"]] = filepath
-            end
-          else
-            Puppet.warning("The #{filepath} plist does not contain a 'label' key; " +
-                         "Puppet is skipping it")
-            next
-          end
-        end
-      end
-    end
+    by_label = make_label_to_path_map
 
     if label
-      if @label_to_path_map.has_key? label
-        return { label => @label_to_path_map[label] }
+      if by_label.has_key? label
+        return { label => by_label[label] }
       else
-        raise Puppet::Error.new("Unable to find launchd plist for job: #{label}")
+        # try refreshing the map, in case a plist has been added in the interim
+        by_label = make_label_to_path_map(true)
+        if by_label.has_key? label
+          return { label => by_label[label] }
+        else
+          raise Puppet::Error, "Unable to find launchd plist for job: #{label}"
+        end
       end
     else
-      @label_to_path_map
+      # caller wants the whole map
+      by_label
     end
   end