diplomat 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d375c62cdbdf8190c936ef5da0b9072843da44b8
-  data.tar.gz: 8a741e51bf5c356087ae1f5ca3becb5aded2a211
+  metadata.gz: a23e42c39267a3f6bff598a5775ec170787be1bf
+  data.tar.gz: 0778158f0ee8e2ba9210f1fc469b1a1b4fefff49
 SHA512:
-  metadata.gz: 5b53bd12baab01f46776a0281f7f9fd916804f5f9acd94df001cf6686e4da1787001a2593f88b4ffde22f88d34e70b8fffd193f4ce7c528d78e335f884db4315
-  data.tar.gz: ac4e242dec87848a8e7991d75670bcad81a1ead33e8c9c6169f89b0344fd5d0b98bdd1c4f1de5e3f0a693ec3d894956da4f09d1277976b3db2b2a91a209474d2
+  metadata.gz: 943740a0d4bb06217d8cb55d5a74cb7b72a2575f768f278f606a5aa2390992c7055424566a94043ae4a8bb81bda054ec587ab45419db326e983564d43c5a59f2
+  data.tar.gz: 976565fa6452fd2d96089297d5a312187461d09dedb49258f1856e25599d40ef607e5bdb866678ec745f0ae5c7e2511d2072476f690b8ed007af2df28eb1ce61

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 *.gem
 *.rbc
 /.config

data/.travis.yml

@@ -5,4 +5,4 @@ rvm:
     - "2.1.0"
 addons:
     code_climate:
-        repo_token: 17481039ac7b5ef8779ab644b28a4d95dd7523c3c1fee560311eb4af63de006f
+        repo_token: c910d8f8af55cc2d2f38170d5362be4e16be8ce232df9c565057985af264b7b

data/README.md

@@ -1,5 +1,5 @@
 # Diplomat
-[![Gem Version](https://badge.fury.io/rb/diplomat.svg)](http://badge.fury.io/rb/diplomat) [![Build Status](https://travis-ci.org/johnhamelink/diplomat.svg?branch=master)](https://travis-ci.org/johnhamelink/diplomat) [![Code Climate](https://codeclimate.com/github/johnhamelink/diplomat.png)](https://codeclimate.com/github/johnhamelink/diplomat)
+[![Gem Version](https://badge.fury.io/rb/diplomat.svg)](http://badge.fury.io/rb/diplomat) [![Build Status](https://travis-ci.org/WeAreFarmGeek/diplomat.svg?branch=master)](https://travis-ci.org/WeAreFarmGeek/diplomat) [![Code Climate](https://codeclimate.com/github/johnhamelink/diplomat.png)](https://codeclimate.com/github/WeAreFarmGeek/diplomat)
 ### A HTTP Ruby API for [Consul](http://www.consul.io/)
 
 ![Diplomacy Boad Game](http://i.imgur.com/Nkuy4b7.jpg)
@@ -41,7 +41,7 @@ production:
 
 ## Usage
 
-[The most up to date place to read about the API is here.](http://rubydoc.info/github/johnhamelink/diplomat)
+[The most up to date place to read about the API is here.](http://rubydoc.info/github/WeAreFarmGeek/diplomat)
 
 Here's a few examples of how diplomat works:
 

data/diplomat.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "fakes-rspec", "~> 1.0"
   spec.add_development_dependency "json", "~> 1.8"
-  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.3.0"
   spec.add_dependency "faraday", "~> 0.9"
 end

data/lib/diplomat.rb

@@ -32,6 +32,6 @@ module Diplomat
 
 
 
-  require_libs "rest_client", "kv", "service"
+  require_libs "rest_client", "kv", "service", "members", "check", "health"
 
 end

data/lib/diplomat/check.rb

@@ -0,0 +1,127 @@
+require 'base64'
+require 'faraday'
+
+module Diplomat
+  class Check < Diplomat::RestClient
+
+    # Get registered checks
+    # @return [OpenStruct] all data associated with the service
+    def checks
+      ret = @conn.get "/v1/agent/checks"
+      return JSON.parse(ret.body)
+    end
+
+    # Register a check
+    # @param check_id [String] the unique id of the check
+    # @param name [String] the name
+    # @param notes [String] notes about the check
+    # @param script [String] command to be run for check
+    # @param interval [String] frequency (with units) of the check execution
+    # @param ttl [String] time (with units) to mark a check down
+    # @return [Integer] Status code
+    def register_script check_id, name, notes, script, interval
+      json = JSON.generate(
+      {
+        "ID" => check_id,
+        "Name" => name,
+        "Notes" => notes,
+        "Script" => script,
+        "Interval" => interval
+      }
+      )
+
+      ret = @conn.put do |req|
+        req.url "/v1/agent/check/register"
+        req.body = json
+      end
+      
+      return true if ret.status == 200
+    end
+
+    def register_ttl check_id, name, notes, ttl
+      json = JSON.generate(
+      {
+        "ID" => check_id,
+        "Name" => name,
+        "Notes" => notes,
+        "TTL" => ttl,
+      }
+      )
+
+      ret = @conn.put do |req|
+        req.url "/v1/agent/check/register"
+        req.body = json
+      end
+      
+      return true if ret.status == 200
+    end
+
+    # Deregister a check
+    # @param check_id [String] the unique id of the check
+    # @return [Integer] Status code
+    def deregister check_id
+      ret = @conn.get "/v1/agent/check/deregister/#{check_id}"
+      return true if ret.status == 200
+    end
+
+    # Pass a check
+    # @param check_id [String] the unique id of the check
+    # @return [Integer] Status code
+    def pass check_id
+      ret = @conn.get "/v1/agent/check/pass/#{check_id}"
+      return true if ret.status == 200
+    end
+
+    # Warn a check
+    # @param check_id [String] the unique id of the check
+    # @return [Integer] Status code
+    def warn check_id
+      ret = @conn.get "/v1/agent/check/warn/#{check_id}"
+      return true if ret.status == 200
+    end
+
+    # Warn a check
+    # @param check_id [String] the unique id of the check
+    # @return [Integer] Status code
+    def fail check_id
+      ret = @conn.get "/v1/agent/check/fail/#{check_id}"
+      return true if ret.status == 200
+    end
+
+    # @note This is sugar, see (#checks)
+    def self.checks
+      Diplomat::Check.new.checks
+    end
+
+    # @note This is sugar, see (#register_script)
+    def self.register_script *args
+      Diplomat::Check.new.register_script *args
+    end
+
+    # @note This is sugar, see (#register_ttl)
+    def self.register_ttl *args
+      Diplomat::Check.new.register_ttl *args
+    end
+
+    # @note This is sugar, see (#deregister)
+    def self.deregister *args
+      Diplomat::Check.new.deregister *args
+    end
+
+    # @note This is sugar, see (#pass)
+    def self.pass *args
+      Diplomat::Check.new.pass *args
+    end
+
+    # @note This is sugar, see (#warn)
+    def self.warn *args
+      Diplomat::Check.new.warn *args
+    end
+
+    # @note This is sugar, see (#fail)
+    def self.fail *args
+      Diplomat::Check.new.fail *args
+    end
+
+  end
+end

data/lib/diplomat/health.rb

@@ -0,0 +1,101 @@
+require 'base64'
+require 'faraday'
+
+module Diplomat
+  class Health < Diplomat::RestClient
+
+    # Get node health
+    # @param n [String] the node
+    # @return [OpenStruct] all data associated with the node
+    def node n
+      ret = @conn.get "/v1/health/node/#{n}"
+      return JSON.parse(ret.body)
+    end
+
+    # Get service checks
+    # @param s [String] the service
+    # @return [OpenStruct] all data associated with the node
+    def checks s
+      ret = @conn.get "/v1/health/checks/#{s}"
+      return JSON.parse(ret.body)
+    end
+
+    # Get service health
+    # @param s [String] the service
+    # @return [OpenStruct] all data associated with the node
+    def service s
+      ret = @conn.get "/v1/health/service/#{s}"
+      return JSON.parse(ret.body)
+    end
+
+    # Get service health
+    # @param s [String] the state ("unknown", "passing", "warning", or "critical")
+    # @return [OpenStruct] all data associated with the node
+    def state s
+      ret = @conn.get "/v1/health/state/#{s}"
+      return JSON.parse(ret.body)
+    end
+
+    # Convenience method to get services in unknown state
+    def unknown
+      state("unknown")
+    end
+
+    # Convenience method to get services in passing state
+    def passing
+      state("passing")
+    end
+
+    # Convenience method to get services in warning state
+    def warning
+      state("warning")
+    end
+
+    # Convenience method to get services in critical state
+    def critical
+      state("critical")
+    end
+
+
+    # @note This is sugar, see (#node)
+    def self.node *args
+      Diplomat::Health.new.node *args
+    end
+
+    # @note This is sugar, see (#checks)
+    def self.checks *args
+      Diplomat::Health.new.checks *args
+    end
+
+    # @note This is sugar, see (#service)
+    def self.service *args
+      Diplomat::Health.new.service *args
+    end
+
+    # @note This is sugar, see (#state)
+    def self.state *args
+      Diplomat::Health.new.state *args
+    end
+
+    # @note This is sugar, see (#unknown)
+    def self.unknown
+      Diplomat::Health.new.unknown
+    end
+
+    # @note This is sugar, see (#passing)
+    def self.passing
+      Diplomat::Health.new.passing
+    end
+
+    # @note This is sugar, see (#warning)
+    def self.warning
+      Diplomat::Health.new.warning
+    end
+
+    # @note This is sugar, see (#critical)
+    def self.critical
+      Diplomat::Health.new.critical
+    end    
+
+  end
+end

data/lib/diplomat/members.rb

@@ -0,0 +1,20 @@
+require 'base64'
+require 'faraday'
+
+module Diplomat
+  class Members < Diplomat::RestClient
+
+    # Get all members
+    # @return [OpenStruct] all data associated with the service
+    def get
+      ret = @conn.get "/v1/agent/members"
+      return JSON.parse(ret.body)
+    end
+
+    # @note This is sugar, see (#get)
+    def self.get
+      Diplomat::Members.new.get
+    end
+
+  end
+end

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/spec/check_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+require 'json'
+require 'base64'
+
+describe Diplomat::Check do
+
+  let(:faraday) { fake }
+
+  context "check" do
+
+    it "checks" do
+      json = JSON.generate(
+              {
+                "service:redis"=> {
+                    "Node"=>"foobar",
+                    "CheckID"=>"service:redis",
+                    "Name"=>"Service 'redis' check",
+                    "Status"=>"passing",
+                    "Notes"=>"",
+                    "Output"=>"",
+                    "ServiceID"=>"redis",
+                    "ServiceName"=>"redis"}
+              }
+      )
+
+      faraday.stub(:get).and_return(OpenStruct.new({ body: json }))
+
+      check = Diplomat::Check.new(faraday)
+
+      expect(check.checks["service:redis"]["Node"]).to eq("foobar")
+    end
+
+    it "register_script" do
+      faraday.stub(:put).and_return(OpenStruct.new({ body: '', status: 200 }))
+      check = Diplomat::Check.new(faraday)
+      expect(check.register_script("foobar-1", "Foobar", "Foobar test", "/script/test", "10s")).to eq(true)
+    end
+
+    it "register_ttl" do
+      faraday.stub(:put).and_return(OpenStruct.new({ body: '', status: 200 }))
+      check = Diplomat::Check.new(faraday)
+      expect(check.register_ttl("foobar-1", "Foobar", "Foobar test", "15s")).to eq(true)
+    end
+
+    it "deregister" do
+      faraday.stub(:get).and_return(OpenStruct.new({ body: '', status: 200 }))
+      check = Diplomat::Check.new(faraday)
+      expect(check.deregister("foobar-1")).to eq(true)
+    end
+
+    it "pass" do
+      faraday.stub(:get).and_return(OpenStruct.new({ body: '', status: 200 }))
+      check = Diplomat::Check.new(faraday)
+      expect(check.pass("foobar-1")).to eq(true)
+    end
+
+    it "warn" do
+      faraday.stub(:get).and_return(OpenStruct.new({ body: '', status: 200 }))
+      check = Diplomat::Check.new(faraday)
+      expect(check.warn("foobar-1")).to eq(true)
+    end
+
+    it "fail" do
+      faraday.stub(:get).and_return(OpenStruct.new({ body: '', status: 200 }))
+      check = Diplomat::Check.new(faraday)
+      expect(check.fail("foobar-1")).to eq(true)
+    end
+
+  end
+
+end

data/spec/health_spec.rb

@@ -0,0 +1,150 @@
+require 'spec_helper'
+require 'json'
+require 'base64'
+
+describe Diplomat::Health do
+
+  let(:faraday) { fake }
+
+  context "health" do
+
+    it "node" do
+      json = <<EOF
+      [
+            {
+                "Node": "foobar",
+                "CheckID": "serfHealth",
+                "Name": "Serf Health Status",
+                "Status": "passing",
+                "Notes": "",
+                "Output": "",
+                "ServiceID": "",
+                "ServiceName": ""
+            },
+            {
+                "Node": "foobar",
+                "CheckID": "service:redis",
+                "Name": "Service 'redis' check",
+                "Status": "passing",
+                "Notes": "",
+                "Output": "",
+                "ServiceID": "redis",
+                "ServiceName": "redis"
+            }
+        ]
+EOF
+
+      faraday.stub(:get).and_return(OpenStruct.new({ body: json }))
+
+      health = Diplomat::Health.new(faraday)
+
+      expect(health.node("foobar")[0]["Node"]).to eq("foobar")
+    end
+
+    it "checks" do
+      json = <<EOF
+[
+    {
+        "Node": "foobar",
+        "CheckID": "service:redis",
+        "Name": "Service 'redis' check",
+        "Status": "passing",
+        "Notes": "",
+        "Output": "",
+        "ServiceID": "redis",
+        "ServiceName": "redis"
+    }
+]
+EOF
+
+      faraday.stub(:get).and_return(OpenStruct.new({ body: json }))
+
+      health = Diplomat::Health.new(faraday)
+
+      expect(health.checks("foobar")[0]["Node"]).to eq("foobar")
+    end
+
+    it "service" do
+      json = <<EOF
+[
+    {
+        "Node": {
+            "Node": "foobar",
+            "Address": "10.1.10.12"
+        },
+        "Service": {
+            "ID": "redis",
+            "Service": "redis",
+            "Tags": null,
+            "Port": 8000
+        },
+        "Checks": [
+            {
+                "Node": "foobar",
+                "CheckID": "service:redis",
+                "Name": "Service 'redis' check",
+                "Status": "passing",
+                "Notes": "",
+                "Output": "",
+                "ServiceID": "redis",
+                "ServiceName": "redis"
+            },
+            {
+                "Node": "foobar",
+                "CheckID": "serfHealth",
+                "Name": "Serf Health Status",
+                "Status": "passing",
+                "Notes": "",
+                "Output": "",
+                "ServiceID": "",
+                "ServiceName": ""
+            }
+        ]
+    }
+]
+EOF
+
+      faraday.stub(:get).and_return(OpenStruct.new({ body: json }))
+
+      health = Diplomat::Health.new(faraday)
+
+      expect(health.service("foobar")[0]["Node"]["Node"]).to eq("foobar")
+    end
+
+it "state" do
+      json = <<EOF
+[
+    {
+        "Node": "foobar",
+        "CheckID": "serfHealth",
+        "Name": "Serf Health Status",
+        "Status": "passing",
+        "Notes": "",
+        "Output": "",
+        "ServiceID": "",
+        "ServiceName": ""
+    },
+    {
+        "Node": "foobar",
+        "CheckID": "service:redis",
+        "Name": "Service 'redis' check",
+        "Status": "passing",
+        "Notes": "",
+        "Output": "",
+        "ServiceID": "redis",
+        "ServiceName": "redis"
+    }
+]
+EOF
+
+      faraday.stub(:get).and_return(OpenStruct.new({ body: json }))
+
+      health = Diplomat::Health.new(faraday)
+
+      expect(health.state("foobar")[0]["Node"]).to eq("foobar")
+    end
+
+
+  end
+
+end

data/spec/members_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'json'
+require 'base64'
+
+describe Diplomat::Members do
+
+  let(:faraday) { fake }
+
+  context "member" do
+
+    it "GET" do
+      json = JSON.generate(
+        [{
+          "Name" => "foobar",
+          "Addr" => "10.1.10.12",
+          "Port" => 8301,
+          "Tags" => {
+            "bootstrap" => "1",
+            "dc" => "dc1",
+            "port" => 8300,
+            "role" => "consul",
+          },
+          "Status" =>  1,
+          "ProtocolMin" => 1,
+          "ProtocolMax" => 2,
+          "ProtocolCur" => 2,
+          "DelegateMin" => 1,
+          "DelegateMax" => 3,
+          "DelegateCur" => 3
+        }]
+      )
+
+      faraday.stub(:get).and_return(OpenStruct.new({ body: json }))
+
+      members = Diplomat::Members.new(faraday)
+
+      expect(members.get[0]["Name"]).to eq("foobar")
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,16 +98,16 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -133,17 +133,22 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - diplomat.gemspec
 - lib/diplomat.rb
+- lib/diplomat/check.rb
+- lib/diplomat/health.rb
 - lib/diplomat/kv.rb
+- lib/diplomat/members.rb
 - lib/diplomat/rest_client.rb
 - lib/diplomat/service.rb
 - lib/diplomat/version.rb
+- spec/check_spec.rb
+- spec/health_spec.rb
 - spec/kv_spec.rb
+- spec/members_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/johnhamelink/diplomat
 licenses:
@@ -170,6 +175,9 @@ signing_key:
 specification_version: 4
 summary: Diplomat is a simple wrapper for Consul
 test_files:
+- spec/check_spec.rb
+- spec/health_spec.rb
 - spec/kv_spec.rb
+- spec/members_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/Gemfile.lock

@@ -1,55 +0,0 @@
-PATH
-  remote: .
-  specs:
-    diplomat (0.1.7)
-      faraday (~> 0.9)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    codeclimate-test-reporter (0.3.0)
-      simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    docile (1.1.3)
-    fakes (1.1.4)
-    fakes-rspec (1.0.5)
-      fakes
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    json (1.8.1)
-    method_source (0.8.2)
-    multi_json (1.9.2)
-    multipart-post (2.0.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.3.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.4.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  codeclimate-test-reporter
-  diplomat!
-  fakes-rspec (~> 1.0)
-  json (~> 1.8)
-  pry (~> 0.9)
-  rake (~> 10.3)
-  rspec (~> 2.14)