openvox 7.37.1 → 8.19.0

data/lib/puppet/util/colors.rb

@@ -1,37 +1,39 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util/platform'
 
 module Puppet::Util::Colors
-  BLACK       = {:console => "\e[0;30m", :html => "color: #FFA0A0"     }
-  RED         = {:console => "\e[0;31m", :html => "color: #FFA0A0"     }
-  GREEN       = {:console => "\e[0;32m", :html => "color: #00CD00"     }
-  YELLOW      = {:console => "\e[0;33m", :html => "color: #FFFF60"     }
-  BLUE        = {:console => "\e[0;34m", :html => "color: #80A0FF"     }
-  MAGENTA     = {:console => "\e[0;35m", :html => "color: #FFA500"     }
-  CYAN        = {:console => "\e[0;36m", :html => "color: #40FFFF"     }
-  WHITE       = {:console => "\e[0;37m", :html => "color: #FFFFFF"     }
-  HBLACK      = {:console => "\e[1;30m", :html => "color: #FFA0A0"     }
-  HRED        = {:console => "\e[1;31m", :html => "color: #FFA0A0"     }
-  HGREEN      = {:console => "\e[1;32m", :html => "color: #00CD00"     }
-  HYELLOW     = {:console => "\e[1;33m", :html => "color: #FFFF60"     }
-  HBLUE       = {:console => "\e[1;34m", :html => "color: #80A0FF"     }
-  HMAGENTA    = {:console => "\e[1;35m", :html => "color: #FFA500"     }
-  HCYAN       = {:console => "\e[1;36m", :html => "color: #40FFFF"     }
-  HWHITE      = {:console => "\e[1;37m", :html => "color: #FFFFFF"     }
-  BG_RED      = {:console => "\e[0;41m", :html => "background: #FFA0A0"}
-  BG_GREEN    = {:console => "\e[0;42m", :html => "background: #00CD00"}
-  BG_YELLOW   = {:console => "\e[0;43m", :html => "background: #FFFF60"}
-  BG_BLUE     = {:console => "\e[0;44m", :html => "background: #80A0FF"}
-  BG_MAGENTA  = {:console => "\e[0;45m", :html => "background: #FFA500"}
-  BG_CYAN     = {:console => "\e[0;46m", :html => "background: #40FFFF"}
-  BG_WHITE    = {:console => "\e[0;47m", :html => "background: #FFFFFF"}
-  BG_HRED     = {:console => "\e[1;41m", :html => "background: #FFA0A0"}
-  BG_HGREEN   = {:console => "\e[1;42m", :html => "background: #00CD00"}
-  BG_HYELLOW  = {:console => "\e[1;43m", :html => "background: #FFFF60"}
-  BG_HBLUE    = {:console => "\e[1;44m", :html => "background: #80A0FF"}
-  BG_HMAGENTA = {:console => "\e[1;45m", :html => "background: #FFA500"}
-  BG_HCYAN    = {:console => "\e[1;46m", :html => "background: #40FFFF"}
-  BG_HWHITE   = {:console => "\e[1;47m", :html => "background: #FFFFFF"}
-  RESET       = {:console => "\e[0m",    :html => ""                   }
+  BLACK       = { :console => "\e[0;30m", :html => "color: #FFA0A0"     }
+  RED         = { :console => "\e[0;31m", :html => "color: #FFA0A0"     }
+  GREEN       = { :console => "\e[0;32m", :html => "color: #00CD00"     }
+  YELLOW      = { :console => "\e[0;33m", :html => "color: #FFFF60"     }
+  BLUE        = { :console => "\e[0;34m", :html => "color: #80A0FF"     }
+  MAGENTA     = { :console => "\e[0;35m", :html => "color: #FFA500"     }
+  CYAN        = { :console => "\e[0;36m", :html => "color: #40FFFF"     }
+  WHITE       = { :console => "\e[0;37m", :html => "color: #FFFFFF"     }
+  HBLACK      = { :console => "\e[1;30m", :html => "color: #FFA0A0"     }
+  HRED        = { :console => "\e[1;31m", :html => "color: #FFA0A0"     }
+  HGREEN      = { :console => "\e[1;32m", :html => "color: #00CD00"     }
+  HYELLOW     = { :console => "\e[1;33m", :html => "color: #FFFF60"     }
+  HBLUE       = { :console => "\e[1;34m", :html => "color: #80A0FF"     }
+  HMAGENTA    = { :console => "\e[1;35m", :html => "color: #FFA500"     }
+  HCYAN       = { :console => "\e[1;36m", :html => "color: #40FFFF"     }
+  HWHITE      = { :console => "\e[1;37m", :html => "color: #FFFFFF"     }
+  BG_RED      = { :console => "\e[0;41m", :html => "background: #FFA0A0" }
+  BG_GREEN    = { :console => "\e[0;42m", :html => "background: #00CD00" }
+  BG_YELLOW   = { :console => "\e[0;43m", :html => "background: #FFFF60" }
+  BG_BLUE     = { :console => "\e[0;44m", :html => "background: #80A0FF" }
+  BG_MAGENTA  = { :console => "\e[0;45m", :html => "background: #FFA500" }
+  BG_CYAN     = { :console => "\e[0;46m", :html => "background: #40FFFF" }
+  BG_WHITE    = { :console => "\e[0;47m", :html => "background: #FFFFFF" }
+  BG_HRED     = { :console => "\e[1;41m", :html => "background: #FFA0A0" }
+  BG_HGREEN   = { :console => "\e[1;42m", :html => "background: #00CD00" }
+  BG_HYELLOW  = { :console => "\e[1;43m", :html => "background: #FFFF60" }
+  BG_HBLUE    = { :console => "\e[1;44m", :html => "background: #80A0FF" }
+  BG_HMAGENTA = { :console => "\e[1;45m", :html => "background: #FFA500" }
+  BG_HCYAN    = { :console => "\e[1;46m", :html => "background: #40FFFF" }
+  BG_HWHITE   = { :console => "\e[1;47m", :html => "background: #FFFFFF" }
+  RESET       = { :console => "\e[0m",    :html => "" }
 
   Colormap = {
     :debug => WHITE,
@@ -43,43 +45,43 @@ module Puppet::Util::Colors
     :emerg => HRED,
     :crit => HRED,
 
-    :black       => BLACK,
-    :red         => RED,
-    :green       => GREEN,
-    :yellow      => YELLOW,
-    :blue        => BLUE,
-    :magenta     => MAGENTA,
-    :cyan        => CYAN,
-    :white       => WHITE,
-    :hblack      => HBLACK,
-    :hred        => HRED,
-    :hgreen      => HGREEN,
-    :hyellow     => HYELLOW,
-    :hblue       => HBLUE,
-    :hmagenta    => HMAGENTA,
-    :hcyan       => HCYAN,
-    :hwhite      => HWHITE,
-    :bg_red      => BG_RED,
-    :bg_green    => BG_GREEN,
-    :bg_yellow   => BG_YELLOW,
-    :bg_blue     => BG_BLUE,
-    :bg_magenta  => BG_MAGENTA,
-    :bg_cyan     => BG_CYAN,
-    :bg_white    => BG_WHITE,
-    :bg_hred     => BG_HRED,
-    :bg_hgreen   => BG_HGREEN,
-    :bg_hyellow  => BG_HYELLOW,
-    :bg_hblue    => BG_HBLUE,
+    :black => BLACK,
+    :red => RED,
+    :green => GREEN,
+    :yellow => YELLOW,
+    :blue => BLUE,
+    :magenta => MAGENTA,
+    :cyan => CYAN,
+    :white => WHITE,
+    :hblack => HBLACK,
+    :hred => HRED,
+    :hgreen => HGREEN,
+    :hyellow => HYELLOW,
+    :hblue => HBLUE,
+    :hmagenta => HMAGENTA,
+    :hcyan => HCYAN,
+    :hwhite => HWHITE,
+    :bg_red => BG_RED,
+    :bg_green => BG_GREEN,
+    :bg_yellow => BG_YELLOW,
+    :bg_blue => BG_BLUE,
+    :bg_magenta => BG_MAGENTA,
+    :bg_cyan => BG_CYAN,
+    :bg_white => BG_WHITE,
+    :bg_hred => BG_HRED,
+    :bg_hgreen => BG_HGREEN,
+    :bg_hyellow => BG_HYELLOW,
+    :bg_hblue => BG_HBLUE,
     :bg_hmagenta => BG_HMAGENTA,
-    :bg_hcyan    => BG_HCYAN,
-    :bg_hwhite   => BG_HWHITE,
-    :reset       => { :console => "\e[m", :html => "" }
+    :bg_hcyan => BG_HCYAN,
+    :bg_hwhite => BG_HWHITE,
+    :reset => { :console => "\e[m", :html => "" }
   }
 
   def colorize(color, str)
     case Puppet[:color]
     when true, :ansi, "ansi", "yes"
-        console_color(color, str)
+      console_color(color, str)
     when :html, "html"
       html_color(color, str)
     else
@@ -89,12 +91,12 @@ module Puppet::Util::Colors
 
   def console_color(color, str)
     Colormap[color][:console] +
-    str.gsub(RESET[:console], Colormap[color][:console]) +
-    RESET[:console]
+      str.gsub(RESET[:console], Colormap[color][:console]) +
+      RESET[:console]
   end
 
   def html_color(color, str)
     span = '<span style="%s">' % Colormap[color][:html]
-    "#{span}%s</span>" % str.gsub(/<span .*?<\/span>/, "</span>\\0#{span}")
+    "#{span}%s</span>" % str.gsub(%r{<span .*?</span>}, "</span>\\0#{span}")
   end
 end

data/lib/puppet/util/command_line/puppet_option_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/command_line/trollop'
 
 module Puppet
@@ -23,7 +25,6 @@ module Puppet
           @parser = Trollop::Parser.new do
             banner usage_msg
           end
-
         end
 
         # This parameter, if set, will tell the underlying option parser not to throw an
@@ -39,36 +40,37 @@ module Puppet
 
         def on(*args, &block)
           # The 2nd element is an optional "short" representation.
-          if args.length == 3
+          case args.length
+          when 3
             long, desc, type = args
-          elsif args.length == 4
+          when 4
             long, short, desc, type = args
           else
             raise ArgumentError, _("this method only takes 3 or 4 arguments. Given: %{args}") % { args: args.inspect }
           end
 
           options = {
-              :long => long,
-              :short => short,
-              :required => false,
-              :callback => pass_only_last_value_on_to(block),
-              :multi => true,
+            :long => long,
+            :short => short,
+            :required => false,
+            :callback => pass_only_last_value_on_to(block),
+            :multi => true,
           }
 
           case type
-            when :REQUIRED
-              options[:type] = :string
-            when :NONE
-              options[:type] = :flag
-            else
-              raise PuppetOptionError.new(_("Unsupported type: '%{type}'") % { type: type })
+          when :REQUIRED
+            options[:type] = :string
+          when :NONE
+            options[:type] = :flag
+          else
+            raise PuppetOptionError, _("Unsupported type: '%{type}'") % { type: type }
           end
 
           @parser.opt long.sub("^--", "").intern, desc, options
         end
 
         def parse(*args)
-          args = args[0] if args.size == 1 and Array === args[0]
+          args = args[0] if args.size == 1 and args[0].is_a?(Array)
           args_copy = args.dup
           begin
             @parser.parse args_copy
@@ -78,7 +80,7 @@ module Puppet
         end
 
         def pass_only_last_value_on_to(block)
-          lambda { |values| block.call(values.is_a?(Array) ? values.last : values) }
+          ->(values) { block.call(values.is_a?(Array) ? values.last : values) }
         end
         private :pass_only_last_value_on_to
       end