puppet 2.7.3 → 2.7.4

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

@@ -3,8 +3,17 @@ Puppet::Type.type(:exec).provide :shell, :parent => :posix do
 
   confine :feature => :posix
 
-  desc "Execute external binaries directly, on POSIX systems.
-passing through a shell so that shell built ins are available."
+  desc <<-EOT
+    Passes the provided command through `/bin/sh`; only available on
+    POSIX systems. This allows the use of shell globbing and built-ins, and
+    does not require that the path to a command be fully-qualified. Although
+    this can be more convenient than the `posix` provider, it also means that
+    you need to be more careful with escaping; as ever, with great power comes
+    etc. etc.
+
+    This provider closely resembles the behavior of the `exec` type
+    in Puppet 0.25.x.
+  EOT
 
   def run(command, check = false)
     command = %Q{/bin/sh -c "#{command.gsub(/"/,'\"')}"}

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

@@ -0,0 +1,35 @@
+require 'puppet/provider/exec'
+
+Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
+  include Puppet::Util::Execution
+
+  confine :feature => :microsoft_windows
+  defaultfor :feature => :microsoft_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."
+
+  # Verify that we have the executable
+  def checkexe(command)
+    exe = extractexe(command)
+
+    if absolute_path?(exe)
+      if !File.exists?(exe)
+        raise ArgumentError, "Could not find command '#{exe}'"
+      elsif !File.file?(exe)
+        raise ArgumentError, "'#{exe}' is a #{File.ftype(exe)}, not a file"
+      end
+      return
+    end
+
+    path = resource[:path] || []
+
+    exts = [".exe", ".ps1", ".bat", ".com", ""]
+    withenv :PATH => path.join(File::PATH_SEPARATOR) do
+      return if exts.any? {|ext| which(exe + ext) }
+    end
+
+    raise ArgumentError, "Could not find command '#{exe}'"
+  end
+end

data/lib/puppet/provider/exec.rb

@@ -0,0 +1,79 @@
+class Puppet::Provider::Exec < Puppet::Provider
+  include Puppet::Util::Execution
+
+  def run(command, check = false)
+    output = nil
+    status = nil
+    dir = nil
+
+    checkexe(command)
+
+    if dir = resource[:cwd]
+      unless File.directory?(dir)
+        if check
+          dir = nil
+        else
+          self.fail "Working directory '#{dir}' does not exist"
+        end
+      end
+    end
+
+    dir ||= Dir.pwd
+
+    debug "Executing#{check ? " check": ""} '#{command}'"
+    begin
+      # Do our chdir
+      Dir.chdir(dir) do
+        environment = {}
+
+        environment[:PATH] = resource[:path].join(File::PATH_SEPARATOR) if resource[:path]
+
+        if envlist = resource[:environment]
+          envlist = [envlist] unless envlist.is_a? Array
+          envlist.each do |setting|
+            if setting =~ /^(\w+)=((.|\n)+)$/
+              env_name = $1
+              value = $2
+              if environment.include?(env_name) || environment.include?(env_name.to_sym)
+                warning "Overriding environment setting '#{env_name}' with '#{value}'"
+              end
+              environment[env_name] = value
+            else
+              warning "Cannot understand environment setting #{setting.inspect}"
+            end
+          end
+        end
+
+        withenv environment do
+          Timeout::timeout(resource[:timeout]) do
+            output, status = Puppet::Util::SUIDManager.
+              run_and_capture(command, resource[:user], resource[:group])
+          end
+          # The shell returns 127 if the command is missing.
+          if status.exitstatus == 127
+            raise ArgumentError, output
+          end
+        end
+      end
+    rescue Errno::ENOENT => detail
+      self.fail detail.to_s
+    end
+
+    return output, status
+  end
+
+  def extractexe(command)
+    # easy case: command was quoted
+    if command =~ /^"([^"]+)"/
+      $1
+    else
+      command.split(/ /)[0]
+    end
+  end
+
+  def validatecmd(command)
+    exe = extractexe(command)
+    # if we're not fully qualified, require a path
+    self.fail "'#{command}' is not qualified and no path was specified. Please qualify the command or specify a path." if !absolute_path?(exe) and resource[:path].nil?
+  end
+end

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

@@ -0,0 +1,48 @@
+require 'puppet/util/adsi'
+
+Puppet::Type.type(:group).provide :windows_adsi do
+  desc "Group management for Windows"
+
+  defaultfor :operatingsystem => :windows
+  confine :operatingsystem => :windows
+  confine :feature => :microsoft_windows
+
+  has_features :manages_members
+
+  def group
+    @group ||= Puppet::Util::ADSI::Group.new(@resource[:name])
+  end
+
+  def members
+    group.members
+  end
+
+  def members=(members)
+    group.set_members(members)
+  end
+
+  def create
+    @group = Puppet::Util::ADSI::Group.create(@resource[:name])
+    self.members = @resource[:members]
+  end
+
+  def exists?
+    Puppet::Util::ADSI::Group.exists?(@resource[:name])
+  end
+
+  def delete
+    Puppet::Util::ADSI::Group.delete(@resource[:name])
+  end
+
+  def gid
+    nil
+  end
+
+  def gid=(value)
+    warning "No support for managing property gid of group #{@resource[:name]} on Windows"
+  end
+
+  def self.instances
+    Puppet::Util::ADSI::Group.map { |g| new(:ensure => :present, :name => g.name) }
+  end
+end

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

@@ -3,6 +3,9 @@ require 'puppet/provider/parsedfile'
 hosts = nil
 case Facter.value(:operatingsystem)
 when "Solaris"; hosts = "/etc/inet/hosts"
+when "windows"
+  require 'win32/resolv'
+  hosts = Win32::Resolv.get_hosts_path
 else
   hosts = "/etc/hosts"
 end

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

@@ -14,13 +14,13 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
 
   confine :operatingsystem => :darwin
 
-  # This should be confined based on macosx_productversion once
-  # http://projects.reductivelabs.com/issues/show/1796
-  # is resolved.
+  # 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 FileTest.exists?("/usr/bin/sw_vers")
     product_version = sw_vers "-productVersion"
 
-    confine :true => if /^10.5/.match(product_version) or /^10.6/.match(product_version)
+    confine :true => unless /^10\.[0-4]/.match(product_version)
       true
     end
   end

data/lib/puppet/provider/mount.rb

@@ -1,6 +1,3 @@
-#  Created by Luke Kanies on 2006-11-12.
-#  Copyright (c) 2006. All rights reserved.
-
 require 'puppet'
 
 # A module just to store the mount/unmount methods.  Individual providers

data/lib/puppet/provider/naginator.rb

@@ -1,6 +1,3 @@
-#  Created by Luke Kanies on 2007-11-27.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'puppet'
 require 'puppet/provider/parsedfile'
 require 'puppet/external/nagios'

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

@@ -107,4 +107,3 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
     self.class.installpkgdmg(source,name)
   end
 end
-

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

@@ -13,13 +13,10 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
 
   def self.instances
     instance_by_name.collect do |name|
-
-            self.new(
-                
-        :name => name,
+      self.new(
+        :name     => name,
         :provider => :apple,
-        
-        :ensure => :installed
+        :ensure   => :installed
       )
     end
   end
@@ -48,4 +45,3 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
     installer "-pkg", source, "-target", "/"
   end
 end
-

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

@@ -109,4 +109,3 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     super
   end
 end
-

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

@@ -27,4 +27,3 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg
     aptitude '-y', 'purge', @resource[:name]
   end
 end
-

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

@@ -81,4 +81,3 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
     aptget '-y', '-q', 'remove', '--purge', @resource[:name]
   end
 end
-

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

@@ -109,4 +109,3 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
     pkgget_with_cat "-f", :remove, @resource[:name]
   end
 end
-

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

@@ -102,16 +102,15 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
     # list out our specific package
     begin
-
-            output = dpkgquery(
-        "-W", "--showformat",
-        
-        '${Status} ${Package} ${Version}\\n', @resource[:name]
+      output = dpkgquery(
+        "-W",
+        "--showformat",
+        '${Status} ${Package} ${Version}\\n',
+        @resource[:name]
       )
     rescue Puppet::ExecutionFailure
       # dpkg-query exits 1 if the package is not found.
       return {:ensure => :purged, :status => 'missing', :name => @resource[:name], :error => 'ok'}
-
     end
 
     hash = self.class.parse_line(output) || {:ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok'}

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

@@ -48,11 +48,11 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
 
     if output =~ /Candidate:\s+(\S+)\s/
       return $1
-        else
+    else
       self.err "Could not find latest version"
       return nil
-        end
-        end
+    end
+  end
 
   #
   # preseeds answers to dpkg-set-selection from the "responsefile"
@@ -79,4 +79,3 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
     aptget '-y', '-q', 'remove', '--purge', @resource[:name]
   end
 end
-

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

@@ -47,4 +47,3 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
     pkgdelete "#{@resource[:name]}-#{@resource.should(:ensure)}"
   end
 end
-

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

@@ -121,4 +121,3 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     self.install(false)
   end
 end
-

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

@@ -27,10 +27,10 @@ Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package
   end
 
   def query
-      swlist resource[:name]
-      {:ensure => :present}
+    swlist resource[:name]
+    {:ensure => :present}
   rescue
-      {:ensure => :absent}
+    {:ensure => :absent}
   end
 
   def uninstall

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

@@ -103,4 +103,3 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
     end
   end
 end
-

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

@@ -0,0 +1,82 @@
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide(:msi, :parent => Puppet::Provider::Package) do
+  desc "Package management by installing and removing MSIs."
+
+  confine    :operatingsystem => :windows
+  defaultfor :operatingsystem => :windows
+
+  has_feature :install_options
+
+  # This is just here to make sure we can find it, and fail if we
+  # can't.  Unfortunately, we need to do "special" quoting of the
+  # install options or msiexec.exe won't know what to do with them, if
+  # the value contains a space.
+  commands :msiexec => "msiexec.exe"
+
+  def self.instances
+    Dir.entries(installed_listing_dir).reject {|d| d == '.' or d == '..'}.collect do |name|
+      new(:name => File.basename(name, '.yml'), :provider => :msi, :ensure => :installed)
+    end
+  end
+
+  def query
+    {:name => resource[:name], :ensure => :installed} if FileTest.exists?(state_file)
+  end
+
+  def install
+    properties_for_command = nil
+    if resource[:install_options]
+      properties_for_command = resource[:install_options].collect do |k,v|
+        property = shell_quote k
+        value    = shell_quote v
+
+        "#{property}=#{value}"
+      end
+    end
+
+    # Unfortunately, we can't use the msiexec method defined earlier,
+    # because of the special quoting we need to do around the MSI
+    # properties to use.
+    execute ['msiexec.exe', '/qn', '/norestart', '/i', shell_quote(resource[:source]), properties_for_command].flatten.compact.join(' ')
+
+    File.open(state_file, 'w') do |f|
+      metadata = {
+        'name'            => resource[:name],
+        'install_options' => resource[:install_options],
+        'source'          => resource[:source]
+      }
+
+      f.puts(YAML.dump metadata)
+    end
+  end
+
+  def uninstall
+    msiexec '/qn', '/norestart', '/x', resource[:source]
+
+    File.delete state_file
+  end
+
+  def validate_source(value)
+    fail("The source parameter is required when using the MSI provider.") if value.nil?
+    fail("The source parameter cannot be empty when using the MSI provider.") if value.empty?
+  end
+
+  private
+
+  def self.installed_listing_dir
+    listing_dir = File.join(Puppet[:vardir], 'db', 'package', 'msi')
+
+    FileUtils.mkdir_p listing_dir unless File.directory? listing_dir
+
+    listing_dir
+  end
+
+  def state_file
+    File.join(self.class.installed_listing_dir, "#{resource[:name]}.yml")
+  end
+
+  def shell_quote(value)
+    value.include?(' ') ? %Q["#{value.gsub(/"/, '\"')}"] : value
+  end
+end

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

@@ -72,27 +72,27 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
   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
-
-        process.each do |line|
-          if match = regex.match(line.split[0])
-            # now we return the first version, unless ensure is latest
-            version = match.captures[1]
-            return version unless @resource[:ensure] == "latest"
-
-            master_version = version unless master_version > version
-          end
+    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
+
+      process.each do |line|
+        if match = regex.match(line.split[0])
+          # now we return the first version, unless ensure is latest
+          version = match.captures[1]
+          return version unless @resource[:ensure] == "latest"
+
+          master_version = version unless master_version > version
         end
-
-        return master_version unless master_version == 0
-        raise Puppet::Error, "#{version} is not available for this package"
       end
+
+      return master_version unless master_version == 0
+      raise Puppet::Error, "#{version} is not available for this package"
+    end
   rescue Puppet::ExecutionFailure
-      return nil
+    return nil
   end
 
   def query
@@ -113,4 +113,3 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     pkgdelete @resource[:name]
   end
 end
-

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

@@ -105,5 +105,4 @@ Puppet::Type.type(:package).provide :pip,
       raise e
     end
   end
-
 end

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

@@ -104,5 +104,4 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
 
     hash
   end
-
 end

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

@@ -12,7 +12,13 @@ require 'puppet/provider/package'
 require 'facter/util/plist'
 
 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. Sub directories are not checked for packages.  See `the wiki docs <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 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. Sub
+    directories are not checked for packages.  See `the wiki docs
+    <http://projects.puppetlabs.com/projects/puppet/wiki/Package_Management_With_Dmg_Patterns>`
+    for more detail."
 
   confine :operatingsystem => :darwin
   defaultfor :operatingsystem => :darwin
@@ -33,13 +39,10 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
 
   def self.instances
     instance_by_name.collect do |name|
-
       new(
-
-        :name => name,
+        :name     => name,
         :provider => :pkgdmg,
-
-        :ensure => :installed
+        :ensure   => :installed
       )
     end
   end
@@ -124,4 +127,3 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
     self.class.installpkgdmg(source,name)
   end
 end
-

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

@@ -172,4 +172,3 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
     pkguti "-y", "-r", @resource[:name]
   end
 end
-

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

@@ -92,4 +92,3 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
     install
   end
 end
-