diplomat-bb 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70431c34cd7188906b4bee0afb835e380a4a5be0
-  data.tar.gz: ea508f7b0801d3183975cc41619f7a420325bc73
+  metadata.gz: 46491a9b4697e14ac80ebfbf24d279577cdae3fa
+  data.tar.gz: cb0e507f5849cb68e6905861de2ba3f1185e88bd
 SHA512:
-  metadata.gz: 2701f07165a4c5816c751b3c39196b600e0c37ecb71496c8d6030317bbfaabe2baeab7a11815468606d22cc778143db74d3249e7eeff5d6185603eed1b5c5dcc
-  data.tar.gz: 5f66babe29e96e7d982403d84d0ceaa69678a331c1c5cd9aa3bceb3524e71931a65522033fe684d0b03fe6c14581e80bdbfc9cc8b3606f5acec3e5c2992ec419
+  metadata.gz: 479f110697541601a1b1ff75e3ed0c383e51222d8fc2575b0ccf23acc885d285a40b687b3325fb4f4392963b535c5e76c19dd06e671e01e093cac25af64109e7
+  data.tar.gz: 666fb5f10e82b19778ac5d3345bc4adf518d4e276bb7f5af7478490c6023efcc20f3c6963657d4a94d3cc62ae7ead84b362539b702ba4bcc887f5dd954bda6fc

data/lib/diplomat/client.rb

@@ -0,0 +1,39 @@
+require 'base64'
+require 'faraday'
+require 'json'
+
+module Diplomat
+  class Client < Diplomat::RestClient
+
+    @@config = {}
+
+
+    # parse configuration
+    # @param directory [String] location of consult client configuration files
+    # @return [OpenStruct] all data associated with the service
+    def config directory
+
+      services = []
+      Dir.glob("#{directory}/*.json") do |json_file|
+        # do work on files ending in .rb in the desired directory
+        file = File.read(json_file)
+        data_hash = JSON.parse(file)
+        data_hash.each do |key, array|
+          if key.casecmp("service") == 0
+            services.push(array)
+          else
+            @@config[key] = array
+          end
+        end
+      end
+      @@config["services"] = services
+      return @@config
+    end
+
+    # @note This is sugar, see (#get)
+    def self.config *args
+      Diplomat::Client.new.config *args
+    end
+
+  end
+end

data/lib/diplomat/configuration.rb

@@ -2,6 +2,7 @@ module Diplomat
   class Configuration
     attr_accessor :middleware
     attr_accessor :url
+    attr_accessor :datacenter
 
     def initialize
       @middleware = []

data/lib/diplomat/service.rb

@@ -17,10 +17,101 @@ module Diplomat
       return OpenStruct.new JSON.parse(ret.body).first
     end
 
+    # Register a service
+    # @param name [String] the name
+    # @param address [String] the address of the service
+    # @param port [Integer] port number associated with the service
+    # @param tags [Array] tags to be associated with the service
+    # @param datacenter [String] datacenter
+    # @param node [String] node identifying the service
+    # @return [Integer] Status code
+    def register name, address, port, node, tags=[], datacenter=''
+
+      dc = datacenter != '' ? datacenter : Diplomat.configuration.datacenter
+
+      json = JSON.generate(
+      {
+        "Datacenter" => dc,
+        "Address" => address,
+        "Node" => node,
+        "Service" => {
+            "Service" => name,
+            "Port" => port,
+            "Tags" => tags
+        }
+      }
+      )
+
+      ret = @conn.put do |req|
+        req.url "/v1/catalog/register"
+        req.body = json
+      end
+
+      return true if ret.status == 200
+    end
+
+    # Deregister a service and all nodes associated with it
+    # @param datacenter [String] datacenter
+    # @param node [String] node identifying the service
+    # @return [Integer] Status code
+    def deregister name, tag='', datacenter=''
+
+      dc = datacenter != '' ? datacenter : Diplomat.configuration.datacenter
+      tag_filter = "&tag=#{tag}" unless tag.empty?
+
+      nodes = self.get("#{name}?dc=#{dc}#{tag_filter}",:all)
+      nodes.each do |x|
+        self.deregister_node(x.ServiceID, x.Node, datacenter )
+      end
+
+      return true
+    end
+
+
+    # Deregister a given node for a service
+    # @param serviceid [String] service id to deregister
+    # @param datacenter [String] datacenter
+    # @param node [String] node identifying the service
+    # @return [Integer] Status code
+    def deregister_node serviceid, node, datacenter=''
+
+      dc = datacenter != '' ? datacenter : Diplomat.configuration.datacenter
+      json = JSON.generate(
+      {
+        "Datacenter" => dc,
+        "Node" => node,
+        "ServiceId" => serviceid
+      }
+      )
+
+      ret = @conn.put do |req|
+        req.url "/v1/catalog/deregister"
+        req.body = json
+      end
+
+      return true if ret.status == 200
+    end
+
+
     # @note This is sugar, see (#get)
     def self.get *args
       Diplomat::Service.new.get *args
     end
 
+    # @note This is sugar, see (#register)
+    def self.register *args
+      Diplomat::Service.new.register *args
+    end
+
+    # @note This is sugar, see (#deregister)
+    def self.deregister *args
+      Diplomat::Service.new.deregister *args
+    end
+
+    # @note This is sugar, see (#deregister_node)
+    def self.deregister_node *args
+      Diplomat::Service.new.deregister_node *args
+    end
+
   end
 end

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/diplomat.rb

@@ -20,7 +20,7 @@ module Diplomat
   self.root_path = File.expand_path "..", __FILE__
   self.lib_path = File.expand_path "../diplomat", __FILE__
 
-  require_libs "configuration", "rest_client", "kv", "service", "members", "check", "health", "session", "lock"
+  require_libs "configuration", "rest_client", "kv", "service", "members", "check", "health", "session", "lock", "client"
   self.configuration ||= Diplomat::Configuration.new
 
   class << self
@@ -31,6 +31,13 @@ module Diplomat
       yield(configuration)
     end
 
+    def bootstrap directory
+      self.configuration ||= Diplomat::Configuration.new
+      config = Diplomat::Client.config directory
+      self.configuration.url = "http://#{config['start_join'].first}:#{config['ports']['http']}"
+      self.configuration.datacenter = config['datacenter']
+    end
+
     private
 
     def method_missing(name, *args, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat-bb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,7 @@ files:
 - features/step_definitions/test_key_value.rb
 - lib/diplomat.rb
 - lib/diplomat/check.rb
+- lib/diplomat/client.rb
 - lib/diplomat/configuration.rb
 - lib/diplomat/health.rb
 - lib/diplomat/kv.rb