puppet 2.7.11 → 2.7.12

data/lib/puppet/parser/relationship.rb

@@ -3,19 +3,20 @@ class Puppet::Parser::Relationship
 
   PARAM_MAP = {:relationship => :before, :subscription => :notify}
 
-  def evaluate(catalog)
-    if source.is_a?(Puppet::Parser::Collector)
-      sources = source.collected.values
-    else
-      sources = [source]
-    end
-    if target.is_a?(Puppet::Parser::Collector)
-      targets = target.collected.values
+  def arrayify(resources)
+    case resources
+    when Puppet::Parser::Collector
+      resources.collected.values
+    when Array
+      resources
     else
-      targets = [target]
+      [resources]
     end
-    sources.each do |s|
-      targets.each do |t|
+  end
+
+  def evaluate(catalog)
+    arrayify(source).each do |s|
+      arrayify(target).each do |t|
         mk_relationship(s, t, catalog)
       end
     end
@@ -30,14 +31,30 @@ class Puppet::Parser::Relationship
   end
 
   def mk_relationship(source, target, catalog)
-    unless source_resource = catalog.resource(source.to_s)
+    # REVISIT: In Ruby 1.8 we applied `to_s` to source and target, rather than
+    # `join` without an argument.  In 1.9 the behaviour of Array#to_s changed,
+    # and it gives a different representation than just concat the stringified
+    # elements.
+    #
+    # This restores the behaviour, but doesn't address the underlying question
+    # of what would happen when more than one item was passed in that array.
+    # (Hint: this will not end well.)
+    #
+    # See http://projects.puppetlabs.com/issues/12076 for the ticket tracking
+    # the fact that we should dig out the sane version of this behaviour, then
+    # implement it - where we don't risk breaking a stable release series.
+    # --daniel 2012-01-21
+    source = source.is_a?(Array) ? source.join : source.to_s
+    target = target.is_a?(Array) ? target.join : target.to_s
+
+    unless source_resource = catalog.resource(source)
       raise ArgumentError, "Could not find resource '#{source}' for relationship on '#{target}'"
     end
-    unless target_resource = catalog.resource(target.to_s)
+    unless target_resource = catalog.resource(target)
       raise ArgumentError, "Could not find resource '#{target}' for relationship from '#{source}'"
     end
-    Puppet.debug "Adding relationship from #{source.to_s} to #{target.to_s} with '#{param_name}'"
+    Puppet.debug "Adding relationship from #{source} to #{target} with '#{param_name}'"
     source_resource[param_name] ||= []
-    source_resource[param_name] << target.to_s
+    source_resource[param_name] << target
   end
 end

data/lib/puppet/parser/resource.rb

@@ -83,7 +83,6 @@ class Puppet::Parser::Resource < Puppet::Resource
     if klass = resource_type and ! builtin_type?
       finish
       evaluated_code = klass.evaluate_code(self)
-      add_edge_to_stage
 
       return evaluated_code
     elsif builtin?

data/lib/puppet/parser/type_loader.rb

@@ -80,8 +80,7 @@ class Puppet::Parser::TypeLoader
 
     loaded_asts = []
     files.each do |file|
-      regex = Puppet.features.microsoft_windows? ? /^[A-Za-z]:#{File::SEPARATOR}/ : /^#{File::SEPARATOR}/
-      unless file =~ regex
+      unless Puppet::Util.absolute_path?(file)
         file = File.join(dir, file)
       end
       @loading_helper.do_once(file) do

data/lib/puppet/provider/augeas/augeas.rb

@@ -285,10 +285,10 @@ Puppet::Type.type(:augeas).provide(:augeas) do
 
       unless force
         # If we have a verison of augeas which is at least 0.3.6 then we
-        # can make the changes now, see if changes were made, and
-        # actually do the save.
+        # can make the changes now and see if changes were made.
         if return_value and versioncmp(get_augeas_version, "0.3.6") >= 0
           debug("Will attempt to save and only run if files changed")
+          # Execute in NEWFILE mode so we can show a diff
           set_augeas_save_mode(SAVE_NEWFILE)
           do_execute_changes
           save_result = @aug.save
@@ -298,13 +298,11 @@ Puppet::Type.type(:augeas).provide(:augeas) do
           if saved_files.size > 0
             root = resource[:root].sub(/^\/$/, "")
             saved_files.each do |key|
-              saved_file = @aug.get(key).to_s.sub(/^\/files/, root)
+              saved_file = @aug.get(key).sub(/^\/files/, root)
               if Puppet[:show_diff]
                 notice "\n" + diff(saved_file, saved_file + ".augnew")
               end
-              if resource.noop?
-                File.delete(saved_file + ".augnew")
-              end
+              File.delete(saved_file + ".augnew")
             end
             debug("Files changed, should execute")
             return_value = true
@@ -323,32 +321,22 @@ Puppet::Type.type(:augeas).provide(:augeas) do
   end
 
   def execute_changes
-    # Re-connect to augeas, and re-execute the changes
-    begin
-      open_augeas
-      saved_files = @aug.match("/augeas/events/saved")
-      unless saved_files.empty?
-        saved_files.each do |key|
-          root = resource[:root].sub(/^\/$/, "")
-          saved_file = @aug.get(key).to_s.sub(/^\/files/, root)
-          if File.exists?(saved_file + ".augnew")
-            success = File.rename(saved_file + ".augnew", saved_file)
-            debug(saved_file + ".augnew moved to " + saved_file)
-            fail("Rename failed with return code #{success}") if success != 0
-          end
-        end
-      else
-        debug("No saved files, re-executing augeas")
-        set_augeas_save_mode(SAVE_OVERWRITE) if versioncmp(get_augeas_version, "0.3.6") >= 0
-        do_execute_changes
-        success = @aug.save
-        fail("Save failed with return code #{success}") if success != true
-      end
-    ensure
-      close_augeas
+    # Workaround Augeas bug where changing the save mode doesn't trigger a
+    # reload of the previously saved file(s) when we call Augeas#load
+    @aug.match("/augeas/events/saved").each do |file|
+      @aug.rm("/augeas#{@aug.get(file)}/mtime")
     end
 
+    # Reload augeas, and execute the changes for real
+    set_augeas_save_mode(SAVE_OVERWRITE) if versioncmp(get_augeas_version, "0.3.6") >= 0
+    @aug.load
+    do_execute_changes
+    success = @aug.save
+    fail("Save failed with return code #{success}") if success != true
+
     :executed
+  ensure
+    close_augeas
   end
 
   # Actually execute the augeas changes.

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

@@ -6,9 +6,31 @@ Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
   confine    :operatingsystem => :windows
   defaultfor :operatingsystem => :windows
 
-  desc "Execute external binaries directly, on Windows systems.
-This does not pass through a shell, or perform any interpolation, but
-only directly calls the command with the arguments given."
+  desc <<-EOT
+    Execute external binaries on Windows systems. As with the `posix`
+    provider, this provider directly calls the command with the arguments
+    given, without passing it through a shell or performing any interpolation.
+    To use shell built-ins --- that is, to emulate the `shell` provider on
+    Windows --- a command must explicitly invoke the shell:
+
+        exec {'echo foo':
+          command => 'cmd.exe /c echo "foo"',
+        }
+
+    If no extension is specified for a command, Windows will use the `PATHEXT`
+    environment variable to locate the executable.
+
+    **Note on PowerShell scripts:** PowerShell's default `restricted`
+    execution policy doesn't allow it to run saved scripts. To run PowerShell
+    scripts, specify the `remotesigned` execution policy as part of the
+    command:
+
+        exec { 'test':
+          path    => 'C:/Windows/System32/WindowsPowerShell/v1.0',
+          command => 'powershell -executionpolicy remotesigned -file C:/test.ps1',
+        }
+
+  EOT
 
   # Verify that we have the executable
   def checkexe(command)

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

@@ -1,5 +1,5 @@
 Puppet::Type.type(:file).provide :posix do
-  desc "Uses POSIX functionality to manage file's users and rights."
+  desc "Uses POSIX functionality to manage file ownership and permissions."
 
   confine :feature => :posix
 

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

@@ -1,5 +1,5 @@
 Puppet::Type.type(:file).provide :windows do
-  desc "Uses Microsoft Windows functionality to manage file's users and rights."
+  desc "Uses Microsoft Windows functionality to manage file ownership and permissions."
 
   confine :operatingsystem => :windows
 

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

@@ -1,7 +1,7 @@
 require 'puppet/util/adsi'
 
 Puppet::Type.type(:group).provide :windows_adsi do
-  desc "Group management for Windows"
+  desc "Local group management for Windows. Nested groups are not supported."
 
   defaultfor :operatingsystem => :windows
   confine    :operatingsystem => :windows

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

@@ -30,7 +30,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
 
     updates = {}
     sources.each do |source|
-      execute(self.srclistcmd(source)).each do |line|
+      execute(self.srclistcmd(source)).each_line do |line|
         if line =~ /^[^#][^:]*:([^:]*):([^:]*)/
           current = {}
           current[:name]    = $1

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

@@ -58,7 +58,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
     if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
       cached_source = "/tmp/#{name}"
       begin
-        curl "-o", cached_source, "-C", "-", "-k", "-s", "--url", source
+        curl "-o", cached_source, "-C", "-", "-k", "-L", "-s", "--url", source
         Puppet.debug "Success: curl transfered [#{name}]"
       rescue Puppet::ExecutionFailure
         Puppet.debug "curl did not transfer [#{name}].  Falling back to slower open-uri transfer methods."

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

@@ -24,7 +24,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
       hash = {}
 
       # now turn each returned line into a package object
-      process.each { |line|
+      process.each_line { |line|
         if hash = parse_line(line)
           packages << new(hash)
         end

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

@@ -12,33 +12,26 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
 
   commands :gemcmd => "gem"
 
-  def self.gemlist(hash)
-    command = [command(:gemcmd), "list"]
+  def self.gemlist(options)
+    gem_list_command = [command(:gemcmd), "list"]
 
-    if hash[:local]
-      command << "--local"
+    if options[:local]
+      gem_list_command << "--local"
     else
-      command << "--remote"
+      gem_list_command << "--remote"
     end
 
-    if name = hash[:justme]
-      command << name + "$"
+    if name = options[:justme]
+      gem_list_command << name + "$"
     end
 
     begin
-      list = execute(command).split("\n").collect do |set|
-        if gemhash = gemsplit(set)
-          gemhash[:provider] = :gem
-          gemhash
-        else
-          nil
-        end
-      end.compact
+      list = execute(gem_list_command).lines.map {|set| gemsplit(set) }
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, "Could not list gems: #{detail}"
     end
 
-    if hash[:justme]
+    if options[:justme]
       return list.shift
     else
       return list
@@ -46,14 +39,19 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
   end
 
   def self.gemsplit(desc)
-    case desc
-    when /^\*\*\*/, /^\s*$/, /^\s+/; return nil
-    when /^(\S+)\s+\((.+)\)/
+    # `gem list` when output console has a line like:
+    # *** LOCAL GEMS ***
+    # but when it's not to the console that line
+    # and all blank lines are stripped
+    # so we don't need to check for them
+
+    if desc =~ /^(\S+)\s+\((.+)\)/
       name = $1
-      version = $2.split(/,\s*/)[0]
-      return {
-        :name => name,
-        :ensure => version
+      versions = $2.split(/,\s*/)
+      {
+        :name     => name,
+        :ensure   => versions,
+        :provider => :gem
       }
     else
       Puppet.warning "Could not match #{desc}"

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

@@ -46,7 +46,7 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
 
   def self.instances
     packages = []
-    port("-q", :installed).each do |line|
+    port("-q", :installed).each_line do |line|
       if hash = parse_installed_query_line(line)
         packages << new(hash)
       end

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

@@ -1,7 +1,13 @@
 require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide(:msi, :parent => Puppet::Provider::Package) do
-  desc "Package management by installing and removing MSIs."
+  desc "Windows package management by installing and removing MSIs.
+
+    This provider requires a `source` attribute, and will accept paths to local
+    files or files on mapped drives.
+
+    This provider cannot uninstall arbitrary MSI packages; it can only uninstall
+    packages which were originally installed by Puppet."
 
   confine    :operatingsystem => :windows
   defaultfor :operatingsystem => :windows

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

@@ -22,7 +22,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
         hash = {}
 
         # now turn each returned line into a package object
-        process.each { |line|
+        process.each_line { |line|
           if match = regex.match(line.split[0])
             fields.zip(match.captures) { |field,value|
               hash[field] = value
@@ -49,7 +49,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
   end
 
   def self.listcmd
-    [command(:pkginfo), " -a"]
+    [command(:pkginfo), "-a"]
   end
 
   def install
@@ -57,28 +57,29 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
 
     unless @resource[:source]
       raise Puppet::Error,
-        "You must specify a package source for BSD packages"
+      "You must specify a package source for BSD packages"
     end
 
-    if @resource[:source][-1,1] == ::File::PATH_SEPARATOR
-      e_vars = { :PKG_PATH => @resource[:source] }
-      full_name = [ @resource[:name], get_version || @resource[:ensure], @resource[:flavor] ].join('-').chomp('-')
+    if @resource[:source][-1,1] == ::File::SEPARATOR
+      e_vars = { 'PKG_PATH' => @resource[:source] }
+      full_name = [ @resource[:name], get_version || @resource[:ensure], @resource[:flavor] ].join('-').chomp('-').chomp('-')
     else
       e_vars = {}
       full_name = @resource[:source]
     end
 
-     Puppet::Util::Execution::withenv(e_vars) { pkgadd full_name }
+    Puppet::Util::Execution::withenv(e_vars) { pkgadd full_name }
   end
 
   def get_version
-    execpipe([command(:pkginfo), " -I ", @resource[:name]]) do |process|
+    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
 
-      process.each do |line|
+      process.each_line do |line|
         if match = regex.match(line.split[0])
           # now we return the first version, unless ensure is latest
           version = match.captures[1]
@@ -89,6 +90,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
       end
 
       return master_version unless master_version == 0
+      return '' if version == -1
       raise Puppet::Error, "#{version} is not available for this package"
     end
   rescue Puppet::ExecutionFailure
@@ -96,17 +98,12 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
   end
 
   def query
-    hash = {}
-    info = pkginfo @resource[:name]
-
     # Search for the version info
-    if info =~ /Information for (inst:)?#{@resource[:name]}-(\S+)/
-      hash[:ensure] = $2
+    if pkginfo(@resource[:name]) =~ /Information for (inst:)?#{@resource[:name]}-(\S+)/
+      return { :ensure => $2 }
     else
       return nil
     end
-
-    hash
   end
 
   def uninstall

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

@@ -20,7 +20,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
   end
 
   def self.listcmd
-    [command(:pacman), " -Q"]
+    [command(:pacman), "-Q"]
   end
 
   # Fetch the list of packages currently installed on the system.

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

@@ -50,8 +50,11 @@ Puppet::Type.type(:package).provide :pip,
   def latest
     client = XMLRPC::Client.new2("http://pypi.python.org/pypi")
     client.http_header_extra = {"Content-Type" => "text/xml"}
+    client.timeout = 10
     result = client.call("package_releases", @resource[:name])
     result.first
+  rescue Timeout::Error => detail
+    raise Puppet::Error, "Timeout while contacting pypi.python.org: #{detail}";
   end
 
   # Install a package.  The ensure parameter may specify installed,