puppet 8.3.1-universal-darwin → 8.5.0-universal-darwin

data/lib/puppet/face/catalog.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:catalog, '0.0.1') do
@@ -61,7 +62,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
 
@@ -131,7 +132,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
       catalog = nil

data/lib/puppet/face/config.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/face'
 require_relative '../../puppet/settings/ini_file'
 
@@ -16,7 +17,7 @@ Puppet::Face.define(:config, '0.0.1') do
   DEFAULT_SECTION_MARKER = Object.new
   DEFAULT_SECTION = "main"
   option "--section " + _("SECTION_NAME") do
-    default_to { DEFAULT_SECTION_MARKER } #Sentinel object for default detection during commands
+    default_to { DEFAULT_SECTION_MARKER } # Sentinel object for default detection during commands
     summary _("The section of the configuration file to interact with.")
     description <<-EOT
       The section of the puppet.conf configuration file to interact with.
@@ -98,10 +99,10 @@ Puppet::Face.define(:config, '0.0.1') do
   def warn_default_section(section_name)
     messages = []
     messages << _("No section specified; defaulting to '%{section_name}'.") %
-      { section_name: section_name }
-    #TRANSLATORS '--section' is a command line option and should not be translated
+                { section_name: section_name }
+    # TRANSLATORS '--section' is a command line option and should not be translated
     messages << _("Set the config section by using the `--section` flag.")
-    #TRANSLATORS `puppet config --section user print foo` is a command line example and should not be translated
+    # TRANSLATORS `puppet config --section user print foo` is a command line example and should not be translated
     messages << _("For example, `puppet config --section user print foo`.")
     messages << _("For more information, see https://puppet.com/docs/puppet/latest/configuration.html")
 
@@ -109,9 +110,9 @@ Puppet::Face.define(:config, '0.0.1') do
   end
 
   def report_section_and_environment(section_name, environment_name)
-      $stderr.puts colorize(:hyellow,
-        _("Resolving settings from section '%{section_name}' in environment '%{environment_name}'") %
-          { section_name: section_name, environment_name: environment_name })
+    $stderr.puts colorize(:hyellow,
+                          _("Resolving settings from section '%{section_name}' in environment '%{environment_name}'") %
+                            { section_name: section_name, environment_name: environment_name })
   end
 
   action(:set) do
@@ -136,7 +137,6 @@ Puppet::Face.define(:config, '0.0.1') do
     EOT
 
     when_invoked do |name, value, options|
-
       @default_section = false
       if options[:section] == DEFAULT_SECTION_MARKER
         options[:section] = DEFAULT_SECTION
@@ -144,15 +144,15 @@ Puppet::Face.define(:config, '0.0.1') do
       end
 
       if name == 'environment' && options[:section] == 'main'
-        Puppet.warning _(<<-EOM).chomp
-The environment should be set in either the `[user]`, `[agent]`, or `[server]`
-section. Variables set in the `[agent]` section are used when running
-`puppet agent`. Variables set in the `[user]` section are used when running
-various other puppet subcommands, like `puppet apply` and `puppet module`; these
-require the defined environment directory to exist locally. Set the config
-section by using the `--section` flag. For example,
-`puppet config --section user set environment foo`. For more information, see
-https://puppet.com/docs/puppet/latest/configuration.html#environment
+        Puppet.warning _(<<~EOM).chomp
+          The environment should be set in either the `[user]`, `[agent]`, or `[server]`
+          section. Variables set in the `[agent]` section are used when running
+          `puppet agent`. Variables set in the `[user]` section are used when running
+          various other puppet subcommands, like `puppet apply` and `puppet module`; these
+          require the defined environment directory to exist locally. Set the config
+          section by using the `--section` flag. For example,
+          `puppet config --section user set environment foo`. For more information, see
+          https://puppet.com/docs/puppet/latest/configuration.html#environment
         EOM
       end
 
@@ -201,7 +201,7 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
   action(:delete) do
     summary _("Delete a Puppet setting.")
     arguments _("<setting>")
-    #TRANSLATORS 'main' is a specific section name and should not be translated
+    # TRANSLATORS 'main' is a specific section name and should not be translated
     description "Deletes a setting from the specified section. (The default is the section 'main')."
     notes <<-'EOT'
       By default, this action deletes the configuration setting from the 'main'
@@ -219,7 +219,6 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
     EOT
 
     when_invoked do |name, options|
-
       @default_section = false
       if options[:section] == DEFAULT_SECTION_MARKER
         options[:section] = DEFAULT_SECTION
@@ -230,7 +229,6 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
       if Puppet::FileSystem.exist?(path)
         Puppet::FileSystem.open(path, nil, 'r+:UTF-8') do |file|
           Puppet::Settings::IniFile.update(file) do |config|
-
             # delete from both master section and server section
             if options[:section] == "master" || options[:section] == "server"
               master_setting_string = config.delete("master", name)
@@ -259,7 +257,7 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
           end
         end
       else
-        #TRANSLATORS the 'puppet.conf' is a specific file and should not be translated
+        # TRANSLATORS the 'puppet.conf' is a specific file and should not be translated
         Puppet.warning(_("The puppet.conf file does not exist %{puppet_conf}") % { puppet_conf: path })
       end
       nil

data/lib/puppet/face/epp.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/face'
 require_relative '../../puppet/pops'
 require_relative '../../puppet/parser/files'
@@ -94,7 +95,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       end
       if !missing_files.empty?
         raise Puppet::Error, _("One or more file(s) specified did not exist:\n%{missing_files_list}") %
-            { missing_files_list: missing_files.map { |f| "   #{f}" }.join("\n") }
+                             { missing_files_list: missing_files.map { |f| "   #{f}" }.join("\n") }
       else
         # Exit with 1 if there were errors
         raise Puppet::Error, _("Errors while validating epp") unless status
@@ -102,8 +103,7 @@ Puppet::Face.define(:epp, '0.0.1') do
     end
   end
 
-
-  action (:dump) do
+  action(:dump) do
     summary _("Outputs a dump of the internal template parse tree for debugging")
     arguments "[--format <old|pn|json>] [--pretty] { -e <source> | [<templates> ...] } "
     returns _("A dump of the resulting AST model unless there are syntax or validation errors.")
@@ -116,7 +116,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       * 'pn' is the Puppet Extended S-Expression Notation.
       * 'json' outputs the same graph as 'pn' but with JSON syntax.
 
-      The output will be "pretty printed" when the option --pretty is given together with --format 'pn' or 'json'. 
+      The output will be "pretty printed" when the option --pretty is given together with --format 'pn' or 'json'.
       This option has no effect on the 'old' format.
 
       The command accepts one or more templates (.epp) files, or an -e followed by the template
@@ -174,20 +174,19 @@ Puppet::Face.define(:epp, '0.0.1') do
       if options[:e]
         buffer.print dump_parse(options[:e], 'command-line-string', options, false)
       elsif args.empty?
-        if ! STDIN.tty?
+        if !STDIN.tty?
           buffer.print dump_parse(STDIN.read, 'stdin', options, false)
         else
           raise Puppet::Error, _("No input to parse given on command line or stdin")
         end
       else
-        templates, missing_files = args.reduce([[],[]]) do |memo, file|
+        templates, missing_files = args.each_with_object([[], []]) do |file, memo|
           template_file = effective_template(file, compiler.environment)
           if template_file.nil?
             memo[1] << file
           else
             memo[0] << template_file
           end
-          memo
         end
 
         show_filename = templates.count > 1
@@ -197,14 +196,14 @@ Puppet::Face.define(:epp, '0.0.1') do
 
         if !missing_files.empty?
           raise Puppet::Error, _("One or more file(s) specified did not exist:\n%{missing_files_list}") %
-              { missing_files_list:  missing_files.collect { |f| "   #{f}" }.join("\n") }
+                               { missing_files_list: missing_files.collect { |f| "   #{f}" }.join("\n") }
         end
       end
       buffer.string
     end
   end
 
-  action (:render) do
+  action(:render) do
     summary _("Renders an epp template as text")
     arguments "-e <source> | [<templates> ...] "
     returns _("A rendered result of one or more given templates.")
@@ -334,7 +333,6 @@ Puppet::Face.define(:epp, '0.0.1') do
 
       compiler = create_compiler(options)
       compiler.with_context_overrides('For rendering epp') do
-
         # Print to a buffer since the face needs to return the resulting string
         # and the face API is "all or nothing"
         #
@@ -343,7 +341,7 @@ Puppet::Face.define(:epp, '0.0.1') do
         if options[:e]
           buffer.print render_inline(options[:e], compiler, options)
         elsif args.empty?
-          if ! STDIN.tty?
+          if !STDIN.tty?
             buffer.print render_inline(STDIN.read, compiler, options)
           else
             raise Puppet::Error, _("No input to process given on command line or stdin")
@@ -361,6 +359,7 @@ Puppet::Face.define(:epp, '0.0.1') do
           end
         end
         raise Puppet::Error, _("error while rendering epp") unless status
+
         buffer.string
       end
     end
@@ -406,9 +405,10 @@ Puppet::Face.define(:epp, '0.0.1') do
     values_file = options[:values_file]
     if values_file
       begin
-        if values_file =~ /\.yaml$/
+        case values_file
+        when /\.yaml$/
           template_values = Puppet::Util::Yaml.safe_load_file(values_file, [Symbol])
-        elsif values_file =~ /\.pp$/
+        when /\.pp$/
           evaluating_parser = Puppet::Pops::Parser::EvaluatingParser.new
           template_values = evaluating_parser.evaluate_file(compiler.topscope, values_file)
         else
@@ -530,6 +530,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       unless given_facts.instance_of?(Hash)
         raise _("Incorrect formatted data in %{fact_file} given via the --facts flag") % { fact_file: fact_file }
       end
+
       # It is difficult to add to or modify the set of facts once the node is created
       # as changes does not show up in parameters. Rather than manually patching up
       # a node and risking future regressions, a new node is created from scratch
@@ -563,5 +564,4 @@ Puppet::Face.define(:epp, '0.0.1') do
       nil
     end
   end
-
 end

data/lib/puppet/face/facts.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/face'
 require_relative '../../puppet/node/facts'
 
@@ -59,7 +60,7 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
 
     render_as :json
 
-    when_invoked do |options|
+    when_invoked do |_options|
       # Use `agent` sections  settings for certificates, Puppet Server URL,
       # etc. instead of `user` section settings.
       Puppet.settings.preferred_run_mode = :agent
@@ -76,8 +77,9 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
       puppet = session.route_to(:puppet)
 
       Puppet.notice(_("Uploading facts for '%{node}' to '%{server}'") % {
-                    node: Puppet[:node_name_value],
-                    server: puppet.url.hostname})
+        node: Puppet[:node_name_value],
+        server: puppet.url.hostname
+      })
 
       puppet.put_facts(Puppet[:node_name_value], facts: facts, environment: Puppet.lookup(:current_environment).name.to_s)
       nil
@@ -172,4 +174,3 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
     end
   end
 end
-

data/lib/puppet/face/generate.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/face'
 require_relative '../../puppet/generate/type'
 
@@ -56,7 +57,8 @@ Puppet::Face.define(:generate, '0.1.0') do
       if Puppet::FileSystem.exist?(outputdir) && !Puppet::FileSystem.directory?(outputdir)
         raise ArgumentError, _("The output directory '%{outputdir}' exists and is not a directory") % { outputdir: outputdir }
       end
-      Puppet::FileSystem::mkpath(outputdir)
+
+      Puppet::FileSystem.mkpath(outputdir)
 
       generator.generate(inputs, outputdir, options[:force])
 

data/lib/puppet/face/help.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/face'
 require_relative '../../puppet/application/face_base'
 require_relative '../../puppet/util/constant_inflector'
@@ -41,7 +42,7 @@ Puppet::Face.define(:help, '0.0.1') do
       end
 
       if args.length > 2
-        #TRANSLATORS 'puppet help' is a command line and should not be translated
+        # TRANSLATORS 'puppet help' is a command line and should not be translated
         raise ArgumentError, _("The 'puppet help' command takes two (optional) arguments: a subcommand and an action")
       end
 
@@ -49,11 +50,9 @@ Puppet::Face.define(:help, '0.0.1') do
       if options.has_key? :version
         if options[:version].to_s !~ /^current$/i
           version = options[:version]
-        else
-          if args.length == 0
-            #TRANSLATORS '--version' is a command line option and should not be translated
-            raise ArgumentError, _("Supplying a '--version' only makes sense when a Faces subcommand is given")
-          end
+        elsif args.length == 0
+          raise ArgumentError, _("Supplying a '--version' only makes sense when a Faces subcommand is given")
+          # TRANSLATORS '--version' is a command line option and should not be translated
         end
       end
 
@@ -62,20 +61,19 @@ Puppet::Face.define(:help, '0.0.1') do
         if actionname
           raise ArgumentError, _("The legacy subcommand '%{sub_command}' does not support supplying an action") % { sub_command: facename }
         end
+
         # legacy apps already emit ronn output
         return render_application_help(facename)
+      elsif options[:ronn]
+        render_face_man(facename || :help)
+      # Calling `puppet help <app> --ronn` normally calls this action with
+      # <app> as the first argument in the `args` array. However, if <app>
+      # happens to match the name of an action, like `puppet help help
+      # --ronn`, then face_base "eats" the argument and `args` will be
+      # empty. Rather than force users to type `puppet help help help
+      # --ronn`, default the facename to `:help`
       else
-        if options[:ronn]
-          # Calling `puppet help <app> --ronn` normally calls this action with
-          # <app> as the first argument in the `args` array. However, if <app>
-          # happens to match the name of an action, like `puppet help help
-          # --ronn`, then face_base "eats" the argument and `args` will be
-          # empty. Rather than force users to type `puppet help help help
-          # --ronn`, default the facename to `:help`
-          render_face_man(facename || :help)
-        else
-          render_face_help(facename, actionname, version)
-        end
+        render_face_help(facename, actionname, version)
       end
     end
   end
@@ -123,7 +121,7 @@ Puppet::Face.define(:help, '0.0.1') do
     face = Puppet::Face[facename.to_sym, version]
     if actionname
       action = face.get_action(actionname.to_sym)
-      if ! action
+      if !action
         fail ArgumentError, _("Unable to load action %{actionname} from %{face}") % { actionname: actionname, face: face }
       end
     end
@@ -158,7 +156,7 @@ Puppet::Face.define(:help, '0.0.1') do
   # @return [Array] An Array of Arrays.  The outer array contains one entry per application; each
   #  element in the outer array is a pair whose first element is a String containing the application
   #  name, and whose second element is a String containing the summary for that application.
-  def all_application_summaries()
+  def all_application_summaries
     available_application_names_special_sort().inject([]) do |result, appname|
       next result if exclude_from_docs?(appname)
 
@@ -173,7 +171,7 @@ Puppet::Face.define(:help, '0.0.1') do
         rescue StandardError, LoadError
           error_message = _("!%{sub_command}! Subcommand unavailable due to error.") % { sub_command: appname }
           error_message += ' ' + _("Check error logs.")
-          result << [ error_message, '', '  ' ]
+          result << [error_message, '', '  ']
         end
       else
         begin
@@ -185,7 +183,7 @@ Puppet::Face.define(:help, '0.0.1') do
         rescue StandardError, LoadError
           error_message = _("!%{sub_command}! Subcommand unavailable due to error.") % { sub_command: appname }
           error_message += ' ' + _("Check error logs.")
-          result << [ error_message, '', '  ' ]
+          result << [error_message, '', '  ']
         end
       end
     end
@@ -194,7 +192,7 @@ Puppet::Face.define(:help, '0.0.1') do
   COMMON = 'Common:'
   SPECIALIZED = 'Specialized:'
   BLANK = "\n"
-  def available_application_names_special_sort()
+  def available_application_names_special_sort
     full_list = Puppet::Application.available_application_names
     a_list = full_list & %w{apply agent config help lookup module resource}
     a_list = a_list.sort
@@ -209,7 +207,7 @@ Puppet::Face.define(:help, '0.0.1') do
     # depends on the implementation coincidence of how our pages are
     # formatted.  If we can't match the pattern we expect we return the empty
     # string to ensure we don't blow up in the summary. --daniel 2011-04-11
-    while line = help.shift do #rubocop:disable Lint/AssignmentInCondition
+    while line = help.shift do # rubocop:disable Lint/AssignmentInCondition
       md = /^puppet-#{appname}\([^\)]+\) -- (.*)$/.match(line)
       if md
         return md[1]
@@ -220,7 +218,7 @@ Puppet::Face.define(:help, '0.0.1') do
   # This should absolutely be a private method, but for some reason it appears
   #  that you can't use the 'private' keyword inside of a Face definition.
   #  See #14205.
-  #private :horribly_extract_summary_from
+  # private :horribly_extract_summary_from
 
   def exclude_from_docs?(appname)
     %w{face_base indirection_base report status}.include? appname
@@ -228,7 +226,7 @@ Puppet::Face.define(:help, '0.0.1') do
   # This should absolutely be a private method, but for some reason it appears
   #  that you can't use the 'private' keyword inside of a Face definition.
   #  See #14205.
-  #private :exclude_from_docs?
+  # private :exclude_from_docs?
 
   def is_face_app?(appname)
     clazz = Puppet::Application.find(appname)
@@ -238,6 +236,5 @@ Puppet::Face.define(:help, '0.0.1') do
   # This should probably be a private method, but for some reason it appears
   #  that you can't use the 'private' keyword inside of a Face definition.
   #  See #14205.
-  #private :is_face_app?
-
+  # private :is_face_app?
 end

data/lib/puppet/face/module/changes.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Face.define(:module, '1.0.0') do
   action(:changes) do
     summary _("Show modified files of an installed module.")
@@ -27,6 +28,7 @@ Puppet::Face.define(:module, '1.0.0') do
       unless root_path
         raise ArgumentError, _("Could not find a valid module at %{path}") % { path: path.inspect }
       end
+
       Puppet::ModuleTool::Applications::Checksummer.run(root_path, options)
     end
 

data/lib/puppet/face/module/install.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 # frozen_string_literal: true
+
 require_relative '../../../puppet/forge'
 require_relative '../../../puppet/module_tool/install_directory'
 require 'pathname'
@@ -129,18 +130,19 @@ Puppet::Face.define(:module, '1.0.0') do
       Puppet::ModuleTool::Applications::Installer.run(name, install_dir, options)
     end
 
-    when_rendering :console do |return_value, name, options|
-      if return_value[:result] == :noop
+    when_rendering :console do |return_value, name, _options|
+      case return_value[:result]
+      when :noop
         Puppet.notice _("Module %{name} %{version} is already installed.") % { name: name, version: return_value[:version] }
         exit 0
-      elsif return_value[:result] == :failure
+      when :failure
         Puppet.err(return_value[:error][:multiline])
         exit 1
       else
         tree = Puppet::ModuleTool.build_tree(return_value[:graph], return_value[:install_dir])
 
         "#{return_value[:install_dir]}\n" +
-        Puppet::ModuleTool.format_tree(tree)
+          Puppet::ModuleTool.format_tree(tree)
       end
     end
   end

data/lib/puppet/face/module/list.rb

@@ -64,7 +64,7 @@ Puppet::Face.define(:module, '1.0.0') do
       modules_by_path = environment.modules_by_path
 
       {
-        :environment     => environment,
+        :environment => environment,
         :modules_by_path => modules_by_path,
         :unmet_dependencies => unmet_dependencies(environment),
       }
@@ -87,15 +87,15 @@ Puppet::Face.define(:module, '1.0.0') do
           # The modules with fewest things depending on them will be the
           # parent of the tree.  Can't assume to start with 0 dependencies
           # since dependencies may be cyclical.
-          modules_by_num_requires = modules.sort_by {|m| m.required_by.size}
+          modules_by_num_requires = modules.sort_by { |m| m.required_by.size }
           @seen = {}
           tree = list_build_tree(modules_by_num_requires, [], nil,
-            :label_unmet => true, :path => path, :label_invalid => false)
+                                 :label_unmet => true, :path => path, :label_invalid => false)
         else
           tree = []
-          modules.sort_by { |mod| mod.forge_name or mod.name  }.each do |mod|
+          modules.sort_by { |mod| mod.forge_name or mod.name }.each do |mod|
             tree << list_build_node(mod, path, :label_unmet => false,
-                      :path => path, :label_invalid => true)
+                                               :path => path, :label_invalid => true)
           end
         end
 
@@ -106,7 +106,6 @@ Puppet::Face.define(:module, '1.0.0') do
     end
   end
 
-
   def unmet_dependencies(environment)
     error_types = [:non_semantic_version, :version_mismatch, :missing]
 
@@ -118,11 +117,10 @@ Puppet::Face.define(:module, '1.0.0') do
     end
 
     # Prepare the unmet dependencies for display on the console.
-    environment.modules.sort_by {|mod| mod.name}.each do |mod|
-      unmet_grouped = Hash.new { |h,k| h[k] = [] }
-      unmet_grouped = mod.unmet_dependencies.inject(unmet_grouped) do |acc, dep|
+    environment.modules.sort_by { |mod| mod.name }.each do |mod|
+      unmet_grouped = Hash.new { |h, k| h[k] = [] }
+      unmet_grouped = mod.unmet_dependencies.each_with_object(unmet_grouped) do |dep, acc|
         acc[dep[:reason]] << dep
-        acc
       end
       unmet_grouped.each do |type, deps|
         unless deps.empty?
@@ -136,7 +134,7 @@ Puppet::Face.define(:module, '1.0.0') do
             msg = _("'%{parent_name}' (%{parent_version}) requires '%{dependency_name}' (%{dependency_version})") % { parent_name: parent_name, parent_version: parent_version, dependency_name: dep_name, dependency_version: version_constraint }
             unmet_deps[type][dep[:name]][:errors] << msg
             unmet_deps[type][dep[:name]][:parent] = {
-              :name    => dep[:parent][:name],
+              :name => dep[:parent][:name],
               :version => parent_version
             }
             unmet_deps[type][dep[:name]][:version] = installed_version
@@ -147,7 +145,6 @@ Puppet::Face.define(:module, '1.0.0') do
     unmet_deps
   end
 
-
   def warn_unmet_dependencies(environment)
     @unmet_deps = unmet_dependencies(environment)
 
@@ -212,9 +209,10 @@ Puppet::Face.define(:module, '1.0.0') do
   #     │ └── bodepd-create_resources (v0.0.1)
   #     └── puppetlabs-sqlite (v0.0.1)
   #
-  def list_build_tree(list, ancestors=[], parent=nil, params={})
-    list.map do |mod|
+  def list_build_tree(list, ancestors = [], parent = nil, params = {})
+    list.filter_map do |mod|
       next if @seen[(mod.forge_name or mod.name)]
+
       node = list_build_node(mod, parent, params)
       @seen[(mod.forge_name or mod.name)] = true
 
@@ -229,11 +227,11 @@ Puppet::Face.define(:module, '1.0.0') do
           node[:dependencies] << { :text => str }
         end
         node[:dependencies] += list_build_tree(mod.dependencies_as_modules,
-          ancestors + [mod], mod, params)
+                                               ancestors + [mod], mod, params)
       end
 
       node
-    end.compact
+    end
   end
 
   # Prepare a module object for print in a tree view.  Each node in the tree

data/lib/puppet/face/module/uninstall.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Face.define(:module, '1.0.0') do
   action(:uninstall) do
     summary _("Uninstall a puppet module.")

data/lib/puppet/face/module/upgrade.rb

@@ -71,17 +71,18 @@ Puppet::Face.define(:module, '1.0.0') do
     end
 
     when_rendering :console do |return_value|
-      if return_value[:result] == :noop
+      case return_value[:result]
+      when :noop
         Puppet.notice return_value[:error][:multiline]
         exit 0
-      elsif return_value[:result] == :failure
+      when :failure
         Puppet.err(return_value[:error][:multiline])
         exit 1
       else
         tree = Puppet::ModuleTool.build_tree(return_value[:graph], return_value[:base_dir])
 
         "#{return_value[:base_dir]}\n" +
-        Puppet::ModuleTool.format_tree(tree)
+          Puppet::ModuleTool.format_tree(tree)
       end
     end
   end

data/lib/puppet/face/module.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/face'
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/util/colors'

data/lib/puppet/face/node/clean.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 Puppet::Face.define(:node, '0.0.1') do
   action(:clean) do
-
     summary _("Clean up signed certs, cached facts, node objects, and reports for a node stored by the puppetmaster")
     arguments _("<host1> [<host2> ...]")
     description <<-'EOT'
@@ -103,6 +103,7 @@ Puppet::Face.define(:node, '0.0.1') do
       type = environment.known_resource_types.find_definition(resource.restype)
       return true if type && type.arguments.keys.include?('ensure')
     end
+
     return false
   end
 end

data/lib/puppet/face/node.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/face'
 Puppet::Indirector::Face.define(:node, '0.0.1') do
   copyright "Puppet Inc.", 2011
@@ -18,7 +19,7 @@ Puppet::Indirector::Face.define(:node, '0.0.1') do
   find = get_action(:find)
   find.summary _("Retrieve a node object.")
   find.arguments _("<host>")
-  #TRANSLATORS the following are specific names and should not be translated `classes`, `environment`, `expiration`, `name`, `parameters`, Puppet::Node
+  # TRANSLATORS the following are specific names and should not be translated `classes`, `environment`, `expiration`, `name`, `parameters`, Puppet::Node
   find.returns _(<<-'EOT')
     A hash containing the node's `classes`, `environment`, `expiration`, `name`,
     `parameters` (its facts, combined with any ENC-set parameters), and `time`.