diplomat 2.2.6 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4fc2a1fed34abcea03720130cdb3403c7f4e95183ba2685a7cb0e97a8b38021
-  data.tar.gz: e3d95df82fe5db865d2018f4cdc5bfc4795bf91e2d006b2ddc96141cea0e4184
+  metadata.gz: c1484b11f450e8df4d3220d2ea3112682afd20848f43f9bc84f3be07629edd2f
+  data.tar.gz: b676fcde876ba6ecb17404436aa3a8c6730a68ec1d07bab51bbfa0e21473bfb8
 SHA512:
-  metadata.gz: 2f139bed5e80cd4f8f793a93d7171de48de69161a679336c5675847c26e3141d0c28b5bcea79dfc2447e7632750e12336d721ba9e48d11d60efd88062a799602
-  data.tar.gz: f6c7ad2ded6476794f53f03e70d663d06bbae0386a5246e8a84b3f5ec58cf18aa9f0c970f9b1e09f00da031ff14659e6564262f88b1c2abedf88b1754beafc5f
+  metadata.gz: c5b5db54f6e827ccfeb79a5906f731d68865a506d176dbb6b7a2c45a3f1096f2a4699c5ee4fd3885ab98d8d14b93752f137b32f4159895cafdbfe7157972f865
+  data.tar.gz: 8b7a2db51a0a83d9f01149d4251713d8097477688a4b84eb323c84857aa7a2c1449d365292aa2d73be46f756457547de5ce9ff2fbe703550500b707ec02eeaa6

data/features/step_definitions/setup_diplomat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'diplomat'
 
 Given 'I am setting up a default diplomat' do

data/features/step_definitions/test_key_value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Then 'I should be able to get and put keys' do
   # High-fructose Corn Syrup
   Diplomat.put('drink', 'Irn Bru')

data/lib/diplomat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'base64'
 require 'faraday'

data/lib/diplomat/acl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul ACL API endpoint
   class Acl < Diplomat::RestClient
@@ -8,7 +10,7 @@ module Diplomat
     # @param id [String] ID of the Acl to get
     # @param options [Hash] options parameter hash
     # @return [Hash]
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def info(id, options = {}, not_found = :reject, found = :return)
       @id = id
       @options = options
@@ -36,7 +38,7 @@ module Diplomat
         raise Diplomat::UnknownStatus, "status #{raw.status}: #{raw.body}"
       end
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # List all Acls
     # @param options [Hash] options parameter hash

data/lib/diplomat/agent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 require 'faraday'
 

data/lib/diplomat/check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul check API endpoint
   class Check < Diplomat::RestClient
@@ -19,7 +21,7 @@ module Diplomat
     # @param interval [String] frequency (with units) of the check execution
     # @param options [Hash] options parameter hash
     # @return [Integer] Status code
-    # rubocop:disable ParameterLists
+    # rubocop:disable Metrics/ParameterLists
     def register_script(check_id, name, notes, args, interval, options = {})
       unless args.is_a?(Array)
         raise(Diplomat::DeprecatedArgument, 'Script usage is deprecated, replace by an array of args')
@@ -35,7 +37,7 @@ module Diplomat
       ret = send_put_request(@conn, ['/v1/agent/check/register'], options, definition)
       ret.status == 200
     end
-    # rubocop:enable ParameterLists
+    # rubocop:enable Metrics/ParameterLists
 
     # Register a TTL check
     # @param check_id [String] the unique id of the check

data/lib/diplomat/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for configuring Diplomat
   class Configuration

data/lib/diplomat/datacenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul dataceneter API endpoint
   class Datacenter < Diplomat::RestClient

data/lib/diplomat/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   class KeyNotFound < StandardError; end
   class PathNotFound < StandardError; end

data/lib/diplomat/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul event API endpoint
   class Event < Diplomat::RestClient
@@ -102,7 +104,7 @@ module Diplomat
     #   middle, though these can only be identified relative to the preceding
     #   event. However, this is ideal for iterating through the sequence of
     #   events (while being sure that none are missed).
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def get(name = nil, token = :last, not_found = :wait, found = :return, options = {})
       @raw = send_get_request(@conn, ['/v1/event/list'], options, use_named_parameter('name', name))
       body = JSON.parse(@raw.body)
@@ -148,7 +150,7 @@ module Diplomat
         token: event_token
       }
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     private
 

data/lib/diplomat/health.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul health API endpoint
   class Health < Diplomat::RestClient
@@ -32,7 +34,7 @@ module Diplomat
     # @param s [String] the service
     # @param options [Hash] options parameter hash
     # @return [OpenStruct] all data associated with the node
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def service(s, options = {})
       custom_params = []
       custom_params << use_named_parameter('dc', options[:dc]) if options[:dc]
@@ -43,7 +45,7 @@ module Diplomat
       ret = send_get_request(@conn, ["/v1/health/service/#{s}"], options, custom_params)
       JSON.parse(ret.body).map { |service| OpenStruct.new service }
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # Get service health
     # @param s [String] the state ("any", "passing", "warning", or "critical")

data/lib/diplomat/kv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul KV API endpoint
   class Kv < Diplomat::RestClient
@@ -40,7 +42,7 @@ module Diplomat
     #   - W R - get the first or current value; always return something, but
     #           block only when necessary
     #   - W W - get the first or next value; wait until there is an update
-    # rubocop:disable PerceivedComplexity, MethodLength, LineLength, CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity, Metrics/MethodLength, Layout/LineLength, Metrics/CyclomaticComplexity
     def get(key, options = {}, not_found = :reject, found = :return)
       @options = options
       return_nil_values = @options && @options[:nil_values]
@@ -81,7 +83,7 @@ module Diplomat
       @raw = parse_body
       return_value(return_nil_values, transformation)
     end
-    # rubocop:enable PerceivedComplexity, LineLength, MethodLength, CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity, Layout/LineLength, Metrics/MethodLength, Metrics/CyclomaticComplexity
 
     # Get all keys recursively, potentially blocking for the first or next value
     # @param key [String] the key
@@ -100,7 +102,7 @@ module Diplomat
     # @param found [Symbol] behaviour if the key does exist;
     #   :reject with exception, :return its current value, or :wait for its next value
     # @return [List] List of hashes, one hash for each key-value returned
-    # rubocop:disable PerceivedComplexity, MethodLength, LineLength, CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity, Metrics/MethodLength, Layout/LineLength, Metrics/CyclomaticComplexity
     def get_all(key, options = {}, not_found = :reject, found = :return)
       @options = options
       @options[:recurse] = true
@@ -140,7 +142,7 @@ module Diplomat
       @raw = parse_body
       return_value(return_nil_values, transformation, true)
     end
-    # rubocop:enable PerceivedComplexity, MethodLength, LineLength, CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity, Metrics/MethodLength, Layout/LineLength, Metrics/CyclomaticComplexity
 
     # Associate a value with a key
     # @param key [String] the key

data/lib/diplomat/lock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul lock API endpoint
   class Lock < Diplomat::RestClient
@@ -41,7 +43,7 @@ module Diplomat
     # @param session [String] the session, generated from Diplomat::Session.create
     # @param options [Hash] :dc string for dc specific query
     # @return [nil]
-    # rubocop:disable AbcSize
+    # rubocop:disable Metrics/AbcSize
     def release(key, session, options = {})
       key = normalize_key_for_uri(key)
       custom_params = []
@@ -51,6 +53,6 @@ module Diplomat
       raw = send_put_request(@conn, ["/v1/kv/#{key}"], options, nil, custom_params)
       raw.body
     end
-    # rubocop:enable AbcSize
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/diplomat/maintenance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods to interact with the Consul maintenance API endpoint
   class Maintenance < Diplomat::RestClient

data/lib/diplomat/members.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul members API endpoint
   class Members < Diplomat::RestClient

data/lib/diplomat/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul node API endpoint
   class Node < Diplomat::RestClient

data/lib/diplomat/nodes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # @depreciated
   # Methods for interacting with the Consul nodes API endpoint

data/lib/diplomat/policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul ACL Policy API endpoint
   class Policy < Diplomat::RestClient
@@ -8,7 +10,7 @@ module Diplomat
     # @param id [String] UUID of the ACL policy to read
     # @param options [Hash] options parameter hash
     # @return [Hash] existing ACL policy
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def read(id, options = {}, not_found = :reject, found = :return)
       @options = options
       custom_params = []
@@ -41,7 +43,7 @@ module Diplomat
         raise Diplomat::UnknownStatus, "status #{@raw.status}: #{@raw.body}"
       end
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # List all the ACL policies
     # @param options [Hash] options parameter hash
@@ -89,7 +91,7 @@ module Diplomat
       custom_params = use_cas(@options)
       @raw = send_put_request(@conn, ['/v1/acl/policy'], options, value, custom_params)
 
-      # rubocop:disable GuardClause
+      # rubocop:disable Style/GuardClause
       if @raw.status == 200
         return parse_body
       elsif @raw.status == 500 && @raw.body.chomp.include?('already exists')
@@ -98,7 +100,7 @@ module Diplomat
         raise Diplomat::UnknownStatus, "status #{@raw.status}: #{@raw.body}"
       end
     end
-    # rubocop:enable GuardClause
+    # rubocop:enable Style/GuardClause
 
     # Delete an ACL policy by its UUID
     # @param id [String] UUID of the ACL policy to delete

data/lib/diplomat/query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul query API endpoint
   class Query < Diplomat::RestClient
@@ -63,7 +65,7 @@ module Diplomat
     #   estimated round trip time from that node
     # @option limit [Integer] to limit the size of the return list to the given number of results
     # @return [OpenStruct] the list of results from the prepared query or prepared query template
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def execute(key, options = {})
       custom_params = []
       custom_params << use_named_parameter('dc', options[:dc]) if options[:dc]
@@ -72,7 +74,7 @@ module Diplomat
       ret = send_get_request(@conn, ["/v1/query/#{key}/execute"], options, custom_params)
       OpenStruct.new JSON.parse(ret.body)
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # Get the fully rendered query template
     # @param key [String] the prepared query ID or name

data/lib/diplomat/rest_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'deep_merge'
 
 module Diplomat
@@ -172,7 +174,7 @@ module Diplomat
     end
 
     # Get the key/value(s) from the raw output
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def return_value(nil_values = false, transformation = nil, return_hash = false)
       @value = decode_values
       return @value if @value.first.is_a? String
@@ -188,7 +190,7 @@ module Diplomat
         end.compact
       end
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # Get the name and payload(s) from the raw output
     def return_payload
@@ -206,7 +208,7 @@ module Diplomat
       options[:consistency] ? [options[:consistency].to_s] : []
     end
 
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     # TODO: Migrate all custom params in options
     def parse_options(options)
       headers = nil
@@ -228,7 +230,7 @@ module Diplomat
       url_prefix = options[:http_addr] if options[:http_addr]
       { query_params: query_params, headers: headers, url_prefix: url_prefix }
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     def send_get_request(connection, url, options, custom_params = nil)
       rest_options = parse_options(options)
@@ -238,7 +240,7 @@ module Diplomat
         connection.get do |req|
           req.options[:params_encoder] = options[:params_encoder] if options[:params_encoder]
           req.url rest_options[:url_prefix] ? rest_options[:url_prefix] + concat_url(url) : concat_url(url)
-          rest_options[:headers].map { |k, v| req.headers[k.to_sym] = v } unless rest_options[:headers].nil?
+          rest_options[:headers]&.map { |k, v| req.headers[k.to_sym] = v }
           req.options.timeout = options[:timeout] if options[:timeout]
         end
       rescue Faraday::ClientError, Faraday::ServerError => e
@@ -256,7 +258,7 @@ module Diplomat
       url += custom_params unless custom_params.nil?
       connection.put do |req|
         req.url rest_options[:url_prefix] ? rest_options[:url_prefix] + concat_url(url) : concat_url(url)
-        rest_options[:headers].map { |k, v| req.headers[k.to_sym] = v } unless rest_options[:headers].nil?
+        rest_options[:headers]&.map { |k, v| req.headers[k.to_sym] = v }
         unless data.nil?
           (req.headers || {})['Content-Type'] = mime
           req.body = if mime == 'application/json' && !data.is_a?(String)
@@ -274,7 +276,7 @@ module Diplomat
       url += custom_params unless custom_params.nil?
       connection.post do |req|
         req.url rest_options[:url_prefix] ? rest_options[:url_prefix] + concat_url(url) : concat_url(url)
-        rest_options[:headers].map { |k, v| req.headers[k.to_sym] = v } unless rest_options[:headers].nil?
+        rest_options[:headers]&.map { |k, v| req.headers[k.to_sym] = v }
         req.body = JSON.dump(data) unless data.nil?
       end
     end
@@ -285,7 +287,7 @@ module Diplomat
       url += custom_params unless custom_params.nil?
       connection.delete do |req|
         req.url rest_options[:url_prefix] ? rest_options[:url_prefix] + concat_url(url) : concat_url(url)
-        rest_options[:headers].map { |k, v| req.headers[k.to_sym] = v } unless rest_options[:headers].nil?
+        rest_options[:headers]&.map { |k, v| req.headers[k.to_sym] = v }
       end
     end
 

data/lib/diplomat/role.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul ACL Role API endpoint
   class Role < Diplomat::RestClient
@@ -8,7 +10,7 @@ module Diplomat
     # @param id [String] UUID or name of the ACL role to read
     # @param options [Hash] options parameter hash
     # @return [Hash] existing ACL role
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def read(id, options = {}, not_found = :reject, found = :return)
       @options = options
       custom_params = []
@@ -41,13 +43,13 @@ module Diplomat
         raise Diplomat::UnknownStatus, "status #{@raw.status}: #{@raw.body}"
       end
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # Read ACL role with the given name
     # @param name [String] name of the ACL role to read
     # @param options [Hash] options parameter hash
     # @return [Hash] existing ACL role
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def read_name(name, options = {}, not_found = :reject, found = :return)
       @options = options
       custom_params = []
@@ -80,7 +82,7 @@ module Diplomat
         raise Diplomat::UnknownStatus, "status #{@raw.status}: #{@raw.body}"
       end
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # List all the ACL roles
     # @param options [Hash] options parameter hash
@@ -128,7 +130,7 @@ module Diplomat
       custom_params = use_cas(@options)
       @raw = send_put_request(@conn, ['/v1/acl/role'], options, value, custom_params)
 
-      # rubocop:disable GuardClause
+      # rubocop:disable Style/GuardClause
       if @raw.status == 200
         return parse_body
       elsif @raw.status == 500 && @raw.body.chomp.include?('already exists')
@@ -137,7 +139,7 @@ module Diplomat
         raise Diplomat::UnknownStatus, "status #{@raw.status}: #{@raw.body}"
       end
     end
-    # rubocop:enable GuardClause
+    # rubocop:enable Style/GuardClause
 
     # Delete an ACL role by its UUID
     # @param id [String] UUID of the ACL role to delete

data/lib/diplomat/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul service API endpoint.
   class Service < Diplomat::RestClient
@@ -9,7 +11,7 @@ module Diplomat
     # @param options [Hash] options parameter hash
     # @param meta [Hash] output structure containing header information about the request (index)
     # @return [OpenStruct] all data associated with the service
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def get(key, scope = :first, options = {}, meta = nil)
       custom_params = []
       custom_params << use_named_parameter('wait', options[:wait]) if options[:wait]
@@ -44,7 +46,7 @@ module Diplomat
         OpenStruct.new JSON.parse(ret.body).first
       end
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # Get all the services
     # @param options [Hash] :dc Consul datacenter to query

data/lib/diplomat/session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul session API endpoint
   class Session < Diplomat::RestClient

data/lib/diplomat/status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul status API endpoints, leader and peers
   class Status < Diplomat::RestClient

data/lib/diplomat/token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
   # Methods for interacting with the Consul ACL Policy API endpoint
   class Token < Diplomat::RestClient
@@ -8,7 +10,7 @@ module Diplomat
     # @param id [String] accessor ID of the ACL token to read
     # @param options [Hash] options parameter hash
     # @return [Hash] existing ACL token
-    # rubocop:disable PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def read(id, options = {}, not_found = :reject, found = :return)
       @options = options
       custom_params = []
@@ -34,7 +36,7 @@ module Diplomat
         raise Diplomat::UnknownStatus, "status #{@raw.status}: #{@raw.body}"
       end
     end
-    # rubocop:enable PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # List all the ACL tokens
     # @param policy [String] filters the token list matching the specific policy ID

data/lib/diplomat/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Diplomat
-  VERSION = '2.2.6'.freeze
+  VERSION = '2.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.3.0
 platform: ruby
 authors:
 - John Hamelink
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,14 +149,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.0
+        version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.0
+        version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement