hako-etcenv 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ead46208a975e2279ea04ab4be4ffd2cdbce98b
-  data.tar.gz: 38a1bb1d2ab90c857cba5648abfe4e65b412c347
+  metadata.gz: 020a0c30850b39d3800425f57a13108618dab7ec
+  data.tar.gz: 7e4b28dceb3ebbb4899bacfa7d770cce7311dc39
 SHA512:
-  metadata.gz: 8edd7034055c5dcb94fd52fe2d9a6760ac218a2134f195ab1dbbda4e1ae548ff016c1ecee9f430cc256f677a2f02fe5a26f0215762cbc5348f6b8dbd6395f9b7
-  data.tar.gz: f10c1c54cbf8cb0f55c421e6577e90e792041ce2b830adee64e91ed17ab999a49f13cb1e3fc6b6959e578cd41dda8371d1cab8fbd09270352c04d80e6f83eee8
+  metadata.gz: 471b88a8a4627e61ec8fabcbb6d8ade5cf86b6359dde655377041d4b5cab59e6df13ed7513617a556dd96ef557ae69d1d228f3d8010be2eea3ff4c252818fe20
+  data.tar.gz: 6e9b59837693ab38a5d16707c8709ce438966b8d10ad307918cc6e1fda78104ce0e8575ddde0abb03548028bd4727804c820405eeac5c46bf4f972a5626f019c

data/hako-etcenv.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'hako-etcenv'
-  spec.version       = '0.1.2'
+  spec.version       = '0.2.0'
   spec.authors       = ['Kohei Suzuki']
   spec.email         = ['eagletmt@gmail.com']
 

data/lib/hako/env_providers/etcenv.rb

@@ -14,21 +14,16 @@ module Hako
         unless options['root']
           validation_error!('root must be set')
         end
-        uri = URI.parse(options.fetch('url'))
-        @etcd = Etcd.client(
-          host: uri.host,
-          port: uri.port,
-          use_ssl: uri.scheme == 'https',
-          ca_file: options.fetch('ca_file', nil),
-          ssl_cert: ssl_cert(options.fetch('ssl_cert', nil)),
-          ssl_key: ssl_key(options.fetch('ssl_key', nil)),
-        )
+        @uri = URI.parse(options.fetch('url'))
+        @ca_file = options.fetch('ca_file', nil)
+        @ssl_cert = options.fetch('ssl_cert', nil)
+        @ssl_key = options.fetch('ssl_key', nil)
         @root = options.fetch('root')
       end
 
       def ask(variables)
         env = {}
-        ::Etcenv::Environment.new(@etcd, @root).expanded_env.each do |key, val|
+        ::Etcenv::Environment.new(etcd_client, @root).expanded_env.each do |key, val|
           if variables.include?(key)
             env[key] = val
           end
@@ -36,8 +31,23 @@ module Hako
         env
       end
 
+      def can_ask_keys?
+        false
+      end
+
       private
 
+      def etcd_client
+        @etcd_client ||= Etcd.client(
+          host: @uri.host,
+          port: @uri.port,
+          use_ssl: @uri.scheme == 'https',
+          ca_file: @ca_file,
+          ssl_cert: ssl_cert(@ssl_cert),
+          ssl_key: ssl_key(@ssl_key),
+        )
+      end
+
       def ssl_cert(cert_path)
         if cert_path
           OpenSSL::X509::Certificate.new(::File.read(cert_path))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako-etcenv
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcenv
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Provide variables from etcd to hako using etcenv