Merge remote-tracking branch 'upstream/pull/2189'

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f43d2ac8cc8d8ed5c75745649c467e46c3efd524..25a30bf40099b15ac1326ca0bcccd3568322472c 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,157 +1,194 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-02-16 19:20:52 +0000 using RuboCop version 0.29.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-09-19 14:24:02 +0100 using RuboCop version 0.58.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
 # versions of RuboCop, may require this file to be generated again.
 
 # 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
 # versions of RuboCop, may require this file to be generated again.
 

-# Offense count: 13
-Lint/AmbiguousOperator:
-  Enabled: false
-
-# Offense count: 110
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-# Offense count: 29
+# Offense count: 32

 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
 # 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/api/traces_controller.rb'
+    - 'app/controllers/traces_controller.rb'
+    - 'app/controllers/users_controller.rb'
+    - 'app/controllers/api/user_preferences_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/browse_helper.rb'
+    - 'app/helpers/browse_tags_helper.rb'
+    - 'app/models/client_application.rb'
+    - 'app/mailers/notifier.rb'
+    - 'lib/nominatim.rb'
+    - 'lib/osm.rb'
+    - 'script/deliver-message'

 
 

-# Offense count: 5
+# Offense count: 4

 Lint/HandleExceptions:
 Lint/HandleExceptions:

-  Enabled: false
+  Exclude:
+    - 'app/controllers/api/amf_controller.rb'
+    - 'app/controllers/users_controller.rb'

 
 

-# Offense count: 8
-Lint/ParenthesesAsGroupedExpression:
-  Enabled: false
-
-# Offense count: 546
+# Offense count: 692

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 194
+  Max: 283
+
+# Offense count: 40
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 262

 
 

-# Offense count: 12
+# Offense count: 11
+# Configuration parameters: CountBlocks.

 Metrics/BlockNesting:
   Max: 5
 
 Metrics/BlockNesting:
   Max: 5
 

-# Offense count: 60
+# Offense count: 63

 # Configuration parameters: CountComments.
 Metrics/ClassLength:
 # Configuration parameters: CountComments.
 Metrics/ClassLength:

-  Max: 1515
+  Max: 1627

 
 

-# Offense count: 68
+# Offense count: 72

 Metrics/CyclomaticComplexity:
 Metrics/CyclomaticComplexity:

-  Max: 21
-
-# Offense count: 2112
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 520
+  Max: 23

 
 

-# Offense count: 520
+# Offense count: 691

 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
 
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
 

+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 135
+

 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 

-# Offense count: 70
+# Offense count: 72

 Metrics/PerceivedComplexity:
 Metrics/PerceivedComplexity:

-  Max: 24
-
-# Offense count: 5
-Style/AccessorMethodName:
-  Enabled: false
+  Max: 23

 
 

-# Offense count: 1
-Style/AsciiComments:
-  Enabled: false
+# Offense count: 6
+Naming/AccessorMethodName:
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/helpers/title_helper.rb'
+    - 'app/models/old_way.rb'
+    - 'lib/osm.rb'
+    - 'lib/potlatch.rb'

 
 

-# Offense count: 9
-Style/ClassVars:
-  Enabled: false
+# Offense count: 8
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - '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: 6
+# Configuration parameters: Database, Include.
+# SupportedDatabases: mysql, postgresql
+# Include: db/migrate/*.rb
+Rails/BulkChangeTable:
+  Exclude:
+    - 'db/migrate/20111116184519_update_oauth.rb'
+    - 'db/migrate/20120208122334_merge_acl_address_and_mask.rb'
+    - 'db/migrate/20120208194454_add_domain_to_acl.rb'
+    - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'

 
 

-# Offense count: 12
-# Configuration parameters: Keywords.
-Style/CommentAnnotation:
-  Enabled: false
+# 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: 306
-Style/Documentation:
-  Enabled: false
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/HasAndBelongsToMany:
+  Exclude:
+    - 'app/models/changeset.rb'
+    - 'app/models/user.rb'

 
 

-# Offense count: 8
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/FormatString:
+# Offense count: 5
+# Configuration parameters: Include.
+# Include: db/migrate/*.rb
+Rails/NotNullColumn:
+  Exclude:
+    - 'db/migrate/002_cleanup_osm_db.rb'
+    - 'db/migrate/020_populate_node_tags_and_remove.rb'
+    - 'db/migrate/021_move_to_innodb.rb'
+    - 'db/migrate/025_add_end_time_to_changesets.rb'
+    - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
+
+# Offense count: 20
+Rails/OutputSafety:
+  Exclude:
+    - 'app/controllers/users_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/changesets_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: 86
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:

   Enabled: false
 
 # Offense count: 1
   Enabled: false
 
 # Offense count: 1

-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
-  Enabled: false
+# Configuration parameters: AllowedChars.
+Style/AsciiComments:
+  Exclude:
+    - 'test/models/message_test.rb'

 
 

-# Offense count: 41
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
+# Offense count: 230
+Style/Documentation:

   Enabled: false
 
   Enabled: false
 

-# Offense count: 5687
+# Offense count: 462

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/HashSyntax:
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: when_needed, always, never
+Style/FrozenStringLiteralComment:

   Enabled: false
 
   Enabled: false
 

-# Offense count: 60
+# Offense count: 2

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

-Style/LineEndConcatenation:
-  Enabled: false
+Style/IfUnlessModifier:
+  Exclude:
+    - 'app/controllers/api/ways_controller.rb'

 
 

-# Offense count: 53
+# Offense count: 70

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

+# Configuration parameters: Strict.

 Style/NumericLiterals:
   MinDigits: 11
 
 Style/NumericLiterals:
   MinDigits: 11
 

-# Offense count: 42
-Style/OneLineConditional:
-  Enabled: false
-
-# Offense count: 44
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Enabled: false
-
-# Offense count: 8
-# Configuration parameters: NamePrefix, NamePrefixBlacklist.
-Style/PredicateName:
-  Enabled: false
-
-# Offense count: 95
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/RaiseArgs:
-  Enabled: false
-
-# Offense count: 11
-Style/RegexpLiteral:
-  MaxSlashes: 5
-
-# Offense count: 2
-Style/RescueModifier:
-  Enabled: false
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiteralsInInterpolation:
-  Enabled: false
-
-# Offense count: 1
-Style/StructInheritance:
-  Enabled: false
-
-# Offense count: 3
-# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, Whitelist.
-Style/TrivialAccessors:
-  Enabled: false
+# Offense count: 3080
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 1073