diplomat 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbf402f2ee123f9bd5695a8faa1d1419cf504c7e
-  data.tar.gz: 183ea346004b5658c96dfdd9c7a023bd4a39a685
+  metadata.gz: 4b30733457f28024a240e54b598c45a2ef02d258
+  data.tar.gz: 50e43ddee795ae3418d2b5e05e71f05e2f803a5e
 SHA512:
-  metadata.gz: 7dfd0b88b712187fe1ad8f025b410e687c6b655c60ded8e448f43d0a586ce0ea030387355f3c45f9b569b15956bc595843ca63a90c2a9fb67d0352aad245b6cf
-  data.tar.gz: e92caa5c03cf316657b98b3c431077e456326d574715f183ba91c084cfcc542dc81cc260b2532193e5c419b522b87facb3dc4cf1c3cd55dac92efe77a871a917
+  metadata.gz: d4e10a411987256743fc86bf7c95e812ecc2b1f785469bb07f441488426505b0d4c125bbc615c991fd76c6bec916369bca7fa1a07b4c6a8446cff6bcf0054479
+  data.tar.gz: ad2d634dda086ab217f7c67165ac8cce6afc4928fd95765334b77f94fcf78facdbea3e7f1e0b6ce2d4c6be05a7a1dec277f673e1a2a09447c2a0185f40b0dea8

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/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) [![Dependency Status](https://gemnasium.com/WeAreFarmGeek/diplomat.svg)](https://gemnasium.com/WeAreFarmGeek/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) [![Dependency Status](https://gemnasium.com/WeAreFarmGeek/diplomat.svg)](https://gemnasium.com/WeAreFarmGeek/diplomat) [![Inline docs](http://inch-ci.org/github/wearefarmgeek/diplomat.svg?branch=master)](http://inch-ci.org/github/wearefarmgeek/diplomat)
 ### A HTTP Ruby API for [Consul](http://www.consul.io/)
 
 ![Diplomacy Boad Game](http://i.imgur.com/Nkuy4b7.jpg)

data/lib/diplomat/check.rb

@@ -4,6 +4,9 @@ require 'faraday'
 module Diplomat
   class Check < Diplomat::RestClient
 
+    @access_methods = [ :checks, :register_script, :register_ttl,
+                        :deregister, :pass, :warn, :fail ]
+
     # Get registered checks
     # @return [OpenStruct] all data associated with the service
     def checks
@@ -88,40 +91,5 @@ module Diplomat
       return 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/event.rb

@@ -2,6 +2,7 @@ require 'faraday'
 
 module Diplomat
   class Event < Diplomat::RestClient
+    @access_methods = [ :fire, :get_all, :get ]
 
     # Send an event
     # @param name [String] the event name
@@ -11,7 +12,7 @@ module Diplomat
     # @param tag [String] the target tag name, must only be used with service
     # @return [nil]
     def fire name, value=nil, service=nil, node=nil, tag=nil
-      raw = @conn.put do |req|
+      @conn.put do |req|
         url = [ "/v1/event/fire/#{name}" ]
         url += use_named_parameter("service", service)
         url += use_named_parameter("node", node)
@@ -140,21 +141,6 @@ module Diplomat
     end
 
 
-    # @note This is sugar, see (#fire)
-    def self.fire *args
-      Diplomat::Event.new.fire *args
-    end
-
-    # @note This is sugar, see (#get_all)
-    def self.get_all *args
-      Diplomat::Event.new.get_all *args
-    end
-
-    # @note This is sugar, see (#get)
-    def self.get *args
-      Diplomat::Event.new.get *args
-    end
-
     private
 
     def wait_for_next_event url

data/lib/diplomat/health.rb

@@ -3,6 +3,8 @@ require 'faraday'
 
 module Diplomat
   class Health < Diplomat::RestClient
+    @access_methods = [ :node, :checks, :service, :state,
+                        :unknown, :passing, :warning, :critical ]
 
     # Get node health
     # @param n [String] the node
@@ -55,47 +57,5 @@ module Diplomat
     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/kv.rb

@@ -3,7 +3,7 @@ require 'faraday'
 
 module Diplomat
   class Kv < Diplomat::RestClient
-
+    @access_methods = [ :get, :put, :delete ]
     attr_reader :key, :value, :raw
 
     # Get a value by its key, potentially blocking for the first or next value
@@ -102,21 +102,6 @@ module Diplomat
       @raw = @conn.delete concat_url url
     end
 
-    # @note This is sugar, see (#get)
-    def self.get *args
-      Diplomat::Kv.new.get *args
-    end
-
-    # @note This is sugar, see (#put)
-    def self.put *args
-      Diplomat::Kv.new.put *args
-    end
-
-    # @note This is sugar, see (#delete)
-    def self.delete *args
-      Diplomat::Kv.new.delete *args
-    end
-
     private
 
     def check_acl_token

data/lib/diplomat/lock.rb

@@ -3,6 +3,8 @@ require 'faraday'
 module Diplomat
   class Lock < Diplomat::RestClient
 
+    @access_methods = [ :acquire, :wait_to_acquire, :release ]
+
     # Acquire a lock
     # @param key [String] the key
     # @param session [String] the session, generated from Diplomat::Session.create
@@ -42,20 +44,5 @@ module Diplomat
       end
       return raw.body
     end
-
-    # @note This is sugar, see (#acquire)
-    def self.acquire *args
-      Diplomat::Lock.new.acquire *args
-    end
-
-    # @note This is sugar, see (#wait_to_acquire)
-    def self.wait_to_acquire *args
-      Diplomat::Lock.new.wait_to_acquire *args
-    end
-
-    # @note This is sugar, see (#release)
-    def self.release *args
-      Diplomat::Lock.new.release *args
-    end
   end
 end

data/lib/diplomat/members.rb

@@ -3,6 +3,7 @@ require 'faraday'
 
 module Diplomat
   class Members < Diplomat::RestClient
+    @access_methods = [ :get ]
 
     # Get all members
     # @return [OpenStruct] all data associated with the service
@@ -10,11 +11,5 @@ module Diplomat
       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/rest_client.rb

@@ -4,6 +4,8 @@ require 'json'
 module Diplomat
   class RestClient
 
+    @access_methods = []
+
     def initialize api_connection=nil
       start_connection api_connection
     end
@@ -20,6 +22,18 @@ module Diplomat
       end
     end
 
+    class << self
+
+      def access_method? methId
+        @access_methods.include? methId
+      end
+
+      def method_missing(methId, *args)
+        access_method?(methId) ? new.send(methId, *args) : super
+      end
+
+    end
+
     private
 
     # Build the API Client

data/lib/diplomat/service.rb

@@ -3,6 +3,8 @@ require 'faraday'
 
 module Diplomat
   class Service < Diplomat::RestClient
+    
+    @access_methods = [ :get, :register, :deregister ]
 
     # Get a service by it's key
     # @param key [String] the key
@@ -48,21 +50,5 @@ module Diplomat
       deregister = @conn.get "/v1/agent/service/deregister/#{service_name}"
       return deregister.status == 200
     end
-
-    # @note This is sugar, see (#get)
-    def self.get *args
-      Diplomat::Service.new(*args).get
-    end
-
-    # @note This is sugar, see (#register)
-    def self.register definition
-      Diplomat::Service.new.register definition
-    end
-
-    # @note This is sugar, see (#deregister)
-    def self.deregister service_name
-      Diplomat::Service.new.deregister service_name
-    end
-
   end
 end

data/lib/diplomat/session.rb

@@ -3,6 +3,8 @@ require 'faraday'
 module Diplomat
   class Session < Diplomat::RestClient
 
+    @access_methods = [ :create, :destroy ]
+
     # Create a new session
     # @param value [Object] hash or json representation of the session arguments
     # @return [String] The sesssion id
@@ -26,15 +28,5 @@ module Diplomat
       end
       return raw.body
     end
-
-    # @note This is sugar, see (#create)
-    def self.create *args
-      Diplomat::Session.new.create *args
-    end
-
-    # @note This is sugar, see (#destroy)
-    def self.destroy *args
-      Diplomat::Session.new.destroy *args
-    end
   end
 end

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

metadata

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