puppet 2.7.19 → 2.7.20.rc1

data/lib/puppet/provider.rb

@@ -33,7 +33,7 @@ class Puppet::Provider
   attr_accessor :resource
 
   def self.command(name)
-    name = symbolize(name)
+    name = name.intern
 
     if defined?(@commands) and command = @commands[name]
       # nothing
@@ -144,7 +144,7 @@ class Puppet::Provider
   # for those providers that use prefetch and flush.
   def self.mk_resource_methods
     [resource_type.validproperties, resource_type.parameters].flatten.each do |attr|
-      attr = symbolize(attr)
+      attr = attr.intern
       next if attr == :name
       define_method(attr) do
         @property_hash[attr] || :absent
@@ -162,7 +162,7 @@ class Puppet::Provider
   # and path to the block (really only used by 'commands').
   def self.optional_commands(hash)
     hash.each do |name, path|
-      name = symbolize(name)
+      name = name.intern
       @commands[name] = path
 
       yield(name, path) if block_given?
@@ -239,7 +239,7 @@ class Puppet::Provider
 
   # Get a parameter value.
   def get(param)
-    @property_hash[symbolize(param)] || :absent
+    @property_hash[param.intern] || :absent
   end
 
   def initialize(resource = nil)
@@ -270,7 +270,7 @@ class Puppet::Provider
   # Set passed params as the current values.
   def set(params)
     params.each do |param, value|
-      @property_hash[symbolize(param)] = value
+      @property_hash[param.intern] = value
     end
   end
 

data/lib/puppet/provider/aixobject.rb

@@ -361,7 +361,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
 
   # Set a property.
   def set(param, value)
-    @property_hash[symbolize(param)] = value
+    @property_hash[param.intern] = value
     
     if getinfo().nil?
       # This is weird... 

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

@@ -24,7 +24,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
   include Puppet::Util::Diff
   include Puppet::Util::Package
 
-  confine :true => Puppet.features.augeas?
+  confine :feature => :augeas
 
   has_features :parse_commands, :need_to_run?,:execute_changes
 

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

@@ -6,7 +6,7 @@ Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
   confine    :operatingsystem => :windows
   defaultfor :operatingsystem => :windows
 
-  desc <<-EOT
+  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.

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

@@ -11,38 +11,19 @@ Puppet::Type.type(:file).provide :windows do
     include Puppet::Util::Windows::Security
   end
 
-  ERROR_INVALID_SID_STRUCTURE = 1337
-
-  def id2name(id)
-    # If it's a valid sid, get the name. Otherwise, it's already a name, so
-    # just return it.
-    begin
-      if string_to_sid_ptr(id)
-        name = nil
-        Puppet::Util::ADSI.execquery(
-          "SELECT Name FROM Win32_Account WHERE SID = '#{id}'
-           AND LocalAccount = true"
-        ).each { |a| name ||= a.name }
-        return name
-      end
-    rescue Puppet::Util::Windows::Error => e
-      raise unless e.code == ERROR_INVALID_SID_STRUCTURE
-    end
-
-    id
-  end
-
   # Determine if the account is valid, and if so, return the UID
   def name2id(value)
-    # If it's a valid sid, then return it. Else, it's a name we need to convert
-    # to sid.
-    begin
-      return value if string_to_sid_ptr(value)
-    rescue Puppet::Util::Windows::Error => e
-      raise unless e.code == ERROR_INVALID_SID_STRUCTURE
-    end
+    Puppet::Util::Windows::Security.name_to_sid(value)
+  end
 
-    Puppet::Util::ADSI.sid_for_account(value) rescue nil
+  # If it's a valid SID, get the name. Otherwise, it's already a name,
+  # so just return it.
+  def id2name(id)
+    if Puppet::Util::Windows::Security.valid_sid?(id)
+      Puppet::Util::Windows::Security.sid_to_name(id)
+    else
+      id
+    end
   end
 
   # We use users and groups interchangeably, so use the same methods for both

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

@@ -7,7 +7,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
   commands :add => "groupadd", :delete => "groupdel", :modify => "groupmod"
 
-  has_feature :system_groups
+  has_feature :system_groups unless %w{HP-UX Solaris}.include? Facter.value(:operatingsystem)
 
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
@@ -21,10 +21,9 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
       end
     end
     cmd << "-o" if @resource.allowdupe?
-    cmd << "-r" if @resource.system?
+    cmd << "-r" if @resource.system? and self.class.system_groups?
     cmd << @resource[:name]
 
     cmd
   end
 end
-

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

@@ -12,7 +12,7 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
     not specify one, but it is a potentially expensive operation, as it
     iterates across all existing groups to pick the appropriate next one."
 
-  confine :true => Puppet.features.ldap?, :false => (Puppet[:ldapuser] == "")
+  confine :feature => :ldap, :false => (Puppet[:ldapuser] == "")
 
   # We're mapping 'members' here because we want to make it
   # easy for the ldap user provider to manage groups.  This

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

@@ -41,7 +41,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   end
 
   def gid
-    Puppet::Util::ADSI.sid_for_account(@resource[:name])
+    Puppet::Util::Windows::Security.name_to_sid(@resource[:name])
   end
 
   def gid=(value)

data/lib/puppet/provider/ldap.rb

@@ -46,7 +46,11 @@ class Puppet::Provider::Ldap < Puppet::Provider
     @property_hash[:ensure] = :present
     self.class.resource_type.validproperties.each do |property|
       if val = resource.should(property)
-        @property_hash[property] = val
+        if property.to_s == 'gid'
+          self.gid = val
+        else
+          @property_hash[property] = val
+        end
       end
     end
   end

data/lib/puppet/provider/nameservice.rb

@@ -6,13 +6,13 @@ require 'puppet'
 class Puppet::Provider::NameService < Puppet::Provider
   class << self
     def autogen_default(param)
-      defined?(@autogen_defaults) ? @autogen_defaults[symbolize(param)] : nil
+      defined?(@autogen_defaults) ? @autogen_defaults[param.intern] : nil
     end
 
     def autogen_defaults(hash)
       @autogen_defaults ||= {}
       hash.each do |param, value|
-        @autogen_defaults[symbolize(param)] = value
+        @autogen_defaults[param.intern] = value
       end
     end
 
@@ -112,7 +112,7 @@ class Puppet::Provider::NameService < Puppet::Provider
   # Autogenerate a value.  Mostly used for uid/gid, but also used heavily
   # with DirectoryServices, because DirectoryServices is stupid.
   def autogen(field)
-    field = symbolize(field)
+    field = field.intern
     id_generators = {:user => :uid, :group => :gid}
     if id_generators[@resource.class.name] == field
       return autogen_id(field)

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

@@ -500,7 +500,7 @@ class DirectoryService < Puppet::Provider::NameService
       exec_arg_vector = self.class.get_exec_preamble("-create", @resource[:name])
       # JJM: The following line just maps the NS name to the DS name
       #      e.g. { :uid => 'UniqueID' }
-      exec_arg_vector << @@ns_to_ds_attribute_map[symbolize(param)]
+      exec_arg_vector << @@ns_to_ds_attribute_map[param.intern]
       # JJM: The following line sends the actual value to set the property to
       exec_arg_vector << value.to_s
       begin
@@ -555,7 +555,7 @@ class DirectoryService < Puppet::Provider::NameService
           add_members(nil, value)
         else
           exec_arg_vector = self.class.get_exec_preamble("-create", @resource[:name])
-          exec_arg_vector << @@ns_to_ds_attribute_map[symbolize(property)]
+          exec_arg_vector << @@ns_to_ds_attribute_map[property.intern]
           next if property == :password  # skip setting the password here
           exec_arg_vector << value.to_s
           begin

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

@@ -20,7 +20,9 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     else
       gem_list_command << "--remote"
     end
-
+    if options[:source]
+      gem_list_command << "--source" << options[:source]
+    end
     if name = options[:justme]
       gem_list_command << name + "$"
     end
@@ -104,7 +106,9 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
 
   def latest
     # This always gets the latest version available.
-    hash = self.class.gemlist(:justme => resource[:name])
+    gemlist_options = {:justme => resource[:name]}
+    gemlist_options.merge!({:source => resource[:source]}) unless resource[:source].nil?
+    hash = self.class.gemlist(gemlist_options)
 
     hash[:ensure][0]
   end

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

@@ -20,7 +20,8 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     search_format = "<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>\n"
 
     begin
-      update_eix if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
+      update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
 
       search_output = nil
       Puppet::Util::Execution.withenv :LASTVERSION => version_format do
@@ -81,7 +82,8 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     search_value = package_name
 
     begin
-      update_eix if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
+      update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
 
       search_output = nil
       Puppet::Util::Execution.withenv :LASTVERSION => version_format do

data/lib/puppet/provider/parsedfile.rb

@@ -127,7 +127,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # Override the default method with a lot more functionality.
   def self.mk_resource_methods
     [resource_type.validproperties, resource_type.parameters].flatten.each do |attr|
-      attr = symbolize(attr)
+      attr = attr.intern
       define_method(attr) do
 #                if @property_hash.empty?
 #                    # Note that this swaps the provider out from under us.

data/lib/puppet/provider/scheduled_task/win32_taskscheduler.rb

@@ -125,7 +125,7 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
 
     # By comparing account SIDs we don't have to worry about case
     # sensitivity, or canonicalization of the account name.
-    Puppet::Util::ADSI.sid_for_account(current) == Puppet::Util::ADSI.sid_for_account(should[0])
+    Puppet::Util::Windows::Security.name_to_sid(current) == Puppet::Util::Windows::Security.name_to_sid(should[0])
   end
 
   def trigger_insync?(current, should)
@@ -202,7 +202,7 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
   end
 
   def user=(value)
-    self.fail("Invalid user: #{value}") unless Puppet::Util::ADSI.sid_for_account(value)
+    self.fail("Invalid user: #{value}") unless Puppet::Util::Windows::Security.name_to_sid(value)
 
     if value.to_s.downcase != 'system'
       task.set_account_information(value, resource[:password])

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

@@ -1,5 +1,5 @@
-Puppet::Type.type(:service).provide :base do
-  desc "The simplest form of service support.
+Puppet::Type.type(:service).provide :base, :parent => :service do
+  desc "The simplest form of Unix service support.
 
   You have to specify enough about your service for this to work; the
   minimum you can specify is a binary for starting the process, and this
@@ -11,10 +11,6 @@ Puppet::Type.type(:service).provide :base do
 
   commands :kill => "kill"
 
-  def self.instances
-    []
-  end
-
   # Get the process ID for a running process. Requires the 'pattern'
   # parameter.
   def getpid
@@ -35,20 +31,6 @@ Puppet::Type.type(:service).provide :base do
     nil
   end
 
-  # How to restart the process.
-  def restart
-    if @resource[:restart] or restartcmd
-      ucommand(:restart)
-    else
-      self.stop
-      self.start
-    end
-  end
-
-  # There is no default command, which causes other methods to be used
-  def restartcmd
-  end
-
   # Check if the process is running.  Prefer the 'status' parameter,
   # then 'statuscmd' method, then look in the process table.  We give
   # the object the option to not return a status command, which might
@@ -119,26 +101,5 @@ Puppet::Type.type(:service).provide :base do
   # There is no default command, which causes other methods to be used
   def stopcmd
   end
-
-  # A simple wrapper so execution failures are a bit more informative.
-  def texecute(type, command, fof = true)
-    begin
-      # #565: Services generally produce no output, so squelch them.
-      execute(command, :failonfail => fof, :squelch => true)
-    rescue Puppet::ExecutionFailure => detail
-      @resource.fail "Could not #{type} #{@resource.ref}: #{detail}"
-    end
-    nil
-  end
-
-  # Use either a specified command or the default for our provider.
-  def ucommand(type, fof = true)
-    if c = @resource[type]
-      cmd = [c]
-    else
-      cmd = [send("#{type}cmd")].flatten
-    end
-    texecute(type, cmd, fof)
-  end
 end
 

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

@@ -2,7 +2,7 @@
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
 Puppet::Type.type(:service).provide :daemontools, :parent => :base do
-  desc <<-EOT
+  desc <<-'EOT'
     Daemontools service management.
 
     This provider manages daemons supervised by D.J. Bernstein daemontools.

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

@@ -1,6 +1,6 @@
 require 'facter/util/plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
-  desc <<-EOT
+  desc <<-'EOT'
     This provider manages jobs with `launchd`, which is the default service
     framework for Mac OS X (and may be available for use on other platforms).
 

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

@@ -21,9 +21,12 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
 
   # Remove the symlinks
   def disable
-      output = chkconfig(@resource[:name], :off)
+    # The off method operates on run levels 2,3,4 and 5 by default We ensure
+    # all run levels are turned off because the reset method may turn on the
+    # service in run levels 0, 1 and/or 6
+    output = chkconfig("--level", "0123456", @resource[:name], :off)
   rescue Puppet::ExecutionFailure
-      raise Puppet::Error, "Could not disable #{self.name}: #{output}"
+    raise Puppet::Error, "Could not disable #{self.name}: #{output}"
   end
 
   def enabled?
@@ -47,7 +50,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
   def enable
       output = chkconfig(@resource[:name], :on)
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not enable #{self.name}: #{detail}"
+    raise Puppet::Error, "Could not enable #{self.name}: #{detail}"
   end
 
   def initscript
@@ -70,6 +73,4 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
   def stopcmd
     [command(:service), @resource[:name], "stop"]
   end
-
 end
-

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

@@ -2,7 +2,7 @@
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
 Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
-  desc <<-EOT
+  desc <<-'EOT'
     Runit service management.
 
     This provider manages daemons running supervised by Runit.

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

@@ -0,0 +1,43 @@
+Puppet::Type.type(:service).provide :service do
+  desc "The simplest form of service support."
+
+  def self.instances
+    []
+  end
+
+  # How to restart the process.
+  def restart
+    if @resource[:restart] or restartcmd
+      ucommand(:restart)
+    else
+      self.stop
+      self.start
+    end
+  end
+
+  # There is no default command, which causes other methods to be used
+  def restartcmd
+  end
+
+  # A simple wrapper so execution failures are a bit more informative.
+  def texecute(type, command, fof = true)
+    begin
+      # #565: Services generally produce no output, so squelch them.
+      execute(command, :failonfail => fof, :squelch => true)
+    rescue Puppet::ExecutionFailure => detail
+      @resource.fail "Could not #{type} #{@resource.ref}: #{detail}"
+    end
+    nil
+  end
+
+  # Use either a specified command or the default for our provider.
+  def ucommand(type, fof = true)
+    if c = @resource[type]
+      cmd = [c]
+    else
+      cmd = [send("#{type}cmd")].flatten
+    end
+    texecute(type, cmd, fof)
+  end
+end
+