From: Tom Hughes <tom@compton.nu>
Date: Fri, 20 Feb 2015 19:23:38 +0000 (+0000)
Subject: Fix some rubocop style issues
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/07757c7769846d32a0bd74f343810bc4147869bc

Fix some rubocop style issues
---

diff --git a/.rubocop.yml b/.rubocop.yml
index 54dd4f715..1f5c531bf 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,6 +4,13 @@ Style/AlignParameters:
   Exclude:
     - '**/metadata.rb'
 
+Style/FileName:
+  Exclude:
+    - 'cookbooks/trac/files/default/trac-authenticate'
+    - 'cookbooks/planet/files/default/replication-bin/replicate-changesets'
+    - 'hooks/*'
+    - 'roles/*.rb'
+
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a6fa2af25..d63b1da17 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -35,22 +35,11 @@ Metrics/PerceivedComplexity:
 Style/Documentation:
   Enabled: false
 
-# Offense count: 32
-# Configuration parameters: Exclude.
-Style/FileName:
-  Enabled: false
-
 # Offense count: 15
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/MultilineOperationIndentation:
-  Enabled: false
-
 # Offense count: 29
 # Cop supports --auto-correct.
 Style/NumericLiterals:
diff --git a/cookbooks/planet/recipes/dump-notes.rb b/cookbooks/planet/recipes/notes.rb
similarity index 98%
rename from cookbooks/planet/recipes/dump-notes.rb
rename to cookbooks/planet/recipes/notes.rb
index ac2e07301..728261cc9 100644
--- a/cookbooks/planet/recipes/dump-notes.rb
+++ b/cookbooks/planet/recipes/notes.rb
@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: planet
-# Recipe:: dump
+# Recipe:: notes
 #
 # Copyright 2013, OpenStreetMap Foundation
 #
diff --git a/roles/planetdump.rb b/roles/planetdump.rb
index 029e3a266..715a17373 100644
--- a/roles/planetdump.rb
+++ b/roles/planetdump.rb
@@ -3,5 +3,5 @@ description "Role applied to all planetdump servers"
 
 run_list(
   "recipe[planet::dump]",
-  "recipe[planet::dump-notes]"
+  "recipe[planet::notes]"
 )