rubocop 0.50.0 → 0.51.0

data/lib/rubocop/ast/node.rb

@@ -285,8 +285,8 @@ module RuboCop
       def_node_matcher :defined_module0, <<-PATTERN
         {(class (const $_ $_) ...)
          (module (const $_ $_) ...)
-         (casgn $_ $_        (send (const nil {:Class :Module}) :new ...))
-         (casgn $_ $_ (block (send (const nil {:Class :Module}) :new ...) ...))}
+         (casgn $_ $_        (send (const nil? {:Class :Module}) :new ...))
+         (casgn $_ $_ (block (send (const nil? {:Class :Module}) :new ...) ...))}
       PATTERN
       private :defined_module0
 
@@ -439,21 +439,21 @@ module RuboCop
       end
 
       def_node_matcher :guard_clause?, <<-PATTERN
-        [{(send nil {:raise :fail} ...) return break next} single_line?]
+        [{(send nil? {:raise :fail} ...) return break next} single_line?]
       PATTERN
 
       def_node_matcher :proc?, <<-PATTERN
-        {(block (send nil :proc) ...)
-         (block (send (const nil :Proc) :new) ...)
-         (send (const nil :Proc) :new)}
+        {(block (send nil? :proc) ...)
+         (block (send (const nil? :Proc) :new) ...)
+         (send (const nil? :Proc) :new)}
       PATTERN
 
-      def_node_matcher :lambda?, '(block (send nil :lambda) ...)'
+      def_node_matcher :lambda?, '(block (send nil? :lambda) ...)'
       def_node_matcher :lambda_or_proc?, '{lambda? proc?}'
 
       def_node_matcher :class_constructor?, <<-PATTERN
-        {       (send (const nil {:Class :Module}) :new ...)
-         (block (send (const nil {:Class :Module}) :new ...) ...)}
+        {       (send (const nil? {:Class :Module}) :new ...)
+         (block (send (const nil? {:Class :Module}) :new ...) ...)}
       PATTERN
 
       def_node_matcher :module_definition?, <<-PATTERN

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

@@ -163,11 +163,11 @@ module RuboCop
       end
 
       def_node_matcher :adjacent_def_modifier?, <<-PATTERN
-        (send nil _ ({def defs} ...))
+        (send nil? _ ({def defs} ...))
       PATTERN
 
       def_node_matcher :bare_access_modifier?, <<-PATTERN
-        (send nil {:public :protected :private :module_function})
+        (send nil? {:public :protected :private :module_function})
       PATTERN
     end
   end

data/lib/rubocop/ast/node/send_node.rb

@@ -16,6 +16,10 @@ module RuboCop
       def node_parts
         to_a
       end
+
+      def negation_method?
+        keyword_bang? || keyword_not?
+      end
     end
   end
 end

data/lib/rubocop/cached_data.rb

@@ -38,12 +38,7 @@ module RuboCop
     def message(offense)
       # JSON.dump will fail if the offense message contains text which is not
       # valid UTF-8
-      message = offense.message
-      if message.respond_to?(:scrub)
-        message.scrub
-      else
-        message.chars.select(&:valid_encoding?).join
-      end
+      offense.message.scrub
     end
 
     # Restore an offense object loaded from a JSON file.

data/lib/rubocop/cli.rb

@@ -31,13 +31,13 @@ module RuboCop
 
       execute_runner(paths)
     rescue RuboCop::Error => e
-      $stderr.puts Rainbow("Error: #{e.message}").red
+      warn Rainbow("Error: #{e.message}").red
       return 2
     rescue Finished
       return 0
-    rescue StandardError, SyntaxError => e
-      $stderr.puts e.message
-      $stderr.puts e.backtrace
+    rescue StandardError, SyntaxError, LoadError => e
+      warn e.message
+      warn e.backtrace
       return 2
     end
 
@@ -45,8 +45,8 @@ module RuboCop
       Signal.trap('INT') do
         exit!(1) if runner.aborting?
         runner.abort
-        $stderr.puts
-        $stderr.puts 'Exiting... Interrupt again to exit immediately.'
+        warn
+        warn 'Exiting... Interrupt again to exit immediately.'
       end
     end
 
@@ -66,6 +66,7 @@ module RuboCop
 
       ConfigLoader.debug = @options[:debug]
       ConfigLoader.auto_gen_config = @options[:auto_gen_config]
+      ConfigLoader.ignore_parent_exclusion = @options[:ignore_parent_exclusion]
 
       @config_store.options_config = @options[:config] if @options[:config]
       @config_store.force_default_config! if @options[:force_default_config]

data/lib/rubocop/config.rb

@@ -17,7 +17,8 @@ module RuboCop
                        AutoCorrect StyleGuide Details].freeze
     # 2.1 is the oldest officially supported Ruby version.
     DEFAULT_RUBY_VERSION = 2.1
-    KNOWN_RUBIES = [1.9, 2.0, 2.1, 2.2, 2.3, 2.4].freeze
+    KNOWN_RUBIES = [2.1, 2.2, 2.3, 2.4].freeze
+    OBSOLETE_RUBIES = { 1.9 => '0.50', 2.0 => '0.50' }.freeze
     DEFAULT_RAILS_VERSION = 5.0
     OBSOLETE_COPS = {
       'Style/TrailingComma' =>
@@ -26,6 +27,9 @@ module RuboCop
         '`Style/TrailingCommaInArguments` instead.',
       'Rails/DefaultScope' =>
         'The `Rails/DefaultScope` cop no longer exists.',
+      'Lint/InvalidCharacterLiteral' =>
+        'The `Lint/InvalidCharacterLiteral` cop has been removed since it ' \
+        'was never being actually triggered.',
       'Style/SingleSpaceBeforeFirstArg' =>
         'The `Style/SingleSpaceBeforeFirstArg` cop has been renamed to ' \
         '`Layout/SpaceBeforeFirstArg`.',
@@ -60,8 +64,8 @@ module RuboCop
         'The `Style/AsciiIdentifiers` cop has been moved to ' \
           '`Naming/AccessorMethodName`.',
       'Style/OpMethod' =>
-        'The `Style/OpMethods` cop has been renamed and moved to ' \
-          '`Naming/BinaryOperatorParameter`.',
+        'The `Style/OpMethod` cop has been renamed and moved to ' \
+          '`Naming/BinaryOperatorParameterName`.',
       'Style/ClassAndModuleCamelCase' =>
         'The `Style/ClassAndModuleCamelCase` cop has been renamed to ' \
           '`Naming/ClassAndModuleCamelCase`.',
@@ -92,6 +96,24 @@ module RuboCop
                      'for alignment, please use AllowForAlignment: ' \
                      'true instead.'
       },
+      {
+        cop: 'Style/Encoding',
+        parameter: 'EnforcedStyle',
+        alternative: 'Style/Encoding no longer supports styles. ' \
+                     'The "never" behavior is always assumed.'
+      },
+      {
+        cop: 'Style/Encoding',
+        parameter: 'SupportedStyles',
+        alternative: 'Style/Encoding no longer supports styles. ' \
+                     'The "never" behavior is always assumed.'
+      },
+      {
+        cop: 'Style/Encoding',
+        parameter: 'AutoCorrectEncodingComment',
+        alternative: 'Style/Encoding no longer supports styles. ' \
+                     'The "never" behavior is always assumed.'
+      },
       {
         cop: 'Style/SpaceAroundOperators',
         parameter: 'MultiSpaceAllowedForOperators',
@@ -355,7 +377,7 @@ module RuboCop
         next if Cop::Cop.registry.contains_cop_matching?([name])
 
         warn Rainbow("Warning: unrecognized cop #{name} found in " \
-                     "#{loaded_path}").yellow
+                     "#{smart_loaded_path}").yellow
       end
     end
 
@@ -364,13 +386,14 @@ module RuboCop
                     valid_cop_names.include?('Syntax')
 
       raise ValidationError,
-            "configuration for Syntax cop found in #{loaded_path}\n" \
+            "configuration for Syntax cop found in #{smart_loaded_path}\n" \
             'This cop cannot be configured.'
     end
 
     def validate_section_presence(name)
       return unless key?(name) && self[name].nil?
-      raise ValidationError, "empty section #{name} found in #{loaded_path}"
+      raise ValidationError,
+            "empty section #{name} found in #{smart_loaded_path}"
     end
 
     def validate_parameter_names(valid_cop_names)
@@ -381,7 +404,7 @@ module RuboCop
                   ConfigLoader.default_configuration[name].key?(param)
 
           warn Rainbow("Warning: unrecognized parameter #{name}:#{param} " \
-                       "found in #{loaded_path}").yellow
+                       "found in #{smart_loaded_path}").yellow
         end
       end
     end
@@ -397,7 +420,7 @@ module RuboCop
           next if valid.include?(style)
 
           msg = "invalid #{style_name} '#{style}' for #{name} found in " \
-            "#{loaded_path}\n" \
+            "#{smart_loaded_path}\n" \
             "Valid choices are: #{valid.join(', ')}"
           raise ValidationError, msg
         end
@@ -425,36 +448,45 @@ module RuboCop
       return unless self[cop] && self[cop].key?(parameter)
 
       "obsolete parameter #{parameter} (for #{cop}) " \
-        "found in #{loaded_path}" \
+        "found in #{smart_loaded_path}" \
         "\n#{alternative}"
     end
 
     def obsolete_cops
       OBSOLETE_COPS.map do |cop_name, message|
         next unless key?(cop_name) || key?(Cop::Badge.parse(cop_name).cop_name)
-        message + "\n(obsolete configuration found in #{loaded_path}, please" \
-                   ' update it)'
+        message + "\n(obsolete configuration found in #{smart_loaded_path}," \
+                   ' please update it)'
       end
     end
 
     def check_target_ruby
       return if KNOWN_RUBIES.include?(target_ruby_version)
 
-      msg = "Unknown Ruby version #{target_ruby_version.inspect} found "
+      msg = if OBSOLETE_RUBIES.include?(target_ruby_version)
+              "Unsupported Ruby version #{target_ruby_version} found in " \
+              "#{target_ruby_source}. #{target_ruby_version}-compatible " \
+              'analysis was dropped after version ' \
+              "#{OBSOLETE_RUBIES[target_ruby_version]}."
+            else
+              "Unknown Ruby version #{target_ruby_version.inspect} found in " \
+              "#{target_ruby_source}."
+            end
 
-      msg +=
-        case @target_ruby_version_source
-        when :dot_ruby_version
-          'in `.ruby-version`.'
-        when :rubocop_yml
-          "in `TargetRubyVersion` parameter (in #{loaded_path})." \
-        end
-
-      msg += "\nKnown versions: #{KNOWN_RUBIES.join(', ')}"
+      msg += "\nSupported versions: #{KNOWN_RUBIES.join(', ')}"
 
       raise ValidationError, msg
     end
 
+    def target_ruby_source
+      case @target_ruby_version_source
+      when :dot_ruby_version
+        '`.ruby-version`'
+      when :rubocop_yml
+        "`TargetRubyVersion` parameter (in #{smart_loaded_path})"
+      end
+    end
+
     def reject_mutually_exclusive_defaults
       disabled_by_default = for_all_cops['DisabledByDefault']
       enabled_by_default = for_all_cops['EnabledByDefault']
@@ -470,12 +502,16 @@ module RuboCop
 
       unless department
         department_options = self[cop_department]
-        if department_options && department_options.fetch('Enabled') == false
+        if department_options && department_options['Enabled'] == false
           return false
         end
       end
 
       cop_options.fetch('Enabled', true)
     end
+
+    def smart_loaded_path
+      PathUtil.smart_path(@loaded_path)
+    end
   end
 end

data/lib/rubocop/config_loader.rb

@@ -18,19 +18,24 @@ module RuboCop
     class << self
       include ConfigLoaderResolver
 
-      attr_accessor :debug, :auto_gen_config
+      attr_accessor :debug, :auto_gen_config, :ignore_parent_exclusion
       attr_writer :root_level # The upwards search is stopped at this level.
       attr_writer :default_configuration
 
       alias debug? debug
       alias auto_gen_config? auto_gen_config
+      alias ignore_parent_exclusion? ignore_parent_exclusion
 
       def clear_options
         @debug = @auto_gen_config = @root_level = nil
       end
 
-      def load_file(path)
-        path = File.absolute_path(path)
+      def load_file(file)
+        return if file.nil?
+        path = File.absolute_path(
+          file.is_a?(RemoteConfig) ? file.file : file
+        )
+
         hash = load_yaml_configuration(path)
 
         # Resolve requires first in case they define additional cops
@@ -40,7 +45,7 @@ module RuboCop
         target_ruby_version_to_f!(hash)
 
         resolve_inheritance_from_gems(hash, hash.delete('inherit_gem'))
-        resolve_inheritance(path, hash)
+        resolve_inheritance(path, hash, file)
 
         hash.delete('inherit_from')
 
@@ -83,25 +88,29 @@ module RuboCop
         result
       end
 
-      def base_configs(path, inherit_from)
+      def base_configs(path, inherit_from, file)
         configs = Array(inherit_from).compact.map do |f|
-          if f =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w[http https])}\z/
-            f = RemoteConfig.new(f, File.dirname(path)).file
-          else
-            f = File.expand_path(f, File.dirname(path))
-
-            if auto_gen_config?
-              next if f.include?(AUTO_GENERATED_FILE)
-            end
-
-            print 'Inheriting ' if debug?
-          end
-          load_file(f)
+          load_file(inherited_file(path, f, file))
         end
 
         configs.compact
       end
 
+      def inherited_file(path, inherit_from, file)
+        regex = URI::DEFAULT_PARSER.make_regexp(%w[http https])
+        if inherit_from =~ /\A#{regex}\z/
+          f = RemoteConfig.new(inherit_from, File.dirname(path))
+        elsif file.is_a?(RemoteConfig)
+          f = file.inherit_from_remote(inherit_from, path)
+        else
+          f = File.expand_path(inherit_from, File.dirname(path))
+
+          return if auto_gen_config? && f.include?(AUTO_GENERATED_FILE)
+          print 'Inheriting ' if debug?
+        end
+        f
+      end
+
       # Returns the path of .rubocop.yml searching upwards in the
       # directory structure starting at the given directory where the
       # inspected file is. If no .rubocop.yml is found there, the
@@ -115,14 +124,21 @@ module RuboCop
         config = load_file(config_file)
         return config if config_file == DEFAULT_FILE
 
-        found_files = config_files_in_path(config_file)
-        if found_files.any? && found_files.last != config_file
-          print 'AllCops/Exclude ' if debug?
-          config.add_excludes_from_higher_level(load_file(found_files.last))
+        if ignore_parent_exclusion?
+          print 'Ignoring AllCops/Exclude from parent folders' if debug?
+        else
+          add_excludes_from_files(config, config_file)
         end
         merge_with_default(config, config_file)
       end
 
+      def add_excludes_from_files(config, config_file)
+        found_files = config_files_in_path(config_file)
+        return unless found_files.any? && found_files.last != config_file
+        print 'AllCops/Exclude ' if debug?
+        config.add_excludes_from_higher_level(load_file(found_files.last))
+      end
+
       def default_configuration
         @default_configuration ||= begin
                                      print 'Default ' if debug?

data/lib/rubocop/config_loader_resolver.rb

@@ -17,8 +17,9 @@ module RuboCop
       end
     end
 
-    def resolve_inheritance(path, hash)
-      base_configs(path, hash['inherit_from']).reverse_each do |base_config|
+    def resolve_inheritance(path, hash, file)
+      base_configs(path, hash['inherit_from'], file)
+        .reverse_each do |base_config|
         base_config.each do |k, v|
           hash[k] = hash.key?(k) ? merge(v, hash[k]) : v if v.is_a?(Hash)
         end

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

@@ -45,7 +45,7 @@ module RuboCop
 
         private
 
-        def_node_search :gem_declarations, '(send nil :gem str ...)'
+        def_node_search :gem_declarations, '(send nil? :gem str ...)'
 
         def duplicated_gem_nodes
           gem_declarations(processed_source.ast)
@@ -56,11 +56,13 @@ module RuboCop
 
         def register_offense(node, gem_name, line_of_first_occurrence)
           line_range = node.loc.column...node.loc.last_column
+          offense_location =
+            source_range(processed_source.buffer, node.loc.line, line_range)
 
           add_offense(
             node,
-            source_range(processed_source.buffer, node.loc.line, line_range),
-            format(MSG, gem_name, line_of_first_occurrence)
+            location: offense_location,
+            message: format(MSG, gem_name, line_of_first_occurrence)
           )
         end
       end

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

@@ -31,7 +31,7 @@ module RuboCop
               "if possible, or 'http://rubygems.org' if not.".freeze
 
         def_node_matcher :insecure_protocol_source?, <<-PATTERN
-          (send nil :source
+          (send nil? :source
             (sym ${:gemcutter :rubygems :rubyforge}))
         PATTERN
 
@@ -40,7 +40,9 @@ module RuboCop
             message = format(MSG, source)
 
             add_offense(
-              node, source_range(node.first_argument.loc.expression), message
+              node,
+              location: source_range(node.first_argument.loc.expression),
+              message: message
             )
           end
         end