From 36d2cb3d66f595cd92a5f75036431d2ccab2c8e9 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 23 May 2018 11:00:27 +0100
Subject: [PATCH 1/1] Fix new foodcritic warnings

---
 cookbooks/blog/recipes/default.rb          | 12 ++++----
 cookbooks/stateofthemap/recipes/default.rb | 32 +++++++++++-----------
 cookbooks/switch2osm/recipes/default.rb    | 16 +++++------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 2d234cb48..8c65a36af 100644
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -41,34 +41,34 @@ wordpress_site "blog.openstreetmap.org" do
 end
 
 wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do
-  name "osmblog-wp-theme"
+  theme "osmblog-wp-theme"
   site "blog.openstreetmap.org"
   repository "git://github.com/harry-wood/osmblog-wp-theme.git"
 end
 
 wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do
-  name "google-analytics-for-wordpress"
+  plugin "google-analytics-for-wordpress"
   site "blog.openstreetmap.org"
 end
 
 wordpress_plugin "blog.openstreetmap.org-google-sitemap-generator" do
-  name "google-sitemap-generator"
+  plugin "google-sitemap-generator"
   site "blog.openstreetmap.org"
 end
 
 wordpress_plugin "blog.openstreetmap.org-shareadraft" do
-  name "shareadraft"
+  plugin "shareadraft"
   site "blog.openstreetmap.org"
 end
 
 wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
-  name "sitepress-multilingual-cms"
+  plugin "sitepress-multilingual-cms"
   site "blog.openstreetmap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
-  name "wordpress-importer"
+  plugin "wordpress-importer"
   site "blog.openstreetmap.org"
 end
 
diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 290ddf2c7..e697ae88c 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -57,14 +57,14 @@ wordpress_site "2007.stateofthemap.org" do
 end
 
 wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
-  name "refreshwp-11"
+  theme "refreshwp-11"
   site "2007.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2007"
 end
 
 wordpress_plugin "2007.stateofthemap.org-geopress" do
-  name "geopress"
+  plugin "geopress"
   site "2007.stateofthemap.org"
 end
 
@@ -84,14 +84,14 @@ wordpress_site "2008.stateofthemap.org" do
 end
 
 wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
-  name "refreshwp-11"
+  theme "refreshwp-11"
   site "2008.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2008"
 end
 
 wordpress_plugin "2008.stateofthemap.org-geopress" do
-  name "geopress"
+  plugin "geopress"
   site "2008.stateofthemap.org"
 end
 
@@ -121,14 +121,14 @@ wordpress_site "2009.stateofthemap.org" do
 end
 
 wordpress_theme "2009.stateofthemap.org-aerodrome" do
-  name "aerodrome"
+  theme "aerodrome"
   site "2009.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2009"
 end
 
 wordpress_plugin "2009.stateofthemap.org-wp-sticky" do
-  name "wp-sticky"
+  plugin "wp-sticky"
   site "2009.stateofthemap.org"
 end
 
@@ -156,20 +156,20 @@ wordpress_site "2010.stateofthemap.org" do
 end
 
 wordpress_theme "2010.stateofthemap.org-aerodrome" do
-  name "aerodrome"
+  theme "aerodrome"
   site "2010.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2010"
 end
 
 wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do
-  name "sitepress-multilingual-cms"
+  plugin "sitepress-multilingual-cms"
   site "2010.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "2010.stateofthemap.org-wp-sticky" do
-  name "wp-sticky"
+  plugin "wp-sticky"
   site "2010.stateofthemap.org"
 end
 
@@ -197,20 +197,20 @@ wordpress_site "2011.stateofthemap.org" do
 end
 
 wordpress_theme "2011.stateofthemap.org-aerodrome" do
-  name "aerodrome"
+  theme "aerodrome"
   site "2011.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2011"
 end
 
 wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do
-  name "sitepress-multilingual-cms"
+  plugin "sitepress-multilingual-cms"
   site "2011.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "2011.stateofthemap.org-wp-sticky" do
-  name "wp-sticky"
+  plugin "wp-sticky"
   site "2011.stateofthemap.org"
 end
 
@@ -238,25 +238,25 @@ wordpress_site "2012.stateofthemap.org" do
 end
 
 wordpress_theme "2012.stateofthemap.org-aerodrome" do
-  name "aerodrome"
+  theme "aerodrome"
   site "2012.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2012"
 end
 
 wordpress_plugin "2012.stateofthemap.org-leaflet-maps-marker" do
-  name "leaflet-maps-marker"
+  plugin "leaflet-maps-marker"
   site "2012.stateofthemap.org"
 end
 
 wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do
-  name "sitepress-multilingual-cms"
+  plugin "sitepress-multilingual-cms"
   site "2012.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "2012.stateofthemap.org-wp-sticky" do
-  name "wp-sticky"
+  plugin "wp-sticky"
   site "2012.stateofthemap.org"
 end
 
diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 48ef029f6..5e2234f73 100644
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -30,50 +30,50 @@ wordpress_site "switch2osm.org" do
 end
 
 wordpress_theme "switch2osm.org-picolight" do
-  name "picolight"
+  theme "picolight"
   site "switch2osm.org"
   repository "git://github.com/Firefishy/picolight-s2o.git"
   revision "master"
 end
 
 wordpress_plugin "switch2osm.org-sitepress-multilingual-cms" do
-  name "sitepress-multilingual-cms"
+  plugin "sitepress-multilingual-cms"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-cms-nav" do
-  name "wpml-cms-nav"
+  plugin "wpml-cms-nav"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-cms-nav.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-sticky-links" do
-  name "wpml-sticky-links"
+  plugin "wpml-sticky-links"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-sticky-links.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-string-translation" do
-  name "wpml-string-translation"
+  plugin "wpml-string-translation"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-string-translation.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-translation-analytics" do
-  name "wpml-translation-analytics"
+  plugin "wpml-translation-analytics"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-translation-analytics.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-translation-management" do
-  name "wpml-translation-management"
+  plugin "wpml-translation-management"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-translation-management.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-xliff" do
-  name "wpml-xliff"
+  plugin "wpml-xliff"
   site "switch2osm.org"
   repository "git://chef.openstreetmap.org/wpml-xliff.git"
 end
-- 
2.43.2