diplomat 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e314345fea055152e86ff0e0a166185de4889f0
-  data.tar.gz: 7630435e44ebfab12efe41d3949a880bb9538d7d
+  metadata.gz: 0aa77dadc7f5b36f11bdd50ee2e43b1bad16d351
+  data.tar.gz: e5c534280a221d8f17e2195a68fb9863cd58f31e
 SHA512:
-  metadata.gz: 180b5d54fb5ee0ef5758ec5f22da3408b2cc2b9bfe135640a0755f84e5dc8d8176bf4215a0a24e44091f247a392e49cd3ec3996f0b812e657a6f0fa4346c4a4d
-  data.tar.gz: 4045fb41d2ae39d4e6a2de5412782574e67834f7932042dcb4b52f1250add0666f7506290183d200d86ed6d8638810360be275a7f4c7a5bb3c1fbf20524f2661
+  metadata.gz: bf071f060eb8683f220baff80a21974d1b25e73e25caaa1e9a825949752476be8e76f85da1874ba003cbf6b1b8d580c85ffa733155299305e79edfb0bb50acad
+  data.tar.gz: d57740b2bb515c6e74db8540db26e1dc5ef63b0e1d3cb3d8cdef554e9d9d48731e98f20a78827e76201ed22c8d8c06d0ca28645ab92d68163f0c1717b16e1405

data/README.md

@@ -338,4 +338,4 @@ This is traditionally kept inside the `config/initializers` directory if you're
 
 ## Enjoy!
 
-![Photo Copyright "merlinmann". All rights reserved.](http://i.imgur.com/3mBwzR9.jpg Photo Copyright "merlinmann" https://www.flickr.com/photos/merlin/. All rights reserved.)
+![Photo Copyright "merlinmann" https://www.flickr.com/photos/merlin/. All rights reserved.](http://i.imgur.com/3mBwzR9.jpg)

data/lib/diplomat/kv.rb

@@ -77,7 +77,7 @@ module Diplomat
           @raw = parse_body
           return @raw.first['ModifyIndex'] if @options && @options[:modify_index]
           return decode_values if @options && @options[:decode_values]
-          return convert_to_hash(return_value(return_nil_values, transformation)) if @options && @options[:convert_to_hash]
+          return convert_to_hash(return_value(return_nil_values, transformation, true)) if @options && @options[:convert_to_hash]
           return return_value(return_nil_values, transformation)
         when :wait
           index = raw.headers['x-consul-index']

data/lib/diplomat/rest_client.rb

@@ -81,13 +81,14 @@ module Diplomat
 
     def build_connection(api_connection, raise_error = false)
       api_connection || Faraday.new(Diplomat.configuration.url, Diplomat.configuration.options) do |faraday|
-        faraday.adapter  Faraday.default_adapter
-        faraday.request  :url_encoded
-        faraday.response :raise_error unless raise_error
-
         Diplomat.configuration.middleware.each do |middleware|
           faraday.use middleware
         end
+
+        faraday.request  :url_encoded
+        faraday.response :raise_error unless raise_error
+
+        faraday.adapter  Faraday.default_adapter
       end
     end
 
@@ -148,10 +149,10 @@ module Diplomat
 
     # Get the key/value(s) from the raw output
     # rubocop:disable PerceivedComplexity, MethodLength, CyclomaticComplexity, AbcSize
-    def return_value(nil_values = false, transformation = nil)
+    def return_value(nil_values = false, transformation = nil, return_hash = false)
       @value = decode_values
       return @value if @value.first.is_a? String
-      if @value.count == 1
+      if @value.count == 1 && !return_hash
         @value = @value.first['Value']
         @value = transformation.call(@value) if transformation && !@value.nil?
         return @value

data/lib/diplomat/service.rb

@@ -3,7 +3,7 @@ module Diplomat
   class Service < Diplomat::RestClient
     include ApiOptions
 
-    @access_methods = %i[get get_all register deregister register_external deregister_external]
+    @access_methods = %i[get get_all register deregister register_external deregister_external maintenance]
 
     # Get a service by it's key
     # @param key [String] the key
@@ -94,5 +94,25 @@ module Diplomat
       deregister = @conn.put '/v1/catalog/deregister', json_definition
       deregister.status == 200
     end
+
+    # Enable or disable maintenance for a service
+    # @param [Hash] opts the options for enabling or disabling maintenance for a service
+    # @options opts [Boolean] :enable (true) whether to enable or disable maintenance
+    # @options opts [String] :reason reason for the service maintenance
+    # @raise [Diplomat::PathNotFound] if the request fails
+    # @return [Boolean] if the request was successful or not
+    def maintenance(service_id, options = { enable: true })
+      url = ["/v1/agent/service/maintenance/#{service_id}"]
+      url += check_acl_token
+      url << ["enable=#{options[:enable]}"]
+      url << ["reason=#{options[:reason].split(' ').join('+')}"] if options && options[:reason]
+      begin
+        maintenance = @conn.put concat_url(url)
+      rescue Faraday::ClientError
+        raise Diplomat::PathNotFound
+      end
+      maintenance.status == 200
+    end
+    # rubocop:enable AbcSize
   end
 end

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = '1.3.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - John Hamelink
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Diplomat is a simple wrapper for Consul