dryad-consul 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7ed3e76062a2b13385dfa1b93280032c1a2e4aa0147445b5d96caeb0ebbaa82
-  data.tar.gz: d4a8f9df580993a60d5780798feb2001bea85b0778878f1c721724a8f9e73eb6
+  metadata.gz: f90d5b5fad7da7535c53c480e9bfaadb8833ee2d50d7e7eb01f489c75a0e4a93
+  data.tar.gz: 24035df45576e6aadbaae41716cd3b1e010c952f30c79730a5247c9cb561168d
 SHA512:
-  metadata.gz: e414e663aa743ada8df13450fc9dcef4053791647358dce1270f3f624f2b9d96ccaebe5e69ebe6f4ca8da0176999a311e8261798b446e53c0f3dd120d1b64616
-  data.tar.gz: 40519c5de6ee81d8c28a35e17525e6159ad347490aafd2f70ea41e9b0f0394e70f80a76e1707aefa89e0cd7ae0134b02c5ff657c8c09656206ecff827dcc4c80
+  metadata.gz: 53b99aabe4027bb678f3a1cd3201f817cfffebf7b9801279e9c74ee5b0dcd8df154e1f1b2260a7d78d85eca606d03295a8a76feac6b4ff4780e350446b982e4f
+  data.tar.gz: df04d80075f510e7743ef98de2ae292d85701e9d0fc5bd0af4c6c35495ca6802d6c9cfaf467ae82dfbbabc6ff258efde7d894f9eba7dbb06adb94d15e5f037b9

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dryad-consul (0.2.5)
+    dryad-consul (0.2.6)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.2.5)
+      dryad-core (= 0.2.6)
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +13,7 @@ GEM
     diplomat (2.2.5)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-core (0.2.5)
+    dryad-core (0.2.6)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

data/lib/dryad/consul.rb

@@ -13,9 +13,14 @@ module Dryad
     class Error < StandardError; end
     class << self
       def configure_consul(configuration)
+        consul = configuration.consul
+        if consul[:username].nil? || consul[:password].nil?
+          url = "http://#{consul[:host]}:#{consul[:port]}"
+        else
+          url = "http://#{consul[:username]}:#{consul[:password]}@#{consul[:host]}:#{consul[:port]}"
+        end
         ::Diplomat.configure do |config|
-          config.url = "http://#{configuration.consul[:host]}:#{configuration.consul[:port]}"
-          config.options = { headers: { "X-Consul-Token" => configuration.consul[:token] } } if configuration.consul[:token]
+          config.url = url
         end
       end
     end

data/lib/dryad/consul/version.rb

@@ -1,5 +1,5 @@
 module Dryad
   module Consul
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad-consul
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dryad-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement