openvox 7.37.1 → 8.19.0

data/lib/puppet/face/config.rb

@@ -1,27 +1,29 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/face'
 require_relative '../../puppet/settings/ini_file'
 
 Puppet::Face.define(:config, '0.0.1') do
   extend Puppet::Util::Colors
-  copyright "Puppet Inc.", 2011
+  copyright "Puppet Inc., Vox Pupuli", 2011
   license   _("Apache 2 license; see COPYING")
 
-  summary _("Interact with Puppet's settings.")
+  summary _("Interact with OpenVox's settings.")
 
-  description "This subcommand can inspect and modify settings from Puppet's
+  description "This subcommand can inspect and modify settings from OpenVox's
     'puppet.conf' configuration file. For documentation about individual settings,
     see https://puppet.com/docs/puppet/latest/configuration.html."
 
   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.
 
       The three most commonly used sections are 'main', 'server', and 'agent'.
-      'Main' is the default, and is used by all Puppet applications. Other
+      'Main' is the default, and is used by all OpenVox applications. Other
       sections can override 'main' values for specific applications --- the
       'server' section affects Puppet Server, and the 'agent'
       section affects puppet agent.
@@ -34,8 +36,8 @@ Puppet::Face.define(:config, '0.0.1') do
   end
 
   action(:print) do
-    summary _("Examine Puppet's current settings.")
-    arguments _("all | <setting> [<setting> ...]")
+    summary _("Examine OpenVox's current settings.")
+    arguments _("all \\| <setting> [<setting> ...]")
     description <<-'EOT'
       Prints the value of a single setting or a list of settings.
 
@@ -54,7 +56,7 @@ Puppet::Face.define(:config, '0.0.1') do
 
       Get a list of important directories from the server's config:
 
-      $ puppet config print all --section server | grep -E "(path|dir)"
+      $ puppet config print all --section server \| grep -E "(path\|dir)"
     EOT
 
     when_invoked do |*args|
@@ -81,7 +83,7 @@ Puppet::Face.define(:config, '0.0.1') do
     end
 
     when_rendering :console do |to_be_rendered|
-      output = ''
+      output = ''.dup
       if to_be_rendered.keys.length > 1
         to_be_rendered.keys.sort.each do |setting|
           output << "#{setting} = #{to_be_rendered[setting]}\n"
@@ -97,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")
 
@@ -108,13 +110,13 @@ 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
-    summary _("Set Puppet's settings.")
+    summary _("Set OpenVox's settings.")
     arguments _("[setting_name] [setting_value]")
     description <<-'EOT'
       Updates values in the `puppet.conf` configuration file.
@@ -135,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
@@ -143,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
 
@@ -198,9 +199,9 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
   end
 
   action(:delete) do
-    summary _("Delete a Puppet setting.")
+    summary _("Delete an OpenVox 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'
@@ -218,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
@@ -229,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)
@@ -258,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,10 +1,12 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/face'
 require_relative '../../puppet/pops'
 require_relative '../../puppet/parser/files'
 require_relative '../../puppet/file_system'
 
 Puppet::Face.define(:epp, '0.0.1') do
-  copyright "Puppet Inc.", 2014
+  copyright "Puppet Inc., Vox Pupuli", 2014
   license   _("Apache 2 license; see COPYING")
 
   summary _("Interact directly with the EPP template parser/renderer.")
@@ -69,7 +71,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       status = true # no validation error yet
       files = args
       if files.empty?
-        if not STDIN.tty?
+        if !STDIN.tty?
           tmp = validate_template_string(STDIN.read)
           status &&= tmp
         else
@@ -93,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
@@ -101,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.")
@@ -115,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
@@ -173,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
@@ -194,16 +194,16 @@ Puppet::Face.define(:epp, '0.0.1') do
           buffer.print dump_parse(Puppet::FileSystem.read(file, :encoding => 'utf-8'), file, options, show_filename)
         end
 
-        if !missing_files.empty?
+        unless 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.")
@@ -333,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"
         #
@@ -342,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")
@@ -351,22 +350,21 @@ Puppet::Face.define(:epp, '0.0.1') do
           show_filename = args.count > 1
           file_nbr = 0
           args.each do |file|
-            begin
-              buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
-            rescue Puppet::ParseError => detail
-              Puppet.err(detail.message)
-              status = false
-            end
+            buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
+          rescue Puppet::ParseError => detail
+            Puppet.err(detail.message)
+            status = false
           end
         end
         raise Puppet::Error, _("error while rendering epp") unless status
+
         buffer.string
       end
     end
   end
 
   def dump_parse(source, filename, options, show_filename = true)
-    output = ""
+    output = ''.dup
     evaluating_parser = Puppet::Pops::Parser::EvaluatingParser::EvaluatingEppParser.new
     begin
       if options[:validate]
@@ -405,9 +403,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
@@ -416,7 +415,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       rescue => e
         Puppet.err(_("Could not load --values_file %{error}") % { error: e.message })
       end
-      if !(template_values.nil? || template_values.is_a?(Hash))
+      unless template_values.nil? || template_values.is_a?(Hash)
         Puppet.err(_("--values_file option must evaluate to a Hash or undef/nil, got: '%{template_class}'") % { template_class: template_values.class })
       end
     end
@@ -450,7 +449,7 @@ Puppet::Face.define(:epp, '0.0.1') do
 
   def render_file(epp_template_name, compiler, options, show_filename, file_nbr)
     template_args = get_values(compiler, options)
-    output = ""
+    output = ''.dup
     begin
       if show_filename && options[:header]
         output << "\n" unless file_nbr == 1
@@ -529,6 +528,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
@@ -562,5 +562,4 @@ Puppet::Face.define(:epp, '0.0.1') do
       nil
     end
   end
-
 end

data/lib/puppet/face/facts.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/indirector/face'
 require_relative '../../puppet/node/facts'
 
 Puppet::Indirector::Face.define(:facts, '0.0.1') do
-  copyright "Puppet Inc.", 2011
+  copyright "Puppet Inc., Vox Pupuli", 2011
   license   _("Apache 2 license; see COPYING")
 
   summary _("Retrieve and store facts.")
   description <<-'EOT'
     This subcommand manages facts, which are collections of normalized system
-    information used by Puppet. It can read facts directly from the local system
+    information used by OpenVox. It can read facts directly from the local system
     (with the default `facter` terminus).
   EOT
 
@@ -58,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
@@ -75,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
@@ -171,4 +174,3 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
     end
   end
 end
-

data/lib/puppet/face/generate.rb

@@ -1,9 +1,11 @@
+# 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
-  copyright 'Puppet Inc.', 2016
+  copyright 'Puppet Inc., Vox Pupuli', 2016
   license   _('Apache 2 license; see COPYING')
 
   summary _('Generates Puppet code from Ruby definitions.')
@@ -55,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/action.erb

@@ -54,7 +54,6 @@ undocumented option
 	end
 	unless action.options.empty?
       action.options.sort.each do |name|
-        next if name == :extra
         option = action.get_option name -%>
 <%= "  " + option.optparse.join(" | ")[0,(optionroom - 1)].ljust(optionroom) + ' - ' -%>
 <%     if !(option.summary) -%>

data/lib/puppet/face/help/face.erb

@@ -49,7 +49,6 @@ undocumented option
 	end
  	unless face.options.empty?
       face.options.sort.each do |name|
-        next if name == :extra
         option = face.get_option name -%>
 <%= "  " + option.optparse.join(" | ")[0,(optionroom - 1)].ljust(optionroom) + ' - ' -%>
 <%     if !(option.summary) -%>

data/lib/puppet/face/help/global.erb

@@ -13,4 +13,4 @@ Available subcommands:
 
 See 'puppet help <subcommand> <action>' for help on a specific subcommand action.
 See 'puppet help <subcommand>' for help on a specific subcommand.
-Puppet v<%= Puppet.version %>
+OpenVox v<%= Puppet.version %>