openvox 7.37.1 → 8.19.0

data/lib/puppet/environments.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require_relative '../puppet/concurrent/synchronized'
 
 # @api private
 module Puppet::Environments
-
   class EnvironmentNotFound < Puppet::Error
     def initialize(environment_name, original = nil)
       environmentpath = Puppet[:environmentpath]
@@ -34,11 +35,7 @@ module Puppet::Environments
     # @!macro loader_get_or_fail
     def get!(name)
       environment = get(name)
-      if environment
-        environment
-      else
-        raise EnvironmentNotFound, name
-      end
+      environment || raise(EnvironmentNotFound, name)
     end
 
     def clear_all
@@ -138,7 +135,6 @@ module Puppet::Environments
   #
   # @api private
   class StaticPrivate < Static
-
     # Unlisted
     #
     # @!macro loader_list
@@ -159,6 +155,7 @@ module Puppet::Environments
     # @!macro loader_get_conf
     def get_conf(name)
       return nil unless name.intern == @env_name
+
       Puppet::Settings::EnvironmentConf.load_from(@env_dir, [])
     end
   end
@@ -197,7 +194,7 @@ module Puppet::Environments
       if Puppet::FileSystem.symlink?(dir) && Puppet[:versioned_environment_dirs]
         dir = Pathname.new Puppet::FileSystem.expand_path(Puppet::FileSystem.readlink(dir))
       end
-      return dir
+      dir
     end
 
     # @!macro loader_search_paths
@@ -267,9 +264,10 @@ module Puppet::Environments
 
     def valid_environment_names
       return [] unless Puppet::FileSystem.directory?(@environment_dir)
-      Puppet::FileSystem.children(@environment_dir).map do |child|
+
+      Puppet::FileSystem.children(@environment_dir).filter_map do |child|
         Puppet::FileSystem.basename_string(child).intern if validated_directory(child)
-      end.compact
+      end
     end
   end
 
@@ -315,7 +313,7 @@ module Puppet::Environments
     end
 
     def clear_all
-      @loaders.each {|loader| loader.clear_all}
+      @loaders.each(&:clear_all)
     end
   end
 
@@ -370,7 +368,7 @@ module Puppet::Environments
       removed_envs = cached_envs - loader_envs
 
       removed_envs.each do |env_name|
-        Puppet.debug { "Environment no longer exists '#{env_name}'"}
+        Puppet.debug { "Environment no longer exists '#{env_name}'" }
         clear(env_name)
       end
 
@@ -407,7 +405,7 @@ module Puppet::Environments
       name = name.to_sym
       entry = @cache[name]
       if entry
-        Puppet.debug {"Found in cache #{name.inspect} #{entry.label}"}
+        Puppet.debug { "Found in cache #{name.inspect} #{entry.label}" }
         # found in cache
         entry.touch
       elsif (env = @loader.get(name))
@@ -421,7 +419,7 @@ module Puppet::Environments
 
     # Adds a cache entry to the cache
     def add_entry(name, cache_entry)
-      Puppet.debug {"Caching environment #{name.inspect} #{cache_entry.label}"}
+      Puppet.debug { "Caching environment #{name.inspect} #{cache_entry.label}" }
       @cache[name] = cache_entry
       @cache_expiration_service.created(cache_entry.value)
     end
@@ -429,7 +427,7 @@ module Puppet::Environments
 
     def clear_entry(name, entry)
       @cache.delete(name)
-      Puppet.debug {"Evicting cache entry for environment #{name.inspect}"}
+      Puppet.debug { "Evicting cache entry for environment #{name.inspect}" }
       @cache_expiration_service.evicted(name.to_sym)
       Puppet::GettextConfig.delete_text_domain(name)
       Puppet.settings.clear_environment_settings(name)

data/lib/puppet/error.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Puppet
   # The base class for all Puppet errors. It can wrap another exception
   class Error < RuntimeError
     attr_accessor :original
-    def initialize(message, original=nil)
+
+    def initialize(message, original = nil)
       super(message.scrub)
       @original = original
     end
@@ -17,15 +20,15 @@ module Puppet
     # May be called with 3 arguments for message, file, line, and exception, or
     # 4 args including the position on the line.
     #
-    def initialize(message, file=nil, line=nil, pos=nil, original=nil)
-      if pos.kind_of? Exception
+    def initialize(message, file = nil, line = nil, pos = nil, original = nil)
+      if pos.is_a? Exception
         original = pos
         pos = nil
       end
 
       super(message, original)
 
-      @file = file unless (file.is_a?(String) && file.empty?)
+      @file = file unless file.is_a?(String) && file.empty?
       @line = line
       @pos = pos
 
@@ -38,7 +41,7 @@ module Puppet
 
     def to_s
       msg = super
-      @file = nil if (@file.is_a?(String) && @file.empty?)
+      @file = nil if @file.is_a?(String) && @file.empty?
       msg += Puppet::Util::Errors.error_location_with_space(@file, @line, @pos)
       msg
     end
@@ -65,7 +68,7 @@ module Puppet
     # @param issue_code [Symbol] The issue code
     # @param arguments [Hash{Symbol=>Object}] Issue arguments
     #
-    def initialize(message, file=nil, line=nil, pos=nil, original=nil, issue_code= nil, arguments = nil)
+    def initialize(message, file = nil, line = nil, pos = nil, original = nil, issue_code = nil, arguments = nil)
       super(message, file, line, pos, original)
       @issue_code = issue_code
       @basic_message = message
@@ -95,14 +98,15 @@ module Puppet
     def self.from_issue_and_stack(issue, args = {})
       filename, line = Puppet::Pops::PuppetStack.top_of_stack
 
-      self.new(
-            issue.format(args),
-            filename,
-            line,
-            nil,
-            nil,
-            issue.issue_code,
-            args)
+      new(
+        issue.format(args),
+        filename,
+        line,
+        nil,
+        nil,
+        issue.issue_code,
+        args
+      )
     end
   end
 
@@ -130,7 +134,7 @@ module Puppet
     include ExternalFileError
     attr_reader :error_data
 
-    def initialize(error_data, message, file: nil, line: nil, pos: nil, original:nil)
+    def initialize(error_data, message, file: nil, line: nil, pos: nil, original: nil)
       super(message, file, line, pos, original)
       @error_data = error_data
     end

data/lib/puppet/etc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../puppet/util/character_encoding'
 # Wrapper around Ruby Etc module allowing us to manage encoding in a single
 # place.
@@ -39,7 +41,6 @@ require_relative '../puppet/util/character_encoding'
 # @api private
 module Puppet::Etc
   class << self
-
     # Etc::getgrent returns an Etc::Group struct object
     # On first call opens /etc/group and returns parse of first entry. Each subsquent call
     # returns new struct the next entry or nil if EOF. Call ::endgrent to close file.
@@ -69,7 +70,7 @@ module Puppet::Etc
       ::Etc.endpwent
     end
 
-    #effectively equivalent to IO#rewind of /etc/passwd
+    # effectively equivalent to IO#rewind of /etc/passwd
     def setpwent
       ::Etc.setpwent
     end
@@ -115,7 +116,7 @@ module Puppet::Etc
 
       setgrent
       begin
-        while cur_group = getgrent #rubocop:disable Lint/AssignmentInCondition
+        while cur_group = getgrent # rubocop:disable Lint/AssignmentInCondition
           yield cur_group
         end
       ensure
@@ -131,6 +132,7 @@ module Puppet::Etc
     # these fields as well. API compatible with Etc::Passwd. Because Struct.new
     # defines a new Class object, we memoize to avoid superfluous extra Class
     # instantiations.
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     def puppet_etc_passwd_class
       @password_class ||= Struct.new(*Etc::Passwd.members, *Etc::Passwd.members.map { |member| "canonical_#{member}".to_sym })
     end
@@ -144,6 +146,7 @@ module Puppet::Etc
     def puppet_etc_group_class
       @group_class ||= Struct.new(*Etc::Group.members, *Etc::Group.members.map { |member| "canonical_#{member}".to_sym })
     end
+    # rubocop:enable Naming/MemoizedInstanceVariableName
 
     # Utility method for overriding the String values of a struct returned by
     # the Etc module to UTF-8. Structs returned by the ruby Etc module contain
@@ -159,12 +162,14 @@ module Puppet::Etc
     #   :canonical_<member name> struct member.
     def override_field_values_to_utf8(struct)
       return nil if struct.nil?
+
       new_struct = struct.is_a?(Etc::Passwd) ? puppet_etc_passwd_class.new : puppet_etc_group_class.new
       struct.each_pair do |member, value|
-        if value.is_a?(String)
+        case value
+        when String
           new_struct["canonical_#{member}".to_sym] = value.dup
           new_struct[member] = Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(value).scrub
-        elsif value.is_a?(Array)
+        when Array
           new_struct["canonical_#{member}".to_sym] = value.inject([]) { |acc, elem| acc << elem.dup }
           new_struct[member] = value.inject([]) do |acc, elem|
             acc << Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(elem).scrub

data/lib/puppet/external/dot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rdot.rb
 #
 #
@@ -7,7 +9,6 @@
 # It also supports undirected edges.
 
 module DOT
-
   # These global vars are used to make nice graph source.
 
   $tab  = '    '
@@ -45,7 +46,7 @@ module DOT
     'shape',       # default: ellipse; node shape; see Section 2.1 and Appendix E
     'shapefile',   # external EPSF or SVG custom shape file
     'sides',       # default: 4; number of sides for shape=polygon
-    'skew' ,       # default: 0.0; skewing of node for shape=polygon
+    'skew',        # default: 0.0; skewing of node for shape=polygon
     'style',       # graphics options, e.g. bold, dotted, filled; cf. Section 2.3
     'toplabel',    # auxiliary label for nodes of shape M*
     'URL',         # URL associated with node (format-dependent)
@@ -99,27 +100,26 @@ module DOT
 
   # options for graph declaration
 
-  GRAPH_OPTS = [
-    'bgcolor',
-    'center', 'clusterrank', 'color', 'concentrate',
-    'fontcolor', 'fontname', 'fontsize',
-    'label', 'layerseq',
-    'margin', 'mclimit',
-    'nodesep', 'nslimit',
-    'ordering', 'orientation',
-    'page',
-    'rank', 'rankdir', 'ranksep', 'ratio',
-    'size'
+  GRAPH_OPTS = %w[
+    bgcolor
+    center clusterrank color concentrate
+    fontcolor fontname fontsize
+    label layerseq
+    margin mclimit
+    nodesep nslimit
+    ordering orientation
+    page
+    rank rankdir ranksep ratio
+    size
   ]
 
   # a root class for any element in dot notation
 
   class DOTSimpleElement
-
     attr_accessor :name
 
     def initialize(params = {})
-      @label = params['name'] ? params['name'] : ''
+      @label = params['name'] || ''
     end
 
     def to_s
@@ -130,51 +130,42 @@ module DOT
   # an element that has options ( node, edge, or graph )
 
   class DOTElement < DOTSimpleElement
-
     # attr_reader :parent
     attr_accessor :name, :options
 
     def initialize(params = {}, option_list = [])
       super(params)
-      @name   = params['name']   ? params['name']   : nil
-      @parent = params['parent'] ? params['parent'] : nil
+      @name   = params['name']   || nil
+      @parent = params['parent'] || nil
       @options = {}
-      option_list.each{ |i|
+      option_list.each { |i|
         @options[i] = params[i] if params[i]
       }
       @options['label'] ||= @name if @name != 'node'
     end
 
     def each_option
-      @options.each{ |i| yield i }
+      @options.each { |i| yield i }
     end
 
     def each_option_pair
-      @options.each_pair{ |key, val| yield key, val }
+      @options.each_pair { |key, val| yield key, val }
     end
-
-    #def parent=( thing )
-    #    @parent.delete( self ) if defined?( @parent ) and @parent
-    #    @parent = thing
-    #end
-
   end
 
-
   # This is used when we build nodes that have shape=record
   # ports don't have options :)
 
   class DOTPort < DOTSimpleElement
-
     attr_accessor :label
 
     def initialize(params = {})
       super(params)
-      @name = params['label'] ? params['label'] : ''
+      @name = params['label'] || ''
     end
 
     def to_s
-      ( @name && @name != "" ? "<#{@name}>" : "" ) + "#{@label}"
+      (@name && @name != "" ? "<#{@name}>" : "") + @label.to_s
     end
   end
 
@@ -183,7 +174,7 @@ module DOT
   class DOTNode < DOTElement
     def initialize(params = {}, option_list = NODE_OPTS)
       super(params, option_list)
-      @ports = params['ports'] ? params['ports'] : []
+      @ports = params['ports'] || []
     end
 
     def each_port
@@ -203,25 +194,28 @@ module DOT
     end
 
     def to_s(t = '')
-
       # This code is totally incomprehensible; it needs to be replaced!
 
-      label = @options['shape'] != 'record' && @ports.length == 0 ?
-          @options['label'] ?
-            t + $tab + "label = #{stringify(@options['label'])}\n" :
-            '' :
-          t + $tab + 'label = "' + " \\\n" +
-          t + $tab2 + "#{stringify(@options['label'])}| \\\n" +
-          @ports.collect{ |i|
-            t + $tab2 + i.to_s
-          }.join( "| \\\n" ) + " \\\n" +
-          t + $tab + '"' + "\n"
-
-        t + "#{@name} [\n" +
-        @options.to_a.collect{ |i|
+      label = if @options['shape'] != 'record' && @ports.length == 0
+                if @options['label']
+                  t + $tab + "label = #{stringify(@options['label'])}\n"
+                else
+                  ''
+                end
+              else
+                t + $tab + 'label = "' + " \\\n" +
+                  t + $tab2 + "#{stringify(@options['label'])}| \\\n" +
+                  @ports.collect { |i|
+                    t + $tab2 + i.to_s
+                  }.join("| \\\n") + " \\\n" +
+                  t + $tab + '"' + "\n"
+              end
+
+      t + "#{@name} [\n" +
+        @options.to_a.filter_map { |i|
           i[1] && i[0] != 'label' ?
             t + $tab + "#{i[0]} = #{i[1]}" : nil
-        }.compact.join( ",\n" ) + ( label != '' ? ",\n" : "\n" ) +
+        }.join(",\n") + (label != '' ? ",\n" : "\n") +
         label +
         t + "]\n"
     end
@@ -231,7 +225,6 @@ module DOT
     def stringify(s)
       %("#{s.gsub('"', '\\"')}")
     end
-
   end
 
   # A subgraph element is the same to graph, but has another header in dot
@@ -240,12 +233,12 @@ module DOT
   class DOTSubgraph < DOTElement
     def initialize(params = {}, option_list = GRAPH_OPTS)
       super(params, option_list)
-      @nodes      = params['nodes'] ? params['nodes'] : []
+      @nodes      = params['nodes'] || []
       @dot_string = 'graph'
     end
 
     def each_node
-      @nodes.each{ |i| yield i }
+      @nodes.each { |i| yield i }
     end
 
     def <<(thing)
@@ -253,7 +246,7 @@ module DOT
     end
 
     def push(thing)
-      @nodes.push( thing )
+      @nodes.push(thing)
     end
 
     def pop
@@ -263,41 +256,39 @@ module DOT
     def to_s(t = '')
       hdr = t + "#{@dot_string} #{@name} {\n"
 
-      options = @options.to_a.collect{ |name, val|
-        val && name != 'label' ?
-          t + $tab + "#{name} = #{val}" :
+      options = @options.to_a.filter_map { |name, val|
+        if val && name != 'label'
+          t + $tab + "#{name} = #{val}"
+        else
           name ? t + $tab + "#{name} = \"#{val}\"" : nil
-      }.compact.join( "\n" ) + "\n"
+        end
+      }.join("\n") + "\n"
 
-      nodes = @nodes.collect{ |i|
-        i.to_s( t + $tab )
-      }.join( "\n" ) + "\n"
+      nodes = @nodes.collect { |i|
+        i.to_s(t + $tab)
+      }.join("\n") + "\n"
       hdr + options + nodes + t + "}\n"
     end
-
   end
 
   # This is a graph.
 
   class DOTDigraph < DOTSubgraph
-
-  def initialize(params = {}, option_list = GRAPH_OPTS)
-    super(params, option_list)
-    @dot_string = 'digraph'
-  end
-
+    def initialize(params = {}, option_list = GRAPH_OPTS)
+      super(params, option_list)
+      @dot_string = 'digraph'
+    end
   end
 
   # This is an edge.
 
   class DOTEdge < DOTElement
-
     attr_accessor :from, :to
 
     def initialize(params = {}, option_list = EDGE_OPTS)
       super(params, option_list)
-      @from = params['from'] ? params['from'] : nil
-      @to   = params['to'] ? params['to'] : nil
+      @from = params['from'] || nil
+      @to   = params['to'] || nil
     end
 
     def edge_link
@@ -306,20 +297,19 @@ module DOT
 
     def to_s(t = '')
       t + "#{@from} #{edge_link} #{to} [\n" +
-        @options.to_a.collect{ |i|
-          i[1] && i[0] != 'label' ?
-            t + $tab + "#{i[0]} = #{i[1]}" :
+        @options.to_a.filter_map { |i|
+          if i[1] && i[0] != 'label'
+            t + $tab + "#{i[0]} = #{i[1]}"
+          else
             i[1] ? t + $tab + "#{i[0]} = \"#{i[1]}\"" : nil
-        }.compact.join( "\n" ) + "\n#{t}]\n"
+          end
+        }.join("\n") + "\n#{t}]\n"
     end
-
   end
 
   class DOTDirectedEdge < DOTEdge
-
     def edge_link
       '->'
     end
-
   end
 end

data/lib/puppet/face/catalog/select.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Select and show a list of resources of a given type.
 Puppet::Face.define(:catalog, '0.0.1') do
   action :select do
@@ -24,7 +26,7 @@ Puppet::Face.define(:catalog, '0.0.1') do
 
       $ puppet catalog select --terminus rest somenode.magpie.lan file
     EOT
-    when_invoked do |host, type, options|
+    when_invoked do |host, type, _options|
       # REVISIT: Eventually, type should have a default value that triggers
       # the non-specific behaviour.  For now, though, this will do.
       # --daniel 2011-05-03
@@ -42,7 +44,7 @@ Puppet::Face.define(:catalog, '0.0.1') do
       if value.nil? then
         _("no matching resources found")
       else
-        value.map {|x| x.to_s }.join("\n")
+        value.map(&:to_s).join("\n")
       end
     end
   end

data/lib/puppet/face/catalog.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:catalog, '0.0.1') do
-  copyright "Puppet Inc.", 2011
+  copyright "Puppet Inc., Vox Pupuli", 2011
   license   "Apache 2 license; see COPYING"
 
   summary _("Compile, save, view, and convert catalogs.")
@@ -24,10 +26,10 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
   deactivate_action(:destroy)
   deactivate_action(:search)
   action(:find) do
-    summary _("Retrieve the catalog for the node from which the comamand is run.")
+    summary _("Retrieve the catalog for the node from which the command is run.")
     arguments "<certname>, <facts>"
     option("--facts_for_catalog") do
-      summary _("Not yet implemented for the CLI; facts will be collected internally.")
+      summary _("Not implemented for the CLI; facts are collected internally.")
     end
     returns <<-'EOT'
       A serialized catalog. When used from the Ruby API, returns a
@@ -74,7 +76,7 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
           # ...
     EOT
 
-    when_invoked do |options|
+    when_invoked do |_options|
       catalog = Puppet::Face[:catalog, "0.0.1"].find(Puppet[:certname]) or raise "Could not find catalog for #{Puppet[:certname]}"
       catalog = catalog.to_ral
 
@@ -144,7 +146,7 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
           Puppet::Face[:catalog, '0.0.1'].download
           # ...
     EOT
-    when_invoked do |options|
+    when_invoked do |_options|
       Puppet::Resource::Catalog.indirection.terminus_class = :rest
       Puppet::Resource::Catalog.indirection.cache_class = nil
       facts = Puppet::Face[:facts, '0.0.1'].find(Puppet[:certname])