From 088b4f047f3d4b8e075e10277bfe5f94cb0b9af1 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 15 Nov 2012 01:54:31 -0800
Subject: auto remove files/nodes/x when nodes/x.json doesn't exist anymore.

---
 lib/leap_cli/config/manager.rb | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'lib/leap_cli/config/manager.rb')

diff --git a/lib/leap_cli/config/manager.rb b/lib/leap_cli/config/manager.rb
index e90b589..3d09e09 100644
--- a/lib/leap_cli/config/manager.rb
+++ b/lib/leap_cli/config/manager.rb
@@ -53,18 +53,24 @@ module LeapCli
       #
       # save compiled hiera .yaml files
       #
-      def export_nodes(destination_directory = nil)
-        dir = destination_directory || Path.named_path(:hiera_dir, @provider_dir)
-        existing_files = Dir.glob(dir + '/*.yaml')
+      def export_nodes
+        existing_hiera = Dir.glob(Path.named_path([:hiera, '*'], @provider_dir))
+        existing_files = Dir.glob(Path.named_path([:node_files_dir, '*'], @provider_dir))
+        updated_hiera = []
         updated_files = []
-        @nodes.each do |name, node|
-          filepath = "#{dir}/#{name}.yaml"
+        self.each_node do |node|
+          filepath = Path.named_path([:node_files_dir, node.name], @provider_dir)
           updated_files << filepath
-          Util::write_file!(filepath, node.dump)
+          hierapath = Path.named_path([:hiera, node.name], @provider_dir)
+          updated_hiera << hierapath
+          Util::write_file!(hierapath, node.dump)
         end
-        (existing_files - updated_files).each do |filepath|
+        (existing_hiera - updated_hiera).each do |filepath|
           Util::remove_file!(filepath)
         end
+        (existing_files - updated_files).each do |filepath|
+          Util::remove_directory!(filepath)
+        end
       end
 
       def export_secrets(destination_file = nil)
-- 
cgit v1.2.3