aide 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c01f8d45784fd63a3cdc2b22cf2a8994951e968
-  data.tar.gz: 74089e428c739b10404e253119b7a694d6d9d1aa
+  metadata.gz: 594b97487398ab5462e49e81809708ff410c9483
+  data.tar.gz: 56d6e52bea45352b5729bcbe7a4c8d67c8e8a968
 SHA512:
-  metadata.gz: 5f93664c613e9d839ec7766bdb164d6f483b737fb38210a867c615c036332df6af635003607fa271013df16939379ecf03e0174a21d570fae75c36c8b086cd6e
-  data.tar.gz: dccf0c39e44413b0048532de41fa53f72f906e56e49529b1a29509386470f4cff47eeebb31db08c6fb70777dc1aa4cc9aad2bbac879638069334728c7b631831
+  metadata.gz: 14a0faf679c5c972812149364215336f385a713d8ef37005c4428d6f5e5aa251a5997e332effdd951918c0c9bb8aee7d008ac9a708138e9f625ca13d11a65dc5
+  data.tar.gz: d77fc8fcc7c7e69e994072c1af3871494ccd3b85638c0e0be95829ec8d1cb326c8b5deb5146b1543896c03049e2549f49c6edd030bed7509fe230a456af8bb4d

data/lib/aide.rb

@@ -27,7 +27,7 @@ module Aide
 
       puts "Aide Services (Using #{config.service_address_key}):"
       self.services.each do |name, service|
-        puts "==> #{name}: #{service.address}#{service.port.nil? ? '' : ":#{service.port}"} #{service.url(filtered: true)}".strip
+        puts "==> #{name}: #{service.address}#{service.port.nil? ? '' : ":#{service.port}"} #{service.display_url(filtered: true)}".strip
       end
     end
 

data/lib/aide/config.rb

@@ -25,14 +25,17 @@ module Aide
       self.service_address_method = SERVICE_ADDRESS_METHOD
     end
 
-    def add_service(name:, url:nil, auth:nil, user_key:nil, password_key:nil, protocol_key:nil)
+    def add_service(name:, url:nil, auth:nil, user_key:nil, password_key:nil, protocol_key:nil, multi_url:nil, node:nil, database_key:nil)
       services[name] = {
         name: name,
         url: url,
+        multi_url: multi_url,
         auth: auth,
         user_key: user_key,
         password_key: password_key,
-        protocol_key: protocol_key
+        protocol_key: protocol_key,
+        node: node,
+        database_key: database_key
       }
     end
 

data/lib/aide/service.rb

@@ -28,6 +28,7 @@ module Aide
       template.gsub!(/{{\.ServicePort}}/, self.ServicePort.to_s)
       template.gsub!(/{{\.port}}/, self.port.to_s)
       template.gsub!(/{{\.auth}}/, self.auth(filtered: filtered).to_s)
+      template.gsub!(/{{\.database}}/, self.database.to_s)
 
       template
     end
@@ -38,6 +39,35 @@ module Aide
       end
     end
 
+    def multi_url(filtered: false)
+      return if empty?
+
+      template = config[:multi_url]
+      return if template.nil?
+
+      template = template.dup
+      template.gsub!(/{{\.protocol}}/, self.protocol.to_s)
+      template.gsub!(/{{\.auth}}/, self.auth(filtered: filtered).to_s)
+      template.gsub!(/{{\.database}}/, self.database.to_s)
+      template.gsub!(/{{\.nodes}}/, self.nodes.to_s)
+
+      template
+    end
+
+    def multi_url!
+      self.multi_url.tap do |orig_url|
+        raise MissingService.new(name) if orig_url.nil?
+      end
+    end
+
+    def display_url(filtered: false)
+      if !config[:multi_url].nil?
+        multi_url(filtered: filtered)
+      else
+        url(filtered: filtered)
+      end
+    end
+
     def auth(filtered: false)
       template = config[:auth]
 
@@ -60,6 +90,34 @@ module Aide
       template
     end
 
+    def nodes
+      return if empty?
+
+      template = config[:node]
+      return if template.nil?
+
+      services.map do |service|
+        self.node(service)
+      end.join(',')
+    end
+
+    def node(node_service=service)
+      template = config[:node]
+      return if template.nil?
+
+      template = template.dup
+      template.gsub!(/{{.address}}/, node_service.send(Aide.config.service_address_method).to_s)
+      template.gsub!(/{{.port}}/, node_service.ServicePort.to_s)
+
+      template
+    end
+
+    def node!
+      self.node.tap do |orig_node|
+        raise MissingService.new(name) if orig_node.nil?
+      end
+    end
+
     def user_key
       config[:user_key]
     end
@@ -102,6 +160,20 @@ module Aide
                     end
     end
 
+    def database_key
+      config[:database_key]
+    end
+
+    def database
+      return if database_key.nil?
+
+      @database ||= begin
+                      database = Diplomat::Kv.get(database_key, {}, :return)
+                      database = nil if database == ""
+                      database
+                    end
+    end
+
     def empty?
       service.to_h.empty?
     end
@@ -111,6 +183,10 @@ module Aide
       @service ||= Diplomat::Service.get(name)
     end
 
+    def services
+      @services || Diplomat::Service.get(name, :all)
+    end
+
     def config
       @config ||= Aide.config.get_service(name: name)
     end

data/lib/aide/version.rb

@@ -1,3 +1,3 @@
 module Aide
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aide
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler