lib/wright/provider/file.rb in wright-0.1.2 vs lib/wright/provider/file.rb in wright-0.2.0

@@ -1,12 +1,12 @@
-require 'wright/provider'
-require 'wright/util/file_permissions'
-require 'wright/util/user'
 require 'fileutils'
 require 'digest'
 require 'tempfile'
 require 'tmpdir'
+require 'wright/provider'
+require 'wright/util/file_permissions'
+require 'wright/util/user'
 
 module Wright
   class Provider
     # File provider. Used as a provider for {Resource::File}.
     class File < Wright::Provider
@@ -41,15 +41,11 @@
 
       private
 
       def create_file
         file_permissions = permissions
-
-        if Wright.dry_run?
-          Wright.log.info "(would) create file: '#{@resource.name}'"
-        else
-          Wright.log.info "create file: '#{@resource.name}'"
+        unless_dry_run("create file: '#{@resource.name}'") do
           write_content_to_file
           file_permissions.update
         end
       end
 
@@ -66,14 +62,11 @@
         return if @resource.content.nil? && ::File.exist?(filename)
         FileUtils.mv(tempfile.path, filename)
       end
 
       def remove_file
-        if Wright.dry_run?
-          Wright.log.info "(would) remove file: '#{@resource.name}'"
-        else
-          Wright.log.info "remove file: '#{@resource.name}'"
+        unless_dry_run("remove file: '#{@resource.name}'") do
           FileUtils.rm(filename)
         end
       end
 
       def permissions
@@ -85,10 +78,10 @@
       end
 
       def content_uptodate?
         return false unless ::File.exist?(filename)
         content = @resource.content || ''
-        target_checksum = checksum(content)
+        target_checksum = checksum(content.to_s)
         current_checksum = checksum(::File.read(filename))
         current_checksum == target_checksum
       end
 
       def uptodate?