etcdist 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a580dea440da658265dfe8df8b0ef76279b396a
-  data.tar.gz: d1849a2743d6ef4619ea50b9c53ee6e5b0b797a9
+  metadata.gz: d0526fae37a18d1b0e85b8672c0962adaa15b7f1
+  data.tar.gz: a96e751c7045642a80c072e43ae19a0eacd007cf
 SHA512:
-  metadata.gz: 9c3ccd1069755f49c8a3bd6939ecaecb86792d45c560366f33df6156a7f615359800e373721942f3019263c345046a5a20b93d5b6bb56b29d6a4ff79954d6160
-  data.tar.gz: 11c1bd5a0682da315cfa09077cad21c3f1d0eafd81f4b768798c865f44893aecdb6b1df5597ccf76c553ed8bd9231e9806c21dd89bcb19769e994053f1579a6a
+  metadata.gz: 4d44b969b49f88baf6207019f851cb912fda3bbd8cf2d6eb06f73356cfeca1cc889a9b3bb5888cc65f865c25a0262b165a97ffffd956272ad095a1f8df06068c
+  data.tar.gz: 834e05e047afc19f0ef355edd3cc4b9e283fd070f45248cc8d21f34801fcf1c354d7439101910c477a241c3b61ece6c2445fe51f6186d573bf7d021d7a353dcb

data/lib/etcdist/reader.rb

@@ -1,4 +1,5 @@
 require 'etcdist/log'
+require 'pathname'
 
 module Etcdist
   # Reads data from file system into directories, keys and values.
@@ -23,6 +24,17 @@ module Etcdist
       end
     end
 
+    def all_dirs
+      @dir = Pathname.new File.expand_path(@dir)
+      root = Pathname.new '/'
+
+      descendant_dirs = Dir[File.join(@dir, '**', '*')].select { |p| File.directory? p }
+      relative_descendant_dirs = descendant_dirs.map { |d| Pathname.new(d).relative_path_from @dir }
+      dirs = relative_descendant_dirs.map { |d| root.join(d).to_s }
+
+      dirs.push '/'
+    end
+
     private
 
     def read_non_blank_lines(f)

data/lib/etcdist/version.rb

@@ -1,3 +1,3 @@
 module Etcdist
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/etcdist/writer.rb

@@ -20,9 +20,21 @@ module Etcdist
         count[:put] += put(dir, entries)
         count[:del] += delete(dir, entries) if @dangerous
       end
+
       Log.info("#{count[:put]} entries added/modified. #{count[:del]} entries deleted.")
     end
 
+    # Deletes any directories that are present in etcd but not on the file system
+    def delete_absent_directories(all_dirs)
+      dirs_to_delete = all_etcd_dirs('/').sort.reverse - all_dirs
+      dirs_to_delete.each do |dir|
+        Log.debug("deleting directory #{dir}") if @dangerous
+        @etcd.delete(dir, recursive: true) if @dangerous && !@dry_run
+      end
+
+      Log.info("#{dirs_to_delete.length} directories deleted.") if @dangerous
+    end
+
     private
 
     def put(dir, entries)
@@ -43,5 +55,21 @@ module Etcdist
     def entries_in(dir)
       @etcd.exists?(dir) ? Hash[@etcd.get(dir).children.map { |n| [n.key.sub(/.*\//, ''), n.value] }] : {}
     end
+
+    def all_etcd_dirs(dir)
+      root_node = @etcd.get(dir, recursive: true).node
+
+      nodes_to_process_stack = [root_node]
+      result = []
+
+      until nodes_to_process_stack.empty?
+        node = nodes_to_process_stack.pop
+        result.push(node.key)
+        child_dir_nodes = node.children.select(dir)
+        child_dir_nodes.each { |child_dir_node| nodes_to_process_stack.push(child_dir_node) }
+      end
+
+      result
+    end
   end
 end

data/lib/etcdist.rb

@@ -20,6 +20,7 @@ module Etcdist
 
     Log.info("using etcd host at: #{etcd.host}:#{etcd.port}")
     writer.write(reader.read)
+    writer.delete_absent_directories(reader.all_dirs)
     Log.info('finished successfully.')
   end
 end

data/spec/etcdist/reader_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Etcdist::Reader do
-
   let(:reader) do
     dir = File.join(File.dirname(__FILE__), '../data')
     Etcdist::Reader.new(dir)

data/spec/etcdist/writer_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Etcdist::Writer do
-
   let(:etcd) do
     double('etcd').as_null_object
   end
@@ -11,7 +10,6 @@ describe Etcdist::Writer do
   end
 
   describe 'PUTs' do
-
     it 'should put entries in etcd' do
       pretend_etcd_contains(nothing)
       expect(etcd).to receive(:set).with('/foo/bar/fish', value: 'plankton')
@@ -45,7 +43,6 @@ describe Etcdist::Writer do
   end
 
   describe 'DELETEs' do
-
     it 'should not delete extra entries by default' do
       pretend_etcd_contains('/foo' => { 'fish' => 'plankton' })
       expect(etcd).not_to receive(:delete)
@@ -53,7 +50,6 @@ describe Etcdist::Writer do
     end
 
     context 'dangerous mode' do
-
       let(:writer) do
         Etcdist::Writer.new(etcd, dangerous: true)
       end
@@ -63,7 +59,6 @@ describe Etcdist::Writer do
         expect(etcd).to receive(:delete).with('/foo/fish')
         writer.write('/foo' => { 'cows' => 'grass' })
       end
-
     end
 
     context 'dry run mode' do
@@ -76,9 +71,6 @@ describe Etcdist::Writer do
         expect(etcd).not_to receive(:delete)
         writer.write('/foo' => { 'cows' => 'grass' })
       end
-
     end
-
   end
-
 end

data/spec/etcdist_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Etcdist do
-
   skip 'acceptance test - expects etcd running on localhost:4001' do
-
     let(:etcd_opts) do
       { host: 'localhost', port: 4001 }
     end
@@ -20,7 +18,5 @@ describe Etcdist do
       Etcdist.execute(dir, etcd_opts)
       expect(etcd.get('/etcdist/foo/fish').value).to eq('plankton')
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcdist
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Springer, Part of Springer Science+Business Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd