diff --git a/.rubocop.yml b/.rubocop.yml index 6247cbb6..6688b803 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,9 +1,8 @@ require: rubocop-rails AllCops: + NewCops: disable TargetRubyVersion: 2.4 -Layout/AlignArguments: - EnforcedStyle: with_fixed_indentation -Layout/AlignParameters: +Layout/ArgumentAlignment: EnforcedStyle: with_fixed_indentation Layout/CommentIndentation: Enabled: false @@ -13,10 +12,22 @@ Layout/DotPosition: EnforcedStyle: trailing Layout/EmptyLineBetweenDefs: AllowAdjacentOneLineDefs: true -Layout/IndentHeredoc: +Layout/HeredocIndentation: Enabled: false +Layout/LineLength: + IgnoredPatterns: + - "^[ ]*#.+$" + - "^[ ]*describe.+$" + - "^[ ]*context.+$" + - "^[ ]*shared_context.+$" + - "^[ ]*shared_examples_for.+$" + - "^[ ]*it.+$" + - "^[ ]*'.+?' => '.+?',?$" + - "^[ ]*\".+?\" => \".+?\",?$" Layout/MultilineMethodCallIndentation: EnforcedStyle: indented +Layout/ParameterAlignment: + EnforcedStyle: with_fixed_indentation Layout/SpaceInsideBlockBraces: Enabled: false Layout/SpaceInLambdaLiteral: @@ -33,8 +44,6 @@ Lint/ElseLayout: Enabled: false Lint/FlipFlop: Enabled: false -Lint/HandleExceptions: - Enabled: false Lint/LiteralInInterpolation: Enabled: false Lint/Loop: @@ -45,6 +54,8 @@ Lint/RequireParentheses: Enabled: false Lint/SafeNavigationChain: Enabled: false +Lint/SuppressedException: + Enabled: false Lint/UnderscorePrefixedVariableName: Enabled: false Lint/Void: @@ -55,16 +66,6 @@ Metrics/BlockLength: Enabled: false Metrics/ClassLength: Enabled: false -Metrics/LineLength: - IgnoredPatterns: - - "^[ ]*#.+$" - - "^[ ]*describe.+$" - - "^[ ]*context.+$" - - "^[ ]*shared_context.+$" - - "^[ ]*shared_examples_for.+$" - - "^[ ]*it.+$" - - "^[ ]*'.+?' => '.+?',?$" - - "^[ ]*\".+?\" => \".+?\",?$" Metrics/MethodLength: Max: 30 Metrics/ParameterLists: diff --git a/Gemfile.lock b/Gemfile.lock index 6dbe283a..f4b0e879 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,17 +5,16 @@ GEM bundler rake thor (>= 0.14.0) - ast (2.4.0) + ast (2.4.1) byebug (11.1.3) coderay (1.1.3) diff-lcs (1.3) fssm (0.2.10) - jaro_winkler (1.5.4) method_source (1.0.0) multi_json (1.14.1) - parallel (1.19.1) - parser (2.6.5.0) - ast (~> 2.4.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -28,6 +27,8 @@ GEM rainbow (3.0.0) rake (13.0.1) redcarpet (3.5.0) + regexp_parser (1.7.1) + rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -41,19 +42,23 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.0) - rubocop (0.71.0) - jaro_winkler (~> 1.5.1) + rubocop (0.89.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) + rexml + rubocop-ast (>= 0.3.0, < 1.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.3.0) + parser (>= 2.7.1.4) rubocop-rails (2.0.1) rack (>= 1.1) rubocop (>= 0.70.0) ruby-progressbar (1.10.1) thor (0.20.0) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) warnings_logger (0.1.1) yard (0.9.20) zeus (0.15.14) diff --git a/gemfiles/rails_4_2.gemfile.lock b/gemfiles/rails_4_2.gemfile.lock index d736ee53..7d9bc691 100644 --- a/gemfiles/rails_4_2.gemfile.lock +++ b/gemfiles/rails_4_2.gemfile.lock @@ -44,7 +44,7 @@ GEM rake thor (>= 0.14.0) arel (6.0.4) - ast (2.4.0) + ast (2.4.1) bcrypt (3.1.13) builder (3.2.4) byebug (11.1.3) @@ -67,7 +67,6 @@ GEM activesupport (>= 4.2.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) jbuilder (2.9.1) activesupport (>= 4.2.0) jquery-rails (4.3.5) @@ -87,9 +86,9 @@ GEM multi_json (1.14.1) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.19.1) - parser (2.7.0.0) - ast (~> 2.4.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) pg (0.21.0) protected_attributes (1.0.9) activemodel (>= 4.0.1, < 5.0) @@ -137,6 +136,8 @@ GEM ffi (~> 1.0) rdoc (4.3.0) redcarpet (3.5.0) + regexp_parser (1.7.1) + rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -158,13 +159,17 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.0) - rubocop (0.78.0) - jaro_winkler (~> 1.5.1) + rubocop (0.89.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) + rexml + rubocop-ast (>= 0.3.0, < 1.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.3.0) + parser (>= 2.7.1.4) rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) @@ -205,7 +210,7 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) warnings_logger (0.1.1) yard (0.9.20) zeus (0.15.14) diff --git a/gemfiles/rails_5_0.gemfile.lock b/gemfiles/rails_5_0.gemfile.lock index 714c4f7a..e5e4304c 100644 --- a/gemfiles/rails_5_0.gemfile.lock +++ b/gemfiles/rails_5_0.gemfile.lock @@ -43,7 +43,7 @@ GEM rake thor (>= 0.14.0) arel (7.1.4) - ast (2.4.0) + ast (2.4.1) bcrypt (3.1.13) builder (3.2.4) byebug (11.1.3) @@ -58,7 +58,6 @@ GEM activesupport (>= 4.2.0) i18n (1.7.0) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) jbuilder (2.9.1) activesupport (>= 4.2.0) jquery-rails (4.3.5) @@ -81,9 +80,9 @@ GEM nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.19.1) - parser (2.7.0.0) - ast (~> 2.4.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) pg (0.21.0) pry (0.13.1) coderay (~> 1.1) @@ -130,6 +129,8 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) + regexp_parser (1.7.1) + rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -151,13 +152,17 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.0) - rubocop (0.78.0) - jaro_winkler (~> 1.5.1) + rubocop (0.89.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) + rexml + rubocop-ast (>= 0.3.0, < 1.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.3.0) + parser (>= 2.7.1.4) rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) @@ -196,7 +201,7 @@ GEM turbolinks-source (5.2.0) tzinfo (1.2.6) thread_safe (~> 0.1) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) warnings_logger (0.1.1) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) diff --git a/gemfiles/rails_5_1.gemfile.lock b/gemfiles/rails_5_1.gemfile.lock index 60e3819c..58e4412c 100644 --- a/gemfiles/rails_5_1.gemfile.lock +++ b/gemfiles/rails_5_1.gemfile.lock @@ -45,7 +45,7 @@ GEM rake thor (>= 0.14.0) arel (8.0.0) - ast (2.4.0) + ast (2.4.1) bcrypt (3.1.13) builder (3.2.4) byebug (11.1.3) @@ -68,7 +68,6 @@ GEM activesupport (>= 4.2.0) i18n (1.7.0) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) jbuilder (2.9.1) activesupport (>= 4.2.0) listen (3.1.5) @@ -88,9 +87,9 @@ GEM nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.19.1) - parser (2.7.0.0) - ast (~> 2.4.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) pg (0.21.0) pry (0.13.1) coderay (~> 1.1) @@ -138,6 +137,8 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) + regexp_parser (1.7.1) + rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -159,13 +160,17 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.0) - rubocop (0.78.0) - jaro_winkler (~> 1.5.1) + rubocop (0.89.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) + rexml + rubocop-ast (>= 0.3.0, < 1.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.3.0) + parser (>= 2.7.1.4) rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) @@ -209,7 +214,7 @@ GEM turbolinks-source (5.2.0) tzinfo (1.2.6) thread_safe (~> 0.1) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) warnings_logger (0.1.1) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock index dd4f1fe1..079a5754 100644 --- a/gemfiles/rails_5_2.gemfile.lock +++ b/gemfiles/rails_5_2.gemfile.lock @@ -51,7 +51,7 @@ GEM archive-zip (0.12.0) io-like (~> 0.3.0) arel (9.0.0) - ast (2.4.0) + ast (2.4.1) bcrypt (3.1.13) bootsnap (1.4.5) msgpack (~> 1.0) @@ -80,7 +80,6 @@ GEM i18n (1.7.0) concurrent-ruby (~> 1.0) io-like (0.3.0) - jaro_winkler (1.5.4) jbuilder (2.9.1) activesupport (>= 4.2.0) listen (3.1.5) @@ -104,9 +103,9 @@ GEM nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.19.1) - parser (2.7.0.0) - ast (~> 2.4.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) pg (0.21.0) pry (0.13.1) coderay (~> 1.1) @@ -155,6 +154,8 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) + regexp_parser (1.7.1) + rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -176,13 +177,17 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.0) - rubocop (0.78.0) - jaro_winkler (~> 1.5.1) + rubocop (0.89.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) + rexml + rubocop-ast (>= 0.3.0, < 1.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.3.0) + parser (>= 2.7.1.4) rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) @@ -226,7 +231,7 @@ GEM turbolinks-source (5.2.0) tzinfo (1.2.6) thread_safe (~> 0.1) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) warnings_logger (0.1.1) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) diff --git a/gemfiles/rails_6_0.gemfile.lock b/gemfiles/rails_6_0.gemfile.lock index e68a298a..f3b3a2c5 100644 --- a/gemfiles/rails_6_0.gemfile.lock +++ b/gemfiles/rails_6_0.gemfile.lock @@ -62,7 +62,7 @@ GEM bundler rake thor (>= 0.14.0) - ast (2.4.0) + ast (2.4.1) bcrypt (3.1.13) bootsnap (1.4.5) msgpack (~> 1.0) @@ -88,7 +88,6 @@ GEM activesupport (>= 4.2.0) i18n (1.7.0) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) jbuilder (2.9.1) activesupport (>= 4.2.0) listen (3.1.5) @@ -112,9 +111,9 @@ GEM nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.19.1) - parser (2.7.0.0) - ast (~> 2.4.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) pg (1.2.0) pry (0.13.1) coderay (~> 1.1) @@ -167,6 +166,7 @@ GEM ffi (~> 1.0) redcarpet (3.5.0) regexp_parser (1.6.0) + rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -188,13 +188,16 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.0) - rubocop (0.78.0) - jaro_winkler (~> 1.5.1) + rubocop (0.84.0) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + rexml + rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.3.0) + parser (>= 2.7.1.4) rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) @@ -237,7 +240,7 @@ GEM turbolinks-source (5.2.0) tzinfo (1.2.6) thread_safe (~> 0.1) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) warnings_logger (0.1.1) webdrivers (4.1.3) nokogiri (~> 1.6)