rubocop 0.45.0 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe4f5525d5939f0396d7851e61030c00fd001da
-  data.tar.gz: 6c8a76124e3ac07618a2bbd69b7ca95619cb570b
+  metadata.gz: 4edd0a2f31f504ae1631e4ef7f1d7a7ef94f1529
+  data.tar.gz: 6b80801b3432a53bfc971750598d178e4f07712c
 SHA512:
-  metadata.gz: b16cbb9b023e3d7757b0c7250951d83082924737fc3148ddc962efa3cfd1bcd1a1bb09881fbee457475e9325d0052a393e8d61abeeef1df6fb083761ad73a42e
-  data.tar.gz: c35d29e51547461c170a5b9e68a8a0448f8608e238d922642c61b82dfc94d75ae22f2a771a47d9ed038ad9c530bf1e331907922bdc284bb82a634fb0461a56e4
+  metadata.gz: aa7daba04fc4aa617b6b9fa03ab4f83c8b27f6043b5fa4e969279da65826b51ab2f8b61ef2d8f32f900a3c729fa1e6be1bce98bd76ecc682e0e927d72607a2ea
+  data.tar.gz: 902ec50c6ecb24d4fd13bb2fbe4adca6639786f77e3b9bfb2a37e057909471f7da5807bcae73381b0471fe67276a681232a40cff02d85e080f7f3523112d0dfa

data/README.md

@@ -51,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.45.0', require: false
+gem 'rubocop', '~> 0.46.0', require: false
 ```
 
 ## Quickstart

data/config/default.yml

@@ -436,6 +436,7 @@ Style/EmptyLinesAroundClassBody:
   SupportedStyles:
     - empty_lines
     - empty_lines_except_namespace
+    - empty_lines_special
     - no_empty_lines
 
 Style/EmptyLinesAroundModuleBody:
@@ -443,8 +444,15 @@ Style/EmptyLinesAroundModuleBody:
   SupportedStyles:
     - empty_lines
     - empty_lines_except_namespace
+    - empty_lines_special
     - no_empty_lines
 
+Style/EmptyMethod:
+  EnforcedStyle: compact
+  SupportedStyles:
+    - compact
+    - expanded
+
 # Checks whether the source file has a utf-8 encoding comment or not
 # AutoCorrectEncodingComment must match the regex
 # /#.*coding\s?[:=]\s?(?:UTF|utf)-8/
@@ -998,6 +1006,7 @@ Style/TernaryParentheses:
   SupportedStyles:
     - require_parentheses
     - require_no_parentheses
+    - require_parentheses_when_complex
   AllowSafeAssignment: true
 
 Style/TrailingBlankLines:
@@ -1135,6 +1144,10 @@ Metrics/LineLength:
   # The IgnoreCopDirectives option causes the LineLength rule to ignore cop
   # directives like '# rubocop: enable ...' when calculating a line's length.
   IgnoreCopDirectives: false
+  # The IgnoredPatterns option is a list of !ruby/regexp and/or string
+  # elements. Strings will be converted to Regexp objects. A line that matches
+  # any regular expression listed in this option will be ignored by LineLength.
+  IgnoredPatterns: []
 
 Metrics/MethodLength:
   CountComments: false  # count full line comments?
@@ -1249,6 +1262,10 @@ Rails/DynamicFindBy:
   Whitelist:
     - find_by_sql
 
+Rails/EnumUniqueness:
+  Include:
+    - app/models/**/*.rb
+
 Rails/Exit:
   Include:
     - app/**/*.rb

data/config/enabled.yml

@@ -244,6 +244,11 @@ Style/EmptyLiteral:
   StyleGuide: '#literal-array-hash'
   Enabled: true
 
+Style/EmptyMethod:
+  Description: 'Checks the formatting of empty method definitions.'
+  StyleGuide: '#no-single-line-methods'
+  Enabled: true
+
 Style/EndBlock:
   Description: 'Avoid the use of END blocks.'
   StyleGuide: '#no-END-blocks'
@@ -602,7 +607,7 @@ Style/ParenthesesAroundCondition:
   Description: >-
                  Don't use parentheses around the condition of an
                  if/unless/while.
-  StyleGuide: '#no-parens-if'
+  StyleGuide: '#no-parens-around-condition'
   Enabled: true
 
 Style/PercentLiteralDelimiters:
@@ -1422,7 +1427,7 @@ Performance/Size:
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#arraycount-vs-arraysize-code'
   Enabled: true
 
-Performance/SortWithBlock:
+Performance/CompareWithBlock:
   Description: 'Use `sort_by(&:foo)` instead of `sort_by { |a, b| a.foo <=> b.foo }`.'
   Enabled: true
 
@@ -1472,6 +1477,10 @@ Rails/DynamicFindBy:
   StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find_by'
   Enabled: true
 
+Rails/EnumUniqueness:
+  Description: 'Avoid duplicate integers in hash-syntax `enum` declaration.'
+  Enabled: true
+
 Rails/Exit:
   Description: >-
                   Favor `fail`, `break`, `return`, etc. over `exit` in
@@ -1559,3 +1568,21 @@ Security/JSONLoad:
   # Autocorrect here will change to a method that may cause crashes depending
   # on the value of the argument.
   AutoCorrect: false
+
+##################### Bundler #############################
+
+Bundler/DuplicatedGem:
+  Description: 'Checks for duplicate gem entries in Gemfile.'
+  Enabled: true
+  Include:
+    - '**/Gemfile'
+    - '**/gems.rb'
+
+Bundler/OrderedGems:
+  Description: >-
+                 Sort alphabetically gems appearing within a contiguous set
+                 of lines in the Gemfile
+  Enabled: true
+  Include:
+    - '**/Gemfile'
+    - '**/gems.rb'

data/lib/rubocop.rb

@@ -91,6 +91,9 @@ require 'rubocop/cop/mixin/too_many_lines'
 require 'rubocop/cop/mixin/trailing_comma'
 require 'rubocop/cop/mixin/unused_argument'
 
+require 'rubocop/cop/bundler/duplicated_gem'
+require 'rubocop/cop/bundler/ordered_gems'
+
 require 'rubocop/cop/lint/ambiguous_operator'
 require 'rubocop/cop/lint/ambiguous_regexp_literal'
 require 'rubocop/cop/lint/assignment_in_condition'
@@ -179,7 +182,7 @@ require 'rubocop/cop/performance/redundant_sort_by'
 require 'rubocop/cop/performance/reverse_each'
 require 'rubocop/cop/performance/sample'
 require 'rubocop/cop/performance/size'
-require 'rubocop/cop/performance/sort_with_block'
+require 'rubocop/cop/performance/compare_with_block'
 require 'rubocop/cop/performance/start_with'
 require 'rubocop/cop/performance/string_replacement'
 require 'rubocop/cop/performance/times_map'
@@ -238,6 +241,7 @@ require 'rubocop/cop/style/empty_lines_around_class_body'
 require 'rubocop/cop/style/empty_lines_around_method_body'
 require 'rubocop/cop/style/empty_lines_around_module_body'
 require 'rubocop/cop/style/empty_literal'
+require 'rubocop/cop/style/empty_method'
 require 'rubocop/cop/style/encoding'
 require 'rubocop/cop/style/end_block'
 require 'rubocop/cop/style/end_of_line'
@@ -393,6 +397,7 @@ require 'rubocop/cop/rails/date'
 require 'rubocop/cop/rails/dynamic_find_by'
 require 'rubocop/cop/rails/delegate'
 require 'rubocop/cop/rails/delegate_allow_blank'
+require 'rubocop/cop/rails/enum_uniqueness'
 require 'rubocop/cop/rails/exit'
 require 'rubocop/cop/rails/find_by'
 require 'rubocop/cop/rails/find_each'

data/lib/rubocop/config.rb

@@ -151,16 +151,6 @@ module RuboCop
       for_cop(cop).empty? || for_cop(cop)['Enabled']
     end
 
-    def add_missing_namespaces
-      keys.each do |k|
-        q = Cop::Cop.qualified_cop_name(k, loaded_path)
-        next if q == k
-
-        self[q] = self[k]
-        delete(k)
-      end
-    end
-
     def validate
       # Don't validate RuboCop's own files. Avoids infinite recursion.
       base_config_path = File.expand_path(File.join(ConfigLoader::RUBOCOP_HOME,

data/lib/rubocop/config_loader.rb

@@ -32,25 +32,34 @@ module RuboCop
       def load_file(path)
         path = File.absolute_path(path)
         hash = load_yaml_configuration(path)
+
+        add_missing_namespaces(path, hash)
+
+        resolve_inheritance_from_gems(hash, hash.delete('inherit_gem'))
+        resolve_inheritance(path, hash)
+        resolve_requires(path, hash)
+
+        hash.delete('inherit_from')
         config = Config.new(hash, path)
 
         config.deprecation_check do |deprecation_message|
           warn("#{path} - #{deprecation_message}")
         end
 
-        config.add_missing_namespaces
-
-        resolve_inheritance_from_gems(config, config.delete('inherit_gem'))
-        resolve_inheritance(path, config)
-        resolve_requires(path, config)
-
-        config.delete('inherit_from')
-
         config.validate
         config.make_excludes_absolute
         config
       end
 
+      def add_missing_namespaces(path, hash)
+        hash.keys.each do |k|
+          q = Cop::Cop.qualified_cop_name(k, path)
+          next if q == k
+
+          hash[q] = hash.delete(k)
+        end
+      end
+
       # Return a recursive merge of two hashes. That is, a normal hash merge,
       # with the addition that any value that is a hash, and occurs in both
       # arguments, will also be merged. And so on.
@@ -66,7 +75,7 @@ module RuboCop
 
       def base_configs(path, inherit_from)
         configs = Array(inherit_from).compact.map do |f|
-          if f =~ /\A#{URI.regexp(%w(http https))}\z/
+          if f =~ /\A#{URI::Parser.new.make_regexp(%w(http https))}\z/
             f = RemoteConfig.new(f, File.dirname(path)).file
           else
             f = File.expand_path(f, File.dirname(path))
@@ -189,5 +198,8 @@ module RuboCop
         dirs_to_search
       end
     end
+
+    # Initializing class ivars
+    clear_options
   end
 end

data/lib/rubocop/cop/bundler/duplicated_gem.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Bundler
+      # A Gem's requirements should be listed only once in a Gemfile.
+      # @example
+      #   # bad
+      #   gem 'rubocop'
+      #   gem 'rubocop'
+      #
+      #   # bad
+      #   group :development do
+      #     gem 'rubocop'
+      #   end
+      #
+      #   group :test do
+      #     gem 'rubocop'
+      #   end
+      #
+      #   # good
+      #   group :development, :test do
+      #     gem 'rubocop'
+      #   end
+      #
+      #   # good
+      #   gem 'rubocop', groups: [:development, :test]
+      class DuplicatedGem < Cop
+        MSG = 'Gem `%s` requirements already given on line %d ' \
+              'of the Gemfile.'.freeze
+
+        def investigate(processed_source)
+          return unless processed_source.ast
+
+          duplicated_gem_nodes.each do |nodes|
+            nodes[1..-1].each do |node|
+              offense(
+                node,
+                node.method_args.first.to_a.first,
+                nodes.first.loc.line
+              )
+            end
+          end
+        end
+
+        private
+
+        def_node_search :gem_declarations, '(send nil :gem str ...)'
+
+        def duplicated_gem_nodes
+          gem_declarations(processed_source.ast)
+            .group_by { |e| e.method_args.first }
+            .keep_if { |_, nodes| nodes.length > 1 }
+            .values
+        end
+
+        def offense(node, gem_name, line_of_first_occurence)
+          line_range = node.loc.column...node.loc.last_column
+
+          add_offense(
+            node,
+            source_range(processed_source.buffer, node.loc.line, line_range),
+            format(MSG, gem_name, line_of_first_occurence)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/bundler/ordered_gems.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+module RuboCop
+  module Cop
+    module Bundler
+      # Gems in consecutive lines should be alphabetically sorted
+      # @example
+      #   # bad
+      #   gem 'rubocop'
+      #   gem 'rspec'
+      #
+      #   # good
+      #   gem 'rspec'
+      #   gem 'rubocop'
+      #
+      #   # good
+      #   gem 'rubocop'
+      #
+      #   gem 'rspec'
+      class OrderedGems < Cop
+        MSG = 'Gem `%s` should appear before `%s` in their gem group.'.freeze
+        def investigate(processed_source)
+          return if processed_source.ast.nil?
+          gem_declarations(processed_source.ast)
+            .each_cons(2) do |previous, current|
+            next unless consecutive_lines(previous, current)
+            next unless current.children[2].children.first.to_s <
+                        previous.children[2].children.first.to_s
+            register_offense(previous, current)
+          end
+        end
+
+        def consecutive_lines(previous, current)
+          previous.source_range.last_line == current.source_range.first_line - 1
+        end
+
+        def register_offense(previous, current)
+          add_offense(
+            current,
+            current.source_range,
+            format(
+              MSG,
+              current.children[2].children.first,
+              previous.children[2].children.first
+            )
+          )
+        end
+
+        def_node_search :gem_declarations, <<-PATTERN
+          (:send, nil, :gem, ...)
+        PATTERN
+      end
+    end
+  end
+end

data/lib/rubocop/cop/cop.rb

@@ -130,6 +130,7 @@ module RuboCop
 
         @offenses = []
         @corrections = []
+        @processed_source = nil
       end
 
       def join_force?(_force_class)

data/lib/rubocop/cop/lint/debugger.rb

@@ -17,10 +17,14 @@ module RuboCop
                       :save_screenshot} ...)}
         END
 
+        def_node_matcher :binding_irb_call?, <<-END
+          (send (send nil :binding) :irb ...)
+        END
+
         def_node_matcher :pry_rescue?, '(send (const nil :Pry) :rescue ...)'
 
         def on_send(node)
-          return unless debugger_call?(node)
+          return unless debugger_call?(node) || binding_irb?(node)
           add_offense(node, :expression, format(MSG, node.source))
         end
 
@@ -38,6 +42,10 @@ module RuboCop
             end
           end
         end
+
+        def binding_irb?(node)
+          target_ruby_version >= 2.4 && binding_irb_call?(node)
+        end
       end
     end
   end

data/lib/rubocop/cop/lint/each_with_object_argument.rb

@@ -15,13 +15,12 @@ module RuboCop
       class EachWithObjectArgument < Cop
         MSG = 'The argument to each_with_object can not be immutable.'.freeze
 
-        def on_send(node)
-          _receiver, method_name, *args = *node
-          return unless method_name == :each_with_object
-          return unless args.length == 1
+        def_node_matcher :each_with_object?, '(send _ :each_with_object $_)'
 
-          arg = args.first
-          add_offense(node, :expression) if arg.immutable_literal?
+        def on_send(node)
+          each_with_object?(node) do |arg|
+            add_offense(node, :expression) if arg.immutable_literal?
+          end
         end
       end
     end

data/lib/rubocop/cop/lint/eval.rb

@@ -7,14 +7,10 @@ module RuboCop
       class Eval < Cop
         MSG = 'The use of `eval` is a serious security risk.'.freeze
 
-        def on_send(node)
-          receiver, method_name, *args = *node
+        def_node_matcher :eval?, '(send nil :eval $!str ...)'
 
-          return unless receiver.nil? &&
-                        method_name == :eval &&
-                        !args.empty? &&
-                        !args.first.str_type?
-          add_offense(node, :selector)
+        def on_send(node)
+          eval?(node) { add_offense(node, :selector) }
         end
       end
     end