X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/957d75295b2c379b17e61a2a22ee28fb5f701589..8c23f36a099780daac2eb84935b9e054448550d6:/.rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e1b70a2d8..191e82b39 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,5 +1,6 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-06-08 15:55:30 +0100 using RuboCop version 0.32.0.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-08-18 20:27:49 +0100 using RuboCop version 0.33.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -7,26 +8,54 @@
 
 # Offense count: 34
 Lint/AmbiguousOperator:
-  Enabled: false
+  Exclude:
+    - 'test/controllers/amf_controller_test.rb'
+    - 'test/controllers/changeset_controller_test.rb'
+    - 'test/lib/bounding_box_test.rb'
+    - 'test/lib/country_test.rb'
 
 # Offense count: 115
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
-# Offense count: 30
+# Offense count: 29
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
-  Enabled: false
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/geocoder_controller.rb'
+    - 'app/controllers/notes_controller.rb'
+    - 'app/controllers/trace_controller.rb'
+    - 'app/controllers/user_controller.rb'
+    - 'app/controllers/user_preference_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/browse_helper.rb'
+    - 'app/models/client_application.rb'
+    - 'app/models/notifier.rb'
+    - 'lib/nominatim.rb'
+    - 'lib/osm.rb'
+    - 'script/deliver-message'
+
+# Offense count: 3
+Lint/FormatParameterMismatch:
+  Exclude:
+    - 'app/controllers/swf_controller.rb'
 
 # Offense count: 5
 Lint/HandleExceptions:
-  Enabled: false
+  Exclude:
+    - 'app/controllers/amf_controller.rb'
+    - 'app/controllers/user_controller.rb'
+    - 'config/initializers/session.rb'
 
 # Offense count: 8
 Lint/ParenthesesAsGroupedExpression:
-  Enabled: false
+  Exclude:
+    - 'test/controllers/amf_controller_test.rb'
+    - 'test/lib/bounding_box_test.rb'
+    - 'test/models/user_preference_test.rb'
 
-# Offense count: 669
+# Offense count: 671
 Metrics/AbcSize:
   Max: 277
 
@@ -37,18 +66,18 @@ Metrics/BlockNesting:
 # Offense count: 62
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1653
+  Max: 1654
 
 # Offense count: 67
 Metrics/CyclomaticComplexity:
   Max: 20
 
-# Offense count: 2537
+# Offense count: 2535
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 694
+  Max: 962
 
-# Offense count: 623
+# Offense count: 628
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
@@ -56,7 +85,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 126
+  Max: 131
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
@@ -70,34 +99,65 @@ Metrics/PerceivedComplexity:
 # Offense count: 2
 # Configuration parameters: Include.
 Rails/HasAndBelongsToMany:
-  Enabled: false
+  Exclude:
+    - 'app/models/changeset.rb'
+    - 'app/models/user.rb'
 
-# Offense count: 67
+# Offense count: 66
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Rails/TimeZone:
   Enabled: false
 
 # Offense count: 5
 Style/AccessorMethodName:
-  Enabled: false
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/helpers/title_helper.rb'
+    - 'app/models/old_way.rb'
+    - 'lib/osm.rb'
+    - 'lib/potlatch.rb'
 
 # Offense count: 1
 Style/AsciiComments:
-  Enabled: false
+  Exclude:
+    - 'test/models/message_test.rb'
 
-# Offense count: 308
+# Offense count: 310
 Style/Documentation:
   Enabled: false
 
 # Offense count: 38
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
-  Enabled: false
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/diary_entry_controller.rb'
+    - 'app/controllers/message_controller.rb'
+    - 'app/controllers/notes_controller.rb'
+    - 'app/controllers/site_controller.rb'
+    - 'app/controllers/user_blocks_controller.rb'
+    - 'app/controllers/user_controller.rb'
+    - 'app/controllers/user_roles_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/models/changeset.rb'
+    - 'app/models/user.rb'
+    - 'lib/diff_reader.rb'
+    - 'lib/object_metadata.rb'
 
 # Offense count: 60
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
-  Enabled: false
+  Exclude:
+    - 'db/migrate/008_remove_segments.rb'
+    - 'db/migrate/020_populate_node_tags_and_remove.rb'
+    - 'db/migrate/023_add_changesets.rb'
+    - 'lib/bounding_box.rb'
+    - 'lib/diff_reader.rb'
+    - 'lib/osm.rb'
+    - 'test/controllers/changeset_controller_test.rb'
+    - 'test/controllers/node_controller_test.rb'
+    - 'test/controllers/relation_controller_test.rb'
+    - 'test/controllers/way_controller_test.rb'
 
 # Offense count: 69
 # Cop supports --auto-correct.
@@ -107,12 +167,25 @@ Style/NumericLiterals:
 # Offense count: 42
 # Cop supports --auto-correct.
 Style/PerlBackrefs:
-  Enabled: false
+  Exclude:
+    - 'app/controllers/amf_controller.rb'
+    - 'app/controllers/application_controller.rb'
+    - 'app/helpers/browse_helper.rb'
+    - 'config/initializers/paperclip.rb'
+    - 'lib/id.rb'
+    - 'lib/potlatch.rb'
+    - 'test/lib/i18n_test.rb'
 
 # Offense count: 8
 # Configuration parameters: NamePrefix, NamePrefixBlacklist.
 Style/PredicateName:
-  Enabled: false
+  Exclude:
+    - 'app/models/changeset.rb'
+    - 'app/models/old_node.rb'
+    - 'app/models/old_relation.rb'
+    - 'app/models/old_way.rb'
+    - 'app/models/user.rb'
+    - 'lib/classic_pagination/pagination.rb'
 
 # Offense count: 97
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -121,16 +194,11 @@ Style/RaiseArgs:
 
 # Offense count: 2
 Style/RescueModifier:
-  Enabled: false
+  Exclude:
+    - 'app/helpers/browse_helper.rb'
 
 # Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/StringLiteralsInInterpolation:
   Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist.
-Style/TrivialAccessors:
-  Enabled: false