puppet 3.4.3 → 3.5.0.rc1

data/lib/puppet/provider/exec.rb

@@ -63,7 +63,7 @@ class Puppet::Provider::Exec < Puppet::Provider
 
       end
     rescue Errno::ENOENT => detail
-      self.fail detail.to_s
+      self.fail Puppet::Error, detail.to_s, detail
     end
 
     # Return output twice as processstatus was returned before, but only exitstatus was ever called.

data/lib/puppet/provider/exec/posix.rb

@@ -17,7 +17,7 @@ Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
     exe = extractexe(command)
 
     if File.expand_path(exe) == exe
-      if !Puppet::FileSystem::File.exist?(exe)
+      if !Puppet::FileSystem.exist?(exe)
         raise ArgumentError, "Could not find command '#{exe}'"
       elsif !File.file?(exe)
         raise ArgumentError, "'#{exe}' is a #{File.ftype(exe)}, not a file"

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

@@ -36,7 +36,7 @@ Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
     exe = extractexe(command)
 
     if absolute_path?(exe)
-      if !Puppet::FileSystem::File.exist?(exe)
+      if !Puppet::FileSystem.exist?(exe)
         raise ArgumentError, "Could not find command '#{exe}'"
       elsif !File.file?(exe)
         raise ArgumentError, "'#{exe}' is a #{File.ftype(exe)}, not a file"

data/lib/puppet/provider/file/posix.rb

@@ -81,7 +81,7 @@ Puppet::Type.type(:file).provide :posix do
     begin
       File.send(method, should, nil, resource[:path])
     rescue => detail
-      raise Puppet::Error, "Failed to set owner to '#{should}': #{detail}"
+      raise Puppet::Error, "Failed to set owner to '#{should}': #{detail}", detail.backtrace
     end
   end
 
@@ -112,7 +112,7 @@ Puppet::Type.type(:file).provide :posix do
     begin
       File.send(method, nil, should, resource[:path])
     rescue => detail
-      raise Puppet::Error, "Failed to set group to '#{should}': #{detail}"
+      raise Puppet::Error, "Failed to set group to '#{should}': #{detail}", detail.backtrace
     end
   end
 

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

@@ -42,11 +42,9 @@ Puppet::Type.type(:file).provide :windows do
 
   def owner=(should)
     begin
-      path = resource[:links] == :manage ? file.path.to_s : file.readlink
-
-      set_owner(should, path)
+      set_owner(should, resolved_path)
     rescue => detail
-      raise Puppet::Error, "Failed to set owner to '#{should}': #{detail}"
+      raise Puppet::Error, "Failed to set owner to '#{should}': #{detail}", detail.backtrace
     end
   end
 
@@ -57,11 +55,9 @@ Puppet::Type.type(:file).provide :windows do
 
   def group=(should)
     begin
-      path = resource[:links] == :manage ? file.path.to_s : file.readlink
-
-      set_group(should, path)
+      set_group(should, resolved_path)
     rescue => detail
-      raise Puppet::Error, "Failed to set group to '#{should}': #{detail}"
+      raise Puppet::Error, "Failed to set group to '#{should}': #{detail}", detail.backtrace
     end
   end
 
@@ -94,6 +90,16 @@ Puppet::Type.type(:file).provide :windows do
   attr_reader :file
   private
   def file
-    @file ||= Puppet::FileSystem::File.new(resource[:path])
+    @file ||= Puppet::FileSystem.pathname(resource[:path])
+  end
+
+  def resolved_path
+    path = file()
+    # under POSIX, :manage means use lchown - i.e. operate on the link
+    return path.to_s if resource[:links] == :manage
+
+    # otherwise, use chown -- that will resolve the link IFF it is a link
+    # otherwise it will operate on the path
+    Puppet::FileSystem.symlink?(path) ? Puppet::FileSystem.readlink(path) : path.to_s
   end
 end

data/lib/puppet/provider/group/aix.rb

@@ -9,7 +9,7 @@ require 'puppet/provider/aixobject'
 Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject do
   desc "Group management for AIX."
 
-  # This will the the default provider for this platform
+  # This will the default provider for this platform
   defaultfor :operatingsystem => :aix
   confine :operatingsystem => :aix
 
@@ -127,7 +127,7 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
       begin
         execute(cmd)
       rescue Puppet::ExecutionFailure  => detail
-        raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}"
+        raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}", detail.backtrace
       end
     end
   end

data/lib/puppet/provider/macauthorization/macauthorization.rb

@@ -17,7 +17,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
   # This should be confined based on macosx_productversion
   # but puppet resource doesn't make the facts available and
   # that interface is heavily used with this provider.
-  if Puppet::FileSystem::File.exist?("/usr/bin/sw_vers")
+  if Puppet::FileSystem.exist?("/usr/bin/sw_vers")
     product_version = sw_vers "-productVersion"
 
     confine :true => unless /^10\.[0-4]/.match(product_version)
@@ -143,7 +143,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
         authdb["rules"].delete(resource[:name])
         Plist::Emit.save_plist(authdb, AuthDB)
       rescue Errno::EACCES => e
-        raise Puppet::Error.new("Error saving #{AuthDB}: #{e}")
+        raise Puppet::Error.new("Error saving #{AuthDB}: #{e}", e)
       end
     end
   end
@@ -188,7 +188,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
       cmds << :security << "authorizationdb" << "write" << name
       execute(cmds, :failonfail => false, :combine => false, :stdinfile => tmp.path.to_s)
     rescue Errno::EACCES => e
-      raise Puppet::Error.new("Cannot save right to #{tmp.path}: #{e}")
+      raise Puppet::Error.new("Cannot save right to #{tmp.path}: #{e}", e)
     ensure
       tmp.close
       tmp.unlink

data/lib/puppet/provider/mount.rb

@@ -27,6 +27,13 @@ module Puppet::Provider::Mount
     info "Remounting"
     if resource[:remounts] == :true
       mountcmd "-o", "remount", resource[:name]
+    elsif ["FreeBSD", "DragonFly", "OpenBSD"].include?(Facter.value(:operatingsystem))
+      if self.options && !self.options.empty?
+        options = self.options + ",update"
+      else
+        options = "update"
+      end
+      mountcmd "-o", options, resource[:name]
     else
       unmount
       mount

data/lib/puppet/provider/mount/parsed.rb

@@ -23,7 +23,6 @@ Puppet::Type.type(:mount).provide(
     @fields = [:device, :blockdevice, :name, :fstype, :pass, :atboot, :options]
   else
     @fields = [:device, :name, :fstype, :options, :dump, :pass]
-    @fielddefaults = [ nil ] * 4 + [ "0", "2" ]
   end
 
   text_line :comment, :match => /^\s*#/

data/lib/puppet/provider/naginator.rb

@@ -23,7 +23,7 @@ class Puppet::Provider::Naginator < Puppet::Provider::ParsedFile
   def self.parse(text)
       Nagios::Parser.new.parse(text.gsub(NAME_STRING, "_naginator_name"))
   rescue => detail
-      raise Puppet::Error, "Could not parse configuration for #{resource_type.name}: #{detail}"
+      raise Puppet::Error, "Could not parse configuration for #{resource_type.name}: #{detail}", detail.backtrace
   end
 
   def self.to_file(records)

data/lib/puppet/provider/nameservice.rb

@@ -169,7 +169,7 @@ class Puppet::Provider::NameService < Puppet::Provider
         execute(cmd)
       end
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not create #{@resource.class.name} #{@resource.name}: #{detail}"
+      raise Puppet::Error, "Could not create #{@resource.class.name} #{@resource.name}: #{detail}", detail.backtrace
     end
   end
 
@@ -183,7 +183,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     begin
       execute(self.deletecmd)
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not delete #{@resource.class.name} #{@resource.name}: #{detail}"
+      raise Puppet::Error, "Could not delete #{@resource.class.name} #{@resource.name}: #{detail}", detail.backtrace
     end
   end
 
@@ -285,7 +285,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     begin
       execute(cmd)
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}"
+      raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}", detail.backtrace
     end
   end
 end

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

@@ -251,7 +251,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
              Please check your password and try again.")
       end
 
-      if Puppet::FileSystem::File.exist?("#{users_plist_dir}/#{resource_name}.plist")
+      if Puppet::FileSystem.exist?("#{users_plist_dir}/#{resource_name}.plist")
         # If a plist already exists in /var/db/dslocal/nodes/Default/users, then
         # we will need to extract the binary plist from the 'ShadowHashData'
         # key, log the new password into the resultant plist's 'SALTED-SHA512'
@@ -296,7 +296,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     if (Puppet::Util::Package.versioncmp(get_macosx_version_major, '10.7') == -1)
       password_hash = nil
       password_hash_file = "#{password_hash_dir}/#{guid}"
-      if Puppet::FileSystem::File.exist?(password_hash_file) and File.file?(password_hash_file)
+      if Puppet::FileSystem.exist?(password_hash_file) and File.file?(password_hash_file)
         fail("Could not read password hash file at #{password_hash_file}") if not File.readable?(password_hash_file)
         f = File.new(password_hash_file)
         password_hash = f.read
@@ -304,7 +304,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       end
       password_hash
     else
-      if Puppet::FileSystem::File.exist?("#{users_plist_dir}/#{username}.plist")
+      if Puppet::FileSystem.exist?("#{users_plist_dir}/#{username}.plist")
         # If a plist exists in /var/db/dslocal/nodes/Default/users, we will
         # extract the binary plist from the 'ShadowHashData' key, decode the
         # salted-SHA512 password hash, and then return it.

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

@@ -113,7 +113,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
       if hash[:pkgname]
         return nil
       else
-        raise Puppet::Error, "Could not list installed Packages: #{detail}"
+        raise Puppet::Error, "Could not list installed Packages: #{detail}", detail.backtrace
       end
     end
 

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

@@ -49,9 +49,6 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
   end
 
   def self.installpkgdmg(source, name)
-    unless source =~ /\.dmg$/i
-      self.fail "Mac OS X PKG DMG's must specify a source string ending in .dmg"
-    end
     require 'open-uri'
     require 'facter/util/plist'
     cached_source = source
@@ -93,7 +90,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
   end
 
   def query
-    Puppet::FileSystem::File.exist?("/var/db/.puppet_appdmg_installed_#{@resource[:name]}") ? {:name => @resource[:name], :ensure => :present} : nil
+    Puppet::FileSystem.exist?("/var/db/.puppet_appdmg_installed_#{@resource[:name]}") ? {:name => @resource[:name], :ensure => :present} : nil
   end
 
   def install

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

@@ -33,7 +33,7 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
   end
 
   def query
-    Puppet::FileSystem::File.exist?("/Library/Receipts/#{@resource[:name]}.pkg") ? {:name => @resource[:name], :ensure => :present} : nil
+    Puppet::FileSystem.exist?("/Library/Receipts/#{@resource[:name]}.pkg") ? {:name => @resource[:name], :ensure => :present} : nil
   end
 
   def install

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

@@ -84,7 +84,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 Puppet::FileSystem::File.exist?(response)
+    if response = @resource[:responsefile] and Puppet::FileSystem.exist?(response)
       self.info("Preseeding #{response} to debconf-set-selections")
 
       preseed response

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

@@ -18,7 +18,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
         "The pkg-get command is missing; blastwave packaging unavailable"
     end
 
-    unless Puppet::FileSystem::File.exist?("/var/pkg-get/admin")
+    unless Puppet::FileSystem.exist?("/var/pkg-get/admin")
       Puppet.notice "It is highly recommended you create '/var/pkg-get/admin'."
       Puppet.notice "See /var/pkg-get/admin-fullauto"
     end

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

@@ -56,7 +56,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
   # preseeds answers to dpkg-set-selection from the "responsefile"
   #
   def run_preseed
-    if response = @resource[:responsefile] and Puppet::FileSystem::File.exist?(response)
+    if response = @resource[:responsefile] and Puppet::FileSystem.exist?(response)
       self.info("Preseeding #{response} to debconf-set-selections")
 
       preseed response

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

@@ -32,7 +32,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
         map {|set| gemsplit(set) }.
         reject {|x| x.nil? }
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not list gems: #{detail}"
+      raise Puppet::Error, "Could not list gems: #{detail}", detail.backtrace
     end
 
     if options[:justme]
@@ -54,7 +54,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       versions = $2.split(/,\s*/)
       {
         :name     => name,
-        :ensure   => versions,
+        :ensure   => versions.map{|v| v.split[0]},
         :provider => :gem
       }
     else
@@ -77,7 +77,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       begin
         uri = URI.parse(source)
       rescue => detail
-        fail "Invalid source '#{uri}': #{detail}"
+        self.fail Puppet::Error, "Invalid source '#{uri}': #{detail}", detail
       end
 
       case uri.scheme

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

@@ -35,9 +35,11 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
             packages << new(hash)
             hash = {}
           else
-            # Print a warning on lines we can't match, but move
-            # on, since it should be non-fatal
-            warning("Failed to match line #{line}")
+            unless line =~ /Updating the pkgdb/
+              # Print a warning on lines we can't match, but move
+              # on, since it should be non-fatal
+              warning("Failed to match line #{line}")
+            end
           end
         }
       end
@@ -54,7 +56,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
 
   def parse_pkgconf
     unless @resource[:source]
-      if Puppet::FileSystem::File.exist?("/etc/pkg.conf")
+      if Puppet::FileSystem.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

@@ -1,4 +1,5 @@
 require 'puppet/provider/package'
+require 'set'
 require 'uri'
 
 Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Package do
@@ -6,7 +7,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 Puppet::FileSystem::File.exist? '/usr/bin/yaourt'
+  commands :yaourt => "/usr/bin/yaourt" if Puppet::FileSystem.exist? '/usr/bin/yaourt'
 
   confine     :operatingsystem => :archlinux
   defaultfor  :operatingsystem => :archlinux
@@ -14,7 +15,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
 
   # If yaourt is installed, we can make use of it
   def yaourt?
-    return Puppet::FileSystem::File.exist? '/usr/bin/yaourt'
+    return Puppet::FileSystem.exist?('/usr/bin/yaourt')
   end
 
   # Install a package using 'pacman', or 'yaourt' if available.
@@ -46,7 +47,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
     begin
       source_uri = URI.parse source
     rescue => detail
-      fail "Invalid source '#{source}': #{detail}"
+      self.fail Puppet::Error, "Invalid source '#{source}': #{detail}", detail
     end
 
     source = case source_uri.scheme
@@ -68,8 +69,14 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
     [command(:pacman), "-Q"]
   end
 
-  # Fetch the list of packages currently installed on the system.
-  def self.instances
+  # Pacman has a concept of package groups as well.
+  # Package groups have no versions.
+  def self.listgroupcmd
+    [command(:pacman), "-Qg"]
+  end
+
+  # Get installed packages (pacman -Q)
+  def self.installedpkgs
     packages = []
     begin
       execpipe(listcmd()) do |process|
@@ -87,6 +94,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
             hash[:provider] = self.name
 
             packages << new(hash)
+
             hash = {}
           else
             warning("Failed to match line %s" % line)
@@ -99,6 +107,51 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
     packages
   end
 
+  # Get installed groups (pacman -Qg)
+  def self.installedgroups
+    packages = []
+    begin
+      execpipe(listgroupcmd()) do |process|
+        # pacman -Qg output is 'groupname packagename'
+        # Groups need to be deduplicated
+        groups = Set[]
+
+        process.each_line { |line|
+          groups.add(line.split[0])
+        }
+
+        groups.each { |line|
+          hash = {
+            :name   => line,
+            :ensure => "1", # Groups don't have versions, so ensure => latest
+                            # will still cause a reinstall.
+            :provider => self.name
+          }
+          packages << new(hash)
+        }
+      end
+    rescue Puppet::ExecutionFailure
+      return nil
+    end
+    packages
+  end
+
+  # Fetch the list of packages currently installed on the system.
+  def self.instances
+    packages = self.installedpkgs
+    groups   = self.installedgroups
+    result   = nil
+
+    if (!packages && !groups)
+      nil
+    elsif (packages && groups)
+      packages.concat(groups)
+    else
+      packages
+    end
+  end
+
+
   # Because Archlinux is a rolling release based distro, installing a package
   # should always result in the newest release.
   def update