sous_chef 0.0.2 → 0.0.3

data/.gitignore

@@ -23,3 +23,4 @@ vendor/gems
 .yardoc
 
 ## PROJECT::SPECIFIC
+sous_chef.gemspec

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 0
 :build: 
-:patch: 2
+:patch: 3
 :major: 0

data/lib/sous_chef/resource/directory.rb

@@ -5,6 +5,7 @@ module SousChef
 
       def initialize(*args)
         action :create
+        force false
         super
       end
 
@@ -20,6 +21,14 @@ module SousChef
         set_or_return(:action, action && validate_action(action))
       end
 
+      def force(forced)
+        @forced = forced
+      end
+
+      def forced?
+        @forced
+      end
+
       def to_script
         @script ||= begin
           setup
@@ -34,7 +43,8 @@ module SousChef
         end
 
         def delete
-          command %{rmdir #{escape_path(path)}}
+          cmd = forced?? 'rm -rf' : 'rmdir'
+          command %{#{cmd} #{escape_path(path)}}
         end
 
         def validate_action(action)

data/lib/sous_chef/resource/file.rb

@@ -2,22 +2,22 @@ module SousChef
   module Resource
     class File < Directory
       def content(content=nil)
-        set_or_return(:content, content)
+        set_or_return(:content, content && content.to_s)
       end
 
       protected
         def escaped_content
-          content#.gsub('$', '\$')
+          content
         end
 
         def create
-          not_if file_exist_command
+          not_if file_exist_command unless forced?
           command create_file_command
         end
 
         def delete
-          only_if file_exist_command
-          command "rm #{escape_path(path)}"
+          only_if file_exist_command unless forced?
+          command "rm #{'-f ' if forced?}#{escape_path(path)}"
         end
 
         def file_exist_command

data/spec/resource/directory_spec.rb

@@ -40,7 +40,7 @@ describe SousChef::Resource::Directory do
     }.should raise_error(ArgumentError)
   end
 
-  it "sets the mode of the file" do
+  it "sets the mode of the directory" do
     @directory = resource("bin") do
       mode 0600
     end
@@ -50,4 +50,12 @@ mkdir -p bin
 chmod 0600 bin
     }.strip
   end
+
+  it "force deletes the directory" do
+    directory = resource("bin") do
+      action :delete
+      force true
+    end
+    directory.to_script.should == %{rm -rf bin}
+  end
 end

data/spec/resource/file_spec.rb

@@ -45,6 +45,18 @@ fi
     }.strip
   end
 
+  it "overwrites files with force true" do
+    @file = resource("note.txt") do
+      content %{new content}
+      force true
+    end
+    @file.to_script.should == %{
+cat <<'SousChefHeredoc' > note.txt
+new content
+SousChefHeredoc
+    }.strip
+  end
+
   it "handles single-quotes in the content" do
     @file = resource("note.txt") do
       content %{this is a 'note'}
@@ -155,4 +167,15 @@ if test -e note.txt; then
 fi
     }.strip
   end
+
+  it "force deletes a file" do
+    @file = resource("note.txt") do
+      action :delete
+      force true
+    end
+
+    @file.to_script.should == %q{
+rm -f note.txt
+    }.strip
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sous_chef
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Martin Emde
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -08:00
+date: 2010-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: []