Reduce pollution of the Chef namespace

diff --git a/cookbooks/chef/libraries/edit_file.rb b/cookbooks/chef/libraries/edit_file.rb
index bfbec455cebc82d00acc90725b70b627c9e3f36a..f7c23178c3928a166886990206990b4de33ad6d6 100644 (file)
--- a/cookbooks/chef/libraries/edit_file.rb
+++ b/cookbooks/chef/libraries/edit_file.rb
@@ -1,4 +1,4 @@
-class Chef
+module OpenStreetMap
   module Mixin
     module EditFile
       def edit_file(file, &_block)
@@ -10,8 +10,6 @@ class Chef
       end
     end
   end
-
-  class Recipe
-    include Chef::Mixin::EditFile
-  end
 end
+
+Chef::Recipe.include(OpenStreetMap::Mixin::EditFile)

diff --git a/cookbooks/chef/libraries/persistent_token.rb b/cookbooks/chef/libraries/persistent_token.rb
index 8299e8550716ec89cd2c6b4e8c1ffd118dd52f39..e6f87350754514a0bb564b4eb1632d1f6dad9fff 100644 (file)
--- a/cookbooks/chef/libraries/persistent_token.rb
+++ b/cookbooks/chef/libraries/persistent_token.rb
@@ -1,6 +1,6 @@
 require "digest"
 
-class Chef
+module OpenStreetMap
   module Mixin
     module PersistentToken
       def persistent_token(*args)
@@ -13,8 +13,6 @@ class Chef
       end
     end
   end
-
-  class Recipe
-    include Chef::Mixin::PersistentToken
-  end
 end
+
+Chef::Recipe.include(OpenStreetMap::Mixin::PersistentToken)

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index e26b7250eb66d328ba47471ce3da1a71deddd6ef..8be994ee3b1ae9af81f3791698b4755f06c1c4ba 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -577,7 +577,7 @@ action :delete do
 end
 
 action_class do
-  include Chef::Mixin::PersistentToken
+  include OpenStreetMap::Mixin::PersistentToken
 
   def site_directory
     new_resource.directory || "/srv/#{new_resource.site}"

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index fbf4aeb0bdd7d4bbb114601ace58c7e336df454e..27cb3b02f9b09ca9c5dad6a13cbf99f5bda0b699 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -484,7 +484,7 @@ action :restart do
 end
 
 action_class do
-  include Chef::Mixin::EditFile
+  include OpenStreetMap::Mixin::EditFile
 
   def rails_directory
     new_resource.directory || "/srv/#{new_resource.site}"

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index c3f16ddca51ffa506e5ee37d6aeab1595857e29a..c8a3e388321e200f56289d84b5d105dfbd0a0c88 100644 (file)
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -217,8 +217,8 @@ action :delete do
 end
 
 action_class do
-  include Chef::Mixin::EditFile
-  include Chef::Mixin::PersistentToken
+  include OpenStreetMap::Mixin::EditFile
+  include OpenStreetMap::Mixin::PersistentToken
 
   def site_directory
     new_resource.directory || "/srv/#{new_resource.site}"