aide 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e62e5574eb4be798be2b64c74f863433333b4ef9
-  data.tar.gz: a9ce9a94d7e96b7b92da3cd48bb9238761c24549
+  metadata.gz: 8c01f8d45784fd63a3cdc2b22cf2a8994951e968
+  data.tar.gz: 74089e428c739b10404e253119b7a694d6d9d1aa
 SHA512:
-  metadata.gz: ee154898d957e27ee14ee1e54c2299b80f5c015d06e661e25fe6d3747e3325c17ddd71d5df1079397b228cdaf892825fb26bfcc3b08d2c4956d56c7a3bd1aa80
-  data.tar.gz: becca1c51d0c3d22cdca74934ac115f05916836763134aab4e301b3223c2aef4ab597b73ff0a57115a4e24f636529be4a4eca37130a25db7e0efe118236f3d0d
+  metadata.gz: 5f93664c613e9d839ec7766bdb164d6f483b737fb38210a867c615c036332df6af635003607fa271013df16939379ecf03e0174a21d570fae75c36c8b086cd6e
+  data.tar.gz: dccf0c39e44413b0048532de41fa53f72f906e56e49529b1a29509386470f4cff47eeebb31db08c6fb70777dc1aa4cc9aad2bbac879638069334728c7b631831

data/lib/aide/config.rb

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

data/lib/aide/service.rb

@@ -14,18 +14,20 @@ module Aide
 
     alias port ServicePort
 
-    def url
+    def url(filtered: false)
       return if empty?
 
-      template = Aide.config.get_service(name: name)[:url]
+      template = config[:url]
       return if template.nil?
 
       template = template.dup
+      template.gsub!(/{{\.protocol}}/, self.protocol.to_s)
       template.gsub!(/{{\.address}}/, self.address.to_s)
       template.gsub!(/{{\.Address}}/, self.Address.to_s)
       template.gsub!(/{{\.ServiceAddress}}/, self.ServiceAddress.to_s)
       template.gsub!(/{{\.ServicePort}}/, self.ServicePort.to_s)
       template.gsub!(/{{\.port}}/, self.port.to_s)
+      template.gsub!(/{{\.auth}}/, self.auth(filtered: filtered).to_s)
 
       template
     end
@@ -36,6 +38,70 @@ module Aide
       end
     end
 
+    def auth(filtered: false)
+      template = config[:auth]
+
+      if template.nil? || self.user.nil? || self.password.nil?
+        return
+      end
+
+      template = template.dup
+      template.gsub!(/{{\.user}}/, self.user.to_s)
+
+      password = nil
+      if filtered
+        password = 'PASSWORD'
+      else
+        password = self.password.to_s
+      end
+
+      template.gsub!(/{{\.password}}/, password)
+
+      template
+    end
+
+    def user_key
+      config[:user_key]
+    end
+
+    def user
+      return if user_key.nil?
+
+      @user ||= begin
+                      user = Diplomat::Kv.get(user_key, {}, :return)
+                      user = nil if user == ""
+                      user
+                    end
+    end
+
+    def password_key
+      config[:password_key]
+    end
+
+    def password
+      return if password_key.nil?
+
+      @password ||= begin
+                      password = Diplomat::Kv.get(password_key, {}, :return)
+                      password = nil if password == ""
+                      password
+                    end
+    end
+
+    def protocol_key
+      config[:protocol_key]
+    end
+
+    def protocol
+      return if protocol_key.nil?
+
+      @protocol ||= begin
+                      protocol = Diplomat::Kv.get(protocol_key, {}, :return)
+                      protocol = nil if protocol == ""
+                      protocol
+                    end
+    end
+
     def empty?
       service.to_h.empty?
     end
@@ -44,5 +110,9 @@ module Aide
     def service
       @service ||= Diplomat::Service.get(name)
     end
+
+    def config
+      @config ||= Aide.config.get_service(name: name)
+    end
   end
 end

data/lib/aide/version.rb

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

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}".strip
+        puts "==> #{name}: #{service.address}#{service.port.nil? ? '' : ":#{service.port}"} #{service.url(filtered: true)}".strip
       end
     end
 

metadata

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