rubocop 0.56.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb9916f20b5502d5f82b3dda566fc49d305b165e
-  data.tar.gz: 0eb589fa94973ba3c4d06e147312982cb8cfe35c
+  metadata.gz: 18bcf8548b6c61400893885a6ef649baeae5d368
+  data.tar.gz: edd6b617b454f944d114b9a9e40f4bd7b60e6629
 SHA512:
-  metadata.gz: 60768e70eb0d1066092c6d45b22be8d1f5bb154c5996296a32e48ba8aec05514bad6e5492d97849b70f0b357f99050237503a0da1ef33afdfb56c76e7f493126
-  data.tar.gz: 3d62fe67836732767da27fb00ab203103050466fd1064295a71109892ba10741ceaeea6f82a19c7866df6d77dbcec7af7d8cfe52bce3800457f5107f1d4ac3bb
+  metadata.gz: '08121a25d44c4a2a976adf2a1dcc894fa0c432443518e17dc07588294cdb2d18fecee5aea9e57bd21de7e0b8af125a37214fe9b4daabda4262ff4cfbac798626'
+  data.tar.gz: 4f5f292778ffa5e92480d931a0a12a784e0fc9e825aabcd9145adbe4704382feef4166b651ecfdb7522670501ff7a87781509da4995ac91ac14b3f485f8d5a37

data/README.md

@@ -1,7 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/rubocop.svg)](http://badge.fury.io/rb/rubocop)
-[![Dependency Status](https://gemnasium.com/bbatsov/rubocop.svg)](https://gemnasium.com/bbatsov/rubocop)
-[![Travis Status](https://travis-ci.org/bbatsov/rubocop.svg?branch=master)](https://travis-ci.org/bbatsov/rubocop)
-[![Appveyor status](https://ci.appveyor.com/api/projects/status/e5jdwocv30oqm4sm?svg=true)](https://ci.appveyor.com/project/bbatsov/rubocop)
+[![Travis Status](https://travis-ci.org/rubocop-hq/rubocop.svg?branch=master)](https://travis-ci.org/rubocop-hq/rubocop)
+[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/sj3ye7n5690d0nvg?svg=true)](https://ci.appveyor.com/project/bbatsov/rubocop)
 [![Coverage Status](https://img.shields.io/codeclimate/coverage/github/bbatsov/rubocop.svg)](https://codeclimate.com/github/bbatsov/rubocop)
 [![Code Climate](https://codeclimate.com/github/bbatsov/rubocop/badges/gpa.svg)](https://codeclimate.com/github/bbatsov/rubocop)
 [![Inline docs](http://inch-ci.org/github/bbatsov/rubocop.svg)](http://inch-ci.org/github/bbatsov/rubocop)
@@ -52,7 +51,7 @@ haven't reached version 1.0 yet). To prevent an unwanted RuboCop update you
 might want to use a conservative version locking in your `Gemfile`:
 
 ```rb
-gem 'rubocop', '~> 0.56.0', require: false
+gem 'rubocop', '~> 0.57.0', require: false
 ```
 
 ## Quickstart

data/assets/output.html.erb

@@ -254,7 +254,7 @@
       <% end %>
     </div>
     <footer>
-      Generated by <a href="https://github.com/bbatsov/rubocop">RuboCop</a>
+      Generated by <a href="https://github.com/rubocop-hq/rubocop">RuboCop</a>
       <span class="version"><%= RuboCop::Version::STRING %></span>
     </footer>
   </body>

data/bin/console

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'pry'
+require 'rubocop'
+
+ARGV.clear
+
+RuboCop.pry

data/config/default.yml

@@ -80,7 +80,7 @@ AllCops:
   DisplayStyleGuide: false
   # When specifying style guide URLs, any paths and/or fragments will be
   # evaluated relative to the base URL.
-  StyleGuideBaseURL: https://github.com/bbatsov/ruby-style-guide
+  StyleGuideBaseURL: https://github.com/rubocop-hq/ruby-style-guide
   # Extra details are not displayed in offense messages by default. Change
   # behavior by overriding ExtraDetails, or by giving the
   # `-E/--extra-details` option.
@@ -809,6 +809,12 @@ Naming/VariableNumber:
 
 #################### Style ###########################
 
+Style/AccessModifierDeclarations:
+  EnforcedStyle: group
+  SupportedStyles:
+    - inline
+    - group
+
 Style/Alias:
   EnforcedStyle: prefer_alias
   SupportedStyles:
@@ -1405,7 +1411,7 @@ Style/StringMethods:
 
 Style/SymbolArray:
   EnforcedStyle: percent
-  MinSize: 0
+  MinSize: 2
   SupportedStyles:
     - percent
     - brackets
@@ -1511,7 +1517,7 @@ Style/WordArray:
   # The `MinSize` option causes the `WordArray` rule to be ignored for arrays
   # smaller than a certain size.  The rule is only applied to arrays
   # whose element count is greater than or equal to `MinSize`.
-  MinSize: 0
+  MinSize: 2
   # The regular expression `WordRegex` decides what is considered a word.
   WordRegex: !ruby/regexp '/\A[\p{Word}\n\t]+\z/'
 
@@ -1668,6 +1674,14 @@ Rails/Blank:
   # Convert usages of `unless present?` to `if blank?`
   UnlessPresent: true
 
+Rails/BulkChangeTable:
+  Database: null
+  SupportedDatabases:
+    - mysql
+    - postgresql
+  Include:
+    - db/migrate/*.rb
+
 Rails/CreateTableWithTimestamps:
   Include:
     - db/migrate/*.rb
@@ -1705,6 +1719,12 @@ Rails/Exit:
   Exclude:
     - lib/**/*.rake
 
+Rails/FilePath:
+  EnforcedStyle: arguments
+  SupportedStyles:
+    - slashes
+    - arguments
+
 Rails/FindBy:
   Include:
     - app/models/**/*.rb

data/config/disabled.yml

@@ -2,7 +2,7 @@
 
 Layout/ClassStructure:
   Description: 'Enforces a configured order of definitions within a class body.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-classes'
+  StyleGuide: 'https://github.com/rubocop-hq/ruby-style-guide#consistent-classes'
   Enabled: false
 
 Layout/EmptyLineAfterGuardClause:
@@ -49,7 +49,7 @@ Rails:
 
 Rails/SaveBang:
   Description: 'Identifies possible cases where Active Record save! or related should be used.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#save-bang'
+  StyleGuide: 'https://github.com/rubocop-hq/rails-style-guide#save-bang'
   Enabled: false
 
 Style/AutoResourceCleanup:

data/config/enabled.yml

@@ -91,6 +91,10 @@ Layout/CaseIndentation:
   StyleGuide: '#indent-when-to-case'
   Enabled: true
 
+Layout/ClosingHeredocIndentation:
+  Description: 'Checks the indenation of here document closings.'
+  Enabled: true
+
 Layout/ClosingParenthesisIndentation:
   Description: 'Checks the indentation of hanging closing parentheses.'
   Enabled: true
@@ -230,6 +234,10 @@ Layout/InitialIndentation:
     Checks the indentation of the first non-blank non-comment line in a file.
   Enabled: true
 
+Layout/LeadingBlankLines:
+  Description: Check for unnecessary blank lines at the beginning of a file.
+  Enabled: true
+
 Layout/LeadingCommentSpace:
   Description: 'Comments should start with a space.'
   StyleGuide: '#hash-space'
@@ -685,10 +693,6 @@ Lint/ShadowingOuterLocalVariable:
                  for block arguments or block local variables.
   Enabled: true
 
-Lint/SplatKeywordArguments:
-  Description: 'Checks for use of splat keyword arguments as a single Hash.'
-  Enabled: true
-
 Lint/StringConversionInInterpolation:
   Description: 'Checks for Object#to_s usage in string interpolation.'
   StyleGuide: '#no-to-s'
@@ -1122,6 +1126,10 @@ Rails/Blank:
   Description: 'Enforces use of `blank?`.'
   Enabled: true
 
+Rails/BulkChangeTable:
+  Description: 'Check whether alter queries are combinable.'
+  Enabled: true
+
 Rails/CreateTableWithTimestamps:
   Description: >-
                   Checks the migration for which timestamps are not included
@@ -1144,7 +1152,7 @@ Rails/DelegateAllowBlank:
 
 Rails/DynamicFindBy:
   Description: 'Use `find_by` instead of dynamic `find_by_*`.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find_by'
+  StyleGuide: 'https://github.com/rubocop-hq/rails-style-guide#find_by'
   Enabled: true
 
 Rails/EnumUniqueness:
@@ -1168,22 +1176,22 @@ Rails/FilePath:
 
 Rails/FindBy:
   Description: 'Prefer find_by over where.first.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find_by'
+  StyleGuide: 'https://github.com/rubocop-hq/rails-style-guide#find_by'
   Enabled: true
 
 Rails/FindEach:
   Description: 'Prefer all.find_each over all.find.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find-each'
+  StyleGuide: 'https://github.com/rubocop-hq/rails-style-guide#find-each'
   Enabled: true
 
 Rails/HasAndBelongsToMany:
   Description: 'Prefer has_many :through to has_and_belongs_to_many.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#has-many-through'
+  StyleGuide: 'https://github.com/rubocop-hq/rails-style-guide#has-many-through'
   Enabled: true
 
 Rails/HasManyOrHasOneDependent:
   Description: 'Define the dependent option to the has_many and has_one associations.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#has_many-has_one-dependent-option'
+  StyleGuide: 'https://github.com/rubocop-hq/rails-style-guide#has_many-has_one-dependent-option'
   Enabled: true
 
 Rails/HttpPositionalArguments:
@@ -1203,7 +1211,7 @@ Rails/InverseOf:
 
 Rails/LexicallyScopedActionFilter:
   Description: "Checks that methods specified in the filter's `only` or `except` options are explicitly defined in the controller."
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#lexically-scoped-action-filter'
+  StyleGuide: 'https://github.com/rubocop-hq/rails-style-guide#lexically-scoped-action-filter'
   Enabled: true
 
 Rails/NotNullColumn:
@@ -1234,7 +1242,7 @@ Rails/ReadWriteAttribute:
   Description: >-
                  Checks for read_attribute(:attr) and
                  write_attribute(:attr, val).
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#read-attribute'
+  StyleGuide: 'https://github.com/rubocop-hq/rails-style-guide#read-attribute'
   Enabled: true
 
 Rails/RedundantReceiverInWithOptions:
@@ -1255,7 +1263,7 @@ Rails/RequestReferer:
 
 Rails/ReversibleMigration:
   Description: 'Checks whether the change method of the migration file is reversible.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#reversible-migration'
+  StyleGuide: 'https://github.com/rubocop-hq/rails-style-guide#reversible-migration'
   Reference: 'http://api.rubyonrails.org/classes/ActiveRecord/Migration/CommandRecorder.html'
   Enabled: true
 
@@ -1276,7 +1284,7 @@ Rails/SkipsModelValidations:
 
 Rails/TimeZone:
   Description: 'Checks the correct usage of time zone aware methods.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#time'
+  StyleGuide: 'https://github.com/rubocop-hq/rails-style-guide#time'
   Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
   Enabled: true
 
@@ -1328,6 +1336,10 @@ Security/YAMLLoad:
 
 #################### Style ###############################
 
+Style/AccessModifierDeclarations:
+  Description: 'Checks style of how access modifiers are used.'
+  Enabled: true
+
 Style/Alias:
   Description: 'Use alias instead of alias_method.'
   StyleGuide: '#alias-method'
@@ -2030,6 +2042,10 @@ Style/UnneededCapitalW:
   Description: 'Checks for %W when interpolation is not needed.'
   Enabled: true
 
+Style/UnneededCondition:
+  Description: 'Checks for unnecessary conditional expressions.'
+  Enabled: true
+
 Style/UnneededInterpolation:
   Description: 'Checks for strings that are just an interpolated expression.'
   Enabled: true

data/lib/rubocop.rb

@@ -11,7 +11,7 @@ require 'powerpack/enumerable/drop_last'
 require 'powerpack/hash/symbolize_keys'
 require 'powerpack/string/blank'
 require 'powerpack/string/strip_indent'
-require 'unicode/display_width'
+require 'unicode/display_width/no_string_ext'
 
 require_relative 'rubocop/version'
 
@@ -173,6 +173,7 @@ require_relative 'rubocop/cop/layout/block_alignment'
 require_relative 'rubocop/cop/layout/block_end_newline'
 require_relative 'rubocop/cop/layout/case_indentation'
 require_relative 'rubocop/cop/layout/class_structure'
+require_relative 'rubocop/cop/layout/closing_heredoc_indentation'
 require_relative 'rubocop/cop/layout/closing_parenthesis_indentation'
 require_relative 'rubocop/cop/layout/comment_indentation'
 require_relative 'rubocop/cop/layout/condition_position'
@@ -207,6 +208,7 @@ require_relative 'rubocop/cop/layout/indentation_width'
 require_relative 'rubocop/cop/layout/indent_hash'
 require_relative 'rubocop/cop/layout/indent_heredoc'
 require_relative 'rubocop/cop/layout/initial_indentation'
+require_relative 'rubocop/cop/layout/leading_blank_lines'
 require_relative 'rubocop/cop/layout/leading_comment_space'
 require_relative 'rubocop/cop/layout/multiline_array_brace_layout'
 require_relative 'rubocop/cop/layout/multiline_assignment_layout'
@@ -301,7 +303,6 @@ require_relative 'rubocop/cop/lint/script_permission'
 require_relative 'rubocop/cop/lint/shadowed_argument'
 require_relative 'rubocop/cop/lint/shadowed_exception'
 require_relative 'rubocop/cop/lint/shadowing_outer_local_variable'
-require_relative 'rubocop/cop/lint/splat_keyword_arguments'
 require_relative 'rubocop/cop/lint/string_conversion_in_interpolation'
 require_relative 'rubocop/cop/lint/syntax'
 require_relative 'rubocop/cop/lint/underscore_prefixed_variable_name'
@@ -378,6 +379,7 @@ require_relative 'rubocop/cop/performance/unfreeze_string'
 require_relative 'rubocop/cop/performance/unneeded_sort'
 require_relative 'rubocop/cop/performance/uri_default_parser'
 
+require_relative 'rubocop/cop/style/access_modifier_declarations'
 require_relative 'rubocop/cop/style/alias'
 require_relative 'rubocop/cop/style/and_or'
 require_relative 'rubocop/cop/style/array_join'
@@ -526,6 +528,7 @@ require_relative 'rubocop/cop/style/trailing_underscore_variable'
 require_relative 'rubocop/cop/style/trivial_accessors'
 require_relative 'rubocop/cop/style/unless_else'
 require_relative 'rubocop/cop/style/unneeded_capital_w'
+require_relative 'rubocop/cop/style/unneeded_condition'
 require_relative 'rubocop/cop/style/unneeded_interpolation'
 require_relative 'rubocop/cop/style/unneeded_percent_q'
 require_relative 'rubocop/cop/style/unpack_first'
@@ -544,6 +547,7 @@ require_relative 'rubocop/cop/rails/application_job'
 require_relative 'rubocop/cop/rails/application_record'
 require_relative 'rubocop/cop/rails/assert_not'
 require_relative 'rubocop/cop/rails/blank'
+require_relative 'rubocop/cop/rails/bulk_change_table'
 require_relative 'rubocop/cop/rails/create_table_with_timestamps'
 require_relative 'rubocop/cop/rails/date'
 require_relative 'rubocop/cop/rails/dynamic_find_by'

data/lib/rubocop/ast/node.rb

@@ -91,7 +91,7 @@ module RuboCop
         @mutable_attributes.frozen?
       end
 
-      protected :parent=
+      protected :parent= # rubocop:disable Style/AccessModifierDeclarations
 
       # Override `AST::Node#updated` so that `AST::Processor` does not try to
       # mutate our ASTs. Since we keep references from children to parents and
@@ -321,7 +321,9 @@ module RuboCop
          (casgn $_ $_        (send (const nil? {:Class :Module}) :new ...))
          (casgn $_ $_ (block (send (const nil? {:Class :Module}) :new ...) ...))}
       PATTERN
+      # rubocop:disable Style/AccessModifierDeclarations
       private :defined_module0
+      # rubocop:enable Style/AccessModifierDeclarations
 
       def defined_module
         namespace, name = *defined_module0

data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb

@@ -40,12 +40,29 @@ module RuboCop
         !receiver && macro_scope?
       end
 
-      # Checks whether the dispatched method is a bare access modifier affects
-      # all methods defined after the macro.
+      # Checks whether the dispatched method is an access modifier.
       #
-      # @return [Boolean] whether the dispatched method is access modifier
+      # @return [Boolean] whether the dispatched method is an access modifier
       def access_modifier?
-        macro? && bare_access_modifier?
+        bare_access_modifier? || non_bare_access_modifier?
+      end
+
+      # Checks whether the dispatched method is a bare access modifier that
+      # affects all methods defined after the macro.
+      #
+      # @return [Boolean] whether the dispatched method is a bare
+      #                   access modifier
+      def bare_access_modifier?
+        macro? && bare_access_modifier_declaration?
+      end
+
+      # Checks whether the dispatched method is a non-bare access modifier that
+      # affects only the method it receives.
+      #
+      # @return [Boolean] whether the dispatched method is a non-bare
+      #                   access modifier
+      def non_bare_access_modifier?
+        macro? && non_bare_access_modifier_declaration?
       end
 
       # Checks whether the name of the dispatched method matches the argument
@@ -166,9 +183,13 @@ module RuboCop
         (send nil? _ ({def defs} ...))
       PATTERN
 
-      def_node_matcher :bare_access_modifier?, <<-PATTERN
+      def_node_matcher :bare_access_modifier_declaration?, <<-PATTERN
         (send nil? {:public :protected :private :module_function})
       PATTERN
+
+      def_node_matcher :non_bare_access_modifier_declaration?, <<-PATTERN
+        (send nil? {:public :protected :private :module_function} _)
+      PATTERN
     end
   end
 end

data/lib/rubocop/config_loader.rb

@@ -49,7 +49,6 @@ module RuboCop
         resolver.resolve_inheritance(path, hash, file, debug?)
 
         hash.delete('inherit_from')
-        hash.delete('inherit_mode')
 
         Config.create(hash, path)
       end

data/lib/rubocop/config_loader_resolver.rb

@@ -70,7 +70,9 @@ module RuboCop
         config = handle_disabled_by_default(config, default_configuration)
       end
 
-      Config.new(merge(default_configuration, config), config_file)
+      Config.new(merge(default_configuration, config,
+                       inherit_mode: config['inherit_mode'] || {}),
+                 config_file)
     end
 
     # Returns a new hash where the parameters of the given config hash have
@@ -83,7 +85,7 @@ module RuboCop
       keys_appearing_in_both = base_hash.keys & derived_hash.keys
       keys_appearing_in_both.each do |key|
         if base_hash[key].is_a?(Hash)
-          result[key] = merge(base_hash[key], derived_hash[key])
+          result[key] = merge(base_hash[key], derived_hash[key], **opts)
         elsif should_union?(base_hash, key, opts[:inherit_mode])
           result[key] = base_hash[key] | derived_hash[key]
         elsif opts[:debug]

data/lib/rubocop/cop/correctors/alignment_corrector.rb

@@ -57,7 +57,7 @@ module RuboCop
           return [] unless node.is_a?(Parser::AST::Node)
 
           node.each_node(:dstr)
-              .select { |n| n.loc.respond_to?(:heredoc_body) }
+              .select(&:heredoc?)
               .map { |n| n.loc.heredoc_body.join(n.loc.heredoc_end) }
         end
 

data/lib/rubocop/cop/generator.rb

@@ -52,7 +52,7 @@ module RuboCop
                 # TODO: Implement the cop in here.
                 #
                 # In many cases, you can use a node matcher for matching node pattern.
-                # See https://github.com/bbatsov/rubocop/blob/master/lib/rubocop/node_pattern.rb
+                # See https://github.com/rubocop-hq/rubocop/blob/master/lib/rubocop/node_pattern.rb
                 #
                 # For example
                 MSG = 'Use `#good_method` instead of `#bad_method`.'.freeze

data/lib/rubocop/cop/layout/class_structure.rb

@@ -103,7 +103,7 @@ module RuboCop
       #     end
       #   end
       #
-      # @see https://github.com/bbatsov/ruby-style-guide#consistent-classes
+      # @see https://github.com/rubocop-hq/ruby-style-guide#consistent-classes
       class ClassStructure < Cop
         HUMANIZED_NODE_TYPE = {
           casgn: :constants,