Fix rubocop warnings
This commit is contained in:
Tom Hughes
parent
600743f170
commit
dd8ebf9b09
5 changed files with 85 additions and 78 deletions
|
|
@ -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-07-13 09:47:52 +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
|
||||
|
|
@ -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,36 +43,30 @@ Lint/HandleExceptions:
|
|||
- 'app/controllers/user_controller.rb'
|
||||
- 'config/initializers/session.rb'
|
||||
|
||||
# Offense count: 8
|
||||
Lint/ParenthesesAsGroupedExpression:
|
||||
Exclude:
|
||||
- 'test/controllers/amf_controller_test.rb'
|
||||
- 'test/lib/bounding_box_test.rb'
|
||||
- 'test/models/user_preference_test.rb'
|
||||
|
||||
# Offense count: 671
|
||||
# Offense count: 616
|
||||
Metrics/AbcSize:
|
||||
Max: 277
|
||||
|
||||
# Offense count: 12
|
||||
# Offense count: 11
|
||||
Metrics/BlockNesting:
|
||||
Max: 5
|
||||
|
||||
# Offense count: 62
|
||||
# Configuration parameters: CountComments.
|
||||
Metrics/ClassLength:
|
||||
Max: 1654
|
||||
Max: 1650
|
||||
|
||||
# Offense count: 67
|
||||
Metrics/CyclomaticComplexity:
|
||||
Max: 20
|
||||
|
||||
# Offense count: 2535
|
||||
# Configuration parameters: AllowURI, URISchemes.
|
||||
# Offense count: 2485
|
||||
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
|
||||
# URISchemes: http, https
|
||||
Metrics/LineLength:
|
||||
Max: 962
|
||||
|
||||
# Offense count: 628
|
||||
# Offense count: 596
|
||||
# Configuration parameters: CountComments.
|
||||
Metrics/MethodLength:
|
||||
Max: 179
|
||||
|
|
@ -92,19 +81,43 @@ Metrics/ModuleLength:
|
|||
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 +135,10 @@ Style/AsciiComments:
|
|||
Exclude:
|
||||
- 'test/models/message_test.rb'
|
||||
|
||||
# Offense count: 310
|
||||
# Offense count: 217
|
||||
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 +159,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 +171,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 +186,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 +201,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'
|
||||
|
|
|
|||
|
|
@ -11,24 +11,24 @@ Rails.application.config.assets.paths << Rails.root.join("config")
|
|||
|
||||
# Precompile additional assets.
|
||||
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
||||
Rails.application.config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js )
|
||||
Rails.application.config.assets.precompile += %w( user.js login.js diary_entry.js )
|
||||
Rails.application.config.assets.precompile += %w( screen-ltr.css print-ltr.css )
|
||||
Rails.application.config.assets.precompile += %w( screen-rtl.css print-rtl.css )
|
||||
Rails.application.config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
|
||||
Rails.application.config.assets.precompile += %w( id.js id.css )
|
||||
Rails.application.config.assets.precompile += %w( embed.js embed.css )
|
||||
Rails.application.config.assets.precompile += %w( html5shiv.js )
|
||||
Rails.application.config.assets.precompile += %w( images/marker-*.png img/*-handle.png )
|
||||
Rails.application.config.assets.precompile += %w( swfobject.js expressInstall.swf )
|
||||
Rails.application.config.assets.precompile += %w( potlatch2.swf )
|
||||
Rails.application.config.assets.precompile += %w( potlatch2/assets.zip )
|
||||
Rails.application.config.assets.precompile += %w( potlatch2/FontLibrary.swf )
|
||||
Rails.application.config.assets.precompile += %w( potlatch2/locales/*.swf )
|
||||
Rails.application.config.assets.precompile += %w( help/introduction.* )
|
||||
Rails.application.config.assets.precompile += %w( iD/img/*.svg iD/img/*.png iD/img/*.gif )
|
||||
Rails.application.config.assets.precompile += %w( iD/img/pattern/*.png )
|
||||
Rails.application.config.assets.precompile += %w( iD/locales/*.json )
|
||||
Rails.application.config.assets.precompile += %w( iD/traffico/stylesheets/traffico.css )
|
||||
Rails.application.config.assets.precompile += %w( iD/traffico/fonts/traffico_* )
|
||||
Rails.application.config.assets.precompile += %w( iD/traffico/string-maps/*.json )
|
||||
Rails.application.config.assets.precompile += %w(index.js browse.js welcome.js fixthemap.js)
|
||||
Rails.application.config.assets.precompile += %w(user.js login.js diary_entry.js)
|
||||
Rails.application.config.assets.precompile += %w(screen-ltr.css print-ltr.css)
|
||||
Rails.application.config.assets.precompile += %w(screen-rtl.css print-rtl.css)
|
||||
Rails.application.config.assets.precompile += %w(leaflet-all.css leaflet.ie.css)
|
||||
Rails.application.config.assets.precompile += %w(id.js id.css)
|
||||
Rails.application.config.assets.precompile += %w(embed.js embed.css)
|
||||
Rails.application.config.assets.precompile += %w(html5shiv.js)
|
||||
Rails.application.config.assets.precompile += %w(images/marker-*.png img/*-handle.png)
|
||||
Rails.application.config.assets.precompile += %w(swfobject.js expressInstall.swf)
|
||||
Rails.application.config.assets.precompile += %w(potlatch2.swf)
|
||||
Rails.application.config.assets.precompile += %w(potlatch2/assets.zip)
|
||||
Rails.application.config.assets.precompile += %w(potlatch2/FontLibrary.swf)
|
||||
Rails.application.config.assets.precompile += %w(potlatch2/locales/*.swf)
|
||||
Rails.application.config.assets.precompile += %w(help/introduction.*)
|
||||
Rails.application.config.assets.precompile += %w(iD/img/*.svg iD/img/*.png iD/img/*.gif)
|
||||
Rails.application.config.assets.precompile += %w(iD/img/pattern/*.png)
|
||||
Rails.application.config.assets.precompile += %w(iD/locales/*.json)
|
||||
Rails.application.config.assets.precompile += %w(iD/traffico/stylesheets/traffico.css)
|
||||
Rails.application.config.assets.precompile += %w(iD/traffico/fonts/traffico_*)
|
||||
Rails.application.config.assets.precompile += %w(iD/traffico/string-maps/*.json)
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ class RemoveSegments < ActiveRecord::Migration
|
|||
# now get the data back
|
||||
csvopts = "FIELDS TERMINATED BY ',' ENCLOSED BY '\"' ESCAPED BY '\"' LINES TERMINATED BY '\\n'"
|
||||
|
||||
tempfiles.each { |fn| File.chmod 0644, fn } if have_segs
|
||||
tempfiles.each { |fn| File.chmod 0o644, fn } if have_segs
|
||||
|
||||
if have_segs
|
||||
execute "LOAD DATA INFILE '#{ways}' INTO TABLE ways #{csvopts} (id, user_id, timestamp) SET visible = 1, version = 1"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue