diplomat 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ea44efec4bbbbd7dcea08226f4c1e85ee3d0c74
-  data.tar.gz: 686a774e0ff66b40516eb75f905a9ffb463e4317
+  metadata.gz: 445cf50cabc901de363e7692e3ab395c24fc0f16
+  data.tar.gz: e2977150c4927b89d3c4dedf415ed69d0a022fa4
 SHA512:
-  metadata.gz: 96a3c918192148440c80515a0e49cadd8422ead23a814c12d9e21e66907654c6d07a6dbf5e6b1a33864165644245442eb0b36ac8fb9ac8a9acbc87d10e52cfb6
-  data.tar.gz: 54a7dc66263f1dadb005e6ba4ef402551e5c5244d492d9f83e01d3dab27164384b865c98c451d4f25305a843542a23797b16bd32b3aea3b1cda1cb96099f79a1
+  metadata.gz: af47156e803a93218c018178b758e8dba6730156914f8c8eaabaf5d87d4b5f32db99352b5c1c95b5426c7a5f098b7991d7d79fe93ba282397d458892f2100c73
+  data.tar.gz: 953d8fd1908d93753588d907f0984ad98d6bb8365aebcc4c13fbe019c081398e207d89a11d8f7f2bf616868b758c71e48c83a3b84b4252906d2dee002e0089f0

data/README.md

@@ -39,6 +39,10 @@ production:
 
 [See here](http://www.consul.io/intro/). I managed to roll it out on my production machines with the help of [Ansible](http://www.ansible.com/) in one working day.
 
+### Which versions of Ruby does Diplomat support?
+
+Check out [Travis](https://travis-ci.org/WeAreFarmGeek/diplomat) to see which versions of ruby we currently test when we're making builds.
+
 ## Usage
 
 [The most up to date place to read about the API is here.](http://rubydoc.info/github/WeAreFarmGeek/diplomat)
@@ -82,6 +86,12 @@ Diplomat::Kv.get('foo/', recurse: true)
 # => [{:key=>"foo/a", :value=>"lorem"}, {:key=>"foo/b", :value=>"ipsum"}, {:key=>"foo/c", :value=>"dolor"}]
 ```
 
+Or list all available keys:
+
+```ruby
+Diplomat::Kv.get('/', :keys => true) # => ['foo/a', 'foo/b']
+```
+
 ### Nodes
 
 #### Getting
@@ -100,6 +110,13 @@ nodes = Diplomat::Node.get_all
 # => [#<OpenStruct Address="10.1.10.12", Node="foo">, #<OpenStruct Address="10.1.10.13", Node="bar">]
 ```
 
+Get all nodes for a particular datacenter
+
+```ruby
+nodes = Diplomat::Node.get_all({ :dc => 'My_Datacenter' })
+# => [#<OpenStruct Address="10.1.10.12", Node="foo">, #<OpenStruct Address="10.1.10.13", Node="bar">]
+```
+
 Register a node:
 
 ```ruby

data/lib/diplomat.rb

@@ -18,6 +18,8 @@ module Diplomat
     alias require_lib require_libs
   end
 
+  raise 'Diplomat only supports ruby >= 2.0.0' unless RUBY_VERSION.to_f >= 2.0
+
   self.root_path = File.expand_path "..", __FILE__
   self.lib_path = File.expand_path "../diplomat", __FILE__
 

data/lib/diplomat/acl.rb

@@ -46,14 +46,8 @@ module Diplomat
     def list
       url = ["/v1/acl/list"]
       url += check_acl_token
-      raw = @conn_no_err.get concat_url url
-
-      if raw.status == 200
-        @raw = raw
-        return parse_body
-      else
-        raise Diplomat::UnknownStatus, "status #{raw.status}"
-      end
+      @raw = @conn_no_err.get concat_url url
+      return parse_body
     end
 
     # Update an Acl definition, create if not present
@@ -69,7 +63,7 @@ module Diplomat
         req.url concat_url url
         req.body = value.to_json
       end
-      JSON.parse(@raw.body)
+      return parse_body
     end
 
     # Create an Acl definition
@@ -83,7 +77,7 @@ module Diplomat
         req.url concat_url url
         req.body = value.to_json
       end
-      JSON.parse(@raw.body)
+      return parse_body
     end
 
     # Destroy an ACl token by its id
@@ -94,7 +88,7 @@ module Diplomat
       url = ["/v1/acl/destroy/#{@id}"]
       url += check_acl_token
       @raw = @conn.put concat_url url
-      @raw.body == "true"
+      return @raw.body == "true"
     end
   end
 end

data/lib/diplomat/event.rb

@@ -76,13 +76,16 @@ module Diplomat
           when :reject
             raise Diplomat::EventAlreadyExists, name
           when :return
-            parse_body
+            # Always set the response to 200 so we always return
+            # the response body.
+            @raw.status = 200
+            @raw = parse_body
             return return_payload
         end
       end
 
       @raw = wait_for_next_event(url)
-      parse_body
+      @raw = parse_body
       return_payload
     end
 
@@ -130,7 +133,7 @@ module Diplomat
             event_token = :last
           when :wait
             @raw = wait_for_next_event(url)
-            parse_body
+            @raw = parse_body
             # If it's possible for two events to arrive at once,
             # this needs to #find again:
             event = @raw.last

data/lib/diplomat/health.rb

@@ -45,10 +45,12 @@ module Diplomat
     # Get service health
     # @param s [String] the service
     # @param options [Hash] :dc string for dc specific query
+    # @param options [Hash] :state string for specific service state
     # @return [OpenStruct] all data associated with the node
     def service s, options=nil
       url = ["/v1/health/service/#{s}"]
       url << use_named_parameter('dc', options[:dc]) if options and options[:dc]
+      url << options[:state] if options and options[:state]
 
       # If the request fails, it's probably due to a bad path
       # so return a PathNotFound error. 

data/lib/diplomat/kv.rb

@@ -74,7 +74,7 @@ module Diplomat
             raise Diplomat::KeyAlreadyExists, key
           when :return
             @raw = raw
-            parse_body
+            @raw = parse_body
             if @options and @options[:modify_index]
               return @raw.first['ModifyIndex']
             end

data/lib/diplomat/node.rb

@@ -29,11 +29,13 @@ module Diplomat
     end
 
     # Get all the nodes
+    # @param options [Hash] :dc string for dc specific query
     # @return [OpenStruct] the list of all nodes
-    def get_all
-      url = "/v1/catalog/nodes"
+    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 url
+        ret = @conn.get concat_url url
       rescue Faraday::ClientError
         raise Diplomat::PathNotFound
       end

data/lib/diplomat/rest_client.rb

@@ -71,7 +71,8 @@ module Diplomat
 
     # Parse the body, apply it to the raw attribute
     def parse_body
-      @raw = JSON.parse(@raw.body)
+      return JSON.parse(@raw.body) if @raw.status == 200
+      raise Diplomat::UnknownStatus, "status #{@raw.status}"
     end
 
     # Return @raw with Value fields decoded

data/lib/diplomat/service.rb

@@ -27,8 +27,8 @@ module Diplomat
       # so return a PathNotFound error.
       begin
         ret = @conn.get concat_url url
-      rescue Faraday::ClientError
-        raise Diplomat::PathNotFound
+      rescue Faraday::ClientError => e
+        raise Diplomat::PathNotFound, e
       end
 
       if meta and ret.headers

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler