openvox 7.37.1 → 8.19.0

data/lib/puppet/gettext/stubs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # These stub the translation methods normally brought in
 # by FastGettext. Used when Gettext could not be properly
 # initialized.

data/lib/puppet/graph/key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Sequential, nestable keys for tracking order of insertion in "the graph"
 # @api private
 class Puppet::Graph::Key

data/lib/puppet/graph/prioritizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Base, template method, class for Prioritizers. This provides the basic
 # tracking facilities used.
 #

data/lib/puppet/graph/rb_tree_map.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Algorithms and Containers project is Copyright (c) 2009 Kanwei Li
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -122,6 +124,7 @@ class Puppet::Graph::RbTreeMap
     result = nil
     if @root
       return unless has_key? key
+
       @root, result = delete_recursive(@root, key)
       @root.color = :black if @root
       @size -= 1
@@ -181,12 +184,14 @@ class Puppet::Graph::RbTreeMap
 
   def first
     return nil unless @root
+
     node = min_recursive(@root)
     [node.key, node.value]
   end
 
   def last
     return nil unless @root
+
     node = max_recursive(@root)
     [node.key, node.value]
   end
@@ -197,6 +202,7 @@ class Puppet::Graph::RbTreeMap
 
   class Node # :nodoc: all
     attr_accessor :color, :key, :value, :left, :right
+
     def initialize(key, value)
       @key = key
       @value = value
@@ -230,33 +236,41 @@ class Puppet::Graph::RbTreeMap
 
     def rotate_left
       r = @right
-      r_key, r_value = r.key, r.value
+      r_key = r.key
+      r_value = r.value
       b = r.left
       r.left = @left
       @left = r
       @right = r.right
       r.right = b
-      r.color, r.key, r.value = :red, @key, @value
-      @key, @value = r_key, r_value
+      r.color = :red
+      r.key = @key
+      r.value = @value
+      @key = r_key
+      @value = r_value
       self
     end
 
     def rotate_right
       l = @left
-      l_key, l_value = l.key, l.value
+      l_key = l.key
+      l_value = l.value
       b = l.right
       l.right = @right
       @right = l
       @left = l.left
       l.left = b
-      l.color, l.key, l.value = :red, @key, @value
-      @key, @value = l_key, l_value
+      l.color = :red
+      l.key = @key
+      l.value = @value
+      @key = l_key
+      @value = l_value
       self
     end
 
     def move_red_left
       colorflip
-      if (@right.left && @right.left.red?)
+      if @right.left && @right.left.red?
         @right.rotate_right
         rotate_left
         colorflip
@@ -266,7 +280,7 @@ class Puppet::Graph::RbTreeMap
 
     def move_red_right
       colorflip
-      if (@left.left && @left.left.red?)
+      if @left.left && @left.left.red?
         rotate_right
         colorflip
       end
@@ -286,6 +300,7 @@ class Puppet::Graph::RbTreeMap
 
   def recursive_yield(node, &blk)
     return unless node
+
     recursive_yield(node.left, &blk)
     yield node.key, node.value
     recursive_yield(node.right, &blk)
@@ -293,14 +308,15 @@ class Puppet::Graph::RbTreeMap
 
   def delete_recursive(node, key)
     if (key <=> node.key) == -1
-      node.move_red_left if ( !isred(node.left) && !isred(node.left.left) )
+      node.move_red_left if !isred(node.left) && !isred(node.left.left)
       node.left, result = delete_recursive(node.left, key)
     else
       node.rotate_right if isred(node.left)
-      if ( ( (key <=> node.key) == 0) && node.right.nil? )
+      if ((key <=> node.key) == 0) && node.right.nil?
         return nil, node.value
       end
-      if ( !isred(node.right) && !isred(node.right.left) )
+
+      if !isred(node.right) && !isred(node.right.left)
         node.move_red_right
       end
       if (key <=> node.key) == 0
@@ -313,40 +329,43 @@ class Puppet::Graph::RbTreeMap
         node.right, result = delete_recursive(node.right, key)
       end
     end
-    return node.fixup, result
+    [node.fixup, result]
   end
 
   def delete_min_recursive(node)
     if node.left.nil?
       return nil, node.value
     end
-    if ( !isred(node.left) && !isred(node.left.left) )
+
+    if !isred(node.left) && !isred(node.left.left)
       node.move_red_left
     end
     node.left, result = delete_min_recursive(node.left)
 
-    return node.fixup, result
+    [node.fixup, result]
   end
 
   def delete_max_recursive(node)
-    if (isred(node.left))
+    if isred(node.left)
       node = node.rotate_right
     end
     return nil, node.value if node.right.nil?
-    if ( !isred(node.right) && !isred(node.right.left) )
+
+    if !isred(node.right) && !isred(node.right.left)
       node.move_red_right
     end
     node.right, result = delete_max_recursive(node.right)
 
-    return node.fixup, result
+    [node.fixup, result]
   end
 
   def get_recursive(node, key)
     return nil if node.nil?
+
     case key <=> node.key
-    when  0 then return node
-    when -1 then return get_recursive(node.left, key)
-    when  1 then return get_recursive(node.right, key)
+    when 0 then node
+    when -1 then get_recursive(node.left, key)
+    when  1 then get_recursive(node.right, key)
     end
   end
 
@@ -369,14 +388,14 @@ class Puppet::Graph::RbTreeMap
     end
 
     case key <=> node.key
-    when  0 then node.value = value
+    when 0 then node.value = value
     when -1 then node.left = insert(node.left, key, value)
     when  1 then node.right = insert(node.right, key, value)
     end
 
-    node.rotate_left if (node.right && node.right.red?)
-    node.rotate_right if (node.left && node.left.red? && node.left.left && node.left.left.red?)
-    node.colorflip if (node.left && node.left.red? && node.right && node.right.red?)
+    node.rotate_left if node.right && node.right.red?
+    node.rotate_right if node.left && node.left.red? && node.left.left && node.left.left.red?
+    node.colorflip if node.left && node.left.red? && node.right && node.right.red?
     node
   end
 

data/lib/puppet/graph/relationship_graph.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The relationship graph is the final form of a puppet catalog in
 # which all dependency edges are explicitly in the graph. This form of the
 # catalog is used to traverse the graph in the order in which resources are
@@ -41,7 +43,7 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
     end
   end
 
-  def add_relationship(f, t, label=nil)
+  def add_relationship(f, t, label = nil)
     super(f, t, label)
     @ready.delete(@prioritizer.priority_of(t))
   end
@@ -97,12 +99,12 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
   end
 
   def traverse(options = {}, &block)
-    continue_while = options[:while] || lambda { true }
-    pre_process = options[:pre_process] || lambda { |resource| }
-    overly_deferred_resource_handler = options[:overly_deferred_resource_handler] || lambda { |resource| }
-    canceled_resource_handler = options[:canceled_resource_handler] || lambda { |resource| }
-    teardown = options[:teardown] || lambda {}
-    graph_cycle_handler = options[:graph_cycle_handler] || lambda { [] }
+    continue_while = options[:while] || -> { true }
+    pre_process = options[:pre_process] || ->(resource) {}
+    overly_deferred_resource_handler = options[:overly_deferred_resource_handler] || ->(resource) {}
+    canceled_resource_handler = options[:canceled_resource_handler] || ->(resource) {}
+    teardown = options[:teardown] || -> {}
+    graph_cycle_handler = options[:graph_cycle_handler] || -> { [] }
 
     cycles = report_cycles_in_graph
     if cycles
@@ -126,22 +128,22 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
         deferred_resources << resource
       end
 
-      if @ready.empty? and deferred_resources.any?
-        if made_progress
-          enqueue(*deferred_resources)
-        else
-          deferred_resources.each do |res|
-            overly_deferred_resource_handler.call(res)
-            finish(res)
-          end
-        end
+      next unless @ready.empty? and deferred_resources.any?
 
-        made_progress = false
-        deferred_resources = []
+      if made_progress
+        enqueue(*deferred_resources)
+      else
+        deferred_resources.each do |res|
+          overly_deferred_resource_handler.call(res)
+          finish(res)
+        end
       end
+
+      made_progress = false
+      deferred_resources = []
     end
 
-    if !continue_while.call()
+    unless continue_while.call()
       while (resource = next_resource)
         canceled_resource_handler.call(resource)
         finish(resource)
@@ -169,7 +171,7 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
 
   def build_autorelation_dependencies(catalog)
     vertices.each do |vertex|
-      [:require,:subscribe].each do |rel_type|
+      [:require, :subscribe].each do |rel_type|
         vertex.send("auto#{rel_type}".to_sym, catalog).each do |edge|
           # don't let automatic relationships conflict with manual ones.
           next if edge?(edge.source, edge.target)
@@ -189,7 +191,7 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
         end
       end
 
-      [:before,:notify].each do |rel_type|
+      [:before, :notify].each do |rel_type|
         vertex.send("auto#{rel_type}".to_sym, catalog).each do |edge|
           # don't let automatic relationships conflict with manual ones.
           next if edge?(edge.target, edge.source)
@@ -243,8 +245,8 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
     #   can "do the right thing" for references to other vertices that may or
     #   may not be containers.
     #
-    admissible = Hash.new { |h,k| k }
-    completed  = Hash.new { |h,k| k }
+    admissible = Hash.new { |_h, k| k }
+    completed  = Hash.new { |_h, k| k }
     containers.each { |x|
       admissible[x] = whit_class.new(:name => "admissible_#{x.ref}", :catalog => catalog)
       completed[x]  = whit_class.new(:name => "completed_#{x.ref}",  :catalog => catalog)
@@ -263,19 +265,19 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
     #
     containers.each { |x|
       contents = catalog.adjacent(x, :direction => :out)
-      add_edge(admissible[x],completed[x]) if contents.empty? # (0)
+      add_edge(admissible[x], completed[x]) if contents.empty? # (0)
       contents.each { |v|
-        add_edge(admissible[x],admissible[v],Default_label) # (1)
+        add_edge(admissible[x], admissible[v], Default_label) # (1)
         add_edge(completed[v], completed[x], Default_label) # (2)
       }
       # (3) & (5)
-      adjacent(x,:direction => :in,:type => :edges).each { |e|
-        add_edge(completed[e.source],admissible[x],e.label)
+      adjacent(x, :direction => :in, :type => :edges).each { |e|
+        add_edge(completed[e.source], admissible[x], e.label)
         remove_edge! e
       }
       # (4) & (5)
-      adjacent(x,:direction => :out,:type => :edges).each { |e|
-        add_edge(completed[x],admissible[e.target],e.label)
+      adjacent(x, :direction => :out, :type => :edges).each { |e|
+        add_edge(completed[x], admissible[e.target], e.label)
         remove_edge! e
       }
     }

data/lib/puppet/graph/sequential_prioritizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This implements a priority in which keys are given values that will keep them
 # in the same priority in which they priorities are requested. Nested
 # structures (those in which a key is contained within another key) are

data/lib/puppet/graph/simple_graph.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/external/dot'
 require_relative '../../puppet/relationship'
 require 'set'
@@ -104,7 +106,7 @@ class Puppet::Graph::SimpleGraph
     # decent Ruby stack.
     recur = [{ :node => root }]
 
-    while not recur.empty? do
+    until recur.empty?
       frame = recur.last
       vertex = frame[:node]
 
@@ -123,7 +125,7 @@ class Puppet::Graph::SimpleGraph
       when :children then
         if frame[:children].length > 0 then
           child = frame[:children].shift
-          if ! s[:index][child] then
+          if !s[:index][child] then
             # Never seen, need to recurse.
             frame[:step] = :after_recursion
             frame[:child] = child
@@ -142,7 +144,7 @@ class Puppet::Graph::SimpleGraph
             end
             s[:scc] << this_scc
           end
-          recur.pop               # done with this node, finally.
+          recur.pop # done with this node, finally.
         end
 
       when :after_recursion then
@@ -169,7 +171,7 @@ class Puppet::Graph::SimpleGraph
 
     # we usually have a disconnected graph, must walk all possible roots
     vertices.each do |vertex|
-      if ! state[:index][vertex] then
+      unless state[:index][vertex] then
         tarjan vertex, state
       end
     end
@@ -184,9 +186,7 @@ class Puppet::Graph::SimpleGraph
     # time-scale.
     state[:scc].select do |component|
       multi_vertex_component?(component) || single_vertex_referring_to_self?(component)
-    end.map do |component|
-      component.sort
-    end.sort
+    end.map(&:sort).sort
   end
 
   # Perform a BFS on the sub graph representing the cycle, with a view to
@@ -197,20 +197,20 @@ class Puppet::Graph::SimpleGraph
   # through the graph first, which are more likely to be interesting to the
   # user.  I think; it would be interesting to verify that. --daniel 2011-01-23
   def paths_in_cycle(cycle, max_paths = 1)
-    #TRANSLATORS "negative or zero" refers to the count of paths
+    # TRANSLATORS "negative or zero" refers to the count of paths
     raise ArgumentError, _("negative or zero max_paths") if max_paths < 1
 
     # Calculate our filtered outbound vertex lists...
     adj = {}
     cycle.each do |vertex|
-      adj[vertex] = adjacent(vertex).select{|s| cycle.member? s}
+      adj[vertex] = adjacent(vertex).select { |s| cycle.member? s }
     end
 
     found = []
 
     # frame struct is vertex, [path]
     stack = [[cycle.first, []]]
-    while frame = stack.shift do #rubocop:disable Lint/AssignmentInCondition
+    while frame = stack.shift # rubocop:disable Lint/AssignmentInCondition
       if frame[1].member?(frame[0]) then
         found << frame[1] + [frame[0]]
         break if found.length >= max_paths
@@ -221,7 +221,7 @@ class Puppet::Graph::SimpleGraph
       end
     end
 
-    return found.sort
+    found.sort
   end
 
   # @return [Array] array of dependency cycles (arrays)
@@ -234,14 +234,14 @@ class Puppet::Graph::SimpleGraph
 
     cycles.each do |cycle|
       paths = paths_in_cycle(cycle)
-      message += paths.map{ |path| '(' + path.join(' => ') + ')'}.join('\n') + '\n'
+      message += paths.map { |path| '(' + path.join(' => ') + ')' }.join('\n') + '\n'
     end
 
     if Puppet[:graph] then
       filename = write_cycles_to_graph(cycles)
       message += _("Cycle graph written to %{filename}.") % { filename: filename }
     else
-      #TRANSLATORS '--graph' refers to a command line option and OmniGraffle and GraphViz are program names and should not be translated
+      # TRANSLATORS '--graph' refers to a command line option and OmniGraffle and GraphViz are program names and should not be translated
       message += _("Try the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz")
     end
     Puppet.err(message)
@@ -266,7 +266,7 @@ class Puppet::Graph::SimpleGraph
     filename = File.join(Puppet[:graphdir], "cycles.dot")
     # DOT files are assumed to be UTF-8 by default - http://www.graphviz.org/doc/info/lang.html
     File.open(filename, "w:UTF-8") { |f| f.puts graph }
-    return filename
+    filename
   end
 
   # Add a new vertex to the graph.
@@ -278,9 +278,10 @@ class Puppet::Graph::SimpleGraph
   # Remove a vertex from the graph.
   def remove_vertex!(v)
     return unless vertex?(v)
+
     @upstream_from.clear
     @downstream_from.clear
-    (@in_to[v].values+@out_from[v].values).flatten.each { |e| remove_edge!(e) }
+    (@in_to[v].values + @out_from[v].values).flatten.each { |e| remove_edge!(e) }
     @in_to.delete(v)
     @out_from.delete(v)
   end
@@ -297,8 +298,9 @@ class Puppet::Graph::SimpleGraph
 
   # Add a new edge.  The graph user has to create the edge instance,
   # since they have to specify what kind of edge it is.
-  def add_edge(e,*a)
-    return add_relationship(e,*a) unless a.empty?
+  def add_edge(e, *a)
+    return add_relationship(e, *a) unless a.empty?
+
     e = Puppet::Relationship.from_data_hash(e) if e.is_a?(Hash)
     @upstream_from.clear
     @downstream_from.clear
@@ -326,19 +328,19 @@ class Puppet::Graph::SimpleGraph
   end
 
   def edges
-    @in_to.values.collect { |x| x.values }.flatten
+    @in_to.values.collect(&:values).flatten
   end
 
   def each_edge
-    @in_to.each { |t,ns| ns.each { |s,es| es.each { |e| yield e }}}
+    @in_to.each { |_t, ns| ns.each { |_s, es| es.each { |e| yield e } } }
   end
 
   # Remove an edge from our graph.
   def remove_edge!(e)
-    if edge?(e.source,e.target)
+    if edge?(e.source, e.target)
       @upstream_from.clear
       @downstream_from.clear
-      @in_to   [e.target].delete e.source if (@in_to   [e.target][e.source] -= [e]).empty?
+      @in_to[e.target].delete e.source if (@in_to[e.target][e.source] -= [e]).empty?
       @out_from[e.source].delete e.target if (@out_from[e.source][e.target] -= [e]).empty?
     end
   end
@@ -347,6 +349,7 @@ class Puppet::Graph::SimpleGraph
   def adjacent(v, options = {})
     ns = (options[:direction] == :in) ? @in_to[v] : @out_from[v]
     return [] unless ns
+
     (options[:type] == :edges) ? ns.values.flatten : ns.keys
   end
 
@@ -360,6 +363,7 @@ class Puppet::Graph::SimpleGraph
     until stack.empty?
       node = stack.shift
       next if seen.member? node
+
       connected = adjacent(node, :direction => direction)
       connected.each do |target|
         yield node, target
@@ -372,7 +376,7 @@ class Puppet::Graph::SimpleGraph
   # A different way of walking a tree, and a much faster way than the
   # one that comes with GRATR.
   def tree_from_vertex(start, direction = :out)
-    predecessor={}
+    predecessor = {}
     walk(start, direction) do |parent, child|
       predecessor[child] = parent
     end
@@ -381,6 +385,7 @@ class Puppet::Graph::SimpleGraph
 
   def downstream_from_vertex(v)
     return @downstream_from[v] if @downstream_from[v]
+
     result = @downstream_from[v] = {}
     @out_from[v].keys.each do |node|
       result[node] = 1
@@ -395,6 +400,7 @@ class Puppet::Graph::SimpleGraph
 
   def upstream_from_vertex(v)
     return @upstream_from[v] if @upstream_from[v]
+
     result = @upstream_from[v] = {}
     @in_to[v].keys.each do |node|
       result[node] = 1
@@ -420,14 +426,14 @@ class Puppet::Graph::SimpleGraph
   # This implementation is not particularly efficient; it's used in testing where clarity
   #   is more important than last-mile efficiency.
   #
-  def path_between(f,t)
-    if f==t
+  def path_between(f, t)
+    if f == t
       []
     elsif direct_dependents_of(f).include?(t)
-      [edges_between(f,t)]
+      [edges_between(f, t)]
     elsif dependents(f).include?(t)
       m = (dependents(f) & direct_dependencies_of(t)).first
-      path_between(f,m) + path_between(m,t)
+      path_between(f, m) + path_between(m, t)
     else
       nil
     end
@@ -440,25 +446,25 @@ class Puppet::Graph::SimpleGraph
   # rdot.rb. If an edge or vertex label is a kind of Hash then the keys
   # which match +dot+ properties will be used as well.
   def to_dot_graph(params = {})
-    params['name'] ||= self.class.name.tr(':','_')
-    fontsize   = params['fontsize'] ? params['fontsize'] : '8'
+    params['name'] ||= self.class.name.tr(':', '_')
+    fontsize   = params['fontsize'] || '8'
     graph      = (directed? ? DOT::DOTDigraph : DOT::DOTSubgraph).new(params)
     edge_klass = directed? ? DOT::DOTDirectedEdge : DOT::DOTEdge
     vertices.each do |v|
       name = v.ref
-      params = {'name'     => stringify(name),
-        'fontsize' => fontsize,
-        'label'    => name}
+      params = { 'name' => stringify(name),
+                 'fontsize' => fontsize,
+                 'label' => name }
       v_label = v.ref
-      params.merge!(v_label) if v_label and v_label.kind_of? Hash
+      params.merge!(v_label) if v_label and v_label.is_a? Hash
       graph << DOT::DOTNode.new(params)
     end
     edges.each do |e|
-      params = {'from'     => stringify(e.source.ref),
-        'to'       => stringify(e.target.ref),
-        'fontsize' => fontsize }
+      params = { 'from' => stringify(e.source.ref),
+                 'to' => stringify(e.target.ref),
+                 'fontsize' => fontsize }
       e_label = e.ref
-      params.merge!(e_label) if e_label and e_label.kind_of? Hash
+      params.merge!(e_label) if e_label and e_label.is_a? Hash
       graph << edge_klass.new(params)
     end
     graph
@@ -469,7 +475,7 @@ class Puppet::Graph::SimpleGraph
   end
 
   # Output the dot format as a string
-  def to_dot(params={}) to_dot_graph(params).to_s; end
+  def to_dot(params = {}) to_dot_graph(params).to_s; end
 
   # Produce the graph files if requested.
   def write_graph(name)
@@ -506,26 +512,26 @@ class Puppet::Graph::SimpleGraph
   def to_data_hash
     hash = { 'edges' => edges.map(&:to_data_hash) }
     hash['vertices'] = if self.class.use_new_yaml_format
-      vertices
-    else
-      # Represented in YAML using the old (version 2.6) format.
-      result = {}
-      vertices.each do |vertex|
-        adjacencies = {}
-        [:in, :out].each do |direction|
-          direction_hash = {}
-          adjacencies[direction.to_s] = direction_hash
-          adjacent(vertex, :direction => direction, :type => :edges).each do |edge|
-            other_vertex = direction == :in ? edge.source : edge.target
-            (direction_hash[other_vertex.to_s] ||= []) << edge
-          end
-          direction_hash.each_pair { |key, edges| direction_hash[key] = edges.uniq.map(&:to_data_hash) }
-        end
-        vname = vertex.to_s
-        result[vname] = { 'adjacencies' => adjacencies, 'vertex' => vname }
-      end
-      result
-    end
+                         vertices
+                       else
+                         # Represented in YAML using the old (version 2.6) format.
+                         result = {}
+                         vertices.each do |vertex|
+                           adjacencies = {}
+                           [:in, :out].each do |direction|
+                             direction_hash = {}
+                             adjacencies[direction.to_s] = direction_hash
+                             adjacent(vertex, :direction => direction, :type => :edges).each do |edge|
+                               other_vertex = direction == :in ? edge.source : edge.target
+                               (direction_hash[other_vertex.to_s] ||= []) << edge
+                             end
+                             direction_hash.each_pair { |key, edges| direction_hash[key] = edges.uniq.map(&:to_data_hash) }
+                           end
+                           vname = vertex.to_s
+                           result[vname] = { 'adjacencies' => adjacencies, 'vertex' => vname }
+                         end
+                         result
+                       end
     hash
   end
 

data/lib/puppet/graph.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet::Graph
   require_relative 'graph/prioritizer'
   require_relative 'graph/sequential_prioritizer'