Fix some cookstyle warnings

[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 e632bcfd49dbd93f8dafd1caf4c09276b90aa01d..7de56267f3628b62f639ce6afdc1d6b267accb0a 100644 (file)
--- a/cookbooks/chef/libraries/edit_file.rb
+++ b/cookbooks/chef/libraries/edit_file.rb
@@ -1,22 +1,15 @@
-class Chef
-  class Util
-    class EditedFile
-      def initialize(file, block)
-        @file = file
-        @block = block
+module OpenStreetMap
+  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
-
-      def to_s
-        ::File.new(@file).collect do |line|
-          line = @block.call(line)
-        end.join("")
-      end
-    end
-  end
-
-  class Recipe
-    def edit_file(file, &block)
-      Chef::Util::EditedFile.new(file, block).to_s
     end
   end
 end
+
+Chef::DSL::Recipe.include(OpenStreetMap::Mixin::EditFile)