Fix some rubocop style issues

diff --git a/.rubocop.yml b/.rubocop.yml
index 54dd4f715d12ea80b249066b3d2f0b1a39938034..1f5c531bf4865c75bc4c21411ec25c1201afc16c 100644 (file)
--- 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 a6fa2af254dc7c39e2232b855e65f4274fa883b5..d63b1da17ba72aeccf82ad734dbbd2d26717bdad 100644 (file)
--- 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 ac2e07301552bc45ee42df9b3d1fcd33e61d849d..728261cc9c794818258411efec54d6526915c4d7 100644 (file)
--- 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 029e3a266d443a07092087abaea5365bd96845cc..715a17373203edce639aad1dbf32743679e28d38 100644 (file)
--- 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]"
 )