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

data/lib/puppet/face/generate.rb

@@ -1,5 +1,7 @@
-require 'puppet/face'
-require 'puppet/generate/type'
+# frozen_string_literal: true
+
+require_relative '../../puppet/face'
+require_relative '../../puppet/generate/type'
 
 # Create the Generate face
 Puppet::Face.define(:generate, '0.1.0') do
@@ -55,9 +57,12 @@ 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])
+
+      exit(1) if generator.bad_input?
       nil
     end
   end

data/lib/puppet/face/help.rb

@@ -1,6 +1,8 @@
-require 'puppet/face'
-require 'puppet/application/face_base'
-require 'puppet/util/constant_inflector'
+# frozen_string_literal: true
+
+require_relative '../../puppet/face'
+require_relative '../../puppet/application/face_base'
+require_relative '../../puppet/util/constant_inflector'
 require 'pathname'
 require 'erb'
 
@@ -24,16 +26,23 @@ Puppet::Face.define(:help, '0.0.1') do
       summary _("The version of the subcommand for which to show help.")
     end
 
+    option "--ronn" do
+      summary _("Whether to render the help text in ronn format.")
+      default_to { false }
+    end
+
     default
     when_invoked do |*args|
       options = args.pop
 
-      if default_case?(args) || help_for_help?(args)
-        return erb('global.erb').result(binding)
+      unless options[:ronn]
+        if default_case?(args) || help_for_help?(args)
+          return erb('global.erb').result(binding)
+        end
       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
 
@@ -41,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
 
@@ -54,9 +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
-        return render_face_help(facename, actionname, version)
+        render_face_help(facename, actionname, version)
       end
     end
   end
@@ -69,8 +86,16 @@ Puppet::Face.define(:help, '0.0.1') do
     args.length == 1 && args.first == 'help'
   end
 
+  def render_face_man(facename)
+    # set 'face' as it's used in the erb processing.
+    face = Puppet::Face[facename.to_sym, :current]
+    # avoid unused variable warning
+    _face = face
+    erb('man.erb').result(binding)
+  end
+
   def render_application_help(applicationname)
-    return Puppet::Application[applicationname].help
+    Puppet::Application[applicationname].help
   rescue StandardError, LoadError => detail
     message = []
     message << _('Could not load help for the application %{application_name}.') % { application_name: applicationname }
@@ -82,7 +107,7 @@ Puppet::Face.define(:help, '0.0.1') do
 
   def render_face_help(facename, actionname, version)
     face, action = load_face_help(facename, actionname, version)
-    return template_for(face, action).result(binding)
+    template_for(face, action).result(binding)
   rescue StandardError, LoadError => detail
     message = []
     message << _('Could not load help for the face %{face_name}.') % { face_name: facename }
@@ -96,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
+      unless action
         fail ArgumentError, _("Unable to load action %{actionname} from %{face}") % { actionname: actionname, face: face }
       end
     end
@@ -114,15 +139,15 @@ Puppet::Face.define(:help, '0.0.1') do
 
   def erb(name)
     template = (Pathname(__FILE__).dirname + "help" + name)
-    erb = ERB.new(template.read, nil, '-')
+    erb = Puppet::Util.create_erb(template.read)
     erb.filename = template.to_s
-    return erb
+    erb
   end
 
   # Return a list of applications that are not simply just stubs for Faces.
   def legacy_applications
     Puppet::Application.available_application_names.reject do |appname|
-      (is_face_app?(appname)) or (exclude_from_docs?(appname))
+      is_face_app?(appname) or exclude_from_docs?(appname)
     end.sort
   end
 
@@ -131,13 +156,13 @@ 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)
 
-      if (appname == COMMON || appname == SPECIALIZED || appname == BLANK)
+      if appname == COMMON || appname == SPECIALIZED || appname == BLANK
         result << appname
-      elsif (is_face_app?(appname))
+      elsif is_face_app?(appname)
         begin
           face = Puppet::Face[appname, :current]
           # Add deprecation message to summary if the face is deprecated
@@ -146,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
@@ -158,18 +183,18 @@ 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
   end
 
-  COMMON = 'Common:'.freeze
-  SPECIALIZED = 'Specialized:'.freeze
-  BLANK = "\n".freeze
-  def available_application_names_special_sort()
+  COMMON = 'Common:'
+  SPECIALIZED = 'Specialized:'
+  BLANK = "\n"
+  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 = full_list & %w[apply agent config help lookup module resource]
     a_list = a_list.sort
     also_ran = full_list - a_list
     also_ran = also_ran.sort
@@ -182,25 +207,26 @@ 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
-      if md = /^puppet-#{appname}\([^\)]+\) -- (.*)$/.match(line)
+    while line = help.shift # rubocop:disable Lint/AssignmentInCondition
+      md = /^puppet-#{appname}\([^)]+\) -- (.*)$/.match(line)
+      if md
         return md[1]
       end
     end
-    return ''
+    ''
   end
   # 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 cert key man plugin report status}.include? appname
+    %w[face_base indirection_base report status].include? appname
   end
   # 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)
@@ -210,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,3 +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.")
@@ -22,9 +24,11 @@ Puppet::Face.define(:module, '1.0.0') do
 
     when_invoked do |path, options|
       Puppet::ModuleTool.set_option_defaults options
-      unless root_path = Puppet::ModuleTool.find_module_root(path)
+      root_path = Puppet::ModuleTool.find_module_root(path)
+      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
 
@@ -34,9 +38,7 @@ Puppet::Face.define(:module, '1.0.0') do
       else
         Puppet.warning _("%{count} files modified") % { count: return_value.size }
       end
-      return_value.map do |changed_file|
-        "#{changed_file}"
-      end.join("\n")
+      return_value.map(&:to_s).join("\n")
     end
   end
 end

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

@@ -1,6 +1,8 @@
 # encoding: UTF-8
-require 'puppet/forge'
-require 'puppet/module_tool/install_directory'
+# frozen_string_literal: true
+
+require_relative '../../../puppet/forge'
+require_relative '../../../puppet/module_tool/install_directory'
 require 'pathname'
 
 Puppet::Face.define(:module, '1.0.0') do
@@ -128,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

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 Puppet::Face.define(:module, '1.0.0') do
   action(:list) do
@@ -60,10 +61,12 @@ Puppet::Face.define(:module, '1.0.0') do
     when_invoked do |options|
       Puppet::ModuleTool.set_option_defaults(options)
       environment = options[:environment_instance]
+      modules_by_path = environment.modules_by_path
 
       {
-        :environment     => environment,
-        :modules_by_path => environment.modules_by_path,
+        :environment => environment,
+        :modules_by_path => modules_by_path,
+        :unmet_dependencies => unmet_dependencies(environment),
       }
     end
 
@@ -71,7 +74,7 @@ Puppet::Face.define(:module, '1.0.0') do
       environment     = result[:environment]
       modules_by_path = result[:modules_by_path]
 
-      output = ''
+      output = ''.dup
 
       warn_unmet_dependencies(environment)
 
@@ -84,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
 
@@ -103,65 +106,69 @@ Puppet::Face.define(:module, '1.0.0') do
     end
   end
 
-  def warn_unmet_dependencies(environment)
+  def unmet_dependencies(environment)
     error_types = [:non_semantic_version, :version_mismatch, :missing]
 
-    @unmet_deps = {}
+    unmet_deps = {}
     error_types.each do |type|
-      @unmet_deps[type] = Hash.new do |hash, key|
+      unmet_deps[type] = Hash.new do |hash, key|
         hash[key] = { :errors => [], :parent => nil }
       end
     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(&: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?
-          unmet_grouped[type].sort_by { |dep| dep[:name] }.each do |dep|
-            dep_name           = dep[:name].gsub('/', '-')
-            installed_version  = dep[:mod_details][:installed_version]
-            version_constraint = dep[:version_constraint]
-            parent_name        = dep[:parent][:name].gsub('/', '-')
-            parent_version     = dep[:parent][:version]
-
-            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],
-              :version => parent_version
-            }
-            @unmet_deps[type][dep[:name]][:version] = installed_version
-          end
+        next if deps.empty?
+
+        unmet_grouped[type].sort_by { |dep| dep[:name] }.each do |dep|
+          dep_name           = dep[:name].tr('/', '-')
+          installed_version  = dep[:mod_details][:installed_version]
+          version_constraint = dep[:version_constraint]
+          parent_name        = dep[:parent][:name].tr('/', '-')
+          parent_version     = dep[:parent][:version]
+
+          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],
+            :version => parent_version
+          }
+          unmet_deps[type][dep[:name]][:version] = installed_version
         end
       end
     end
+    unmet_deps
+  end
+
+  def warn_unmet_dependencies(environment)
+    @unmet_deps = unmet_dependencies(environment)
 
     # Display unmet dependencies by category.
     error_display_order = [:non_semantic_version, :version_mismatch, :missing]
     error_display_order.each do |type|
-      unless @unmet_deps[type].empty?
-        @unmet_deps[type].keys.sort.each do |dep|
-          name    = dep.gsub('/', '-')
-          errors  = @unmet_deps[type][dep][:errors]
-          version = @unmet_deps[type][dep][:version]
-
-          msg = case type
-                when :version_mismatch
-                  _("Module '%{name}' (v%{version}) fails to meet some dependencies:\n") % { name: name, version: version }
-                when :non_semantic_version
-                  _("Non semantic version dependency %{name} (v%{version}):\n") % { name: name, version: version }
-                else
-                  _("Missing dependency '%{name}':\n") % { name: name }
-                end
-
-          errors.each { |error_string| msg << "  #{error_string}\n" }
-          Puppet.warning msg.chomp
-        end
+      next if @unmet_deps[type].empty?
+
+      @unmet_deps[type].keys.sort.each do |dep|
+        name    = dep.tr('/', '-')
+        errors  = @unmet_deps[type][dep][:errors]
+        version = @unmet_deps[type][dep][:version]
+
+        msg = case type
+              when :version_mismatch
+                _("Module '%{name}' (v%{version}) fails to meet some dependencies:\n") % { name: name, version: version }
+              when :non_semantic_version
+                _("Non semantic version dependency %{name} (v%{version}):\n") % { name: name, version: version }
+              else
+                _("Missing dependency '%{name}':\n") % { name: name }
+              end
+
+        errors.each { |error_string| msg << "  #{error_string}\n" }
+        Puppet.warning msg.chomp
       end
     end
   end
@@ -202,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
 
@@ -214,16 +222,16 @@ Puppet::Face.define(:module, '1.0.0') do
           dep[:reason] == :missing
         end
         missing_deps.map do |mis_mod|
-          str = "#{colorize(:bg_red, _('UNMET DEPENDENCY'))} #{mis_mod[:name].gsub('/', '-')} "
+          str = "#{colorize(:bg_red, _('UNMET DEPENDENCY'))} #{mis_mod[:name].tr('/', '-')} "
           str << "(#{colorize(:cyan, mis_mod[:version_constraint])})"
           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
@@ -238,8 +246,8 @@ Puppet::Face.define(:module, '1.0.0') do
   # Returns a Hash
   #
   def list_build_node(mod, parent, params)
-    str = ''
-    str << (mod.forge_name ? mod.forge_name.gsub('/', '-') : mod.name)
+    str = ''.dup
+    str << (mod.forge_name ? mod.forge_name.tr('/', '-') : mod.name)
     str << ' (' + colorize(:cyan, mod.version ? "v#{mod.version}" : '???') + ')'
 
     unless File.dirname(mod.path) == params[:path]
@@ -251,8 +259,8 @@ Puppet::Face.define(:module, '1.0.0') do
         str << '  ' + colorize(:red, _('invalid'))
       elsif parent.respond_to?(:forge_name)
         unmet_parent = @unmet_deps[:version_mismatch][mod.forge_name][:parent]
-        if (unmet_parent[:name] == parent.forge_name &&
-            unmet_parent[:version] == "v#{parent.version}")
+        if unmet_parent[:name] == parent.forge_name &&
+           unmet_parent[:version] == "v#{parent.version}"
           str << '  ' + colorize(:red, _('invalid'))
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Face.define(:module, '1.0.0') do
   action(:uninstall) do
     summary _("Uninstall a puppet module.")
@@ -57,7 +59,7 @@ Puppet::Face.define(:module, '1.0.0') do
     end
 
     when_invoked do |name, options|
-      name = name.gsub('/', '-')
+      name = name.tr('/', '-')
 
       Puppet::ModuleTool.set_option_defaults options
       message = if options[:version]

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

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 Puppet::Face.define(:module, '1.0.0') do
   action(:upgrade) do
@@ -63,24 +64,25 @@ Puppet::Face.define(:module, '1.0.0') do
     end
 
     when_invoked do |name, options|
-      name = name.gsub('/', '-')
+      name = name.tr('/', '-')
       Puppet.notice _("Preparing to upgrade '%{name}' ...") % { name: name }
       Puppet::ModuleTool.set_option_defaults options
       Puppet::ModuleTool::Applications::Upgrader.new(name, options).run
     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,6 +1,8 @@
-require 'puppet/face'
-require 'puppet/module_tool'
-require 'puppet/util/colors'
+# frozen_string_literal: true
+
+require_relative '../../puppet/face'
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/util/colors'
 
 Puppet::Face.define(:module, '1.0.0') do
   extend Puppet::Util::Colors

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

@@ -1,6 +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'
@@ -26,9 +27,9 @@ Puppet::Face.define(:node, '0.0.1') do
       # definition, and should not be modifiable beyond that.  This is one of
       # the only places left in the code that tries to manipulate it. Other
       # parts of code that handle certificates behave differently if the
-      # run_mode is master. Those other behaviors are needed for cleaning the
+      # run_mode is server. Those other behaviors are needed for cleaning the
       # certificates correctly.
-      Puppet.settings.preferred_run_mode = "master"
+      Puppet.settings.preferred_run_mode = "server"
 
       Puppet::Node::Facts.indirection.terminus_class = :yaml
       Puppet::Node::Facts.indirection.cache_class = :yaml
@@ -47,6 +48,14 @@ Puppet::Face.define(:node, '0.0.1') do
   end
 
   class LoggerIO
+    def debug(message)
+      Puppet.debug(message)
+    end
+
+    def warn(message)
+      Puppet.warning(message) unless message =~ /cadir is currently configured to be inside/
+    end
+
     def err(message)
       Puppet.err(message) unless message =~ /^\s*Error:\s*/
     end
@@ -94,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
+
+    false
   end
 end

data/lib/puppet/face/node.rb

@@ -1,4 +1,6 @@
-require 'puppet/indirector/face'
+# frozen_string_literal: true
+
+require_relative '../../puppet/indirector/face'
 Puppet::Indirector::Face.define(:node, '0.0.1') do
   copyright "Puppet Inc.", 2011
   license   _("Apache 2 license; see COPYING")
@@ -17,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`.
@@ -32,11 +34,11 @@ Puppet::Indirector::Face.define(:node, '0.0.1') do
 
     $ puppet node find somenode.puppetlabs.lan --terminus plain --render-as yaml
 
-    Retrieve a node using the puppet master's configured ENC:
+    Retrieve a node using the Puppet Server's configured ENC:
 
-    $ puppet node find somenode.puppetlabs.lan --terminus exec --run_mode master --render-as yaml
+    $ puppet node find somenode.puppetlabs.lan --terminus exec --run_mode server --render-as yaml
 
-    Retrieve the same node from the puppet master:
+    Retrieve the same node from the Puppet Server:
 
     $ puppet node find somenode.puppetlabs.lan --terminus rest --render-as yaml
   EOT