diplomat 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce6e11c99998e8ccde4674d2f25b1c65a7dadcb6
-  data.tar.gz: 0ed7b4a14cedf79aed1f0856b60f8eb96744adbe
+  metadata.gz: a9956fd68674648c7b2644f8d08d154a367ca2e1
+  data.tar.gz: 74a39316e04f1134fa609670a4edb7001dcb6bf6
 SHA512:
-  metadata.gz: dae2bbf4adfdcda941ce8d9ad5b09868dfe7abbd957122e217159fc27d15f585201edfd8de4ac570fb0e28baf284352ba9c4e4a750808b9e95b8149e074eaf80
-  data.tar.gz: 4a5b3fb941c350acc1a2272727fb4eaefe63df2c5814bca82fd9dc0f889acf6709aa85b1fb531431d2c092b96cff766d48ae5fe392c6f6c84a8d81e659d191e8
+  metadata.gz: 1a836986d9eca10c7afed887e8c4b0241e2cbca3ef53c7a144f39563497ded774a754fc71ba647ab80b37dbd72de6fac0c510dc8525bd11071faae9160ede586
+  data.tar.gz: ae779f2691daf74d05e1d96f8a627b42e3a2939145d26f98eb5ea9ea984b142b634be65505f55cb875db46e8d90ab98daccb092140bd04db8791224d7d3d84fa

data/README.md

@@ -131,6 +131,13 @@ services = Diplomat::Service.get_all
 # => #<OpenStruct consul=[], foo=[], bar=[]>
 ```
 
+If you wish to list all the services for a specific datacenter:
+
+```ruby
+services = Diplomat::Service.get_all({ :dc => 'My_Datacenter' })
+# => #<OpenStruct consul=[], foo=[], bar=[]>
+```
+
 ### Datacenters
 
 Getting a list of datacenters is quite simple and gives you the option to extract all services out of

data/lib/diplomat/health.rb

@@ -8,34 +8,75 @@ module Diplomat
 
     # Get node health
     # @param n [String] the node
+    # @param options [Hash] :dc string for dc specific query
     # @return [OpenStruct] all data associated with the node
-    def node n
-      ret = @conn.get "/v1/health/node/#{n}"
+    def node n, options=nil
+      url = ["/v1/health/node/#{n}"]
+      url << use_named_parameter('dc', options[:dc]) if options and options[:dc]
+
+      # If the request fails, it's probably due to a bad path
+      # so return a PathNotFound error.
+      begin
+        ret = @conn.get concat_url url
+      rescue Faraday::ClientError
+        raise Diplomat::PathNotFound
+      end
       return JSON.parse(ret.body)
     end
 
     # Get service checks
     # @param s [String] the service
+    # @param options [Hash] :dc string for dc specific query
     # @return [OpenStruct] all data associated with the node
-    def checks s
-      ret = @conn.get "/v1/health/checks/#{s}"
+    def checks s, options=nil
+      url = ["/v1/health/checks/#{s}"]
+      url << use_named_parameter('dc', options[:dc]) if options and options[:dc]
+      
+      # If the request fails, it's probably due to a bad path
+      # so return a PathNotFound error.
+      begin
+        ret = @conn.get concat_url url
+      rescue Faraday::ClientError
+        raise Diplomat::PathNotFound
+      end
       return JSON.parse(ret.body)
     end
 
     # Get service health
     # @param s [String] the service
+    # @param options [Hash] :dc string for dc specific query
     # @return [OpenStruct] all data associated with the node
-    def service s
-      ret = @conn.get "/v1/health/service/#{s}"
+    def service s, options=nil
+      url = ["/v1/health/service/#{s}"]
+      url << use_named_parameter('dc', options[:dc]) if options and options[:dc]
+
+      # If the request fails, it's probably due to a bad path
+      # so return a PathNotFound error. 
+      begin
+        ret = @conn.get concat_url url
+      rescue Faraday::ClientError
+        raise Diplomat::PathNotFound
+      end
       return JSON.parse(ret.body)
     end
 
     # Get service health
     # @param s [String] the state ("unknown", "passing", "warning", or "critical")
+    # @param options [Hash] :dc string for dc specific query
     # @return [OpenStruct] all data associated with the node
-    def state s
-      ret = @conn.get "/v1/health/state/#{s}"
-      return JSON.parse(ret.body)
+    def state s, options=nil
+       url = ["/v1/health/state/#{s}"]
+       url << use_named_parameter('dc', options[:dc]) if options and options[:dc]
+       
+       # If the request fails, it's probably due to a bad path
+       # so return a PathNotFound error.
+       begin
+         ret = @conn.get concat_url url
+       rescue Faraday::ClientError
+         raise Diplomat::PathNotFound
+       end
+       return JSON.parse(ret.body)
+
     end
 
     # Convenience method to get services in unknown state

data/lib/diplomat/kv.rb

@@ -16,6 +16,7 @@ module Diplomat
     # @option options [String] :consistency The read consistency type
     # @option options [String] :dc Target datacenter
     # @option options [Boolean] :keys Only return key names.
+    # @option options [Boolean] :modify_index Only return ModifyIndex value.
     # @option options [String] :separator List only up to a given separator. Only applies when combined with :keys option.
     # @option options [Boolean] :nil_values If to return keys/dirs with nil values
     # @param not_found [Symbol] behaviour if the key doesn't exist;
@@ -71,6 +72,9 @@ module Diplomat
           when :return
             @raw = raw
             parse_body
+            if @options and @options[:modify_index]
+              return @raw.first['ModifyIndex']
+            end
             return return_value(return_nil_values)
           when :wait
             index = raw.headers["x-consul-index"]
@@ -136,11 +140,11 @@ module Diplomat
     def dc(options)
       if options && options[:dc] then use_named_parameter("dc", options[:dc]) else [] end
     end
-    
+
     def keys(options)
       if options && options[:keys] == true then ['keys'] else [] end
     end
-    
+
     def separator(options)
       if options && options[:separator] then use_named_parameter("separator", options[:separator]) else [] end
     end

data/lib/diplomat/nodes.rb

@@ -3,7 +3,7 @@ require 'faraday'
 
 module Diplomat
   class Nodes < Diplomat::RestClient
-    @access_methods = [ :get ]
+    @access_methods = [ :get, :get_all ]
 
     # Get all nodes
     # @deprecated Please use Diplomat::Node instead.
@@ -12,5 +12,16 @@ module Diplomat
       ret = @conn.get "/v1/catalog/nodes"
       return JSON.parse(ret.body)
     end
+    
+    def get_all options=nil
+      url = ["/v1/catalog/nodes"]
+      url << use_named_parameter('dc', options[:dc]) if options and options[:dc]
+      begin
+        ret = @conn.get concat_url url
+      rescue Faraday::ClientError
+        raise Diplomat::PathNotFound
+      end
+      return JSON.parse(ret.body).map { |service| OpenStruct.new service }
+    end 
   end
 end

data/lib/diplomat/service.rb

@@ -42,11 +42,13 @@ module Diplomat
     end
 
     # Get all the services
+    # @param options [Hash] :dc Consul datacenter to query
     # @return [OpenStruct] the list of all services
-    def get_all
-      url = "/v1/catalog/services"
+    def get_all options=nil
+      url = ["/v1/catalog/services"]
+      url << use_named_parameter('dc', options[:dc]) if options and options[:dc]
       begin
-        ret = @conn.get url
+        ret = @conn.get concat_url url
       rescue Faraday::ClientError
         raise Diplomat::PathNotFound
       end

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Diplomat is a simple wrapper for Consul