diplomat 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a23e42c39267a3f6bff598a5775ec170787be1bf
-  data.tar.gz: 0778158f0ee8e2ba9210f1fc469b1a1b4fefff49
+  metadata.gz: 3f2bf40d8cc3eea258753340fb38086dc71c8f2f
+  data.tar.gz: e3db694a3793a961971686d989adfcbc98292c4e
 SHA512:
-  metadata.gz: 943740a0d4bb06217d8cb55d5a74cb7b72a2575f768f278f606a5aa2390992c7055424566a94043ae4a8bb81bda054ec587ab45419db326e983564d43c5a59f2
-  data.tar.gz: 976565fa6452fd2d96089297d5a312187461d09dedb49258f1856e25599d40ef607e5bdb866678ec745f0ae5c7e2511d2072476f690b8ed007af2df28eb1ce61
+  metadata.gz: ea31b94d60f6f5bc15ac1d1ec3632dc8b02eff9dac5d7cce5e1979ba1fe5c74a54f6d83f35f9314e8c5b5563c669c5af711bfed879bec9a6bbfd2fb77d1bf7a0
+  data.tar.gz: c27de31b09f4d25a59964d61a59d3d393bc158a3774b41bb53c82ef5e19cfaa68b2246e139142c2e9cc88f45b10c46d9139a8a7b7efb6ff8004993992daa862f

data/README.md

@@ -9,7 +9,7 @@
 
 #### What's Diplomat for?
 
-Diplomat allows any ruby application to interact with [Consul's](http://www.consul.io/) distributed key value store, and also receive information about services currently available in the Consol cluster.
+Diplomat allows any ruby application to interact with [Consul's](http://www.consul.io/) distributed key value store, and also receive information about services currently available in the Consul cluster.
 
 #### Does it work in rails?
 
@@ -31,7 +31,7 @@ production:
 <% end %>
 ```
 
-#### Why would I use Consol over ZooKeeper, Doozerd, etcd, Nagios, Sensu, SmartStack, SkyDNS, Chef, Puppet, Ansible, etc?
+#### Why would I use Consul over ZooKeeper, Doozerd, etcd, Nagios, Sensu, SmartStack, SkyDNS, Chef, Puppet, Ansible, etc?
 
 [Read up what makes Consul different here](http://www.consul.io/intro/vs/index.html)
 

data/lib/diplomat/service.rb

@@ -6,9 +6,14 @@ module Diplomat
 
     # Get a service by it's key
     # @param key [String] the key
+    # @param scope [Symbol] :first or :all results
     # @return [OpenStruct] all data associated with the service
-    def get key
+    def get key, scope=:first
       ret = @conn.get "/v1/catalog/service/#{key}"
+
+      if scope == :all
+        return JSON.parse(ret.body).map { |service| OpenStruct.new service }
+      end
       return OpenStruct.new JSON.parse(ret.body).first
     end
 

data/lib/diplomat/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,33 +81,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: fivemat
+  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: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +157,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- diplomat.gemspec
 - lib/diplomat.rb
 - lib/diplomat/check.rb
 - lib/diplomat/health.rb
@@ -145,11 +167,6 @@ files:
 - 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:
 - BSD
@@ -170,14 +187,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 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
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,35 +0,0 @@
-Gemfile.lock
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalisation:
-/.bundle/
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-    - "1.9.3"
-    - "2.0.0"
-    - "2.1.0"
-addons:
-    code_climate:
-        repo_token: c910d8f8af55cc2d2f38170d5362be4e16be8ce232df9c565057985af264b7b

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in roundel.gemspec
-gemspec

data/Rakefile

@@ -1,5 +0,0 @@
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/diplomat.gemspec

@@ -1,29 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'diplomat/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "diplomat"
-  spec.version       = Diplomat::VERSION
-  spec.authors       = ["John Hamelink"]
-  spec.email         = ["john@johnhamelink.com"]
-  spec.description   = %q{Diplomat is a simple wrapper for Consul}
-  spec.summary       = %q{Diplomat is a simple wrapper for Consul}
-  spec.homepage      = "https://github.com/johnhamelink/diplomat"
-  spec.license       = "BSD"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.3"
-  spec.add_development_dependency "pry", "~> 0.9"
-  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", "~> 0.3.0"
-  spec.add_dependency "faraday", "~> 0.9"
-end

data/spec/check_spec.rb

@@ -1,71 +0,0 @@
-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

@@ -1,150 +0,0 @@
-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/kv_spec.rb

@@ -1,59 +0,0 @@
-require 'spec_helper'
-require 'json'
-require 'base64'
-
-describe Diplomat::Kv do
-
-  let(:faraday) { fake }
-
-  context "keys" do
-    let(:key) { "key" }
-    let(:key_url) { "/v1/kv/#{key}" }
-    let(:key_params) { "toast" }
-
-    it "GET" do
-      json = JSON.generate([{
-        "Key"   => key,
-        "Value" => Base64.encode64(key_params),
-        "Flags" => 0
-      }])
-
-      faraday.stub(:get).and_return(OpenStruct.new({ body: json }))
-
-      kv = Diplomat::Kv.new(faraday)
-
-      expect(kv.get("key")).to eq("toast")
-    end
-
-    it "PUT" do
-
-      json = JSON.generate([{
-        "Key"   => key,
-        "Value" => Base64.encode64(key_params),
-        "Flags" => 0
-      }])
-
-      faraday.stub(:get).and_return(OpenStruct.new({ body: json }))
-      faraday.stub(:put).and_return(OpenStruct.new({ body: "true\n"}))
-      kv = Diplomat::Kv.new(faraday)
-
-      expect(kv.put(key, key_params)).to eq(key_params)
-    end
-
-    it "namespaces" do
-      json = JSON.generate([{
-        "Key"   => key,
-        "Value" => Base64.encode64(key_params),
-        "Flags" => 0
-      }])
-
-      faraday.stub(:get).and_return(OpenStruct.new({ body: json }))
-      faraday.stub(:put).and_return(OpenStruct.new({ body: "true\n"}))
-      kv = Diplomat::Kv.new(faraday)
-
-      expect(kv.put("toast/#{key}", key_params)).to eq(key_params)
-    end
-
-  end
-
-end

data/spec/members_spec.rb

@@ -1,42 +0,0 @@
-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

data/spec/spec_helper.rb

@@ -1,15 +0,0 @@
-require "bundler/setup"
-Bundler.setup
-
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
-require 'diplomat'
-require 'fakes-rspec'
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-  config.order = 'random'
-end