consul_api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54c7f6c686636fc5d995b1ff100633b1474ef582
-  data.tar.gz: 0a2d34bc07ee5f630d9b6decaa8613d5a4b0ab7b
+  metadata.gz: 5c41569f58a1d5cfd56e2fa6f1e49aa91cd44c6d
+  data.tar.gz: b1d83907083c624c58129e1c32bb20aa3479a9a2
 SHA512:
-  metadata.gz: 067509624045f0efa7e1df3809972f2fc8f8bb9b5fe82a32e79f4bf6dc2954d50979fd8137c28e6fb22336a636aef6755ad3eaf142d2bf64ed3e3101953bc851
-  data.tar.gz: eb9e725177801383916e68250e561fd25c629811d627ecc6243780d825c262c9a7716a0cef9e00c6b84b78da7cb038d20feafd138ed55389fdba977a63fdac87
+  metadata.gz: a0bb0fd26ad95722ebbea0fb8abdb0b1ca7c3456cf0149a2b0eb4338ad508691025f5c0acd8570c7f937b65f34f69cc8429570089138681a4e212dc1e05e2e78
+  data.tar.gz: 69c4f618c5faaefc1896fafe952417bd3b778d66319e098fc9483ccf967506809767e3adbfde37ea922cc266b5274c20e604f0d7c39c9def3c17ebc8c5433b64

data/consul_api.gemspec

@@ -23,4 +23,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "activesupport"
+  spec.add_development_dependency "pry"
 end

data/lib/consul_api/agent.rb

@@ -0,0 +1,61 @@
+module ConsulApi
+  class Agent
+    include Common
+
+    def self.checks
+      issue_request(path: '/checks')
+    end
+
+    def self.services
+      issue_request(path: '/services')
+    end
+
+    def self.members
+      issue_request(path: '/members')
+    end
+
+    def self.self
+      issue_request(path: '/self')
+    end
+
+    def self.join(address, query={})
+      issue_request(path: "/join/#{address}", query: query)
+    end
+
+    def self.force_leave(address)
+      issue_request(path: "/force-leave/#{address}")
+    end
+
+    def self.check_register(query)
+      issue_request(path: '/check/register/', query: query, method: :put)
+    end
+
+    def self.check_deregister(check_id)
+      issue_request(path: "/check/deregister/#{check_id}", method: :put)
+    end
+
+    def self.check_pass(check_id, query={})
+      issue_request(path: "/check/pass/#{check_id}", query: query)
+    end
+
+    def self.check_warn(check_id, query={})
+      issue_request(path: "/check/warn/#{check_id}", query: query)
+    end
+
+    def self.check_fail(check_id, query={})
+      issue_request(path: "/check/fail/#{check_id}", query: query)
+    end
+
+    def self.service_register(query)
+      issue_request(path: '/service/register', query: query, method: :put)
+    end
+
+    def self.service_deregister(service_id)
+      issue_request(path: "/service/deregister/#{service_id}", method: :put)
+    end
+
+    def self.base_url
+      "#{consul_api_url}/v1/agent"
+    end
+  end
+end

data/lib/consul_api/catalog.rb

@@ -31,7 +31,7 @@ module ConsulApi
     end
 
     def self.base_url
-      "#{ENV['CONSUL_SERVER_URL']}/v1/catalog"
+      "#{consul_api_url}/v1/catalog"
     end
   end
 end

data/lib/consul_api/common.rb

@@ -2,16 +2,45 @@ module ConsulApi
   module Common
     module ClassMethods
       def issue_request(method: :get, path: '', query: nil)
-        response = Faraday.send(method, "#{base_url}#{path}", query)
+        conn = Faraday.new(:url => "#{base_url}#{path}")
+        response = conn.send(method) do |req|
+          req.headers['Content-Type'] = 'application/json'
+          req.body = query.to_json
+        end
+
+        # 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
+
         begin
-          parsed_response = JSON.parse(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) }
       end
+
+      def consul_ip
+        # override with an environment variable, or read from the gateway of docker0 interface
+        @@consul_ip ||= ENV['CONSUL_IP'] ? ENV['CONSUL_IP'] : `route -n | grep 'UG[ \t]' | awk '{print $2}'`.strip
+      end
+
+      def consul_api_port
+        @@consul_api_port ||= ENV['CONSUL_API_PORT'] ? ENV['CONSUL_API_PORT'] : 8500
+      end
+
+      def consul_dns_port
+        @@consul_dns_port ||= ENV['CONSUL_DNS_PORT'] ? ENV['CONSUL_DNS_PORT'] : 8600
+      end
+
+      def consul_api_url
+        "http://#{consul_ip}:#{consul_api_port}"
+      end
     end
 
     def self.included(base)

data/lib/consul_api/dns.rb

@@ -0,0 +1,24 @@
+module ConsulApi
+  class DNS
+    include Common
+    def self.resolve_service(host)
+      srv = []
+      srv = resolver.getresources(host, Resolv::DNS::Resource::IN::SRV)
+      # Sort SRV records: lowest priority first, highest weight first
+      srv.sort! { |a,b| (a.priority != b.priority) ? (a.priority <=> b.priority) : (b.weight <=> a.weight) }
+      "#{resolve_node(srv.first.target)}:#{srv.first.port}"
+    end
+
+    def self.resolve_node(host)
+      resolver.getaddress(host).to_s
+    end
+
+    def self.resolver
+      Resolv::DNS.new(
+        nameserver_port: [[consul_ip, consul_dns_port]],
+        search: [],
+        ndots: 1
+      )
+    end
+  end
+end

data/lib/consul_api/version.rb

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

data/lib/consul_api.rb

@@ -1,7 +1,10 @@
+require 'faraday'
+require 'hashie'
 require "consul_api/version"
 require 'consul_api/common'
 require 'consul_api/catalog'
+require 'consul_api/agent'
+require 'consul_api/dns'
 module ConsulApi
 
-  # Your code goes here...
 end

data/spec/agent_spec.rb

@@ -0,0 +1,16 @@
+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)
+    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)
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+ENV['RACK_ENV'] = 'test'
+require 'webmock/rspec'
+require 'vcr'
+require 'active_support/all'
+require 'pry'
+
+require 'consul_api'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir['./spec/support/**/*.rb'].each { |f| require f }
+ENV['CONSUL_IP'] = '127.0.0.1'
+RSpec.configure do |config|
+
+end

data/spec/support/vcr.rb

@@ -0,0 +1,13 @@
+VCR.configure do |c|
+  c.cassette_library_dir = './spec/vcr'
+  c.hook_into :webmock
+end
+
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+  c.around(:each, :vcr) do |example|
+    name = example.metadata[:full_description].split(/\s+/, 2).join('/').underscore.gsub(/[^\w\/]+/, '_')
+    options = example.metadata.slice(:record, :match_requests_on).except(:example_group)
+    VCR.use_cassette(name, options) { example.call }
+  end
+end

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

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: put
+    uri: http://127.0.0.1:8500/v1/agent/service/register
+    body:
+      encoding: UTF-8
+      string: '{"ID":"123","Name":"abc"}'
+    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:
+      Date:
+      - Wed, 17 Sep 2014 22:03:52 GMT
+      Content-Length:
+      - '0'
+      Content-Type:
+      - text/plain; charset=utf-8
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Wed, 17 Sep 2014 22:03:52 GMT
+recorded_with: VCR 2.9.2

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

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://127.0.0.1:8500/v1/agent/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
+      Date:
+      - Wed, 17 Sep 2014 22:03:52 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_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.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jay OConnor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,6 +66,76 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - jay@bellycard.com
@@ -80,9 +150,16 @@ files:
 - Rakefile
 - consul_api.gemspec
 - lib/consul_api.rb
+- lib/consul_api/agent.rb
 - lib/consul_api/catalog.rb
 - lib/consul_api/common.rb
+- lib/consul_api/dns.rb
 - lib/consul_api/version.rb
+- spec/agent_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
 homepage: ''
 licenses:
 - MIT
@@ -107,4 +184,9 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for Consul V1 API
-test_files: []
+test_files:
+- spec/agent_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