rubocop 0.65.0 → 0.66.0

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

@@ -96,10 +96,6 @@ module RuboCop
             corrector.replace(node.source_range, "[#{words.join(', ')}]")
           end
         end
-
-        def trim_string_interporation_escape_character(str)
-          str.gsub(/\\\#{(.*?)\}/) { "\#{#{Regexp.last_match(1)}}" }
-        end
       end
     end
   end

data/lib/rubocop/cop/util.rb

@@ -85,6 +85,10 @@ module RuboCop
         end
       end
 
+      def trim_string_interporation_escape_character(str)
+        str.gsub(/\\\#{(.*?)\}/) { "\#{#{Regexp.last_match(1)}}" }
+      end
+
       def interpret_string_escapes(string)
         StringInterpreter.interpret(string)
       end

data/lib/rubocop/core_ext/string.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# Extensions to the core String class
+class String
+  unless method_defined? :blank?
+    # Checks whether a string is blank. A string is considered blank if it
+    # is either empty or contains only whitespace characters.
+    #
+    # @return [Boolean] true is the string is blank, false otherwise
+    #
+    # @example
+    #   ''.blank? #=> true
+    #
+    # @example
+    #   '    '.blank? #=> true
+    #
+    # @example
+    #   '  test'.blank? #=> false
+    def blank?
+      empty? || strip.empty?
+    end
+  end
+
+  unless method_defined? :strip_indent
+    # The method strips the whitespace preceding the base indentation.
+    # Useful for HEREDOCs and other multi-line strings.
+    #
+    # @example
+    #
+    #   code = <<-END.strip_indent
+    #     def test
+    #       some_method
+    #       other_method
+    #     end
+    #   END
+    #
+    #   #=> "def\n  some_method\n  \nother_method\nend"
+    #
+    # @todo Replace call sites with squiggly heredocs when required Ruby
+    #   version is >= 2.3.0
+    def strip_indent
+      leading_space = scan(/^[ \t]*(?=\S)/).min
+      indent = leading_space ? leading_space.size : 0
+      gsub(/^[ \t]{#{indent}}/, '')
+    end
+  end
+end

data/lib/rubocop/node_pattern.rb

@@ -37,8 +37,7 @@ module RuboCop
   #     '(send !const ...)' # ! negates the next part of the pattern
   #     '$(send const ...)' # arbitrary matching can be performed on a capture
   #     '(send _recv _msg)' # wildcards can be named (for readability)
-  #     '(send ... :new)'   # you can specifically match against the last child
-  #                         # (this only works for the very last)
+  #     '(send ... :new)'   # you can match against the last children
   #     '(send $...)'       # capture all the children as an array
   #     '(send $... int)'   # capture all children but the last as an array
   #     '(send _x :+ _x)'   # unification is performed on named wildcards
@@ -118,8 +117,13 @@ module RuboCop
       PARAM     = /\A#{PARAM_NUMBER}\Z/.freeze
       CLOSING   = /\A(?:\)|\}|\])\Z/.freeze
 
+      REST      = '...'.freeze
+      CAPTURED_REST = '$...'.freeze
+
       attr_reader :match_code
 
+      SEQ_HEAD_INDEX = -1
+
       def initialize(str, node_var = 'node0')
         @string   = str
         @root     = node_var
@@ -133,8 +137,7 @@ module RuboCop
       end
 
       def run(node_var)
-        tokens =
-          @string.scan(TOKEN).reject { |token| token =~ /\A#{SEPARATORS}\Z/ }
+        tokens = Compiler.tokens(@string)
 
         @match_code = compile_expr(tokens, node_var, false)
 
@@ -180,83 +183,76 @@ module RuboCop
         # temp variable as 'cur_node'
         with_temp_node(cur_node) do |init, temp_node|
           terms = compile_seq_terms(tokens, temp_node)
+          terms.unshift(compile_guard_clause(temp_node))
 
-          join_terms(init, terms, ' && ')
+          join_terms(init, terms, " &&\n")
         end
       end
 
+      def compile_guard_clause(cur_node)
+        "#{cur_node}.is_a?(RuboCop::AST::Node)"
+      end
+
       def compile_seq_terms(tokens, cur_node)
-        ret, size =
+        ret =
           compile_seq_terms_with_size(tokens, cur_node) do |token, terms, index|
-            case token
-            when '...'.freeze
-              return compile_ellipsis(tokens, cur_node, terms, index)
-            when '$...'.freeze
-              return compile_capt_ellip(tokens, cur_node, terms, index)
+            capture = next_capture if token == CAPTURED_REST
+            if capture || token == REST
+              index = 0 if index == SEQ_HEAD_INDEX # Consider ($...) as (_ $...)
+              return compile_ellipsis(tokens, cur_node, terms, index, capture)
             end
           end
-
-        ret << "(#{cur_node}.children.size == #{size})"
+        ret << "(#{cur_node}.children.size == #{ret.size - 1})"
       end
 
       def compile_seq_terms_with_size(tokens, cur_node)
-        index = nil
+        index = SEQ_HEAD_INDEX
         terms = []
         until tokens.first == ')'
-          yield tokens.first, terms, index || 0
-          term, index = compile_expr_with_index(tokens, cur_node, index)
+          yield tokens.first, terms, index
+          term = compile_expr_with_index(tokens, cur_node, index)
+          index += 1
           terms << term
         end
 
         tokens.shift # drop concluding )
-        [terms, index]
+        terms
       end
 
       def compile_expr_with_index(tokens, cur_node, index)
-        if index.nil?
+        if index == SEQ_HEAD_INDEX
           # in 'sequence head' position; some expressions are compiled
           # differently at 'sequence head' (notably 'node type' expressions)
           # grep for seq_head to see where it makes a difference
-          [compile_expr(tokens, cur_node, true), 0]
+          compile_expr(tokens, cur_node, true)
         else
           child_node = "#{cur_node}.children[#{index}]"
-          [compile_expr(tokens, child_node, false), index + 1]
-        end
-      end
-
-      def compile_ellipsis(tokens, cur_node, terms, index)
-        if (term = compile_seq_tail(tokens, "#{cur_node}.children.last"))
-          terms << "(#{cur_node}.children.size > #{index})"
-          terms << term
-        elsif index > 0
-          terms << "(#{cur_node}.children.size >= #{index})"
+          compile_expr(tokens, child_node, false)
         end
-        terms
       end
 
-      def compile_capt_ellip(tokens, cur_node, terms, index)
-        capture = next_capture
-        if (term = compile_seq_tail(tokens, "#{cur_node}.children.last"))
-          terms << "(#{cur_node}.children.size > #{index})"
-          terms << term
-          terms << "(#{capture} = #{cur_node}.children[#{index}..-2])"
-        else
-          terms << "(#{cur_node}.children.size >= #{index})" if index > 0
-          terms << "(#{capture} = #{cur_node}.children[#{index}..-1])"
+      def compile_ellipsis(tokens, cur_node, terms, index, capture = nil)
+        tokens.shift # drop ellipsis
+        tail = compile_seq_tail(tokens, cur_node)
+        terms << "(#{cur_node}.children.size >= #{index + tail.size})"
+        terms.concat tail
+        if capture
+          range = index..-tail.size - 1
+          terms << "(#{capture} = #{cur_node}.children[#{range}])"
         end
         terms
       end
 
       def compile_seq_tail(tokens, cur_node)
-        tokens.shift
-        if tokens.first == ')'
-          tokens.shift
-          nil
-        else
-          expr = compile_expr(tokens, cur_node, false)
-          fail_due_to('missing )') unless tokens.shift == ')'
-          expr
+        child_node = "#{cur_node}.children[%<revindex>i]"
+        terms = []
+        until tokens.first == ')'
+          terms << compile_expr(tokens, child_node, false)
         end
+        tokens.shift # drop ')'
+        # E.g. for terms.size == 3, we want to replace the three [%<revindex>i]
+        # with [-3], [-2] and [-1]
+        terms.map.with_index { |term, i| format term, revindex: i - terms.size }
       end
 
       def compile_union(tokens, cur_node, seq_head)
@@ -444,12 +440,6 @@ module RuboCop
         params.empty? ? '' : ",#{params}"
       end
 
-      def emit_guard_clause
-        <<-RUBY
-          return unless node.is_a?(RuboCop::AST::Node)
-        RUBY
-      end
-
       def emit_method_code
         <<-RUBY
           return unless #{@match_code}
@@ -475,6 +465,10 @@ module RuboCop
       def next_temp_value
         @temps += 1
       end
+
+      def self.tokens(pattern)
+        pattern.scan(TOKEN).reject { |token| token =~ /\A#{SEPARATORS}\Z/ }
+      end
     end
     private_constant :Compiler
 
@@ -491,7 +485,6 @@ module RuboCop
         compiler = Compiler.new(pattern_str, 'node')
         src = "def #{method_name}(node = self" \
               "#{compiler.emit_trailing_params});" \
-              "#{compiler.emit_guard_clause}" \
               "#{compiler.emit_method_code};end"
 
         location = caller_locations(1, 1).first
@@ -552,11 +545,39 @@ module RuboCop
       end
     end
 
+    attr_reader :pattern
+
     def initialize(str)
+      @pattern = str
       compiler = Compiler.new(str)
       src = "def match(node0#{compiler.emit_trailing_params});" \
             "#{compiler.emit_method_code}end"
-      instance_eval(src)
+      instance_eval(src, __FILE__, __LINE__ + 1)
+    end
+
+    def match(*args)
+      # If we're here, it's because the singleton method has not been defined,
+      # either because we've been dup'ed or serialized through YAML
+      initialize(pattern)
+      match(*args)
+    end
+
+    def marshal_load(pattern)
+      initialize pattern
+    end
+
+    def marshal_dump
+      pattern
+    end
+
+    def ==(other)
+      other.is_a?(NodePattern) &&
+        Compiler.tokens(other.pattern) == Compiler.tokens(pattern)
+    end
+    alias eql? ==
+
+    def to_s
+      "#<#{self.class} #{pattern}>"
     end
   end
 end

data/lib/rubocop/processed_source.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'digest/md5'
+require 'digest/sha1'
 
 module RuboCop
   # ProcessedSource contains objects which are generated by Parser
@@ -78,7 +78,7 @@ module RuboCop
 
     # Raw source checksum for tracking infinite loops.
     def checksum
-      Digest::MD5.hexdigest(@raw_source)
+      Digest::SHA1.hexdigest(@raw_source)
     end
 
     def each_comment

data/lib/rubocop/result_cache.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'digest/md5'
+require 'digest/sha1'
 require 'find'
 require 'etc'
 
@@ -141,7 +141,7 @@ module RuboCop
     end
 
     def file_checksum(file, config_store)
-      digester = Digest::MD5.new
+      digester = Digest::SHA1.new
       mode = File.stat(file).mode
       digester.update(
         "#{file}#{mode}#{config_store.for(file).signature}"
@@ -173,7 +173,7 @@ module RuboCop
                     .select { |path| File.file?(path) }
                     .sort
                     .map { |path| IO.read(path, encoding: Encoding::UTF_8) }
-          Digest::MD5.hexdigest(sources.join)
+          Digest::SHA1.hexdigest(sources.join)
         end
     end
 
@@ -185,7 +185,7 @@ module RuboCop
       options = options.to_s.gsub(/[^a-z]+/i, '_')
       # We must avoid making file names too long for some filesystems to handle
       # If they are short, we can leave them human-readable
-      options.length <= 32 ? options : Digest::MD5.hexdigest(options)
+      options.length <= 32 ? options : Digest::SHA1.hexdigest(options)
     end
   end
 end

data/lib/rubocop/rspec/cop_helper.rb

@@ -50,12 +50,17 @@ module CopHelper
   end
 
   def autocorrect_source_with_loop(source, file = nil)
+    cnt = 0
     loop do
       cop.instance_variable_set(:@corrections, [])
       new_source = autocorrect_source(source, file)
       return new_source if new_source == source
 
       source = new_source
+      cnt += 1
+      if cnt > RuboCop::Runner::MAX_ITERATIONS
+        raise RuboCop::Runner::InfiniteCorrectionLoop.new(file, [])
+      end
     end
   end
 

data/lib/rubocop/rspec/expect_offense.rb

@@ -64,11 +64,11 @@ module RuboCop
     # @example `expect_offense` and `expect_no_corrections`
     #
     #   expect_offense(<<-RUBY.strip_indent)
-    #       a do
-    #         b
-    #       end.c
-    #       ^^^^^ Avoid chaining a method call on a do...end block.
-    #     RUBY
+    #     a do
+    #       b
+    #     end.c
+    #     ^^^^^ Avoid chaining a method call on a do...end block.
+    #   RUBY
     #
     #   expect_no_corrections
     module ExpectOffense

data/lib/rubocop/runner.rb

@@ -30,15 +30,6 @@ module RuboCop
       @aborting = false
     end
 
-    def trap_interrupt
-      Signal.trap('INT') do
-        exit!(1) if aborting?
-        self.aborting = true
-        warn ''
-        warn 'Exiting... Interrupt again to exit immediately.'
-      end
-    end
-
     def run(paths)
       target_files = find_target_files(paths)
       if @options[:list_target_files]
@@ -47,6 +38,12 @@ module RuboCop
         warm_cache(target_files) if @options[:parallel]
         inspect_files(target_files)
       end
+    rescue Interrupt
+      self.aborting = true
+      warn ''
+      warn 'Exiting...'
+
+      false
     end
 
     def aborting?
@@ -81,11 +78,7 @@ module RuboCop
     end
 
     def each_inspected_file(files)
-      trap_interrupt
-
       files.reduce(true) do |all_passed, file|
-        break false if aborting?
-
         offenses = process_file(file)
         yield file
 

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.65.0'.freeze
+    STRING = '0.66.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.65.0
+  version: 0.66.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jaro_winkler
@@ -60,20 +60,6 @@ dependencies:
     - - "!="
       - !ruby/object:Gem::Version
         version: 2.5.1.1
-- !ruby/object:Gem::Dependency
-  name: powerpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +112,22 @@ dependencies:
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -412,12 +404,14 @@ files:
 - lib/rubocop/cop/lint/return_in_void_context.rb
 - lib/rubocop/cop/lint/safe_navigation_chain.rb
 - lib/rubocop/cop/lint/safe_navigation_consistency.rb
+- lib/rubocop/cop/lint/safe_navigation_with_empty.rb
 - lib/rubocop/cop/lint/script_permission.rb
 - lib/rubocop/cop/lint/shadowed_argument.rb
 - lib/rubocop/cop/lint/shadowed_exception.rb
 - lib/rubocop/cop/lint/shadowing_outer_local_variable.rb
 - lib/rubocop/cop/lint/string_conversion_in_interpolation.rb
 - lib/rubocop/cop/lint/syntax.rb
+- lib/rubocop/cop/lint/to_json.rb
 - lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb
 - lib/rubocop/cop/lint/unified_integer.rb
 - lib/rubocop/cop/lint/unneeded_cop_disable_directive.rb
@@ -633,6 +627,7 @@ files:
 - lib/rubocop/cop/style/comment_annotation.rb
 - lib/rubocop/cop/style/commented_keyword.rb
 - lib/rubocop/cop/style/conditional_assignment.rb
+- lib/rubocop/cop/style/constant_visibility.rb
 - lib/rubocop/cop/style/copyright.rb
 - lib/rubocop/cop/style/date_time.rb
 - lib/rubocop/cop/style/def_with_parentheses.rb
@@ -779,6 +774,7 @@ files:
 - lib/rubocop/cop/variable_force/scope.rb
 - lib/rubocop/cop/variable_force/variable.rb
 - lib/rubocop/cop/variable_force/variable_table.rb
+- lib/rubocop/core_ext/string.rb
 - lib/rubocop/error.rb
 - lib/rubocop/file_finder.rb
 - lib/rubocop/formatter/auto_gen_config_formatter.rb
@@ -848,7 +844,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Automatic Ruby code style checking tool.