Merge remote-tracking branch 'github/pull/440'

[chef.git] / cookbooks / chef / libraries / edit_file.rb

diff --git a/cookbooks/chef/libraries/edit_file.rb b/cookbooks/chef/libraries/edit_file.rb
index 400e1967e0c96718f84733728d6c8d621f25963a..bfbec455cebc82d00acc90725b70b627c9e3f36a 100644 (file)
--- a/cookbooks/chef/libraries/edit_file.rb
+++ b/cookbooks/chef/libraries/edit_file.rb
@@ -1,22 +1,17 @@
 class Chef
-  class Util
-    class EditedFile
-      def initialize(file, block)
-        @file = file
-        @block = block
-      end
-
-      def to_s
-        ::File.new(@file).collect do |line|
-          line = @block.call(line)
-        end.join("")
+  module Mixin
+    module EditFile
+      def edit_file(file, &_block)
+        Chef::DelayedEvaluator.new do
+          ::File.new(file).collect do |line|
+            yield line
+          end.join("")
+        end
       end
     end
   end
 
   class Recipe
-    def edit_file(file, &block)
-      Chef::Util::EditedFile.new(file, block)
-    end
+    include Chef::Mixin::EditFile
   end
 end