puppet 8.5.1-x86-mingw32 → 8.7.0-x86-mingw32

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

@@ -56,7 +56,7 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
     when :SERVICE_DISABLED
       :false
     else
-      raise Puppet::Error.new(_("Unknown start type: %{start_type}") % { start_type: start_type })
+      raise Puppet::Error, _("Unknown start type: %{start_type}") % { start_type: start_type }
     end
   rescue => detail
     raise Puppet::Error.new(_("Cannot get start type %{resource_name}, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail)
@@ -73,7 +73,7 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
     if enabled? == :false
       # If disabled and not managing enable, respect disabled and fail.
       if @resource[:enable].nil?
-        raise Puppet::Error.new(_("Will not start disabled service %{resource_name} without managing enable. Specify 'enable => false' to override.") % { resource_name: @resource[:name] })
+        raise Puppet::Error, _("Will not start disabled service %{resource_name} without managing enable. Specify 'enable => false' to override.") % { resource_name: @resource[:name] }
       # Otherwise start. If enable => false, we will later sync enable and
       # disable the service again.
       elsif @resource[:enable] == :true
@@ -101,7 +101,7 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
             when :SERVICE_RUNNING, :SERVICE_CONTINUE_PENDING, :SERVICE_START_PENDING
               :running
             else
-              raise Puppet::Error.new(_("Unknown service state '%{current_state}' for service '%{resource_name}'") % { current_state: current_state, resource_name: @resource[:name] })
+              raise Puppet::Error, _("Unknown service state '%{current_state}' for service '%{resource_name}'") % { current_state: current_state, resource_name: @resource[:name] }
             end
     debug("Service #{@resource[:name]} is #{current_state}")
     state
@@ -164,16 +164,16 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
 
   def validate_logon_credentials
     unless Puppet::Util::Windows::User.localsystem?(@normalized_logon_account)
-      raise Puppet::Error.new("\"#{@normalized_logon_account}\" is not a valid account") unless @logonaccount_information && [:SidTypeUser, :SidTypeWellKnownGroup].include?(@logonaccount_information.account_type)
+      raise Puppet::Error, "\"#{@normalized_logon_account}\" is not a valid account" unless @logonaccount_information && [:SidTypeUser, :SidTypeWellKnownGroup].include?(@logonaccount_information.account_type)
 
       user_rights = Puppet::Util::Windows::User.get_rights(@logonaccount_information.domain_account) unless Puppet::Util::Windows::User.default_system_account?(@normalized_logon_account)
-      raise Puppet::Error.new("\"#{@normalized_logon_account}\" has the 'Log On As A Service' right set to denied.") if user_rights =~ /SeDenyServiceLogonRight/
-      raise Puppet::Error.new("\"#{@normalized_logon_account}\" is missing the 'Log On As A Service' right.") unless user_rights.nil? || user_rights =~ /SeServiceLogonRight/
+      raise Puppet::Error, "\"#{@normalized_logon_account}\" has the 'Log On As A Service' right set to denied." if user_rights =~ /SeDenyServiceLogonRight/
+      raise Puppet::Error, "\"#{@normalized_logon_account}\" is missing the 'Log On As A Service' right." unless user_rights.nil? || user_rights =~ /SeServiceLogonRight/
     end
 
     is_a_predefined_local_account = Puppet::Util::Windows::User.default_system_account?(@normalized_logon_account) || @normalized_logon_account == 'LocalSystem'
     account_info = @normalized_logon_account.split("\\")
     able_to_logon = Puppet::Util::Windows::User.password_is?(account_info[1], @resource[:logonpassword], account_info[0]) unless is_a_predefined_local_account
-    raise Puppet::Error.new("The given password is invalid for user '#{@normalized_logon_account}'.") unless is_a_predefined_local_account || able_to_logon
+    raise Puppet::Error, "The given password is invalid for user '#{@normalized_logon_account}'." unless is_a_predefined_local_account || able_to_logon
   end
 end

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

@@ -72,8 +72,10 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
         return :absent
       end
 
-      month, day, year = match_obj[1], match_obj[2], match_obj[-1]
-      return "20#{year}-#{month}-#{day}"
+      month = match_obj[1]
+      day = match_obj[2]
+      year = match_obj[-1]
+      "20#{year}-#{month}-#{day}"
     end
 
     # We do some validation before-hand to ensure the value's an Array,

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

@@ -87,14 +87,14 @@ Puppet::Type.type(:user).provide :directoryservice do
   # display its output.
   def self.instances
     get_all_users.collect do |user|
-      self.new(generate_attribute_hash(user))
+      new(generate_attribute_hash(user))
     end
   end
 
   # Return an array of hashes containing information about every user on
   # the system.
   def self.get_all_users
-    Puppet::Util::Plist.parse_plist(dscl '-plist', '.', 'readall', '/Users')
+    Puppet::Util::Plist.parse_plist(dscl('-plist', '.', 'readall', '/Users'))
   end
 
   # This method accepts an individual user plist, passed as a hash, and
@@ -171,7 +171,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   # of the local groups on the machine.
   def self.get_list_of_groups
     # rubocop:disable Naming/MemoizedInstanceVariableName
-    @groups ||= Puppet::Util::Plist.parse_plist(dscl '-plist', '.', 'readall', '/Groups')
+    @groups ||= Puppet::Util::Plist.parse_plist(dscl('-plist', '.', 'readall', '/Groups'))
     # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 
@@ -179,7 +179,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   # value. The value returned is the first item within the array returned
   # from dscl
   def self.get_attribute_from_dscl(path, username, keyname)
-    Puppet::Util::Plist.parse_plist(dscl '-plist', '.', 'read', "/#{path}/#{username}", keyname)
+    Puppet::Util::Plist.parse_plist(dscl('-plist', '.', 'read', "/#{path}/#{username}", keyname))
   end
 
   # The plist embedded in the ShadowHashData key is a binary plist. The
@@ -205,7 +205,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   # The salted-SHA512 password hash in 10.7 is stored in the 'SALTED-SHA512'
   # key as binary data. That data is extracted and converted to a hex string.
   def self.get_salted_sha512(embedded_binary_plist)
-    embedded_binary_plist['SALTED-SHA512'].unpack("H*")[0]
+    embedded_binary_plist['SALTED-SHA512'].unpack1("H*")
   end
 
   # This method reads the passed embedded_binary_plist hash and returns values
@@ -216,11 +216,11 @@ Puppet::Type.type(:user).provide :directoryservice do
     case field
     when 'salt', 'entropy'
       value = embedded_binary_plist['SALTED-SHA512-PBKDF2'][field]
-      if value == nil
+      if value.nil?
         raise Puppet::Error, "Invalid #{field} given for user #{user_name}"
       end
 
-      value.unpack('H*').first
+      value.unpack1('H*')
     when 'iterations'
       Integer(embedded_binary_plist['SALTED-SHA512-PBKDF2'][field])
     else
@@ -234,7 +234,7 @@ Puppet::Type.type(:user).provide :directoryservice do
     password_hash = nil
     password_hash_file = "#{password_hash_dir}/#{guid}"
     if Puppet::FileSystem.exist?(password_hash_file) and File.file?(password_hash_file)
-      raise Puppet::Error, "Could not read password hash file at #{password_hash_file}" if not File.readable?(password_hash_file)
+      raise Puppet::Error, "Could not read password hash file at #{password_hash_file}" unless File.readable?(password_hash_file)
 
       f = File.new(password_hash_file)
       password_hash = f.read
@@ -300,22 +300,22 @@ Puppet::Type.type(:user).provide :directoryservice do
       # For the :password and :groups properties, call the setter methods
       # to enforce those values. For everything else, use dscl with the
       # ns_to_ds_attribute_map to set the appropriate values.
-      if value != "" and not value.nil?
-        case attribute
-        when :password
-          self.password = value
-        when :iterations
-          self.iterations = value
-        when :salt
-          self.salt = value
-        when :groups
-          value.split(',').each do |group|
-            merge_attribute_with_dscl('Groups', group, 'GroupMembership', @resource.name)
-            merge_attribute_with_dscl('Groups', group, 'GroupMembers', @guid)
-          end
-        else
-          create_attribute_with_dscl('Users', @resource.name, self.class.ns_to_ds_attribute_map[attribute], value)
+      next unless value != "" and !value.nil?
+
+      case attribute
+      when :password
+        self.password = value
+      when :iterations
+        self.iterations = value
+      when :salt
+        self.salt = value
+      when :groups
+        value.split(',').each do |group|
+          merge_attribute_with_dscl('Groups', group, 'GroupMembership', @resource.name)
+          merge_attribute_with_dscl('Groups', group, 'GroupMembers', @guid)
         end
+      else
+        create_attribute_with_dscl('Users', @resource.name, self.class.ns_to_ds_attribute_map[attribute], value)
       end
     end
   end
@@ -395,7 +395,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   # we have to treat the ds cache just like you would in the password=
   # method.
   def iterations=(value)
-    if (Puppet::Util::Package.versioncmp(self.class.get_os_version, '10.7') > 0)
+    if Puppet::Util::Package.versioncmp(self.class.get_os_version, '10.7') > 0
       assert_full_pbkdf2_password
 
       sleep 3
@@ -412,12 +412,12 @@ Puppet::Type.type(:user).provide :directoryservice do
   # we have to treat the ds cache just like you would in the password=
   # method.
   def salt=(value)
-    if (Puppet::Util::Package.versioncmp(self.class.get_os_version, '10.15') >= 0)
+    if Puppet::Util::Package.versioncmp(self.class.get_os_version, '10.15') >= 0
       if value.length != 64
         self.fail "macOS versions 10.15 and higher require the salt to be 32-bytes. Since Puppet's user resource requires the value to be hex encoded, the length of the salt's string must be 64. Please check your salt and try again."
       end
     end
-    if (Puppet::Util::Package.versioncmp(self.class.get_os_version, '10.7') > 0)
+    if Puppet::Util::Package.versioncmp(self.class.get_os_version, '10.7') > 0
       assert_full_pbkdf2_password
 
       sleep 3
@@ -448,10 +448,10 @@ Puppet::Type.type(:user).provide :directoryservice do
   # In the event that the user doesn't HAVE a value for the attribute, the
   # provider should use the -create option with dscl to add the attribute value
   # for the user record
-  ['home', 'uid', 'gid', 'comment', 'shell'].each do |setter_method|
+  %w[home uid gid comment shell].each do |setter_method|
     define_method("#{setter_method}=") do |value|
       if @property_hash[setter_method.intern]
-        if %w(home uid).include?(setter_method)
+        if %w[home uid].include?(setter_method)
           raise Puppet::Error, "OS X version #{self.class.get_os_version} does not allow changing #{setter_method} using puppet"
         end
 
@@ -479,7 +479,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   def assert_full_pbkdf2_password
     missing = [:password, :salt, :iterations].select { |parameter| @resource[parameter].nil? }
 
-    if !missing.empty?
+    unless missing.empty?
       raise Puppet::Error, "OS X versions > 10\.7 use PBKDF2 password hashes, which requires all three of salt, iterations, and password hash. This resource is missing: #{missing.join(', ')}."
     end
   end
@@ -503,11 +503,9 @@ Puppet::Type.type(:user).provide :directoryservice do
   end
 
   def set_attribute_with_dscl(dscl_command, path, username, keyname, value)
-    begin
-      dscl '.', dscl_command, "/#{path}/#{username}", keyname, value
-    rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not set the dscl #{keyname} key with value: #{value} - #{detail.inspect}", detail.backtrace
-    end
+    dscl '.', dscl_command, "/#{path}/#{username}", keyname, value
+  rescue Puppet::ExecutionFailure => detail
+    raise Puppet::Error, "Could not set the dscl #{keyname} key with value: #{value} - #{detail.inspect}", detail.backtrace
   end
 
   # Create the new user with dscl
@@ -549,7 +547,7 @@ Puppet::Type.type(:user).provide :directoryservice do
       # variable IS a Hash and contains the 'SALTED-SHA512' key (indicating an
       # older 10.7-style password hash), it will be deleted and a newer
       # 10.8-style (PBKDF2) password hash will be generated.
-      if (shadow_hash_data.instance_of?(Hash)) && (shadow_hash_data.has_key?('SALTED-SHA512'))
+      if shadow_hash_data.instance_of?(Hash) && shadow_hash_data.has_key?('SALTED-SHA512')
         shadow_hash_data.delete('SALTED-SHA512')
       end
 
@@ -661,7 +659,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   # the user's plist itself, and the shadow_hash_data hash containing the
   # existing PBKDF2 values.
   def set_salted_pbkdf2(users_plist, shadow_hash_data, field, value)
-    shadow_hash_data = Hash.new unless shadow_hash_data
+    shadow_hash_data ||= Hash.new
     shadow_hash_data['SALTED-SHA512-PBKDF2'] = Hash.new unless shadow_hash_data['SALTED-SHA512-PBKDF2']
     case field
     when 'salt', 'entropy'

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

@@ -40,7 +40,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
       cmd << "/usr/lbin/modprpw"
       cmd << "-v"
       cmd << "-l"
-      cmd << "#{resource.name}"
+      cmd << resource.name.to_s
     end
     cmd
   end
@@ -48,14 +48,14 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
   def password
     # Password management routine for trusted and non-trusted systems
     # temp=""
-    while ent = Etc.getpwent() do # rubocop:disable Lint/AssignmentInCondition
+    while ent = Etc.getpwent() # rubocop:disable Lint/AssignmentInCondition
       if ent.name == resource.name
         temp = ent.name
         break
       end
     end
     Etc.endpwent()
-    if !temp
+    unless temp
       return nil
     end
 
@@ -66,17 +66,17 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
       if File.file?(file_name)
         # Found the tcb user for the specific user, now get passwd
         File.open(file_name).each do |line|
-          if (line =~ /u_pwd/)
-            temp_passwd = line.split(":")[1].split("=")[1]
-            ent.passwd = temp_passwd
-            return ent.passwd
-          end
+          next unless line =~ /u_pwd/
+
+          temp_passwd = line.split(":")[1].split("=")[1]
+          ent.passwd = temp_passwd
+          return ent.passwd
         end
       else
         debug "No trusted computing user file #{file_name} found."
       end
     else
-      return ent.passwd
+      ent.passwd
     end
   end
 
@@ -84,11 +84,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
     # Check to see if the HP-UX box is running in trusted compute mode
     # UID for root should always be 0
     trusted_sys = exec_getprpw('root', '-m uid')
-    if trusted_sys.chomp == "uid=0"
-      return true
-    else
-      return false
-    end
+    trusted_sys.chomp == "uid=0"
   end
 
   def exec_getprpw(user, opts)

data/lib/puppet/provider/user/pw.rb

@@ -96,7 +96,7 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
 
   # Get expiry from system and convert to Puppet-style date
   def expiry
-    expiry = self.get(:expiry)
+    expiry = get(:expiry)
     expiry = :absent if expiry == 0
 
     if expiry != :absent

data/lib/puppet/provider/user/user_role_add.rb

@@ -76,7 +76,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
 
   def command(cmd)
-    cmd = ("role_#{cmd}").intern if is_role? or (!exists? and @resource[:ensure] == :role)
+    cmd = "role_#{cmd}".intern if is_role? or (!exists? and @resource[:ensure] == :role)
     super(cmd)
   end
 
@@ -221,25 +221,23 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   # data, but it is still terrible.  We still skip platform locking, so a
   # concurrent `vipw -s` session will have no idea we risk data loss.
   def password=(cryptopw)
-    begin
-      shadow = File.read(target_file_path)
-
-      # Go Mifune loves the race here where we can lose data because
-      # /etc/shadow changed between reading it and writing it.
-      # --daniel 2012-02-05
-      Puppet::Util.replace_file(target_file_path, 0640) do |fh|
-        shadow.each_line do |line|
-          line_arr = line.split(':')
-          if line_arr[0] == @resource[:name]
-            line_arr[1] = cryptopw
-            line_arr[2] = (Date.today - Date.new(1970, 1, 1)).to_i.to_s
-            line = line_arr.join(':')
-          end
-          fh.print line
+    shadow = File.read(target_file_path)
+
+    # Go Mifune loves the race here where we can lose data because
+    # /etc/shadow changed between reading it and writing it.
+    # --daniel 2012-02-05
+    Puppet::Util.replace_file(target_file_path, 0o640) do |fh|
+      shadow.each_line do |line|
+        line_arr = line.split(':')
+        if line_arr[0] == @resource[:name]
+          line_arr[1] = cryptopw
+          line_arr[2] = (Date.today - Date.new(1970, 1, 1)).to_i.to_s
+          line = line_arr.join(':')
         end
+        fh.print line
       end
-    rescue => detail
-      self.fail Puppet::Error, "Could not write replace #{target_file_path}: #{detail}", detail
     end
+  rescue => detail
+    self.fail Puppet::Error, "Could not write replace #{target_file_path}: #{detail}", detail
   end
 end

data/lib/puppet/provider/user/useradd.rb

@@ -102,7 +102,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
     unless @users
       unless Puppet::FileSystem.exist?(passwd_file)
-        raise Puppet::Error.new("Forcelocal set for user resource '#{resource[:name]}', but #{passwd_file} does not exist")
+        raise Puppet::Error, "Forcelocal set for user resource '#{resource[:name]}', but #{passwd_file} does not exist"
       end
 
       @users = []
@@ -163,7 +163,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     @groups_of[user] = []
 
     unless Puppet::FileSystem.exist?(group_file)
-      raise Puppet::Error.new("Forcelocal set for user resource '#{user}', but #{group_file} does not exist")
+      raise Puppet::Error, "Forcelocal set for user resource '#{user}', but #{group_file} does not exist"
     end
 
     Puppet::FileSystem.each_line(group_file) do |line|
@@ -225,7 +225,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   has_features :manages_homedir, :allows_duplicates, :manages_expiry
-  has_features :system_users unless %w{HP-UX Solaris}.include? Puppet.runtime[:facter].value('os.name')
+  has_features :system_users unless %w[HP-UX Solaris].include? Puppet.runtime[:facter].value('os.name')
 
   has_features :manages_passwords, :manages_password_age if Puppet.features.libshadow?
   has_features :manages_shell
@@ -235,11 +235,11 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     # because by default duplicates are allowed.  This check is
     # to ensure consistent behaviour of the useradd provider when
     # using both useradd and luseradd
-    if (!@resource.allowdupe?) && @resource.forcelocal?
+    if !@resource.allowdupe? && @resource.forcelocal?
       if @resource.should(:uid) && finduser(:uid, @resource.should(:uid).to_s)
         raise(Puppet::Error, "UID #{@resource.should(:uid)} already exists, use allowdupe to force user creation")
       end
-    elsif @resource.allowdupe? && (!@resource.forcelocal?)
+    elsif @resource.allowdupe? && !@resource.forcelocal?
       return ["-o"]
     end
     []
@@ -324,7 +324,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     else
       cmd = [command(:add)]
     end
-    if (!@resource.should(:gid)) && Puppet::Util.gid(@resource[:name])
+    if !@resource.should(:gid) && Puppet::Util.gid(@resource[:name])
       cmd += ["-g", @resource[:name]]
     end
     cmd += add_properties
@@ -401,7 +401,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     end
     super
     if @resource.forcelocal?
-      set(:groups, @resource[:groups]) if self.groups?
+      set(:groups, @resource[:groups]) if groups?
       set(:expiry, @resource[:expiry]) if @resource[:expiry]
     end
     set(:password, @resource[:password]) if @resource[:password]

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

@@ -81,7 +81,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
       resource.debug("#{sid.domain}\\#{account} (#{sid.sid})")
       "#{sid.domain}\\#{account}"
     end
-    return groups.join(',')
+    groups.join(',')
   end
 
   def create

data/lib/puppet/provider.rb

@@ -241,7 +241,7 @@ class Puppet::Provider
     end
 
     def command
-      if not @optional
+      unless @optional
         @confiner.confine :exists => @path, :for_binary => true
       end
 
@@ -290,7 +290,7 @@ class Puppet::Provider
   def self.fact_match(fact, values)
     fact_val = Puppet.runtime[:facter].value(fact).to_s.downcase
     if fact_val.empty?
-      return false
+      false
     else
       values = [values] unless values.is_a?(Array)
       values.any? do |value|
@@ -380,7 +380,7 @@ class Puppet::Provider
   # @raise [Puppet::DevError] Error indicating that the method should have been implemented by subclass.
   # @see prefetch
   def self.instances
-    raise Puppet::DevError, _("To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api") % { provider: self.name }
+    raise Puppet::DevError, _("To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api") % { provider: name }
   end
 
   # Creates getter- and setter- methods for each property supported by the resource type.
@@ -415,7 +415,7 @@ class Puppet::Provider
     end
   end
 
-  self.initvars
+  initvars
 
   # This method is used to generate a method for a command.
   # @return [void]
@@ -437,7 +437,7 @@ class Puppet::Provider
   # @return [String] Returns the data source, which is the provider name if no other source has been set.
   # @todo Unclear what "the source" is used for?
   def self.source
-    @source ||= self.name
+    @source ||= name
   end
 
   # Returns true if the given attribute/parameter is supported by the provider.
@@ -536,8 +536,8 @@ class Puppet::Provider
   def name
     n = @property_hash[:name]
     if n
-      return n
-    elsif self.resource
+      n
+    elsif resource
       resource.name
     else
       raise Puppet::DevError, _("No resource and no name in property hash in %{class_name} instance") % { class_name: self.class.name }
@@ -579,7 +579,7 @@ class Puppet::Provider
     return nil unless other.is_a? Puppet::Provider
 
     # Otherwise, order by the providers class name.
-    return self.class.name <=> other.class.name
+    self.class.name <=> other.class.name
   end
 
   # @comment Document prefetch here as it does not exist anywhere else (called from transaction if implemented)

data/lib/puppet/reference/indirection.rb

@@ -15,6 +15,9 @@ reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirect
     text << Puppet::Util::Docs.scrub(ind.doc) + "\n\n"
 
     Puppet::Indirector::Terminus.terminus_classes(ind.name).sort_by(&:to_s).each do |terminus|
+      # this is an "abstract" terminus, ignore it
+      next if ind.name == :resource && terminus == :validator
+
       terminus_name = terminus.to_s
       term_class = Puppet::Indirector::Terminus.terminus_class(ind.name, terminus)
       if term_class

data/lib/puppet/reference/metaparameter.rb

@@ -14,7 +14,7 @@ etc.), prevent Puppet from making changes (`noop`), and change logging verbosity
 
 ## Available Metaparameters
 
-}
+  }.dup
   begin
     params = []
     Puppet::Type.eachmetaparam { |param|

data/lib/puppet/reference/providers.rb

@@ -13,7 +13,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
   command_line = Puppet::Util::CommandLine.new
   types.reject! { |type| !command_line.args.include?(type.name.to_s) } unless command_line.args.empty?
 
-  ret = "Details about this host:\n\n"
+  ret = "Details about this host:\n\n".dup
 
   # Throw some facts in there, so we know where the report is from.
   ret << option('Ruby Version', Facter.value('ruby.version'))
@@ -30,7 +30,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
     ret << "\n" # add a trailing newline
 
     # Now build up a table of provider suitability.
-    headers = %w{Provider Suitable?} + features.collect { |f| f.to_s }.sort
+    headers = %w[Provider Suitable?] + features.collect(&:to_s).sort
 
     table_data = {}
 
@@ -71,7 +71,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
           when :false
             details << _("  - Got %{values} false tests that should have been true\n") % { values: values }
           when :feature
-            details << _("  - Missing features %{values}\n") % { values: values.collect { |f| f.to_s }.join(",") }
+            details << _("  - Missing features %{values}\n") % { values: values.collect(&:to_s).join(",") }
           end
         end
         notes << details

data/lib/puppet/reference/type.rb

@@ -50,7 +50,7 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
   Resource types define features they can use, and providers can be tested to see
   which features they provide.
 
-  }
+  }.dup
 
   types.sort_by(&:to_s).each { |name, type|
     str << "

data/lib/puppet/relationship.rb

@@ -34,7 +34,8 @@ class Puppet::Relationship
   end
 
   def initialize(source, target, options = {})
-    @source, @target = source, target
+    @source = source
+    @target = target
 
     options = (options || {}).each_with_object({}) { |a, h| h[a[0].to_sym] = a[1]; }
     [:callback, :event].each do |option|
@@ -47,11 +48,9 @@ class Puppet::Relationship
   # of :NONE comes from.
   def match?(event)
     if self.event.nil? or event == :NONE or self.event == :NONE
-      return false
-    elsif self.event == :ALL_EVENTS or event == self.event
-      return true
+      false
     else
-      return false
+      self.event == :ALL_EVENTS or event == self.event
     end
   end
 

data/lib/puppet/reports/http.rb

@@ -36,7 +36,7 @@ Puppet::Reports.register_report(:http) do
     end
 
     client = Puppet.runtime[:http]
-    client.post(url, self.to_yaml, headers: headers, options: options) do |response|
+    client.post(url, to_yaml, headers: headers, options: options) do |response|
       unless response.success?
         Puppet.err _("Unable to submit report to %{url} [%{code}] %{message}") % { url: Puppet[:reporturl].to_s, code: response.code, message: response.reason }
       end

data/lib/puppet/reports/log.rb

@@ -7,8 +7,8 @@ Puppet::Reports.register_report(:log) do
     the log destination is syslog."
 
   def process
-    self.logs.each do |log|
-      log.source = "//#{self.host}/#{log.source}"
+    logs.each do |log|
+      log.source = "//#{host}/#{log.source}"
       Puppet::Util::Log.newmessage(log)
     end
   end

data/lib/puppet/reports/store.rb

@@ -19,14 +19,14 @@ Puppet::Reports.register_report(:store) do
 
     dir = File.join(Puppet[:reportdir], host)
 
-    if !Puppet::FileSystem.exist?(dir)
+    unless Puppet::FileSystem.exist?(dir)
       FileUtils.mkdir_p(dir)
-      FileUtils.chmod_R(0750, dir)
+      FileUtils.chmod_R(0o750, dir)
     end
 
     # Now store the report.
     now = Time.now.gmtime
-    name = %w{year month day hour min}.collect do |method|
+    name = %w[year month day hour min].collect do |method|
       # Make sure we're at least two digits everywhere
       "%02d" % now.send(method).to_s
     end.join("") + ".yaml"
@@ -34,7 +34,7 @@ Puppet::Reports.register_report(:store) do
     file = File.join(dir, name)
 
     begin
-      Puppet::FileSystem.replace_file(file, 0640) do |fh|
+      Puppet::FileSystem.replace_file(file, 0o640) do |fh|
         fh.print to_yaml
       end
     rescue => detail

data/lib/puppet/reports.rb

@@ -77,8 +77,8 @@ class Puppet::Reports
     # Use this method so they all get loaded
     instance_loader(:report).loadall(Puppet.lookup(:current_environment))
     loaded_instances(:report).sort_by(&:to_s).each do |name|
-      mod = self.report(name)
-      docs << "#{name}\n#{"-" * name.to_s.length}\n"
+      mod = report(name)
+      docs << "#{name}\n#{'-' * name.to_s.length}\n"
 
       docs << Puppet::Util::Docs.scrub(mod.doc) << "\n\n"
     end