initial directory support

1 files changed, 45 insertions, 19 deletions

diff --git a/lib/dslkeywords/file.rb b/lib/dslkeywords/file.rb
index 186fa10..bcbe350 100644
--- a/lib/dslkeywords/file.rb
+++ b/lib/dslkeywords/file.rb
@@ -21,8 +21,8 @@ module RCM
     end
   end
 
-  # Base for File and Symlink
-  class BaseFile < Resource
+  # Base for BaseFile and Directory
+  class BasicFile < Resource
     include Chained
 
     def initialize(file_path)
@@ -31,11 +31,7 @@ module RCM
       @is = :present
     end
 
-    class UnsupportedOperation < StandardError; end
-
     def is(what) = @is = validate(__method__, what.to_sym, :present, :absent)
-    def manage(what) = @manage_directory = validate(__method__, what.to_sym, :directory) == :directory
-    def from(what) = @from = validate(__method__, what.to_sym, :sourcefile, :template)
     def path(file_path = nil) = file_path.nil? ? @file_path : @file_path = file_path
 
     def content(text = nil)
@@ -65,17 +61,7 @@ module RCM
       end
     end
 
-    def evaluate_absent!
-      if ::File.exist?(@file_path)
-        dry? "Deleting #{@file_path}" do
-          backup!(@file_path)
-          ::File.delete(@file_path) if ::File.file?(@file_path)
-        end
-      end
-      cleanup_directory! if @manage_directory
-    end
-
-    def cleanup_directory!
+    def cleanup_parent_directory!
       parent_dir = ::File.dirname(@file_path)
       while Dir.empty?(parent_dir)
         dry? "Deleting empty parent directory #{parent_dir}" do
@@ -86,6 +72,26 @@ module RCM
     end
   end
 
+  # Base for File and Symlink
+  class BaseFile < BasicFile
+    class UnsupportedOperation < StandardError; end
+
+    def manage(what) = @manage_directory = validate(__method__, what.to_sym, :directory) == :directory
+    def from(what) = @from = validate(__method__, what.to_sym, :sourcefile, :template)
+
+    protected
+
+    def evaluate_absent!
+      if ::File.exist?(@file_path)
+        dry? "Deleting #{@file_path}" do
+          backup!(@file_path)
+          ::File.delete(@file_path) if ::File.file?(@file_path)
+        end
+      end
+      cleanup_parent_directory! if @manage_directory
+    end
+  end
+
   # Managing files
   class File < BaseFile
     include FileBackup
@@ -163,9 +169,18 @@ module RCM
     end
   end
 
+  class Directory < BaseFile
+    def evaluate!
+      return unless super
+
+      raise 'Not yet implemented'
+    end
+  end
+
   # Add file keyword to the DSL
   class DSL
-    def file(file_path, &block)
+    def file(file_path = nil, &block)
+      return :file if file_path.nil?
       return unless @conds_met
 
       f = File.new(file_path)
@@ -174,7 +189,8 @@ module RCM
       f
     end
 
-    def symlink(file_path, &block)
+    def symlink(file_path = nil, &block)
+      return :symlink if file_path.nil?
       return unless @conds_met
 
       s = Symlink.new(file_path)
@@ -182,5 +198,15 @@ module RCM
       self << s
       s
     end
+
+    def directory(file_path = nil, &block)
+      return :directory if file_path.nil?
+      return unless @conds_met
+
+      d = Directory.new(file_path)
+      d.content(d.instance_eval(&block))
+      self << d
+      d
+    end
   end
 end