rubocop 0.66.0 → 0.67.0

data/lib/rubocop/cop/rails/redundant_receiver_in_with_options.rb

@@ -81,6 +81,7 @@ module RuboCop
 
         def on_block(node)
           with_options?(node) do |arg, body|
+            return if body.nil?
             return unless all_block_nodes_in(body).count.zero?
 
             send_nodes = all_send_nodes_in(body)

data/lib/rubocop/cop/style/block_comments.rb

@@ -52,10 +52,18 @@ module RuboCop
         def parts(comment)
           expr = comment.loc.expression
           eq_begin = expr.resize(BEGIN_LENGTH)
-          eq_end = range_between(expr.end_pos - END_LENGTH, expr.end_pos)
+          eq_end = eq_end_part(comment, expr)
           contents = range_between(eq_begin.end_pos, eq_end.begin_pos)
           [eq_begin, eq_end, contents]
         end
+
+        def eq_end_part(comment, expr)
+          if comment.text.chomp == comment.text
+            range_between(expr.end_pos - END_LENGTH - 1, expr.end_pos - 2)
+          else
+            range_between(expr.end_pos - END_LENGTH, expr.end_pos)
+          end
+        end
       end
     end
   end

data/lib/rubocop/cop/{performance → style}/redundant_sort_by.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Performance
+    module Style
       # This cop identifies places where `sort_by { ... }` can be replaced by
       # `sort`.
       #

data/lib/rubocop/cop/{performance → style}/sample.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Performance
+    module Style
       # This cop is used to identify usages of `shuffle.first`,
       # `shuffle.last`, and `shuffle[]` and change them to use
       # `sample` instead.

data/lib/rubocop/cop/style/stderr_puts.rb

@@ -17,12 +17,14 @@ module RuboCop
       class StderrPuts < Cop
         include RangeHelp
 
-        MSG = 'Use `warn` instead of `$stderr.puts` to allow such output ' \
-              'to be disabled.'.freeze
+        MSG =
+          'Use `warn` instead of `%<bad>s` to allow such output to be disabled.'
+          .freeze
 
         def_node_matcher :stderr_puts?, <<-PATTERN
           (send
-            (gvar #stderr_gvar?) :puts $_
+            {(gvar #stderr_gvar?) (const nil? :STDERR)}
+            :puts $_
             ...)
         PATTERN
 
@@ -40,6 +42,10 @@ module RuboCop
 
         private
 
+        def message(node)
+          format(MSG, bad: "#{node.receiver.source}.#{node.method_name}")
+        end
+
         def stderr_gvar?(sym)
           sym == :$stderr
         end

data/lib/rubocop/cop/{performance/lstrip_rstrip.rb → style/strip.rb}

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Performance
+    module Style
       # This cop identifies places where `lstrip.rstrip` can be replaced by
       # `strip`.
       #
@@ -13,7 +13,7 @@ module RuboCop
       #
       #   # good
       #   'abc'.strip
-      class LstripRstrip < Cop
+      class Strip < Cop
         include RangeHelp
 
         MSG = 'Use `strip` instead of `%<methods>s`.'.freeze

data/lib/rubocop/cop/style/struct_inheritance.rb

@@ -8,12 +8,20 @@ module RuboCop
       # @example
       #   # bad
       #   class Person < Struct.new(:first_name, :last_name)
+      #     def age
+      #       42
+      #     end
       #   end
       #
       #   # good
-      #   Person = Struct.new(:first_name, :last_name)
+      #   Person = Struct.new(:first_name, :last_name) do
+      #     def age
+      #       42
+      #     end
+      #   end
       class StructInheritance < Cop
-        MSG = "Don't extend an instance initialized by `Struct.new`.".freeze
+        MSG = "Don't extend an instance initialized by `Struct.new`. " \
+              'Use a block to customize the struct.'.freeze
 
         def on_class(node)
           _name, superclass, _body = *node

data/lib/rubocop/cop/{performance → style}/unneeded_sort.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Performance
+    module Style
       # This cop is used to identify instances of sorting and then
       # taking only the first or last element. The same behavior can
       # be accomplished without a relatively expensive sort by using

data/lib/rubocop/node_pattern.rb

@@ -96,11 +96,11 @@ module RuboCop
     # Builds Ruby code which implements a pattern
     class Compiler
       SYMBOL       = %r{:(?:[\w+@*/?!<>=~|%^-]+|\[\]=?)}.freeze
-      IDENTIFIER   = /[a-zA-Z_-]/.freeze
+      IDENTIFIER   = /[a-zA-Z_][a-zA-Z0-9_-]*/.freeze
       META         = /\(|\)|\{|\}|\[|\]|\$\.\.\.|\$|!|\^|\.\.\./.freeze
       NUMBER       = /-?\d+(?:\.\d+)?/.freeze
       STRING       = /".+?"/.freeze
-      METHOD_NAME  = /\#?#{IDENTIFIER}+[\!\?]?\(?/.freeze
+      METHOD_NAME  = /\#?#{IDENTIFIER}[\!\?]?\(?/.freeze
       PARAM_NUMBER = /%\d*/.freeze
 
       SEPARATORS = /[\s]+/.freeze
@@ -109,9 +109,10 @@ module RuboCop
 
       TOKEN = /\G(?:#{SEPARATORS}|#{TOKENS}|.)/.freeze
 
-      NODE      = /\A#{IDENTIFIER}+\Z/.freeze
-      PREDICATE = /\A#{IDENTIFIER}+\?\(?\Z/.freeze
-      WILDCARD  = /\A_#{IDENTIFIER}*\Z/.freeze
+      NODE      = /\A#{IDENTIFIER}\Z/.freeze
+      PREDICATE = /\A#{IDENTIFIER}\?\(?\Z/.freeze
+      WILDCARD  = /\A_(?:#{IDENTIFIER})?\Z/.freeze
+
       FUNCALL   = /\A\##{METHOD_NAME}/.freeze
       LITERAL   = /\A(?:#{SYMBOL}|#{NUMBER}|#{STRING})\Z/.freeze
       PARAM     = /\A#{PARAM_NUMBER}\Z/.freeze
@@ -372,7 +373,8 @@ module RuboCop
       end
 
       def compile_nodetype(cur_node, type)
-        "(#{cur_node} && #{cur_node}.#{type.tr('-', '_')}_type?)"
+        "(#{cur_node}.is_a?(RuboCop::AST::Node) && " \
+          "#{cur_node}.#{type.tr('-', '_')}_type?)"
       end
 
       def compile_param(cur_node, number, seq_head)

data/lib/rubocop/path_util.rb

@@ -41,10 +41,10 @@ module RuboCop
       when Regexp
         begin
           path =~ pattern
-        rescue ArgumentError => e
-          return false if e.message.start_with?('invalid byte sequence')
+        rescue ArgumentError => ex
+          return false if ex.message.start_with?('invalid byte sequence')
 
-          raise e
+          raise exception
         end
       end
     end

data/lib/rubocop/processed_source.rb

@@ -146,8 +146,8 @@ module RuboCop
 
       begin
         @buffer.source = source
-      rescue EncodingError => error
-        @parser_error = error
+      rescue EncodingError => ex
+        @parser_error = ex
         return
       end
 

data/lib/rubocop/remote_config.rb

@@ -47,8 +47,8 @@ module RuboCop
       generate_request(uri) do |request|
         begin
           handle_response(http.request(request), limit, &block)
-        rescue SocketError => err
-          handle_response(err, limit, &block)
+        rescue SocketError => ex
+          handle_response(ex, limit, &block)
         end
       end
     end
@@ -72,8 +72,10 @@ module RuboCop
       else
         begin
           response.error!
-        rescue StandardError => e
-          raise e, "#{e.message} while downloading remote config file #{uri}"
+        rescue StandardError => ex
+          message = "#{ex.message} while downloading remote config"\
+            " file #{uri}"
+          raise ex, message
         end
       end
     end

data/lib/rubocop/result_cache.rb

@@ -100,9 +100,9 @@ module RuboCop
 
       begin
         FileUtils.mkdir_p(dir)
-      rescue Errno::EACCES => e
+      rescue Errno::EACCES => ex
         warn "Couldn't create cache directory. Continuing without cache."\
-             "\n  #{e.message}"
+             "\n  #{ex.message}"
         return
       end
 

data/lib/rubocop/runner.rb

@@ -108,8 +108,8 @@ module RuboCop
       end
       formatter_set.file_finished(file, offenses)
       offenses
-    rescue InfiniteCorrectionLoop => e
-      formatter_set.file_finished(file, e.offenses.compact.sort.freeze)
+    rescue InfiniteCorrectionLoop => ex
+      formatter_set.file_finished(file, ex.offenses.compact.sort.freeze)
       raise
     end
 

data/lib/rubocop/target_finder.rb

@@ -145,8 +145,13 @@ module RuboCop
 
       first_line = File.open(file, &:readline)
       !(first_line =~ /#!.*(#{ruby_interpreters(file).join('|')})/).nil?
-    rescue EOFError, ArgumentError => e
-      warn "Unprocessable file #{file}: #{e.class}, #{e.message}" if debug?
+    rescue EOFError, ArgumentError => ex
+      if debug?
+        warn(
+          "Unprocessable file #{file}: #{ex.class}, #{ex.message}"
+        )
+      end
+
       false
     end
 

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.66.0'.freeze
+    STRING = '0.67.0'.freeze
 
     MSG = '%<version>s (using Parser %<parser_version>s, running on ' \
           '%<ruby_engine>s %<ruby_version>s %<ruby_platform>s)'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.67.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jaro_winkler
@@ -315,9 +315,12 @@ files:
 - lib/rubocop/cop/layout/leading_blank_lines.rb
 - lib/rubocop/cop/layout/leading_comment_space.rb
 - lib/rubocop/cop/layout/multiline_array_brace_layout.rb
+- lib/rubocop/cop/layout/multiline_array_line_breaks.rb
 - lib/rubocop/cop/layout/multiline_assignment_layout.rb
 - lib/rubocop/cop/layout/multiline_block_layout.rb
 - lib/rubocop/cop/layout/multiline_hash_brace_layout.rb
+- lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb
+- lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb
 - lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb
 - lib/rubocop/cop/layout/multiline_method_call_indentation.rb
 - lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb
@@ -472,6 +475,7 @@ files:
 - lib/rubocop/cop/mixin/method_complexity.rb
 - lib/rubocop/cop/mixin/method_preference.rb
 - lib/rubocop/cop/mixin/min_body_length.rb
+- lib/rubocop/cop/mixin/multiline_element_line_breaks.rb
 - lib/rubocop/cop/mixin/multiline_expression_indentation.rb
 - lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb
 - lib/rubocop/cop/mixin/negative_conditional.rb
@@ -512,6 +516,7 @@ files:
 - lib/rubocop/cop/naming/memoized_instance_variable_name.rb
 - lib/rubocop/cop/naming/method_name.rb
 - lib/rubocop/cop/naming/predicate_name.rb
+- lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb
 - lib/rubocop/cop/naming/uncommunicative_block_param_name.rb
 - lib/rubocop/cop/naming/uncommunicative_method_param_name.rb
 - lib/rubocop/cop/naming/variable_name.rb
@@ -529,25 +534,22 @@ files:
 - lib/rubocop/cop/performance/fixed_size.rb
 - lib/rubocop/cop/performance/flat_map.rb
 - lib/rubocop/cop/performance/inefficient_hash_search.rb
-- lib/rubocop/cop/performance/lstrip_rstrip.rb
 - lib/rubocop/cop/performance/open_struct.rb
 - lib/rubocop/cop/performance/range_include.rb
 - lib/rubocop/cop/performance/redundant_block_call.rb
 - lib/rubocop/cop/performance/redundant_match.rb
 - lib/rubocop/cop/performance/redundant_merge.rb
-- lib/rubocop/cop/performance/redundant_sort_by.rb
 - lib/rubocop/cop/performance/regexp_match.rb
 - lib/rubocop/cop/performance/reverse_each.rb
-- lib/rubocop/cop/performance/sample.rb
 - lib/rubocop/cop/performance/size.rb
 - lib/rubocop/cop/performance/start_with.rb
 - lib/rubocop/cop/performance/string_replacement.rb
 - lib/rubocop/cop/performance/times_map.rb
 - lib/rubocop/cop/performance/unfreeze_string.rb
-- lib/rubocop/cop/performance/unneeded_sort.rb
 - lib/rubocop/cop/performance/uri_default_parser.rb
 - lib/rubocop/cop/rails/action_filter.rb
 - lib/rubocop/cop/rails/active_record_aliases.rb
+- lib/rubocop/cop/rails/active_record_override.rb
 - lib/rubocop/cop/rails/active_support_aliases.rb
 - lib/rubocop/cop/rails/application_job.rb
 - lib/rubocop/cop/rails/application_record.rb
@@ -581,6 +583,7 @@ files:
 - lib/rubocop/cop/rails/presence.rb
 - lib/rubocop/cop/rails/present.rb
 - lib/rubocop/cop/rails/read_write_attribute.rb
+- lib/rubocop/cop/rails/redundant_allow_nil.rb
 - lib/rubocop/cop/rails/redundant_receiver_in_with_options.rb
 - lib/rubocop/cop/rails/reflection_class_name.rb
 - lib/rubocop/cop/rails/refute_methods.rb
@@ -719,11 +722,13 @@ files:
 - lib/rubocop/cop/style/redundant_parentheses.rb
 - lib/rubocop/cop/style/redundant_return.rb
 - lib/rubocop/cop/style/redundant_self.rb
+- lib/rubocop/cop/style/redundant_sort_by.rb
 - lib/rubocop/cop/style/regexp_literal.rb
 - lib/rubocop/cop/style/rescue_modifier.rb
 - lib/rubocop/cop/style/rescue_standard_error.rb
 - lib/rubocop/cop/style/return_nil.rb
 - lib/rubocop/cop/style/safe_navigation.rb
+- lib/rubocop/cop/style/sample.rb
 - lib/rubocop/cop/style/self_assignment.rb
 - lib/rubocop/cop/style/semicolon.rb
 - lib/rubocop/cop/style/send.rb
@@ -737,6 +742,7 @@ files:
 - lib/rubocop/cop/style/string_literals.rb
 - lib/rubocop/cop/style/string_literals_in_interpolation.rb
 - lib/rubocop/cop/style/string_methods.rb
+- lib/rubocop/cop/style/strip.rb
 - lib/rubocop/cop/style/struct_inheritance.rb
 - lib/rubocop/cop/style/symbol_array.rb
 - lib/rubocop/cop/style/symbol_literal.rb
@@ -756,6 +762,7 @@ files:
 - lib/rubocop/cop/style/unneeded_condition.rb
 - lib/rubocop/cop/style/unneeded_interpolation.rb
 - lib/rubocop/cop/style/unneeded_percent_q.rb
+- lib/rubocop/cop/style/unneeded_sort.rb
 - lib/rubocop/cop/style/unpack_first.rb
 - lib/rubocop/cop/style/variable_interpolation.rb
 - lib/rubocop/cop/style/when_then.rb
@@ -829,7 +836,22 @@ metadata:
   source_code_uri: https://github.com/rubocop-hq/rubocop/
   documentation_uri: https://docs.rubocop.org/
   bug_tracker_uri: https://github.com/rubocop-hq/rubocop/issues
-post_install_message: 
+post_install_message: |
+  Performance Cops will be removed from RuboCop 0.68. Use rubocop-performance gem instead.
+
+  Put this in your Gemfile.
+
+    gem 'rubocop-performance'
+
+  And then execute:
+
+    $ bundle install
+
+  Put this into your .rubocop.yml.
+
+    require: rubocop-performance
+
+  More information: https://github.com/rubocop-hq/rubocop-performance
 rdoc_options: []
 require_paths:
 - lib