consul-templaterb 1.23.0 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1322b0762c3a9ea41ae648227b38f42e21166193fbae07cc5b1b450b7814ce6b
-  data.tar.gz: e656d9e1b4cff345704bfe1e32ce71fc9be6b9433f554a0c6184ef506423e453
+  metadata.gz: f4f6bc7af6e5c8ccdb5417157b443de3c43ae33ffbcd90953b9960033d1cf960
+  data.tar.gz: f9635b5936d0f11cbfa32b7088faba4d90e1b43ed4ac7c4f4127f6d450981435
 SHA512:
-  metadata.gz: 89029f97088f851c676263d79d584e0b6cfa22b72f2008690857f5341b7af3f8b7b627d082ada09b057010c97358cd75846f18ed8b825e4e212a0c07c0998abf
-  data.tar.gz: e2581df1a03190bb75a1f40838282ab49c9184e32a5fcf7807b1f86febbb1b0a88ea1deb93cddfe256c3aeccfeaf3874d4ad99f8b53935200fd15c9c8d71d821
+  metadata.gz: 68aae80142edd53811fe41b427573f6dd06e5dfdd19bba59607050927a7f17aa4ff1cb70f697e51213105fd97771fccafef833592d3d2a58f6857a5d8f982231
+  data.tar.gz: 3a74bf0df8f28e3578615db1e2155772668528814c14ae6010849cc7cbdccc2c662485f9fead52b5849993407cf708d97902c9cf4ae2ff1ce1345bff3f769281

data/.rubocop.yml

@@ -3,6 +3,9 @@ AllCops:
     - bundle/**/*
   TargetRubyVersion: 2.4
 
+Layout/LineLength:
+  Max: 175
+
 Metrics/AbcSize:
   Max: 82
 
@@ -18,9 +21,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 20
 
-Metrics/LineLength:
-  Max: 175
-
 Metrics/MethodLength:
   Max: 65
 
@@ -30,14 +30,28 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 23
 
-Style/Documentation:
+# We use `dc` as a parameter in many methods
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/VariableNumber:
   Enabled: false
 
+Style/Documentation:
+  Enabled: true
+
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/MultilineBlockChain:
   Enabled: false
 
-Style/VariableNumber:
-  Enabled: false

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- 2.4.8
+- 2.4.9
 - 2.5.7
 - 2.6.5
 - 2.7.0

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## (UNRELEASED)
 
+## 1.24.0 (February 19, 2020)
+
+NEW FEATURES:
+
+ * pluggable node meta
+
 ## 1.23.0 (February 18, 2020)
 
 NEW FEATURES:

data/bin/consul-templaterb

@@ -14,12 +14,13 @@ end
 def compute_default_output(source)
   dest = source.gsub(/\.erb$/, '')
   raise "Source and destination cannot be the same in #{source}" if source == dest || dest.empty?
+
   dest
 end
 
 options = {
   erb: {
-    trim_mode: '-', # trim_mode for ERB
+    trim_mode: '-' # trim_mode for ERB
   },
   vault: {
     debug: {
@@ -59,22 +60,22 @@ options = {
     enable_gzip_compression: true,
     paths: {
       '/v1/catalog/services': {
-        min_duration: 15,    # Since services change a lot, refresh services every 15 seconds
+        min_duration: 15    # Since services change a lot, refresh services every 15 seconds
       },
       '/v1/catalog/nodes': {
-        min_duration: 15,    # Do not wake up before 15 seconds when node appear/disappear
+        min_duration: 15    # Do not wake up before 15 seconds when node appear/disappear
       },
       '/v1/coordinate/nodes': {
-        min_duration: 60,    # Since coordinates change a lot, refresh coordinates every 30 seconds
+        min_duration: 60    # Since coordinates change a lot, refresh coordinates every 30 seconds
       },
       '/v1/catalog/datacenters': {
-        min_duration: 60,    # Datacenters are not added every minute, right?
+        min_duration: 60    # Datacenters are not added every minute, right?
       },
       '/v1/agent/metrics': {
-        min_duration: 60,    # Refresh metrics only minute max
+        min_duration: 60    # Refresh metrics only minute max
       },
       '/v1/agent/self': {
-        min_duration: 60,    # Refresh self info every minute max
+        min_duration: 60    # Refresh self info every minute max
       }
     }
   }
@@ -89,18 +90,19 @@ optparse = OptionParser.new do |opts|
   opts.banner = usage_text
 
   opts.on('-h', '--help', 'Show help') do
-    STDERR.puts opts
+    warn opts
     exit 0
   end
 
   opts.on('-v', '--version', 'Show Version') do
-    STDERR.puts Consul::Async::VERSION
+    warn Consul::Async::VERSION
     exit 0
   end
 
   opts.on('--retry [RETRIES]', '--consul-retry-attempts [RETRIES]', Integer,
           "If consul fails after n retries, stop the program, default=#{options[:consul][:max_consecutive_errors_on_endpoint]}") do |value|
     raise "#{value} Must be greater or equal to 0" unless value >= 0
+
     options[:consul][:max_consecutive_errors_on_endpoint] = value
   end
 
@@ -141,6 +143,7 @@ optparse = OptionParser.new do |opts|
   opts.on('--vault-retry [RETRIES]', '--vault-retry-attempts [RETRIES]', Integer,
           "If vault fails after n retries, stop the program, default=#{options[:vault][:max_consecutive_errors_on_endpoint]}") do |value|
     raise "#{value} Must be greater or equal to 0" unless value >= 0
+
     options[:vault][:max_consecutive_errors_on_endpoint] = value
   end
 
@@ -150,6 +153,7 @@ optparse = OptionParser.new do |opts|
 
   opts.on('-w', '--wait=<min_duration>', Integer, 'Wait at least n seconds before each template generation') do |min_duration|
     raise "--wait=#{min_duration} must be greater than 0" unless min_duration.positive?
+
     consul_engine.template_frequency = min_duration
   end
 
@@ -169,6 +173,7 @@ optparse = OptionParser.new do |opts|
     raise "Please specify a signal, use any of: #{valid_signals.inspect}" unless val
     return nil if val == none_value
     raise "Invalid signal #{val}, valid signals: #{valid_signals.inspect}" unless valid_signals.include? val
+
     val
   end
 
@@ -198,7 +203,7 @@ optparse = OptionParser.new do |opts|
       if all_ready
         modified = results.any?(&:modified)
         if @programs[cmd].nil?
-          STDERR.puts "[EXEC] Starting process: #{cmd}... on_reload=#{sig_reload ? sig_reload : 'NONE'} on_term=#{sig_term}"
+          warn "[EXEC] Starting process: #{cmd}... on_reload=#{sig_reload || 'NONE'} on_term=#{sig_term}"
           @programs[cmd] = Consul::Async::ProcessHandler.new(cmd, sig_reload: sig_reload, sig_term: sig_term)
           @programs[cmd].start
         else
@@ -207,7 +212,7 @@ optparse = OptionParser.new do |opts|
           begin
             @programs[cmd].process_status
           rescue Consul::Async::ProcessDoesNotExist => e
-            STDERR.puts "[FATAL] The process is dead, aborting run: #{e.inspect}"
+            warn "[FATAL] The process is dead, aborting run: #{e.inspect}"
             template_manager.terminate
             EventMachine.stop
           end
@@ -243,9 +248,10 @@ optparse = OptionParser.new do |opts|
     dest = splitted[1]
     unless dest
       dest = compute_default_output(source)
-      STDERR.puts "-t --template #{tpl} : Since output has not been set, using #{dest}"
+      warn "-t --template #{tpl} : Since output has not been set, using #{dest}"
     end
     raise "Source and destination cannot be the same in #{tpl}" if source == dest || dest.empty?
+
     command = splitted[2]
     parameter_file = splitted[3]
     params = {}
@@ -255,6 +261,7 @@ optparse = OptionParser.new do |opts|
       consul_engine.add_template_callback do |_all_ready, _template_manager, results|
         results.each do |res|
           next unless res.ready? && res.modified && res.output_file == dest && res.template_file == source
+
           # Our template has been fully rendered
           system(command)
         end
@@ -265,7 +272,7 @@ optparse = OptionParser.new do |opts|
   opts.on('-o', '--once', 'Do not run the process as a daemon') do
     consul_engine.add_template_callback do |all_ready, template_manager, _|
       if all_ready
-        STDERR.puts '[INFO] Program ends since daemon mode has been disabled, file(s) has been written'
+        warn '[INFO] Program ends since daemon mode has been disabled, file(s) has been written'
         template_manager.terminate
         EventMachine.stop
       end
@@ -275,7 +282,7 @@ end
 
 def kill_program
   @programs.each do |k, v|
-    STDERR.puts "Killing process #{k}..."
+    warn "Killing process #{k}..."
     v.kill
   end
   @programs = {}
@@ -295,14 +302,12 @@ def find_max_descriptors(max_descripors)
 end
 
 %i[consul vault].each do |type|
-  unless options[type][:base_url].start_with? 'http', 'https'
-    options[type][:base_url] = "http://#{options[type][:base_url]}"
-  end
+  options[type][:base_url] = "http://#{options[type][:base_url]}" unless options[type][:base_url].start_with? 'http', 'https'
 end
 
 # Since we might be using a lots of descriptors, document this
 new_size = find_max_descriptors(65_536)
-STDERR.puts "Max number of descriptors set to #{new_size}" if options[:consul][:debug][:network]
+warn "Max number of descriptors set to #{new_size}" if options[:consul][:debug][:network]
 
 # This is needed to avoid EM not to crash on some Linux Hosts
 # When using a very large number of Consul Endpoints
@@ -329,7 +334,7 @@ Signal.trap('USR1', 'IGNORE') unless Gem.win_platform?
   Signal.trap(sig) do |signo|
     # handle nicely forks
     m_p = my_pid == Process.pid
-    STDERR.puts "[KILL] received #{Signal.signame(signo)}, stopping myself" if m_p
+    warn "[KILL] received #{Signal.signame(signo)}, stopping myself" if m_p
     template_manager.terminate
     kill_program if m_p
   end
@@ -338,7 +343,7 @@ end
 begin
   consul_engine.run(template_manager)
 rescue Interrupt => e
-  STDERR.puts "[WARN] consul-templaterb has been interrupted #{e}"
+  warn "[WARN] consul-templaterb has been interrupted #{e}"
 end
 
 exit consul_engine.result

data/consul-templaterb.gemspec

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'consul/async/version'
 
@@ -16,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.description   = 'A ruby implementation of Consul Template with support of erb templating ' \
                        'with hi-performance on large clusters and advanced process management features.'
   spec.metadata      = { 'bug_tracker_uri' => 'https://github.com/criteo/consul-templaterb/issues',
-                         'changelog_uri'   => 'https://github.com/criteo/consul-templaterb/blob/master/CHANGELOG.md',
-                         'homepage_uri'    => 'https://github.com/criteo/consul-templaterb',
+                         'changelog_uri' => 'https://github.com/criteo/consul-templaterb/blob/master/CHANGELOG.md',
+                         'homepage_uri' => 'https://github.com/criteo/consul-templaterb',
                          'source_code_uri' => 'https://github.com/criteo/consul-templaterb' }
   spec.license       = 'Apache v2'
 
@@ -29,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = ['README.md', 'CHANGELOG.md', 'TemplateAPI.md']
   spec.require_paths = ['lib']
 
-  spec.require_paths = ['lib']
   spec.add_runtime_dependency 'em-http-request', '>= 1.1.5'
   spec.add_runtime_dependency 'eventmachine', '>= 1.2.7'
   spec.add_runtime_dependency 'parallel', '>= 1.2.7'
@@ -38,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'rubocop', '0.49.0'
+  spec.add_development_dependency 'rubocop', '0.80.0'
   spec.add_development_dependency 'rubocop-junit-formatter'
   spec.add_development_dependency 'webmock'
 end

data/lib/consul/async/consul_endpoint.rb

@@ -1,10 +1,11 @@
 require 'consul/async/utilities'
 require 'consul/async/stats'
 require 'em-http'
-require 'thread'
 require 'json'
 module Consul
   module Async
+    # The class configuring Consul endpoints
+    # It allows to translate configuration options per specific endpoint/path
     class ConsulConfiguration
       attr_reader :base_url, :token, :retry_duration, :min_duration, :wait_duration, :max_retry_duration, :retry_on_non_diff,
                   :missing_index_retry_time_on_diff, :missing_index_retry_time_on_unchanged, :debug, :enable_gzip_compression,
@@ -51,6 +52,7 @@ module Consul
 
       def create(path)
         return self unless @paths[path.to_sym]
+
         ConsulConfiguration.new(base_url: ch(path, :base_url),
                                 debug: ch(path, :debug),
                                 token: ch(path, :token),
@@ -67,6 +69,9 @@ module Consul
                                 fail_fast_errors: @fail_fast_errors)
       end
     end
+
+    # This keep track of answer from Consul
+    # It also keep statistics about result (x_consul_index, stats...)
     class ConsulResult
       attr_reader :data, :http, :x_consul_index, :last_update, :stats, :retry_in
       def initialize(data, modified, http, x_consul_index, stats, retry_in, fake: false)
@@ -102,6 +107,8 @@ module Consul
         next_retry + last_update
       end
     end
+    # Basic Encapsulation of HTTP response from Consul
+    # It supports empty responses to handle first call is an easy way
     class HttpResponse
       attr_reader :response_header, :response, :error
       def initialize(http, override_nil_response = nil)
@@ -116,6 +123,9 @@ module Consul
         end
       end
     end
+    # This class represents a specific path in Consul HTTP API
+    # It also stores x_consul_index and keep track on updates of API
+    # So, it basically performs all the optimizations to keep updated with Consul internal state.
     class ConsulEndpoint
       attr_reader :conf, :path, :x_consul_index, :queue, :stats, :last_result, :enforce_json_200, :start_time, :default_value, :query_params
       def initialize(conf, path, enforce_json_200 = true, query_params = {}, default_value = '[]')
@@ -144,12 +154,12 @@ module Consul
         on_response do |result|
           state = result.x_consul_index.to_i < 1 ? '[WARN]' : '[ OK ]'
           stats = result.stats
-          STDERR.puts "[DBUG]#{state}#{result.modified? ? '[MODFIED]' : '[NO DIFF]'}" \
+          warn "[DBUG]#{state}#{result.modified? ? '[MODFIED]' : '[NO DIFF]'}" \
           "[s:#{stats.successes},err:#{stats.errors}]" \
           "[#{stats.body_bytes_human.ljust(8)}][#{stats.bytes_per_sec_human.ljust(9)}]"\
           " #{path.ljust(48)} idx:#{result.x_consul_index}, next in #{result.retry_in} s"
         end
-        on_error { |http| STDERR.puts "[ERROR]: #{path}: #{http.error.inspect}" }
+        on_error { |http| warn "[ERROR]: #{path}: #{http.error.inspect}" }
       end
 
       def on_response(&block)
@@ -173,7 +183,7 @@ module Consul
       def build_request(consul_index)
         res = {
           head: {
-            'Accept'         => 'application/json',
+            'Accept' => 'application/json',
             'X-Consul-Index' => consul_index,
             'X-Consul-Token' => conf.token
           },
@@ -216,7 +226,7 @@ module Consul
       def fetch
         options = {
           connect_timeout: 5, # default connection setup timeout
-          inactivity_timeout: conf.wait_duration + 1 + (conf.wait_duration / 16), # default connection inactivity (post-setup) timeout
+          inactivity_timeout: conf.wait_duration + 1 + (conf.wait_duration / 16) # default connection inactivity (post-setup) timeout
         }
         connection = {
           conn: EventMachine::HttpRequest.new(conf.base_url, options)
@@ -228,7 +238,7 @@ module Consul
             is_kv_empty = path.start_with?('/v1/kv') && http.response_header.status == 404
             if !is_kv_empty && enforce_json_200 && http.response_header.status != 200 && http.response_header['Content-Type'] != 'application/json'
               _handle_error(http, consul_index) do
-                STDERR.puts "[RETRY][#{path}] (#{@consecutive_errors} errors)" if (@consecutive_errors % 10) == 1
+                warn "[RETRY][#{path}] (#{@consecutive_errors} errors)" if (@consecutive_errors % 10) == 1
               end
             else
               n_consul_index = find_x_consul_index(http)

data/lib/consul/async/consul_template.rb

@@ -1,12 +1,13 @@
 require 'consul/async/utilities'
 require 'em-http'
-require 'thread'
 require 'forwardable'
 require 'erb'
 require 'digest'
 
 module Consul
   module Async
+    # Exception thrown when a template is invalid and cause a Runtime Exception during
+    # its rendering
     class InvalidTemplateException < StandardError
       attr_reader :cause
       def initialize(cause)
@@ -14,6 +15,7 @@ module Consul
       end
     end
 
+    # Exception thrown when the template is Invalid due to a Syntax Error
     class SyntaxErrorInTemplate < InvalidTemplateException
       attr_reader :cause
       def initialize(cause)
@@ -21,6 +23,7 @@ module Consul
       end
     end
 
+    # Class to handle the retrival of a Remote resource (such a JSON API)
     class RemoteResource
       def initialize(endpoints_manager)
         @endp_manager = endpoints_manager
@@ -78,6 +81,10 @@ module Consul
       end
     end
 
+    # This class keep references over all endpoints (aka datasources) registered for all templates.
+    # This allows reusing those endpoints as well as performing listing and garbage collecting.
+    # This is also the main object visible from ERB files which contains all methods available
+    # to template writters.
     class EndPointsManager
       attr_reader :consul_conf, :vault_conf, :running, :net_info, :start_time, :coordinate, :remote_resource, :templates
       def initialize(consul_configuration, vault_configuration, templates, trim_mode = nil)
@@ -100,9 +107,9 @@ module Consul
         @context = {
           current_erb_path: nil,
           template_info: {
-            'source_root'       => nil,
-            'source'            => nil,
-            'destination'       => nil,
+            'source_root' => nil,
+            'source' => nil,
+            'destination' => nil,
             'was_rendered_once' => false
           },
           params: {}
@@ -119,6 +126,7 @@ module Consul
       # https://www.consul.io/api/health.html#list-nodes-for-service
       def service(name, dc: nil, passing: false, tag: nil)
         raise 'You must specify a name for a service' if name.nil?
+
         path = "/v1/health/service/#{name}"
         query_params = {}
         query_params[:dc] = dc if dc
@@ -130,6 +138,7 @@ module Consul
       # https://www.consul.io/api/health.html#list-checks-for-service
       def checks_for_service(name, dc: nil, passing: false)
         raise 'You must specify a name for a service' if name.nil?
+
         path = "/v1/health/checks/#{name}"
         query_params = {}
         query_params[:dc] = dc if dc
@@ -140,6 +149,7 @@ module Consul
       # https://www.consul.io/api/health.html#list-checks-for-node
       def checks_for_node(name, dc: nil, passing: false)
         raise 'You must specify a name for a service' if name.nil?
+
         path = "/v1/health/node/#{name}"
         query_params = {}
         query_params[:dc] = dc if dc
@@ -182,8 +192,8 @@ module Consul
       # Return a param of template
       def param(key, default_value = nil)
         v = @context[:params][key]
-        v = @context[:params][key.to_sym] unless v
-        v = default_value unless v
+        v ||= @context[:params][key.to_sym]
+        v ||= default_value
         v
       end
 
@@ -222,6 +232,7 @@ module Consul
 
       def secrets(path = '')
         raise "You need to provide a vault token to use 'secret' keyword" if vault_conf.token.nil?
+
         path = "/v1/#{path}".gsub(%r{/{2,}}, '/')
         query_params = { list: 'true' }
         create_if_missing(path, query_params, vault_conf.fail_fast_errors, vault_conf.max_consecutive_errors_on_endpoint) do
@@ -231,6 +242,7 @@ module Consul
 
       def secret(path = '', post_data = nil)
         raise "You need to provide a vault token to use 'secret' keyword" if vault_conf.token.nil?
+
         path = "/v1/#{path}".gsub(%r{/{2,}}, '/')
         query_params = {}
         method = post_data ? 'POST' : 'GET'
@@ -243,12 +255,14 @@ module Consul
       def render_file(path, params = {})
         new_path = File.expand_path(path, File.dirname(@context[:current_erb_path]))
         raise "render_file ERROR: #{path} is resolved as #{new_path}, but the file does not exists" unless File.exist? new_path
+
         render(File.read(new_path), new_path, params, current_template_info: template_info)
       end
 
       # render a sub template from a string template
       def render_from_string(template_content, params = {})
         return unless template_content
+
         sha1res = Digest::SHA1.hexdigest(template_content)
         new_path = File.expand_path(":memory:sha1:#{sha1res}", File.dirname(@context[:current_erb_path]))
         render(template_content, new_path, params, current_template_info: template_info)
@@ -256,6 +270,7 @@ module Consul
 
       def find_line(e)
         return e.message.dup[5..-1] if e.message.start_with? '(erb):'
+
         e.backtrace.each do |line|
           return line[5..-1] if line.start_with? '(erb):'
         end
@@ -273,6 +288,7 @@ module Consul
         }
         result = ERB.new(tpl, nil, @trim_mode).result(binding)
         raise "Result is not a string :='#{result}' for #{tpl_file_path}" unless result.is_a?(String)
+
         @context = old_value
         result
       rescue StandardError => e
@@ -380,6 +396,7 @@ module Consul
       end
     end
 
+    # Abstract class that stores information about a result
     class ConsulTemplateAbstract
       attr_reader :result, :endpoint, :seen_at
       def initialize(consul_endpoint)
@@ -421,12 +438,14 @@ module Consul
       end
     end
 
+    # Concrete class of a result when the result is a JSON Object
     class ConsulTemplateAbstractMap < ConsulTemplateAbstract
       def initialize(consul_endpoint)
         super(consul_endpoint)
       end
     end
 
+    # Concrete class of a result when the result is a JSON Array
     class ConsulTemplateAbstractArray < ConsulTemplateAbstract
       def initialize(consul_endpoint)
         super(consul_endpoint)
@@ -436,8 +455,11 @@ module Consul
     # technically this class could be also an array, a simple string or any simple json object other than a hash.
     class ConsulTemplateAbstractJSONObject < ConsulTemplateAbstractMap; end
 
+    # Just another name
     class ConsulTemplateAbstractJSONArray < ConsulTemplateAbstractArray; end
 
+    # The ServiceInstance has shortcuts (such as service_address method), but is
+    # basically a Hash.
     class ServiceInstance < Hash
       def initialize(obj)
         merge!(obj)
@@ -471,6 +493,7 @@ module Consul
         ret = 'passing'
         checks = self['Checks']
         return ret unless checks
+
         checks.each do |chk|
           st = chk['Status']
           if st == 'critical'
@@ -494,6 +517,7 @@ module Consul
       end
     end
 
+    # Representation as a Map of a Service (includes Service, Node, Checks)
     class ConsulTemplateService < ConsulTemplateAbstractMap
       def initialize(consul_endpoint)
         super(consul_endpoint)
@@ -503,6 +527,7 @@ module Consul
 
       def result_delegate
         return @cached_result if @cached_json == result.json
+
         new_res = []
         result.json.each do |v|
           new_res << ServiceInstance.new(v)
@@ -513,12 +538,14 @@ module Consul
       end
     end
 
+    # Object returned by datacenters(), basically a JSON Array
     class ConsulTemplateDatacenters < ConsulTemplateAbstractArray
       def initialize(consul_endpoint)
         super(consul_endpoint)
       end
     end
 
+    # Object returned by services() an abstract map of service_name, tags
     class ConsulTemplateServices < ConsulTemplateAbstractMap
       def initialize(consul_endpoint)
         super(consul_endpoint)
@@ -526,6 +553,7 @@ module Consul
 
       def parse_result(res)
         return res unless res.data == '{}' || endpoint.query_params[:tag]
+
         res_json = JSON.parse(res.data)
         result = {}
         res_json.each do |name, tags|
@@ -536,33 +564,43 @@ module Consul
       end
     end
 
+    # Another name to handle backwards compatibility
     class ConsulTemplateJSONObject < ConsulTemplateAbstractJSONObject; end
+
+    # Another name to handle backwards compatibility
     class ConsulTemplateJSONArray < ConsulTemplateAbstractJSONArray; end
 
+    # Object returned by /v1/agent/self, a JSON Map
     class ConsulAgentSelf < ConsulTemplateAbstractMap
       def initialize(consul_endpoint)
         super(consul_endpoint)
       end
     end
 
+    # Object returning metrics from Consul agent, a JSON Map
     class ConsulAgentMetrics < ConsulTemplateAbstractMap
       def initialize(consul_endpoint)
         super(consul_endpoint)
       end
     end
 
+    # List of checks for agent
     class ConsulTemplateChecks < ConsulTemplateAbstractArray
       def initialize(consul_endpoint)
         super(consul_endpoint)
       end
     end
 
+    # List of nodes of the whole cluster
     class ConsulTemplateNodes < ConsulTemplateAbstractArray
       def initialize(consul_endpoint)
         super(consul_endpoint)
       end
     end
 
+    # Key/Values representations
+    # This is an array as it might contain several values
+    # Several helpers exist to handle nicely transformations
     class ConsulTemplateKV < ConsulTemplateAbstractArray
       attr_reader :root
       def initialize(consul_endpoint, root)
@@ -584,6 +622,7 @@ module Consul
       def get_value_decoded(name = root)
         val = get_value(name)
         return nil unless val
+
         Base64.decode64(val)
       end
 
@@ -591,10 +630,12 @@ module Consul
       def get_value_json(name = root, catch_errors: true)
         x = get_value_decoded(name)
         return nil unless x
+
         begin
           JSON.parse(x)
         rescue JSON::ParserError => e
           return nil if catch_errors
+
           raise StandardError.new(e), "get_value_json() cannot deserialize kv(#{name}) as JSON: #{e.message}", e.backtrace
         end
       end
@@ -603,23 +644,29 @@ module Consul
       def get_value_yaml(name = root, catch_errors: true)
         x = get_value_decoded(name)
         return nil unless x
+
         begin
           YAML.safe_load(x)
         rescue YAML::ParserError => e
           return nil if catch_errors
+
           raise StandardError.new(e), "get_value_yaml() cannot deserialize kv(#{name}) as YAML: #{e.message}", e.backtrace
         end
       end
     end
 
+    # Vault Secrets is a Map of secrets properly decoded
     class ConsulTemplateVaultSecret < ConsulTemplateAbstractMap
       def initialize(vault_endpoint)
         super(vault_endpoint)
       end
     end
+
+    # Array of available secrets
     class ConsulTemplateVaultSecretList < ConsulTemplateAbstractArray
       def parse_result(res)
         return res if res.data.nil?
+
         res.mutate(JSON.generate(res.json['data']['keys']))
         res
       end

data/lib/consul/async/consul_template_engine.rb

@@ -5,10 +5,11 @@ require 'consul/async/vault_endpoint'
 require 'consul/async/consul_template'
 require 'consul/async/consul_template_render'
 require 'em-http'
-require 'thread'
 require 'erb'
 module Consul
   module Async
+    # The Engine keeps tracks of all templates, handle hot-reload of files if needed
+    # as well as ticking the clock to compute state of templates periodically.
     class ConsulTemplateEngine
       attr_reader :template_manager, :hot_reload_failure, :template_frequency, :debug_memory, :result, :templates
       attr_writer :hot_reload_failure, :template_frequency, :debug_memory
@@ -61,17 +62,17 @@ module Consul
           @template_callbacks.each do |c|
             c.call([all_ready, template_manager, results])
           end
-        rescue StandardError => cbk_error
-          ::Consul::Async::Debug.puts_error "callback error: #{cbk_error.inspect}"
-          raise cbk_error
+        rescue StandardError => e
+          ::Consul::Async::Debug.puts_error "callback error: #{e.inspect}"
+          raise e
         end
       rescue Consul::Async::InvalidTemplateException => e
-        STDERR.puts "[FATAL]#{e}"
+        warn "[FATAL]#{e}"
         template_manager.terminate
         @result = 1
         EventMachine.stop
       rescue StandardError => e
-        STDERR.puts "[FATAL] Error occured: #{e.inspect} - #{e.backtrace.join("\n\t")}"
+        warn "[FATAL] Error occured: #{e.inspect} - #{e.backtrace.join("\n\t")}"
         template_manager.terminate
         @result = 2
         EventMachine.stop
@@ -82,6 +83,7 @@ module Consul
         do_run(template_manager, template_renders)
 
         return if @all_templates_rendered || @periodic_started
+
         # We continue if rendering not done and periodic not started
         EventMachine.next_tick do
           do_run_fast(template_manager, template_renders)
@@ -111,7 +113,7 @@ module Consul
               diff_num_objects = new_memory_state[:objects] - @last_memory_state[:objects]
               if diff_allocated != 0 || diff_num_objects.abs > (@last_memory_state[:pages] / 3)
                 timediff = new_memory_state[:time] - @last_memory_state[:time]
-                STDERR.puts "[MEMORY] #{new_memory_state[:time]} significant RAM Usage detected\n" \
+                warn "[MEMORY] #{new_memory_state[:time]} significant RAM Usage detected\n" \
                             "[MEMORY] #{new_memory_state[:time]} Pages  : #{new_memory_state[:pages]}" \
                             " (diff #{diff_allocated} aka #{(diff_allocated / timediff).round(0)}/s) \n" \
                             "[MEMORY] #{new_memory_state[:time]} Objects: #{new_memory_state[:objects]}"\

data/lib/consul/async/consul_template_render.rb

@@ -1,9 +1,10 @@
 require 'consul/async/utilities'
 require 'em-http'
-require 'thread'
 require 'erb'
 module Consul
   module Async
+    # Result of the rendering of a template
+    # .ready? will tell if rendering is full or partial
     class ConsulTemplateRenderedResult
       attr_reader :template_file, :output_file, :hot_reloaded, :ready, :modified, :last_result
       def initialize(template_file, output_file, hot_reloaded, was_success, modified, last_result)
@@ -19,6 +20,9 @@ module Consul
         @ready
       end
     end
+    # Object handling the whole rendering of a template
+    # It stores the input, the output and flags about last result being modified or simply readiness
+    # information about whether the template did receive all data to be fully rendered
     class ConsulTemplateRender
       attr_reader :template_file, :output_file, :template_file_ctime, :hot_reload_failure, :params
       def initialize(template_manager, template_file, output_file, hot_reload_failure: 'die', params: {})
@@ -53,6 +57,7 @@ module Consul
       # Will throw Consul::Async::InvalidTemplateException if template invalid
       def update_template(new_template, current_template_info)
         return false unless new_template != @template
+
         # We render to ensure the template is valid
         render(new_template, current_template_info)
         @template = new_template.freeze
@@ -61,9 +66,9 @@ module Consul
 
       def _build_default_template_info
         {
-          'destination'       => @output_file,
-          'source_root'       => template_file.freeze,
-          'source'            => template_file.freeze,
+          'destination' => @output_file,
+          'source_root' => template_file.freeze,
+          'source' => template_file.freeze,
           'was_rendered_once' => @was_rendered_once
         }
       end
@@ -72,7 +77,7 @@ module Consul
         current_template_info = _build_default_template_info
         success, modified, last_res = @template_manager.write(@output_file, @template, @last_result, template_file, params, current_template_info: current_template_info)
         @last_result = last_res if last_res
-        @was_rendered_once = success unless @was_rendered_once
+        @was_rendered_once ||= success
         [success, modified, @last_result]
       end
 
@@ -84,9 +89,10 @@ module Consul
             @template_file_ctime = new_time
             return update_template(load_template, current_template_info: current_template_info)
           rescue Consul::Async::InvalidTemplateException => e
-            STDERR.puts "****\n[ERROR] HOT Reload of template #{template_file} did fail due to:\n #{e}\n****\n template_info: #{current_template_info}\n****"
+            warn "****\n[ERROR] HOT Reload of template #{template_file} did fail due to:\n #{e}\n****\n template_info: #{current_template_info}\n****"
             raise e unless hot_reload_failure == 'keep'
-            STDERR.puts "[WARN] Hot reload of #{template_file} was not taken into account, keep running with previous version"
+
+            warn "[WARN] Hot reload of #{template_file} was not taken into account, keep running with previous version"
           end
         end
         false

data/lib/consul/async/debug.rb

@@ -1,5 +1,6 @@
 module Consul
   module Async
+    # Toolbox for logs
     class Debug
       def self.level
         @level || 2
@@ -12,15 +13,16 @@ module Consul
       def self.level=(log_level)
         lvl = levels.index(log_level)
         raise "Log level #{log_level} unsupported, must be one of #{levels.inspect}" if lvl.nil?
+
         @level = lvl
       end
 
       def self.puts_error(msg)
-        STDERR.puts "[ERROR] #{msg}" if level.positive?
+        warn "[ERROR] #{msg}" if level.positive?
       end
 
       def self.puts_info(msg)
-        STDERR.puts "[INFO] #{msg}" if level > 1
+        warn "[INFO] #{msg}" if level > 1
       end
 
       def self.print_info(msg)
@@ -28,7 +30,7 @@ module Consul
       end
 
       def self.puts_debug(msg)
-        STDERR.puts "[DEBG] #{msg}" if level > 2
+        warn "[DEBG] #{msg}" if level > 2
       end
 
       def self.print_debug(msg)

data/lib/consul/async/json_endpoint.rb

@@ -5,6 +5,7 @@ require 'json'
 
 module Consul
   module Async
+    # Configuration to apply to JSONEndpoints
     class JSONConfiguration
       attr_reader :url, :retry_duration, :min_duration, :retry_on_non_diff,
                   :debug, :enable_gzip_compression, :request_method, :json_body,
@@ -34,6 +35,7 @@ module Consul
         self
       end
     end
+    # Result from call to a Remote JSON endpoint
     class JSONResult
       attr_reader :data, :http, :last_update, :stats, :retry_in
       def initialize(data, modified, http, stats, retry_in, fake: false)
@@ -67,6 +69,7 @@ module Consul
         next_retry + last_update
       end
     end
+    # Encapsulation of HTTP Response
     class HttpResponse
       attr_reader :response_header, :response, :error
       def initialize(http, override_nil_response = nil)
@@ -81,6 +84,7 @@ module Consul
         end
       end
     end
+    # Endpoint (aka URL) of a remote API that might be called
     class JSONEndpoint
       attr_reader :conf, :url, :queue, :stats, :last_result, :enforce_json_200, :start_time, :default_value, :query_params
       def initialize(conf, url, default_value, enforce_json_200 = true, query_params = {})

data/lib/consul/async/process_handler.rb

@@ -1,11 +1,16 @@
 module Consul
   module Async
+    # Exception thrown when process does not exists
     class ProcessDoesNotExist < StandardError
     end
+
+    # Handle the full lifecycle of a process and allows to forward
+    # Posix signals to child process when needed.
     class ProcessHandler
       attr_reader :command, :sig_reload, :sig_term, :pid, :exit_status
       def initialize(command, sig_reload: 'HUP', sig_term: 'TERM')
         raise 'empty sig_term is not supported' unless sig_term
+
         @command = command
         @sig_reload = sig_reload
         @sig_term = sig_term
@@ -15,44 +20,49 @@ module Consul
 
       def start
         return pid unless pid.nil?
+
         @pid = Process.spawn(command)
       end
 
       def reload
         return if sig_reload.nil?
-        STDERR.puts "Sending SIG #{sig_reload} to #{pid}..."
+
+        warn "Sending SIG #{sig_reload} to #{pid}..."
         begin
           Process.kill(sig_reload, pid)
         rescue Errno::ESRCH => e
-          STDERR.puts "*** Process #{pid} has already been killed: #{e.inspect}"
+          warn "*** Process #{pid} has already been killed: #{e.inspect}"
           raise e
         end
       end
 
       def kill
         return exit_status if pid.nil?
+
         the_pid = pid
         @pid = nil
-        STDERR.puts "[KILL] Sending SIG #{sig_term} to #{the_pid}..."
+        warn "[KILL] Sending SIG #{sig_term} to #{the_pid}..."
         begin
-          STDERR.puts "[KILL] waiting for #{the_pid}..."
+          warn "[KILL] waiting for #{the_pid}..."
           Process.kill(sig_term, the_pid)
         rescue Errno::ESRCH
-          STDERR.puts "[KILL] *** Process #{the_pid} has already been killed"
+          warn "[KILL] *** Process #{the_pid} has already been killed"
         end
         begin
           _pid, @exit_status = Process.waitpid2 the_pid
         rescue SystemCallError
-          STDERR.puts "[KILL] *** UNEXPECTED ERROR *** Failed to get return code for #{the_pid}"
+          warn "[KILL] *** UNEXPECTED ERROR *** Failed to get return code for #{the_pid}"
         end
         exit_status
       end
 
       def process_status
         raise ProcessDoesNotExist, 'No child process' if pid.nil?
+
         begin
           cpid, result = Process.waitpid2(pid, Process::WNOHANG)
           raise ProcessDoesNotExist, "Unexpected PID: #{cpid}, was expecting #{pid}" unless cpid.nil? || cpid == pid
+
           result
         rescue Errno::ECHILD => e
           e2 = ProcessDoesNotExist.new e

data/lib/consul/async/stats.rb

@@ -2,6 +2,8 @@ require 'consul/async/utilities'
 
 module Consul
   module Async
+    # Object keeping stats about a single Endpoint
+    # Accessible within the .stats of a EndPoint
     class EndPointStats
       attr_reader :successes, :errors, :consecutive_errors, :start, :body_bytes, :last_error, :last_success, :last_modified, :changes, :network_bytes
 

data/lib/consul/async/utilities.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'json'
 module Consul
   module Async
+    # Various utilities
     class Utilities
       def self.bytes_to_h(bytes)
         if bytes < 1024
@@ -25,6 +26,7 @@ module Consul
       # Loads parameters from a file, supports JSON and YAML
       def self.load_parameters_from_file(parameters_file)
         raise "Parameters file #{parameters_file} does not exists" unless File.exist? parameters_file
+
         if parameters_file.downcase.end_with?('.yaml', '.yml')
           YAML.load_file(parameters_file)
         elsif parameters_file.downcase.end_with?('.json')
@@ -35,7 +37,7 @@ module Consul
       end
 
       def self.random
-        @random = Random.new unless @random
+        @random ||= Random.new
         @random
       end
     end

data/lib/consul/async/vault_endpoint.rb

@@ -3,11 +3,11 @@ require 'consul/async/stats'
 require 'consul/async/debug'
 require 'em-http'
 require 'net/http'
-require 'thread'
 require 'json'
 
 module Consul
   module Async
+    # Configuration for Vault Endpoints
     class VaultConfiguration
       attr_reader :base_url, :token, :token_renew, :retry_duration, :min_duration, :wait_duration, :max_retry_duration, :retry_on_non_diff,
                   :lease_duration_factor, :debug, :max_consecutive_errors_on_endpoint, :fail_fast_errors
@@ -48,6 +48,7 @@ module Consul
 
       def create(path)
         return self unless @paths[path.to_sym]
+
         VaultConfiguration.new(base_url: ch(path, :base_url),
                                debug: ch(path, :debug),
                                token: ch(path, :token),
@@ -60,6 +61,7 @@ module Consul
                                fail_fast_errors: @fail_fast_errors)
       end
     end
+    # Keep information about Vault result of a query
     class VaultResult
       attr_reader :data, :http, :stats, :retry_in
 
@@ -92,6 +94,8 @@ module Consul
         @data_json
       end
     end
+
+    # VaultHttpResponse supports empty results (when no data has been received yet)
     class VaultHttpResponse
       attr_reader :response_header, :response, :error, :json
 
@@ -109,6 +113,7 @@ module Consul
       end
     end
 
+    # Endpoint in vault (a path in Vault)
     class VaultEndpoint
       attr_reader :conf, :path, :http_method, :queue, :stats, :last_result, :enforce_json_200, :start_time, :default_value, :query_params
 
@@ -140,7 +145,7 @@ module Consul
         on_response do |result|
           state = result.x_consul_index.to_i < 1 ? '[WARN]' : '[ OK ]'
           stats = result.stats
-          STDERR.puts "[DBUG]#{state}#{result.modified? ? '[MODFIED]' : '[NO DIFF]'}" \
+          warn "[DBUG]#{state}#{result.modified? ? '[MODFIED]' : '[NO DIFF]'}" \
           "[s:#{stats.successes},err:#{stats.errors}]" \
           "[#{stats.body_bytes_human.ljust(8)}][#{stats.bytes_per_sec_human.ljust(9)}]"\
           " #{path.ljust(48)} idx:#{result.x_consul_index}, next in #{result.retry_in} s"
@@ -192,6 +197,7 @@ module Consul
 
       def _get_errors(http)
         return [http.error] if http.error
+
         unless http.json.nil?
           return http.json['errors'] if http.json.key?('errors')
         end
@@ -213,7 +219,7 @@ module Consul
       def fetch
         options = {
           connect_timeout: 5, # default connection setup timeout
-          inactivity_timeout: 1, # default connection inactivity (post-setup) timeout
+          inactivity_timeout: 1 # default connection inactivity (post-setup) timeout
         }
         connection = EventMachine::HttpRequest.new(conf.base_url, options)
         cb = proc do |_|
@@ -241,9 +247,7 @@ module Consul
           end
 
           http.errback do
-            unless @stopping
-              _handle_error(http) { connection = EventMachine::HttpRequest.new(conf.base_url, options) }
-            end
+            _handle_error(http) { connection = EventMachine::HttpRequest.new(conf.base_url, options) } unless @stopping
           end
           queue.pop(&cb)
         end

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.23.0'.freeze
+    VERSION = '1.24.0'.freeze
   end
 end

data/samples/consul-ui/css/style.css

@@ -250,3 +250,7 @@ pre, code {
 .connect-disabled {
   display: none;
 }
+
+.hidden {
+  display: none;
+}

data/samples/consul-ui/decorators.js.erb

@@ -153,7 +153,6 @@ function decorateIsoDate(value, formated) {
     return document.createTextNode(value);
   }
   const d = new Date(parsed);
-  console.log(d);
   const e = document.createElement('time');
   e.setAttribute('datetime', formated);
   e.setAttribute('title', value);
@@ -223,6 +222,64 @@ function service_meta_semantics_decorator(instance, key, value, serviceName) {
     return fun(instance, key, value);
 }
 
+const node_meta_decorators = {
+  'os': function(k, v, nodeMetaTags, serviceMetaIfAny) {
+    var e = document.createElement('span');
+    e.setAttribute('class', 'badge badge-light mx-1 lookup');
+    e.appendChild(document.createTextNode(k + ':' + v + ' '));
+    var i = document.createElement('i');
+    i.setAttribute('class', 'fab fa-' + v);
+    e.appendChild(i);
+    return e;
+  }
+}
+
+function default_node_meta_decorator(k, value, nodeMetaTags, serviceMetaIfAny) {
+  if (httpRegexp.test(value)) {
+    var e = document.createElement('a');
+    e.setAttribute('href', value);
+    e.setAttribute('class', 'lookup');
+    e.appendChild(document.createTextNode(k + ':'+ value));
+    var metaTag = document.createElement('span');
+    metaTag.setAttribute('class', 'badge badge-secondary mx-1');
+    metaTag.appendChild(e);
+    return metaTag;
+  } else {
+    var metaTag = document.createElement('span');
+    metaTag.setAttribute('class', 'badge badge-primary mx-1 lookup');
+    metaTag.appendChild(document.createTextNode(k + ':' + value));
+    return metaTag;
+  }
+}
+
+function find_decorator(k, v) {
+  const nd = node_meta_decorators[k];
+  if (nd != null) {
+    return nd;
+  } else {
+    return default_node_meta_decorator;
+  }
+}
+
+function nodeMetaGenerator(nodeMetaTags, serviceMetaIfAny) {
+    var allMeta = document.createElement('div');
+    var metaTags = document.createElement('div');
+    metaTags.setAttribute('title', 'Node Meta')
+    metaTags.className = 'node-meta';
+    for (var tagKey in nodeMetaTags) {
+        const tagValue = nodeMetaTags[tagKey];
+        if (tagValue == ''){
+          continue;
+        }
+        const decorator = find_decorator(tagKey, tagValue);
+        var clazz = 'badge badge-primary mx-1 lookup';
+        const elem = decorator(tagKey, tagValue, nodeMetaTags, serviceMetaIfAny);
+        metaTags.appendChild(elem);
+    }
+    allMeta.appendChild(metaTags);
+    return allMeta;
+}
+
 /**
  * navBarDecorator is called to modify to modify naviguation bar of all UI pages.
  * it receives the nav bar div

data/samples/consul-ui/js/utils.js

@@ -122,22 +122,6 @@ function nodeAddressGenator(nodeaddr) {
     return htmlAddress;
 }
 
-function nodeMetaGenerator(nodeMetaTags) {
-    var metaTags = document.createElement('div');
-    metaTags.setAttribute('title', 'Node Meta')
-    metaTags.className = 'node-meta';
-    for (var tagKey in nodeMetaTags) {
-        if (!nodeMetaTags[tagKey]) {
-            continue;
-        }
-        var metaTag = document.createElement('span');
-        metaTag.setAttribute('class', 'badge badge-primary mx-1 lookup');
-        metaTag.appendChild(document.createTextNode(tagKey + ':' + nodeMetaTags[tagKey]));
-        metaTags.appendChild(metaTag);
-    }
-    return metaTags;
-}
-
 function tagsGenerator(instanceTags) {
     var tags = document.createElement('div');
 

data/samples/consul-ui/ringbuffer.rb

@@ -1,4 +1,6 @@
 module ConsulTimeline
+  # Node of a ringbuffer
+  # This contains entries to next and previous elemens as well as the value
   class RingBufferNode
     attr_reader :prev, :value, :next
     attr_writer :prev, :next, :value
@@ -28,10 +30,15 @@ module ConsulTimeline
       "[prev=#{@prev.object_id}, next=#{@next.object_id}, value=#{@value}]"
     end
   end
+  # A ringbuffer that supports inserting out of order elements at the right place
+  # This is needed as Consul might notify us from changes in any order, so we
+  # might receive a notification t-2 AFTER t-1, at t.
+  # The ringbuffer will discard old elements so it keeps the "n" most recent elements only.
   class SortedRingBuffer
     include Enumerable
     def initialize(max_size, sort_func)
       raise "Invalid size #{max_size}" unless max_size.positive?
+
       @head = RingBufferNode.new(nil, nil, nil)
       @sort_func = sort_func
       @tail = @head
@@ -43,11 +50,11 @@ module ConsulTimeline
 
     def push(obj)
       return unless obj
+
       cur = @tail
       raise "No head.next found in #{@head}" unless @head.next
-      while cur && cur.value && @sort_func.call(cur.value, obj).positive?
-        cur = cur.prev
-      end
+
+      cur = cur.prev while cur&.value && @sort_func.call(cur.value, obj).positive?
       if cur.nil?
         # The value we try to insert is before @head
         # no need to do anything
@@ -64,6 +71,7 @@ module ConsulTimeline
 
     def each
       return enum_for(:each) unless block_given? # Sparkling magic!
+
       cur = @head
       until cur.nil?
         yield cur.value if cur.value
@@ -103,5 +111,6 @@ if ARGV.count.positive? && ARGV[0] == 'debug'
   ringbuff.push 99_999_999_999_999
   arr = ringbuff.to_a
   raise "OOPS wrong size := #{arr.count} instead of #{size}" unless arr.count == size
+
   STDOUT.puts JSON.generate(arr)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.24.0
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: rubocop-junit-formatter
   requirement: !ruby/object:Gem::Requirement