Merge remote-tracking branch 'openstreetmap/pull/1285'

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 191e82b39b4389e0a115941fdc52a6a2de7ec639..3a3008e9eaefa24f7ee2ccacafde158cddf33bb6 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-08-18 20:27:49 +0100 using RuboCop version 0.33.0.
+# on 2016-09-07 11:03:27 +0100 using RuboCop version 0.41.2.
 # 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
@@ -14,11 +14,11 @@ Lint/AmbiguousOperator:
     - 'test/lib/bounding_box_test.rb'
     - 'test/lib/country_test.rb'
 
-# Offense count: 115
+# Offense count: 117
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
-# Offense count: 29
+# Offense count: 30
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
@@ -36,11 +36,6 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
-# Offense count: 3
-Lint/FormatParameterMismatch:
-  Exclude:
-    - 'app/controllers/swf_controller.rb'
-
 # Offense count: 5
 Lint/HandleExceptions:
   Exclude:
@@ -48,14 +43,12 @@ Lint/HandleExceptions:
     - 'app/controllers/user_controller.rb'
     - 'config/initializers/session.rb'
 
-# Offense count: 8
-Lint/ParenthesesAsGroupedExpression:
+# Offense count: 2
+Lint/ShadowingOuterLocalVariable:
   Exclude:
-    - 'test/controllers/amf_controller_test.rb'
-    - 'test/lib/bounding_box_test.rb'
-    - 'test/models/user_preference_test.rb'
+    - 'app/views/changeset/list.atom.builder'
 
-# Offense count: 671
+# Offense count: 626
 Metrics/AbcSize:
   Max: 277
 
@@ -66,18 +59,19 @@ Metrics/BlockNesting:
 # Offense count: 62
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1654
+  Max: 1650
 
-# Offense count: 67
+# Offense count: 68
 Metrics/CyclomaticComplexity:
   Max: 20
 
-# Offense count: 2535
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 2561
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
 Metrics/LineLength:
   Max: 962
 
-# Offense count: 628
+# Offense count: 604
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
@@ -85,26 +79,50 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 131
+  Max: 139
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 69
+# Offense count: 70
 Metrics/PerceivedComplexity:
   Max: 23
 
 # Offense count: 2
 # Configuration parameters: Include.
+# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
+Rails/Exit:
+  Exclude:
+    - 'lib/**/*.rake'
+    - 'lib/daemons/gpx_import.rb'
+
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
   Exclude:
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 
-# Offense count: 66
+# Offense count: 17
+Rails/OutputSafety:
+  Exclude:
+    - 'app/controllers/user_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/changeset_helper.rb'
+    - 'app/helpers/geocoder_helper.rb'
+    - 'app/helpers/note_helper.rb'
+    - 'app/helpers/open_graph_helper.rb'
+    - 'app/helpers/user_blocks_helper.rb'
+    - 'app/helpers/user_roles_helper.rb'
+    - 'lib/rich_text.rb'
+    - 'test/helpers/application_helper_test.rb'
+
+# Offense count: 65
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 
@@ -122,28 +140,10 @@ Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 
-# Offense count: 310
+# Offense count: 218
 Style/Documentation:
   Enabled: false
 
-# Offense count: 38
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  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:
@@ -164,12 +164,11 @@ Style/LineEndConcatenation:
 Style/NumericLiterals:
   MinDigits: 11
 
-# Offense count: 42
+# Offense count: 38
 # Cop supports --auto-correct.
 Style/PerlBackrefs:
   Exclude:
     - 'app/controllers/amf_controller.rb'
-    - 'app/controllers/application_controller.rb'
     - 'app/helpers/browse_helper.rb'
     - 'config/initializers/paperclip.rb'
     - 'lib/id.rb'
@@ -177,9 +176,13 @@ Style/PerlBackrefs:
     - 'test/lib/i18n_test.rb'
 
 # Offense count: 8
-# Configuration parameters: NamePrefix, NamePrefixBlacklist.
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
 Style/PredicateName:
   Exclude:
+    - 'spec/**/*'
     - 'app/models/changeset.rb'
     - 'app/models/old_node.rb'
     - 'app/models/old_relation.rb'
@@ -188,11 +191,14 @@ Style/PredicateName:
     - 'lib/classic_pagination/pagination.rb'
 
 # Offense count: 97
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Enabled: false
 
 # Offense count: 2
+# Cop supports --auto-correct.
 Style/RescueModifier:
   Exclude:
     - 'app/helpers/browse_helper.rb'
@@ -200,5 +206,11 @@ Style/RescueModifier:
 # Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: single_quotes, double_quotes
 Style/StringLiteralsInInterpolation:
-  Enabled: false
+  Exclude:
+    - 'app/controllers/amf_controller.rb'
+    - 'app/models/node.rb'
+    - 'app/models/way.rb'
+    - 'lib/migrate.rb'
+    - 'test/controllers/changeset_controller_test.rb'