rubocop 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ce46e11fac05ae40731d9a49b0c4229aa719d395a3f946b294965c52513ad1b
-  data.tar.gz: 56c6f908f370d96d011287d67172e41c9a8a3a21748fb04d5235d0f957ffd64f
+  metadata.gz: 6385e74786dea3c867437d18cb40ed5715ed391e14c05f9589b9029b5d8e3b82
+  data.tar.gz: 56ca46faf293f235cecc7e9efc3590f355889b837bf2a9d27c224eb62e5a5ac5
 SHA512:
-  metadata.gz: f58d45c385e3fcccee94a8c258dd9536fb768c8ae069201411bb22f3c33dac0806b1d177f7f5562a27b71ae25ab3896917c06c29703c1f1c7d276506442069c6
-  data.tar.gz: ca55f537a662481c1337f6301d162074138c76a36c3332715aa2304ef2b67363df4b026ec1aa4dabe6e9c6b7833c0ed48edca99ea249a152a6a563a6242beeac
+  metadata.gz: 1f7dd2432b886b8a843fb168179d51a1f2944c045261d461a35e3a40942d55de8a837051bb06635482cf29db50f6bb8f4be16bf284a9596d70ab3e1235a296ec
+  data.tar.gz: 3cdc1f213db45d58d9ae5f2b05a6ed93d9c5cb18bf096e7ff2c848bdf191f70b1af011401a97c70f54a0a63107a24bb60c7eea50284a3f7b9467e522c3d9b183

data/lib/rubocop/cli/command/suggest_extensions.rb

@@ -11,6 +11,15 @@ module RuboCop
 
         self.command_name = :suggest_extensions
 
+        def self.dependent_gems
+          return [] unless defined?(Bundler)
+
+          # This only includes gems in Gemfile, not in lockfile
+          Bundler.load.dependencies.map(&:name)
+        rescue Bundler::GemfileNotFound
+          []
+        end
+
         def run
           return if skip? || extensions.none?
 
@@ -18,14 +27,17 @@ module RuboCop
           puts 'Tip: Based on detected gems, the following '\
             'RuboCop extension libraries might be helpful:'
 
-          extensions.each do |extension|
+          extensions.sort.each do |extension|
             puts "  * #{extension} (http://github.com/rubocop-hq/#{extension})"
           end
 
           puts
-          puts 'You can opt out of this message by adding the following to your config:'
+          puts 'You can opt out of this message by adding the following to your config '\
+            '(see https://docs.rubocop.org/rubocop/extensions.html#extension-suggestions '\
+            'for more options):'
           puts '  AllCops:'
           puts '    SuggestExtensions: false'
+
           puts if @options[:display_time]
         end
 
@@ -46,21 +58,22 @@ module RuboCop
         end
 
         def extensions
-          extensions = @config_store.for_pwd.for_all_cops['SuggestExtensions']
-          return [] unless extensions
-
-          extensions.select { |_, v| (v & dependent_gems).any? }.keys - dependent_gems
-        end
+          return [] unless dependent_gems.any?
 
-        def dependent_gems
-          # This only includes gems in Gemfile, not in lockfile
-          Bundler.load.dependencies.map(&:name)
+          @extensions ||= begin
+            extensions = @config_store.for_pwd.for_all_cops['SuggestExtensions'] || {}
+            extensions.select { |_, v| (Array(v) & dependent_gems).any? }.keys - dependent_gems
+          end
         end
 
         def puts(*args)
           output = (@options[:stderr] ? $stderr : $stdout)
           output.puts(*args)
         end
+
+        def dependent_gems
+          @dependent_gems ||= self.class.dependent_gems
+        end
       end
     end
   end

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

@@ -59,7 +59,7 @@ module RuboCop
         private
 
         def receiver_and_method_call_on_different_lines?(node)
-          node.receiver && node.receiver.loc.last_line != node.loc.selector.line
+          node.receiver && node.receiver.loc.last_line != node.loc.selector&.line
         end
 
         def empty_lines(node)

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

@@ -23,10 +23,11 @@ module RuboCop
               'Use double quoted strings if you need interpolation.'
 
         def on_str(node)
-          parent = node.parent
-          return if parent && (parent.dstr_type? || parent.regexp_type?)
+          return unless node
+          return if string_or_regex?(node.parent)
           return unless /(?<!\\)#\{.*\}/.match?(node.source)
           return if heredoc?(node)
+          return unless node.loc.begin && node.loc.end
 
           add_offense(node) do |corrector|
             autocorrect(corrector, node)
@@ -35,6 +36,10 @@ module RuboCop
 
         private
 
+        def string_or_regex?(node)
+          node&.dstr_type? || node&.regexp_type?
+        end
+
         def autocorrect(corrector, node)
           starting_token, ending_token = if node.source.include?('"')
                                            ['%{', '}']

data/lib/rubocop/cop/naming/variable_number.rb

@@ -104,6 +104,8 @@ module RuboCop
         def on_arg(node)
           @node = node
           name, = *node
+          return if allowed_identifier?(name)
+
           check_name(node, name, node.loc.name)
         end
         alias on_lvasgn on_arg
@@ -139,7 +141,7 @@ module RuboCop
         end
 
         def allowed_identifier?(name)
-          allowed_identifiers.include?(name.to_s)
+          allowed_identifiers.include?(name.to_s.delete('@'))
         end
 
         def allowed_identifiers

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.5.0'
+    STRING = '1.5.1'
 
     MSG = '%<version>s (using Parser %<parser_version>s, '\
           'rubocop-ast %<rubocop_ast_version>s, ' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel