diplomat 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 638859b7d485cfb4a37766bd7200a60e9852b55f
-  data.tar.gz: 901ea80b4cb6464e702acc333797eaa40b74f7e1
+  metadata.gz: dd8fd2de1577af47ba483ec661d17065898e0347
+  data.tar.gz: 67472f8f9b059e34acb2da7565416545a16a4150
 SHA512:
-  metadata.gz: 83498aaefff2fae7565159695858b89ffc36c6797cfd67daecee80e45ff488176e2d078bf548a669353192ea813110ac82eda738c3aafa9ccfdacbea5c0fb490
-  data.tar.gz: 0dd991bc36661431069d0ecdd09fdd92ca0d1bdd0303b4ae0f34043f69a33606f84840c2728ee85aedfef69249898ca8afe938306a9330bfceff7925a0c190bb
+  metadata.gz: fc1c47f0f2a6fd0ef1d8d368ff476c2943b7ac28d0ea8baa69cedd18e22ba78131196b8b6867c0ab8debfcd6b5ee84d5e26b9065a994bb11148e17c6bc91d435
+  data.tar.gz: c6c453c1bebd64a5354304820e3946abb3f98ff3974e0ba15cb9c4c9939b5016a2dcc6bda78bbaf17f7d2c3d547f1db1ac0b3de1d07d3e04304256645137f45f

data/README.md

@@ -106,6 +106,13 @@ foo_service = Diplomat::Service.get('foo', :all, { :dc => 'My_Datacenter'})
 # => [#<OpenStruct Node="hotel", Address="1.2.3.4", ServiceID="hotel_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>,#<OpenStruct Node="indigo", Address="1.2.3.5", ServiceID="indigo_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>]
 ```
 
+If you wish to list all the services on consul:
+
+```ruby
+services = Diplomat::Service.get_all
+# => #<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.rb

@@ -21,7 +21,7 @@ module Diplomat
   self.root_path = File.expand_path "..", __FILE__
   self.lib_path = File.expand_path "../diplomat", __FILE__
 
-  require_libs "configuration", "rest_client", "kv", "datacenter", "service", "members", "check", "health", "session", "lock", "error", "event"
+  require_libs "configuration", "rest_client", "kv", "datacenter", "service", "members", "nodes", "check", "health", "session", "lock", "error", "event"
   self.configuration ||= Diplomat::Configuration.new
 
   class << self

data/lib/diplomat/kv.rb

@@ -9,8 +9,10 @@ module Diplomat
     # Get a value by its key, potentially blocking for the first or next value
     # @param key [String] the key
     # @param options [Hash] the query params
+    # @option options [Boolean] :recurse If to make recursive get or not
     # @option options [String] :consistency The read consistency type
     # @option options [String] :dc Target datacenter
+    # @option options [Boolean] :nil_values If to return keys/dirs with nil values
     # @param not_found [Symbol] behaviour if the key doesn't exist;
     #   :reject with exception, :return degenerate value, or :wait for it to appear
     # @param found [Symbol] behaviour if the key does exist;
@@ -42,6 +44,8 @@ module Diplomat
       url += use_consistency(@options)
       url += dc(@options)
 
+      return_nil_values = (@options and @options[:nil_values])
+
       # 404s OK using this connection
       raw = @conn_no_err.get concat_url url
       if raw.status == 404
@@ -60,7 +64,7 @@ module Diplomat
           when :return
             @raw = raw
             parse_body
-            return return_value
+            return return_value(return_nil_values)
           when :wait
             index = raw.headers["x-consul-index"]
         end
@@ -75,7 +79,7 @@ module Diplomat
         req.options.timeout = 86400
       end
       parse_body
-      return_value
+      return_value(return_nil_values)
     end
 
     # Associate a value with a key

data/lib/diplomat/nodes.rb

@@ -0,0 +1,15 @@
+require 'base64'
+require 'faraday'
+
+module Diplomat
+  class Nodes < Diplomat::RestClient
+    @access_methods = [ :get ]
+
+    # Get all nodes
+    # @return [OpenStruct] all data associated with the nodes in catalog
+    def get
+      ret = @conn.get "/v1/catalog/nodes"
+      return JSON.parse(ret.body)
+    end
+  end
+end

data/lib/diplomat/rest_client.rb

@@ -75,16 +75,17 @@ module Diplomat
     end
 
     # Get the key/value(s) from the raw output
-    def return_value
+    def return_value(nil_values=false)
       if @raw.count == 1
         @value = @raw.first["Value"]
         @value = Base64.decode64(@value) unless @value.nil?
       else
         @value = @raw.reduce([]) do |acc, e|
+          val = e["Value"].nil? ? nil : Base64.decode64(e["Value"])
           acc << {
             :key => e["Key"],
-            :value => Base64.decode64(e["Value"])
-          } unless e["Value"].nil?
+            :value => val
+          } if val or nil_values
           acc
         end
       end

data/lib/diplomat/service.rb

@@ -4,7 +4,7 @@ require 'faraday'
 module Diplomat
   class Service < Diplomat::RestClient
 
-    @access_methods = [ :get, :register, :deregister ]
+    @access_methods = [ :get, :get_all, :register, :deregister ]
 
     # Get a service by it's key
     # @param key [String] the key
@@ -41,6 +41,19 @@ module Diplomat
       return OpenStruct.new JSON.parse(ret.body).first
     end
 
+    # Get all the services
+    # @return [OpenStruct] the list of all services
+    def get_all
+      url = "/v1/catalog/services"
+      begin
+        ret = @conn.get url
+      rescue Faraday::ClientError
+        raise Diplomat::PathNotFound
+      end
+
+      return OpenStruct.new JSON.parse(ret.body)
+    end
+
     # Register a service
     # @param definition [Hash] Hash containing definition of service
     # @return [Boolean]

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.13.2"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,6 +186,7 @@ files:
 - lib/diplomat/kv.rb
 - lib/diplomat/lock.rb
 - lib/diplomat/members.rb
+- lib/diplomat/nodes.rb
 - lib/diplomat/rest_client.rb
 - lib/diplomat/service.rb
 - lib/diplomat/session.rb
@@ -210,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Diplomat is a simple wrapper for Consul