Change roundabout exit logic and remove blank string from locale file

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8d81a7c56f99cc52b57159cc272288ac5c2a9fdb..2c8d29eb887fac048d55a61cfcdb3d34e5138fa3 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,11 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2016-09-07 11:03:27 +0100 using RuboCop version 0.41.2.
+# on 2017-10-05 10:04:24 +0100 using RuboCop version 0.50.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
 # 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: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/MultilineOperationIndentation:
+  Exclude:
+    - 'lib/bounding_box.rb'
+

 # Offense count: 34
 Lint/AmbiguousOperator:
   Exclude:
 # Offense count: 34
 Lint/AmbiguousOperator:
   Exclude:


@@ -14,11 +22,11 @@ Lint/AmbiguousOperator:
     - 'test/lib/bounding_box_test.rb'
     - 'test/lib/country_test.rb'
 
     - 'test/lib/bounding_box_test.rb'
     - 'test/lib/country_test.rb'
 

-# Offense count: 117
+# Offense count: 124

 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 

-# Offense count: 30
+# Offense count: 32

 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:


@@ -36,60 +44,94 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
     - 'lib/osm.rb'
     - 'script/deliver-message'
 

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

 Lint/HandleExceptions:
   Exclude:
     - 'app/controllers/amf_controller.rb'
     - 'app/controllers/user_controller.rb'
 Lint/HandleExceptions:
   Exclude:
     - 'app/controllers/amf_controller.rb'
     - 'app/controllers/user_controller.rb'

-    - 'config/initializers/session.rb'
+
+# Offense count: 3
+Lint/InterpolationCheck:
+  Exclude:
+    - 'test/controllers/node_controller_test.rb'

 
 # Offense count: 2
 Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'app/views/changeset/list.atom.builder'
 
 
 # Offense count: 2
 Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'app/views/changeset/list.atom.builder'
 

-# Offense count: 626
+# Offense count: 666

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 277
+  Max: 280
+
+# Offense count: 41
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 240

 
 # Offense count: 12
 
 # Offense count: 12

+# Configuration parameters: CountBlocks.

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

-# Offense count: 62
+# Offense count: 63

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

-  Max: 1650
+  Max: 1797

 
 

-# Offense count: 68
+# Offense count: 71

 Metrics/CyclomaticComplexity:
   Max: 20
 
 Metrics/CyclomaticComplexity:
   Max: 20
 

-# Offense count: 2561
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# Offense count: 3004
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.

 # URISchemes: http, https
 Metrics/LineLength:
 # URISchemes: http, https
 Metrics/LineLength:

-  Max: 962
+  Max: 1073

 
 

-# Offense count: 604
+# Offense count: 675

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

-# Offense count: 1
+# Offense count: 2

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

-  Max: 139
+  Max: 147

 
 # 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: 71

 Metrics/PerceivedComplexity:
   Max: 23
 
 Metrics/PerceivedComplexity:
   Max: 23
 

+# Offense count: 5
+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: 8
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+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: 2
 # Configuration parameters: Include.
 # Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
 # Offense count: 2
 # Configuration parameters: Include.
 # Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb


@@ -106,7 +148,18 @@ Rails/HasAndBelongsToMany:
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 

-# Offense count: 17
+# 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/user_controller.rb'
 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/user_controller.rb'


@@ -120,30 +173,28 @@ Rails/OutputSafety:
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 

-# Offense count: 65
+# Offense count: 86

 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 

-# Offense count: 5
-Style/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: 1
 Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 
 # Offense count: 1
 Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 

-# Offense count: 218
+# Offense count: 219

 Style/Documentation:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
 

+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'app/controllers/way_controller.rb'
+

 # Offense count: 60
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
 # Offense count: 60
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:


@@ -159,27 +210,13 @@ Style/LineEndConcatenation:
     - 'test/controllers/relation_controller_test.rb'
     - 'test/controllers/way_controller_test.rb'
 
     - 'test/controllers/relation_controller_test.rb'
     - 'test/controllers/way_controller_test.rb'
 

-# Offense count: 69
+# Offense count: 75

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

+# Configuration parameters: Strict.

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

-# Offense count: 8
-# 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'
-    - 'app/models/old_way.rb'
-    - 'app/models/user.rb'
-    - 'lib/classic_pagination/pagination.rb'
-
-# Offense count: 97
+# Offense count: 95

 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, exploded
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, exploded


@@ -187,7 +224,6 @@ Style/RaiseArgs:
   Enabled: false
 
 # Offense count: 2
   Enabled: false
 
 # Offense count: 2

-# Cop supports --auto-correct.
-Style/RescueModifier:
+Style/RescueStandardError:

   Exclude:
     - 'app/helpers/browse_helper.rb'
   Exclude:
     - 'app/helpers/browse_helper.rb'