openvox 7.37.1 → 8.19.0

data/lib/puppet/util/fileparsing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A mini-language for parsing files.  This is only used file the ParsedFile
 # provider, but it makes more sense to split it out so it's easy to maintain
 # in one place.
@@ -40,7 +42,8 @@ module Puppet::Util::FileParsing
     def fields=(fields)
       @fields = fields.collect do |field|
         r = field.intern
-        raise ArgumentError.new(_("Cannot have fields named %{name}") % { name: r }) if INVALID_FIELDS.include?(r)
+        raise ArgumentError, _("Cannot have fields named %{name}") % { name: r } if INVALID_FIELDS.include?(r)
+
         r
       end
     end
@@ -102,7 +105,7 @@ module Puppet::Util::FileParsing
     def join(details)
       joinchar = self.joiner
 
-      fields.collect { |field|
+      fields.filter_map { |field|
         # If the field is marked absent, use the appropriate replacement
         if details[field] == :absent or details[field] == [:absent] or details[field].nil?
           if self.optional.include?(field)
@@ -113,14 +116,12 @@ module Puppet::Util::FileParsing
         else
           details[field].to_s
         end
-      }.reject { |c| c.nil?}.join(joinchar)
+      }.join(joinchar)
     end
 
     # Customize this so we can do a bit of validation.
     def optional=(optional)
-      @optional = optional.collect do |field|
-        field.intern
-      end
+      @optional = optional.collect(&:intern)
     end
 
     # Create a hook that modifies the hash resulting from parsing.
@@ -160,7 +161,7 @@ module Puppet::Util::FileParsing
 
   # Try to match a specific text line.
   def handle_text_line(line, record)
-    line =~ record.match ? {:record_type => record.name, :line => line} : nil
+    line =~ record.match ? { :record_type => record.name, :line => line } : nil
   end
 
   # Try to match a record.
@@ -217,7 +218,7 @@ module Puppet::Util::FileParsing
           end
         end
 
-        if record.rollup and ! line_fields.empty?
+        if record.rollup and !line_fields.empty?
           last_field = record.fields[-1]
           val = ([ret[last_field]] + line_fields).join(record.joiner)
           ret[last_field] = val
@@ -227,9 +228,9 @@ module Puppet::Util::FileParsing
 
     if ret
       ret[:record_type] = record.name
-      return ret
+      ret
     else
-      return nil
+      nil
     end
   end
 
@@ -243,7 +244,7 @@ module Puppet::Util::FileParsing
   def lines(text)
     # NOTE: We do not have to remove trailing separators because split will ignore
     # them by default (unless you pass -1 as a second parameter)
-    text.split(self.line_separator)
+    text.split(line_separator)
   end
 
   # Split a bunch of text into lines and then parse them individually.
@@ -308,7 +309,7 @@ module Puppet::Util::FileParsing
 
   # Are there any record types defined?
   def records?
-    defined?(@record_types) and ! @record_types.empty?
+    defined?(@record_types) and !@record_types.empty?
   end
 
   # Define a new type of text record.
@@ -343,7 +344,7 @@ module Puppet::Util::FileParsing
     end
 
     case record.type
-    when :text; return details[:line]
+    when :text; details[:line]
     else
       return record.to_line(details) if record.respond_to?(:to_line)
 
@@ -355,9 +356,9 @@ module Puppet::Util::FileParsing
         if regex == true
           regex = /\s+$/
         end
-        return line.sub(regex,'')
+        line.sub(regex, '')
       else
-        return line
+        line
       end
     end
   end
@@ -365,9 +366,9 @@ module Puppet::Util::FileParsing
   # Whether to add a trailing separator to the file.  Defaults to true
   def trailing_separator
     if defined?(@trailing_separator)
-      return @trailing_separator
+      @trailing_separator
     else
-      return true
+      true
     end
   end
 
@@ -375,13 +376,9 @@ module Puppet::Util::FileParsing
     type = type.intern
     record = record_type(type)
     if record && record.fields.include?(attr.intern)
-      return true
+      true
     else
-      if attr.intern == :ensure
-        return true
-      else
-        false
-      end
+      attr.intern == :ensure
     end
   end
 
@@ -405,4 +402,3 @@ module Puppet::Util::FileParsing
     @record_types[type.intern]
   end
 end
-

data/lib/puppet/util/filetype.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Basic classes for reading, writing, and emptying files.  Not much
 # to see here.
 
@@ -14,6 +16,7 @@ class Puppet::Util::FileType
 
   class << self
     attr_accessor :name
+
     include Puppet::Util::ClassGen
   end
 
@@ -34,37 +37,33 @@ class Puppet::Util::FileType
       # Rename the read method
       define_method(:real_read, instance_method(:read))
       define_method(:read) do
-        begin
-          val = real_read
-          @loaded = Time.now
-          if val
-            return val.gsub(/# HEADER.*\n/,'')
-          else
-            return ""
-          end
-        rescue Puppet::Error
-          raise
-        rescue => detail
-          message = _("%{klass} could not read %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
-          Puppet.log_exception(detail, message)
-          raise Puppet::Error, message, detail.backtrace
+        val = real_read
+        @loaded = Time.now
+        if val
+          val.gsub(/# HEADER.*\n/, '')
+        else
+          ""
         end
+      rescue Puppet::Error
+        raise
+      rescue => detail
+        message = _("%{klass} could not read %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
+        Puppet.log_exception(detail, message)
+        raise Puppet::Error, message, detail.backtrace
       end
 
       # And then the write method
       define_method(:real_write, instance_method(:write))
       define_method(:write) do |text|
-        begin
-          val = real_write(text)
-          @synced = Time.now
-          return val
-        rescue Puppet::Error
-          raise
-        rescue => detail
-          message = _("%{klass} could not write %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
-          Puppet.log_exception(detail, message)
-          raise Puppet::Error, message, detail.backtrace
-        end
+        val = real_write(text)
+        @synced = Time.now
+        val
+      rescue Puppet::Error
+        raise
+      rescue => detail
+        message = _("%{klass} could not write %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
+        Puppet.log_exception(detail, message)
+        raise Puppet::Error, message, detail.backtrace
       end
     end
   end
@@ -79,7 +78,8 @@ class Puppet::Util::FileType
   end
 
   def initialize(path, default_mode = nil)
-    raise ArgumentError.new(_("Path is nil")) if path.nil?
+    raise ArgumentError, _("Path is nil") if path.nil?
+
     @path = path
     @default_mode = default_mode
   end
@@ -90,9 +90,9 @@ class Puppet::Util::FileType
   def cronargs
     uid = Puppet::Util.uid(@path)
     if uid && uid == Puppet::Util::SUIDManager.uid
-      {:failonfail => true, :combine => true}
+      { :failonfail => true, :combine => true }
     else
-      {:failonfail => true, :combine => true, :uid => @path}
+      { :failonfail => true, :combine => true, :uid => @path }
     end
   end
 
@@ -110,7 +110,7 @@ class Puppet::Util::FileType
         # being explicitly preserved
         Puppet::FileSystem.read(@path, :encoding => Encoding.default_external)
       else
-        return nil
+        nil
       end
     end
 
@@ -202,11 +202,11 @@ class Puppet::Util::FileType
     rescue => detail
       case detail.to_s
       when /no crontab for/
-        return ""
+        ""
       when /are not allowed to/
         Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case Puppet authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
 
-        return ""
+        ""
       else
         raise FileReadError, _("Could not read crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
       end
@@ -215,7 +215,7 @@ class Puppet::Util::FileType
     # Remove a specific @path's cron tab.
     def remove
       cmd = "#{cmdbase} -r"
-      if %w{Darwin FreeBSD DragonFly}.include?(Puppet.runtime[:facter].value("operatingsystem"))
+      if %w[Darwin FreeBSD DragonFly].include?(Puppet.runtime[:facter].value('os.name'))
         cmd = "/bin/echo yes | #{cmd}"
       end
 
@@ -244,10 +244,10 @@ class Puppet::Util::FileType
     # Only add the -u flag when the @path is different.  Fedora apparently
     # does not think I should be allowed to set the @path to my own user name
     def cmdbase
-      if @uid == Puppet::Util::SUIDManager.uid || Puppet.runtime[:facter].value(:operatingsystem) == "HP-UX"
-        return "crontab"
+      if @uid == Puppet::Util::SUIDManager.uid || Puppet.runtime[:facter].value('os.name') == "HP-UX"
+        "crontab"
       else
-        return "crontab -u #{@path}"
+        "crontab -u #{@path}"
       end
     end
   end
@@ -263,15 +263,15 @@ class Puppet::Util::FileType
         return ""
       end
 
-      Puppet::Util::Execution.execute(%w{crontab -l}, cronargs)
+      Puppet::Util::Execution.execute(%w[crontab -l], cronargs)
     rescue => detail
       case detail.to_s
       when /can't open your crontab/
-        return ""
+        ""
       when /you are not authorized to use cron/
         Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case Puppet authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
 
-        return ""
+        ""
       else
         raise FileReadError, _("Could not read crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
       end
@@ -279,7 +279,7 @@ class Puppet::Util::FileType
 
     # Remove a specific @path's cron tab.
     def remove
-      Puppet::Util::Execution.execute(%w{crontab -r}, cronargs)
+      Puppet::Util::Execution.execute(%w[crontab -r], cronargs)
     rescue => detail
       raise FileReadError, _("Could not remove crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
     end
@@ -314,15 +314,15 @@ class Puppet::Util::FileType
         return ""
       end
 
-      Puppet::Util::Execution.execute(%w{crontab -l}, cronargs)
+      Puppet::Util::Execution.execute(%w[crontab -l], cronargs)
     rescue => detail
       case detail.to_s
       when /open.*in.*directory/
-        return ""
+        ""
       when /not.*authorized.*cron/
         Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case Puppet authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
 
-        return ""
+        ""
       else
         raise FileReadError, _("Could not read crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
       end
@@ -330,7 +330,7 @@ class Puppet::Util::FileType
 
     # Remove a specific @path's cron tab.
     def remove
-      Puppet::Util::Execution.execute(%w{crontab -r}, cronargs)
+      Puppet::Util::Execution.execute(%w[crontab -r], cronargs)
     rescue => detail
       raise FileReadError, _("Could not remove crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
     end

data/lib/puppet/util/http_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/http'
 
 # for backwards compatibility

data/lib/puppet/util/inifile.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Module Puppet::IniConfig
 # A generic way to parse .ini style files and manipulate them in memory
 # One 'file' can be made up of several physical files. Changes to sections
@@ -71,14 +73,14 @@ module Puppet::Util::IniConfig
     # exists, return nil
     def [](key)
       entry = find_entry(key)
-      return(entry.nil? ? nil : entry[1])
+      (entry.nil? ? nil : entry[1])
     end
 
     # Format the section as text in the way it should be
     # written to file
     def format
       if @destroy
-        text = ""
+        text = ''.dup
       else
         text = "[#{name}]\n"
         @entries.each do |entry|
@@ -94,17 +96,16 @@ module Puppet::Util::IniConfig
     end
 
     private
+
     def find_entry(key)
       @entries.each do |entry|
         return entry if entry.is_a?(Array) && entry[0] == key
       end
       nil
     end
-
   end
 
   class PhysicalFile
-
     # @!attribute [r] filetype
     #   @api private
     #   @return [Puppet::Util::FileType::FileTypeFlat]
@@ -138,6 +139,7 @@ module Puppet::Util::IniConfig
       if text.nil?
         raise IniParseError, _("Cannot read nonexistent file %{file}") % { file: @file.inspect }
       end
+
       parse(text)
     end
 
@@ -148,7 +150,7 @@ module Puppet::Util::IniConfig
     )
     INI_CONTINUATION = /^[ \t\r\n\f]/
     INI_SECTION_NAME = /^\[([^\]]+)\]/
-    INI_PROPERTY     = /^\s*([^\s=]+)\s*\=\s*(.*)$/
+    INI_PROPERTY     = /^\s*([^\s=]+)\s*=\s*(.*)$/
 
     # @api private
     def parse(text)
@@ -182,7 +184,7 @@ module Puppet::Util::IniConfig
           val = match[2].rstrip
 
           if section.nil?
-            raise IniParseError.new(_("Property with key %{key} outside of a section") % { key: key.inspect })
+            raise IniParseError, _("Property with key %{key} outside of a section") % { key: key.inspect }
           end
 
           section[key] = val
@@ -207,7 +209,7 @@ module Puppet::Util::IniConfig
     end
 
     def format
-      text = ""
+      text = ''.dup
 
       @contents.each do |content|
         if content.is_a? Section
@@ -249,7 +251,7 @@ module Puppet::Util::IniConfig
     private
 
     def section_exists?(name)
-      if self.get_section(name)
+      if get_section(name)
         true
       elsif @file_collection and @file_collection.get_section(name)
         true
@@ -260,7 +262,6 @@ module Puppet::Util::IniConfig
   end
 
   class FileCollection
-
     attr_reader :files
 
     def initialize
@@ -274,9 +275,7 @@ module Puppet::Util::IniConfig
     end
 
     def store
-      @files.values.each do |file|
-        file.store
-      end
+      @files.values.each(&:store)
     end
 
     def each_section(&block)
@@ -305,7 +304,7 @@ module Puppet::Util::IniConfig
     alias [] get_section
 
     def include?(name)
-      !! get_section(name)
+      !!get_section(name)
     end
 
     def add_section(name, file)
@@ -317,11 +316,7 @@ module Puppet::Util::IniConfig
     # Return a file if it's already been defined, create a new file if it hasn't
     # been defined.
     def get_physical_file(file)
-      if @files[file]
-        @files[file]
-      else
-        new_physical_file(file)
-      end
+      @files[file] || new_physical_file(file)
     end
 
     # Create a new physical file and set required attributes on that file.

data/lib/puppet/util/instance_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util/autoload'
 require_relative '../../puppet/util'
 require_relative '../../puppet/concurrent/lock'
@@ -50,6 +52,7 @@ module Puppet::Util::InstanceLoader
       name = name.intern
       instances = instance_hash(type)
       return nil unless instances
+
       unless instances.include? name
         if instance_loader(type).load(name, Puppet.lookup(:current_environment))
           unless instances.include? name

data/lib/puppet/util/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet::Util
   module Json
     class ParseError < StandardError

data/lib/puppet/util/json_lockfile.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util/lockfile'
 
 # This class provides a simple API for managing a lock file
@@ -33,12 +35,13 @@ class Puppet::Util::JsonLockfile < Puppet::Util::Lockfile
   #  they will be converted to Strings.
   def lock_data
     return nil unless file_locked?
+
     file_contents = super
     return nil if file_contents.nil? or file_contents.empty?
+
     Puppet::Util::Json.load(file_contents)
   rescue Puppet::Util::Json::ParseError
     Puppet.warning _("Unable to read lockfile data from %{path}: not in JSON") % { path: @file_path }
     nil
   end
-
 end

data/lib/puppet/util/ldap/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/ldap'
 
 class Puppet::Util::Ldap::Connection
@@ -8,12 +10,12 @@ class Puppet::Util::Ldap::Connection
   # Return a default connection, using our default settings.
   def self.instance
     ssl = if Puppet[:ldaptls]
-      :tls
-        elsif Puppet[:ldapssl]
-          true
-        else
-          false
-        end
+            :tls
+          elsif Puppet[:ldapssl]
+            true
+          else
+            false
+          end
 
     options = {}
     options[:ssl] = ssl
@@ -46,7 +48,7 @@ class Puppet::Util::Ldap::Connection
 
   # Create a per-connection unique name.
   def name
-    [host, port, user, password, ssl].collect { |p| p.to_s }.join("/")
+    [host, port, user, password, ssl].collect(&:to_s).join("/")
   end
 
   # Should we reset the connection?
@@ -56,18 +58,18 @@ class Puppet::Util::Ldap::Connection
 
   # Start our ldap connection.
   def start
-      case ssl
-      when :tls
-        @connection = LDAP::SSLConn.new(host, port, true)
-      when true
-        @connection = LDAP::SSLConn.new(host, port)
-      else
-        @connection = LDAP::Conn.new(host, port)
-      end
-      @connection.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
-      @connection.set_option(LDAP::LDAP_OPT_REFERRALS, LDAP::LDAP_OPT_ON)
-      @connection.simple_bind(user, password)
+    case ssl
+    when :tls
+      @connection = LDAP::SSLConn.new(host, port, true)
+    when true
+      @connection = LDAP::SSLConn.new(host, port)
+    else
+      @connection = LDAP::Conn.new(host, port)
+    end
+    @connection.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
+    @connection.set_option(LDAP::LDAP_OPT_REFERRALS, LDAP::LDAP_OPT_ON)
+    @connection.simple_bind(user, password)
   rescue => detail
-      raise Puppet::Error, _("Could not connect to LDAP: %{detail}") % { detail: detail }, detail.backtrace
+    raise Puppet::Error, _("Could not connect to LDAP: %{detail}") % { detail: detail }, detail.backtrace
   end
 end

data/lib/puppet/util/ldap/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/ldap'
 
 class Puppet::Util::Ldap::Generator