etcenv 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c67fca7ce92b7e16d5365bdc969aa6e974fc6cc9
-  data.tar.gz: 99ad3db08fcc4e806a677cfe085bb475e1dceab7
+  metadata.gz: e08b420a67f38847ae025f781cbedb6484a0af74
+  data.tar.gz: 84cc434c7876ceb2f31e0158dde5665d4d005d73
 SHA512:
-  metadata.gz: 3c1e239945d4bbbd0735f3f8ec451eab0da1ca607cdbfd9390543b10aec9718364ec51081fa521343d9d05607b55357fc73b8a2f2ff45a22f83d568edb26ea22
-  data.tar.gz: d5b380c6fa77885aa7d0d1d522b185184fa959a9f6864018b01696061451aeea356b47f84a09e9adf9ae93f1e0f2b848928016c8e2415cb6b322a5d67fef7479
+  metadata.gz: 033c93840d0379655f653c87a5fcd551b171489c6bd24d859dda7be495b3c1ce45c831f53e98916acd31fdfea25d87ae8ed84a10975a28836c9b00e04e373c65
+  data.tar.gz: fa114bfa98c149a549cd0c68b1424b758ee57fb30a7d8d2a25a1919639ae49de6490925fc5f193978dd4acff3efce79b3fa84bc405ab908c267cdb50760fb198

data/README.md

@@ -67,12 +67,12 @@ In docker mode, etcenv evaluates `${...}` expansion like dotenv do.
 
 ### Include other directory's variables
 
-Set directory path to `_include`. Directories can be specified multiple, separated by comma.
+Set directory path to `.include`. Directories can be specified multiple, separated by comma.
 
 ```
 etcdctl mkdir /common
 etcdctl set /common/COMMON_SECRET xxx
-etcdctl set /my-app/_include /common
+etcdctl set /my-app/.include /common
 ```
 
 Also, you can omit path of parent directory:
@@ -82,11 +82,11 @@ etcdctl mkdir /envs/common
 etcdctl set /envs/common/COMMON_SECRET xxx
 
 etcdctl mkdir /envs/my-app
-etcdctl set /envs/my-app/_include common
+etcdctl set /envs/my-app/.include common
 ```
 
-- `_include` will be applied recursively (up to 10 times by default). If `_include` is looping, it'll be an error.
-- For multiple `_include`, value for same key may be overwritten.
+- `.include` will be applied recursively (up to 10 times by default). If `.include` is looping, it'll be an error.
+- For multiple `.include`, value for same key may be overwritten.
   - If `a` includes `b`,`c` and `b` includes `d`, result for `a` will be: `d`, `b`, `c`, then `a`.
 
 ## Development

data/lib/etcenv/cli.rb

@@ -104,7 +104,7 @@ module Etcenv
         return 1
       end
       env = argv.inject(nil) do |env, key|
-        new_env = Environment.new(etcd, key).env
+        new_env = Environment.new(etcd, key).expanded_env
         env ? env.merge(new_env) : new_env
       end
       dump_env(env)
@@ -129,7 +129,6 @@ module Etcenv
       envs = argv.map { |key| Environment.new(etcd, key) }
 
       watchers = envs.map { |env| Watcher.new(env, verbose: true) }
-      Thread.abort_on_exception = true
 
       dumper_ch = Queue.new
       dumper = Thread.new do
@@ -142,6 +141,7 @@ module Etcenv
           dumper_ch.pop
         end
       end
+      dumper.abort_on_exception = true
 
       watchers.map do |watcher|
         Thread.new do

data/lib/etcenv/dockerenv_file.rb

@@ -8,12 +8,8 @@ module Etcenv
 
     attr_reader :env
 
-    def expanded_env
-      VariableExpander.expand @env
-    end
-
     def lines
-      expanded_env.map { |k,v| "#{k}=#{v}" }
+      env.map { |k,v| "#{k}=#{v}" }
     end
 
     def to_s

data/lib/etcenv/dotenv_file.rb

@@ -8,12 +8,8 @@ module Etcenv
 
     attr_reader :env
 
-    def expanded_env
-      VariableExpander.expand @env
-    end
-
     def lines
-      expanded_env.map { |k, v| make_dotenv_line(k, v) }
+      env.map { |k, v| make_dotenv_line(k, v) }
     end
 
     def to_s

data/lib/etcenv/environment.rb

@@ -1,10 +1,12 @@
+require 'etcenv/variable_expander'
+
 module Etcenv
   class Environment
     class NotDirectory < StandardError; end
     class DepthLimitError < StandardError; end
     class LoopError < StandardError; end
 
-    INCLUDE_KEY = '_include'
+    INCLUDE_KEY = '.include'
     MAX_DEPTH_DEFAULT = 10
 
     def initialize(etcd, root_key, max_depth: MAX_DEPTH_DEFAULT)
@@ -18,6 +20,10 @@ module Etcenv
     attr_reader :root_key, :env, :etcd
     attr_accessor :max_depth
 
+    def expanded_env
+      VariableExpander.expand(env)
+    end
+
     def modified_indices
       @modified_indices ||= {}
     end
@@ -29,7 +35,7 @@ module Etcenv
         includes.each do |name|
           env.merge! fetch(name)
         end
-        env.delete '_include'
+        env.delete '.include'
         @env = env
       end
       self
@@ -50,7 +56,7 @@ module Etcenv
     end
 
     def default_prefix
-      root_key.sub(/^.*\//, '')
+      root_key.sub(/^(.*)\/.+?$/, '\1')
     end
 
     def resolve_key(key)
@@ -80,11 +86,12 @@ module Etcenv
 
       node.children.each do |child|
         name = child.key.sub(/^.*\//, '')
+
+        index = [index, child.modified_index].max
         if child.dir
           next
         else
           dir[name] = child.value
-          index = [index, child.modified_index].max
         end
       end
 

data/lib/etcenv/version.rb

@@ -1,3 +1,3 @@
 module Etcenv
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/etcenv/watcher.rb

@@ -2,9 +2,13 @@ require 'thread'
 
 module Etcenv
   class Watcher
+    WATCH_TIMEOUT = 120
+
     def initialize(env, verbose: false)
       @env = env
       @verbose = verbose
+      @indices = {}
+      @lock = Mutex.new
     end
 
     attr_reader :env, :verbose
@@ -16,11 +20,8 @@ module Etcenv
     def watch
       ch = Queue.new
       threads = env.modified_indices.map do |key, index|
-        Thread.new do
-          $stderr.puts "[watcher] waiting for change on #{key} (index: #{index.succ})" if verbose
-          etcd.watch(key, recursive: true, index: index.succ)
-          $stderr.puts "[watcher] dir #{key} has updated" if verbose
-          ch << key
+        Thread.new(ch, key, index, &method(:watch_thread)).tap do |th|
+          th.abort_on_exception = true
         end
       end
       report = ch.pop
@@ -30,11 +31,32 @@ module Etcenv
 
     def auto_reload_loop
       loop do
-        watch
-        $stderr.puts "[watcher] reloading env #{env.root_key}" if verbose
-        env.load
-        yield env if block_given?
+        begin
+          watch
+          $stderr.puts "[watcher] reloading env #{env.root_key}" if verbose
+          env.load
+          yield env if block_given?
+        rescue => e
+          $stderr.puts "[watcher][error] Failed to reload env #{env.root_key}: #{e.inspect}"
+          $stderr.puts "\t#{e.backtrace.join("\n\t")}"
+        end
+      end
+    end
+
+    private
+
+    def watch_thread(ch, key, index)
+      $stderr.puts "[watcher] waiting for change on #{key} (index: #{index.succ})" if verbose
+      response = etcd.watch(key, recursive: true, index: [@indices[key] || 0, index].max.succ, timeout: WATCH_TIMEOUT)
+      @lock.synchronize do
+        # Record modified_index in watcher itself; Because the latest index may be hidden in normal response
+        # e.g. unlisted keys, removed keys
+        @indices[key] = response.node.modified_index
       end
+      $stderr.puts "[watcher] dir #{key} has updated" if verbose
+      ch << key
+    rescue Net::ReadTimeout
+      retry
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcenv
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Dump etcd keys into dotenv file or docker env file