consul_api 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c41569f58a1d5cfd56e2fa6f1e49aa91cd44c6d
-  data.tar.gz: b1d83907083c624c58129e1c32bb20aa3479a9a2
+  metadata.gz: f22e8fdb3be7edafca3fbc65932cf460ba5a8e25
+  data.tar.gz: 5b867560da1f1446001bf4762a868980b895b799
 SHA512:
-  metadata.gz: a0bb0fd26ad95722ebbea0fb8abdb0b1ca7c3456cf0149a2b0eb4338ad508691025f5c0acd8570c7f937b65f34f69cc8429570089138681a4e212dc1e05e2e78
-  data.tar.gz: 69c4f618c5faaefc1896fafe952417bd3b778d66319e098fc9483ccf967506809767e3adbfde37ea922cc266b5274c20e604f0d7c39c9def3c17ebc8c5433b64
+  metadata.gz: ef4049f4576df68f9d6986a89fbc5a30de19c9e942e4cba6514be04e05e363225a14618314bf937dfe3b17b6d3b3c2ce0a19f7a23df615a98de4334041188741
+  data.tar.gz: 0b671d652a0060ecda80fbcceaaeda43984b1f2456c30512bab147c2aacc127236bd6817bc1e0c3412b7292a89124b2d2f9487bede6feb8bb29fea3dcabf01d1

data/lib/consul_api/common.rb

@@ -11,18 +11,17 @@ module ConsulApi
         # gets and puts will fail with an http status code in the 4xx and 5xx range
         fail "http status #{response.status} returned from consul" if response.status >= 400
 
-        # if the response is empty, return an empty hash
-        body = response.body == '' ? '{}' : response.body
-
+        # return a nil of the response is 'null'
+        return nil if response.body == nil || response.body == 'null'
         begin
+          # if the response is empty, return an empty hash
+          body = response.body == '' ? '{}' : response.body
           parsed_response = JSON.parse(body)
         rescue => e
           fail "unable to parse the json returned by Consul.  Returned data: #{response.body}"
         end
 
-        return Hashie::Mash.new(parsed_response) if parsed_response.is_a?(Hash)
-        # assume array otherwise, and return a collection of Mashes
-        parsed_response.map { |node| Hashie::Mash.new(node) }
+        parsed_response
       end
 
       def consul_ip

data/lib/consul_api/version.rb

@@ -1,3 +1,3 @@
 module ConsulApi
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/agent_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe ConsulApi::Agent, :vcr do
   describe '#services' do
     it 'gets services running on an agent' do
-      expect(ConsulApi::Agent.services).to be_a(Hashie::Mash)
+      expect(ConsulApi::Agent.services).to be_a(Hash)
     end
   end
 
   describe '#service_register' do
     it 'registers a service on consul' do
-      expect(ConsulApi::Agent.service_register({'ID' => '123', 'Name' => 'abc'})).to be_a(Hashie::Mash)
+      expect(ConsulApi::Agent.service_register({'ID' => '123', 'Name' => 'abc'})).to be_a(Hash)
     end
   end
 

data/spec/catalog_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ConsulApi::Catalog, :vcr do
+  describe '#datacenters' do
+    it 'returns an array of the data' do
+      expect(ConsulApi::Catalog.datacenters).to be_a(Array)
+    end
+  end
+
+  describe '#nodes' do
+    it 'returns an array of the data' do
+      expect(ConsulApi::Catalog.nodes).to be_a(Array)
+    end
+  end
+
+  describe '#services' do
+    it 'returns an array of the data' do
+      expect(ConsulApi::Catalog.services).to be_a(Hash)
+    end
+  end
+
+  describe '#node' do
+    it 'returns an array of the data' do
+      expect(ConsulApi::Catalog.node('488221c29862')).to be_a(Hash)
+    end
+  end
+
+  describe '#service' do
+    it 'returns an array of the data' do
+      expect(ConsulApi::Catalog.service('abc')).to be_a(Array)
+    end
+  end
+end

data/spec/vcr/consul_api/agent_service_register/registers_a_service_on_consul.yml

@@ -21,7 +21,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Wed, 17 Sep 2014 22:03:52 GMT
+      - Wed, 17 Sep 2014 23:48:17 GMT
       Content-Length:
       - '0'
       Content-Type:
@@ -30,5 +30,5 @@ http_interactions:
       encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Wed, 17 Sep 2014 22:03:52 GMT
+  recorded_at: Wed, 17 Sep 2014 23:48:17 GMT
 recorded_with: VCR 2.9.2

data/spec/vcr/consul_api/agent_services/gets_services_running_on_an_agent.yml

@@ -23,12 +23,12 @@ http_interactions:
       Content-Type:
       - application/json
       Date:
-      - Wed, 17 Sep 2014 22:03:52 GMT
+      - Wed, 17 Sep 2014 23:48:17 GMT
       Content-Length:
       - '162'
     body:
       encoding: UTF-8
       string: '{"123":{"ID":"123","Service":"abc","Tags":null,"Port":0},"jockey_consul_update":{"ID":"jockey_consul_update","Service":"docker_consul_update","Tags":[],"Port":0}}'
     http_version: 
-  recorded_at: Wed, 17 Sep 2014 22:03:52 GMT
+  recorded_at: Wed, 17 Sep 2014 23:48:17 GMT
 recorded_with: VCR 2.9.2

data/spec/vcr/consul_api/catalog_datacenters/returns_an_array_of_the_data.yml

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://127.0.0.1:8500/v1/catalog/datacenters
+    body:
+      encoding: UTF-8
+      string: 'null'
+    headers:
+      User-Agent:
+      - Faraday v0.9.0
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 17 Sep 2014 23:48:17 GMT
+      Content-Length:
+      - '7'
+    body:
+      encoding: UTF-8
+      string: '["dc1"]'
+    http_version: 
+  recorded_at: Wed, 17 Sep 2014 23:48:17 GMT
+recorded_with: VCR 2.9.2

data/spec/vcr/consul_api/catalog_node/returns_an_array_of_the_data.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://127.0.0.1:8500/v1/catalog/node/488221c29862
+    body:
+      encoding: UTF-8
+      string: 'null'
+    headers:
+      User-Agent:
+      - Faraday v0.9.0
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '290'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Wed, 17 Sep 2014 23:48:17 GMT
+      Content-Length:
+      - '294'
+    body:
+      encoding: UTF-8
+      string: '{"Node":{"Node":"488221c29862","Address":"172.17.42.1"},"Services":{"123":{"ID":"123","Service":"abc","Tags":[],"Port":0},"consul":{"ID":"consul","Service":"consul","Tags":[],"Port":8300},"jockey_consul_update":{"ID":"jockey_consul_update","Service":"docker_consul_update","Tags":[],"Port":0}}}'
+    http_version: 
+  recorded_at: Wed, 17 Sep 2014 23:48:17 GMT
+recorded_with: VCR 2.9.2

data/spec/vcr/consul_api/catalog_nodes/returns_an_array_of_the_data.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://127.0.0.1:8500/v1/catalog/nodes
+    body:
+      encoding: UTF-8
+      string: 'null'
+    headers:
+      User-Agent:
+      - Faraday v0.9.0
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '290'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Wed, 17 Sep 2014 23:48:17 GMT
+      Content-Length:
+      - '49'
+    body:
+      encoding: UTF-8
+      string: '[{"Node":"488221c29862","Address":"172.17.42.1"}]'
+    http_version: 
+  recorded_at: Wed, 17 Sep 2014 23:48:17 GMT
+recorded_with: VCR 2.9.2

data/spec/vcr/consul_api/catalog_service/returns_an_array_of_the_data.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://127.0.0.1:8500/v1/catalog/service/abc
+    body:
+      encoding: UTF-8
+      string: 'null'
+    headers:
+      User-Agent:
+      - Faraday v0.9.0
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '290'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Wed, 17 Sep 2014 23:48:17 GMT
+      Content-Length:
+      - '120'
+    body:
+      encoding: UTF-8
+      string: '[{"Node":"488221c29862","Address":"172.17.42.1","ServiceID":"123","ServiceName":"abc","ServiceTags":[],"ServicePort":0}]'
+    http_version: 
+  recorded_at: Wed, 17 Sep 2014 23:48:17 GMT
+recorded_with: VCR 2.9.2

data/spec/vcr/consul_api/catalog_services/returns_an_array_of_the_data.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://127.0.0.1:8500/v1/catalog/services
+    body:
+      encoding: UTF-8
+      string: 'null'
+    headers:
+      User-Agent:
+      - Faraday v0.9.0
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      X-Consul-Index:
+      - '290'
+      X-Consul-Knownleader:
+      - 'true'
+      X-Consul-Lastcontact:
+      - '0'
+      Date:
+      - Wed, 17 Sep 2014 23:48:17 GMT
+      Content-Length:
+      - '48'
+    body:
+      encoding: UTF-8
+      string: '{"abc":[],"consul":[],"docker_consul_update":[]}'
+    http_version: 
+  recorded_at: Wed, 17 Sep 2014 23:48:17 GMT
+recorded_with: VCR 2.9.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jay OConnor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -156,10 +156,16 @@ files:
 - lib/consul_api/dns.rb
 - lib/consul_api/version.rb
 - spec/agent_spec.rb
+- spec/catalog_spec.rb
 - spec/spec_helper.rb
 - spec/support/vcr.rb
 - spec/vcr/consul_api/agent_service_register/registers_a_service_on_consul.yml
 - spec/vcr/consul_api/agent_services/gets_services_running_on_an_agent.yml
+- spec/vcr/consul_api/catalog_datacenters/returns_an_array_of_the_data.yml
+- spec/vcr/consul_api/catalog_node/returns_an_array_of_the_data.yml
+- spec/vcr/consul_api/catalog_nodes/returns_an_array_of_the_data.yml
+- spec/vcr/consul_api/catalog_service/returns_an_array_of_the_data.yml
+- spec/vcr/consul_api/catalog_services/returns_an_array_of_the_data.yml
 homepage: ''
 licenses:
 - MIT
@@ -186,7 +192,13 @@ specification_version: 4
 summary: Ruby wrapper for Consul V1 API
 test_files:
 - spec/agent_spec.rb
+- spec/catalog_spec.rb
 - spec/spec_helper.rb
 - spec/support/vcr.rb
 - spec/vcr/consul_api/agent_service_register/registers_a_service_on_consul.yml
 - spec/vcr/consul_api/agent_services/gets_services_running_on_an_agent.yml
+- spec/vcr/consul_api/catalog_datacenters/returns_an_array_of_the_data.yml
+- spec/vcr/consul_api/catalog_node/returns_an_array_of_the_data.yml
+- spec/vcr/consul_api/catalog_nodes/returns_an_array_of_the_data.yml
+- spec/vcr/consul_api/catalog_service/returns_an_array_of_the_data.yml
+- spec/vcr/consul_api/catalog_services/returns_an_array_of_the_data.yml