puppet 6.0.5-x64-mingw32 → 8.8.1-x64-mingw32

data/lib/puppet/gettext/config.rb

@@ -1,5 +1,7 @@
-require 'puppet/util/platform'
-require 'puppet/file_system'
+# frozen_string_literal: true
+
+require_relative '../../puppet/util/platform'
+require_relative '../../puppet/file_system'
 
 module Puppet::GettextConfig
   LOCAL_PATH = File.absolute_path('../../../locales', File.dirname(__FILE__))
@@ -24,7 +26,7 @@ module Puppet::GettextConfig
   rescue LoadError
     # Stub out gettext's `_` and `n_()` methods, which attempt to load translations,
     # with versions that do nothing
-    require 'puppet/gettext/stubs'
+    require_relative '../../puppet/gettext/stubs'
     @gettext_loaded = false
   end
 
@@ -41,9 +43,9 @@ module Puppet::GettextConfig
   # @return [String] the active locale
   def self.current_locale
     if gettext_loaded?
-      return FastGettext.default_locale
+      FastGettext.default_locale
     else
-      return 'en'
+      'en'
     end
   end
 
@@ -53,7 +55,7 @@ module Puppet::GettextConfig
   def self.loaded_text_domains
     return [] if @gettext_disabled || !gettext_loaded?
 
-    return FastGettext.translation_repositories.keys
+    FastGettext.translation_repositories.keys
   end
 
   # @api private
@@ -63,9 +65,10 @@ module Puppet::GettextConfig
   # @param [String, Symbol] domain_name the name of the domain to create
   def self.reset_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+
     domain_name = domain_name.to_sym
 
-    Puppet.debug "Reset text domain to #{domain_name.inspect}"
+    Puppet.debug { "Reset text domain to #{domain_name.inspect}" }
     FastGettext.add_text_domain(domain_name,
                                 type: :chain,
                                 chain: [],
@@ -83,6 +86,7 @@ module Puppet::GettextConfig
   # non-default text domain.
   def self.clear_text_domain
     return if @gettext_disabled || !gettext_loaded?
+
     FastGettext.text_domain = nil
   end
 
@@ -112,13 +116,14 @@ module Puppet::GettextConfig
   # @param [String, Symbol] domain_name the name of the domain to switch to
   def self.use_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+
     domain_name = domain_name.to_sym
 
     if FastGettext.translation_repositories.include?(domain_name)
-      Puppet.debug "Use text domain #{domain_name.inspect}"
+      Puppet.debug { "Use text domain #{domain_name.inspect}" }
       FastGettext.text_domain = domain_name
     else
-      Puppet.debug "Requested unknown text domain #{domain_name.inspect}"
+      Puppet.debug { "Requested unknown text domain #{domain_name.inspect}" }
     end
   end
 
@@ -135,14 +140,15 @@ module Puppet::GettextConfig
   # @param [String, Symbol] domain_name the name of the domain to delete
   def self.delete_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+
     domain_name = domain_name.to_sym
 
     deleted = FastGettext.translation_repositories.delete(domain_name)
     if FastGettext.text_domain == domain_name
-      Puppet.debug "Deleted current text domain #{domain_name.inspect}: #{!deleted.nil?}"
+      Puppet.debug { "Deleted current text domain #{domain_name.inspect}: #{!deleted.nil?}" }
       FastGettext.text_domain = nil
     else
-      Puppet.debug "Deleted text domain #{domain_name.inspect}: #{!deleted.nil?}"
+      Puppet.debug { "Deleted text domain #{domain_name.inspect}: #{!deleted.nil?}" }
     end
   end
 
@@ -185,11 +191,11 @@ module Puppet::GettextConfig
   # @return [String] path to the config, or nil if not found
   def self.puppet_locale_path
     if Puppet::FileSystem.exist?(LOCAL_PATH)
-      return LOCAL_PATH
+      LOCAL_PATH
     elsif Puppet::Util::Platform.windows? && Puppet::FileSystem.exist?(WINDOWS_PATH)
-      return WINDOWS_PATH
+      WINDOWS_PATH
     elsif !Puppet::Util::Platform.windows? && Puppet::FileSystem.exist?(POSIX_PATH)
-      return POSIX_PATH
+      POSIX_PATH
     else
       nil
     end
@@ -201,9 +207,9 @@ module Puppet::GettextConfig
   # @return [Symbol] :mo if in a package structure, :po otherwise
   def self.translation_mode(conf_path)
     if WINDOWS_PATH == conf_path || POSIX_PATH == conf_path
-      return :mo
+      :mo
     else
-      return :po
+      :po
     end
   end
 
@@ -233,7 +239,7 @@ module Puppet::GettextConfig
     end
 
     add_repository_to_domain(project_name, locale_dir, file_format, text_domain)
-    return true
+    true
   end
 
   # @api private
@@ -267,6 +273,7 @@ module Puppet::GettextConfig
   # @param [String] locale the language portion of a locale string (e.g. "ja")
   def self.set_locale(locale)
     return if @gettext_disabled || !gettext_loaded?
+
     # make sure we're not using the `available_locales` machinery
     FastGettext.default_available_locales = nil
 

data/lib/puppet/gettext/module_translations.rb

@@ -1,7 +1,8 @@
-require 'puppet/gettext/config'
+# frozen_string_literal: true
 
-module Puppet::ModuleTranslations
+require_relative '../../puppet/gettext/config'
 
+module Puppet::ModuleTranslations
   # @api private
   # Loads translation files for each of the specified modules,
   # if present. Requires the modules to have `forge_name` specified.
@@ -11,11 +12,11 @@ module Puppet::ModuleTranslations
     modules.each do |mod|
       next unless mod.forge_name && mod.has_translations?(Puppet::GettextConfig.current_locale)
 
-      module_name = mod.forge_name.gsub('/', '-')
+      module_name = mod.forge_name.tr('/', '-')
       if Puppet::GettextConfig.load_translations(module_name, mod.locale_directory, :po)
-        Puppet.debug "Loaded translations for #{module_name}."
+        Puppet.debug { "Loaded translations for #{module_name}." }
       elsif Puppet::GettextConfig.gettext_loaded?
-        Puppet.debug "Could not find translation files for #{module_name} at #{mod.locale_directory}. Skipping translation initialization."
+        Puppet.debug { "Could not find translation files for #{module_name} at #{mod.locale_directory}. Skipping translation initialization." }
       else
         Puppet.warn_once("gettext_unavailable", "gettext_unavailable", "No gettext library found, skipping translation initialization.")
       end
@@ -31,9 +32,9 @@ module Puppet::ModuleTranslations
     Dir.glob("#{vardir}/locales/#{locale}/*.po") do |f|
       module_name = File.basename(f, ".po")
       if Puppet::GettextConfig.load_translations(module_name, File.join(vardir, "locales"), :po)
-        Puppet.debug "Loaded translations for #{module_name}."
+        Puppet.debug { "Loaded translations for #{module_name}." }
       elsif Puppet::GettextConfig.gettext_loaded?
-        Puppet.debug "Could not load translations for #{module_name}."
+        Puppet.debug { "Could not load translations for #{module_name}." }
       else
         Puppet.warn_once("gettext_unavailable", "gettext_unavailable", "No gettext library found, skipping translation initialization.")
       end

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
@@ -213,8 +219,8 @@ class Puppet::Graph::RbTreeMap
           :color => @color,
         }
       }
-      h.merge!(:left => left.to_hash) if @left
-      h.merge!(:right => right.to_hash) if @right
+      h[:left] = left.to_hash if @left
+      h[:right] = right.to_hash if @right
       h
     end
 
@@ -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,14 +99,15 @@ 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 { [] }
-
-    if cycles = report_cycles_in_graph
+    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
       graph_cycle_handler.call(cycles)
     end
 
@@ -125,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)
@@ -168,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)
@@ -188,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)
@@ -242,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)
@@ -262,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