rubocop 1.14.0 → 1.18.0

data/lib/rubocop/formatter/junit_formatter.rb

@@ -22,9 +22,13 @@ module RuboCop
         testsuites = REXML::Element.new('testsuites', @document)
         testsuite = REXML::Element.new('testsuite', testsuites)
         @testsuite = testsuite.tap { |element| element.add_attributes('name' => 'rubocop') }
+
+        reset_count
       end
 
       def file_finished(file, offenses)
+        @inspected_file_count += 1
+
         # TODO: Returns all cops with the same behavior as
         # the original rubocop-junit-formatter.
         # https://github.com/mikian/rubocop-junit-formatter/blob/v0.1.4/lib/rubocop/formatter/junit_formatter.rb#L9
@@ -32,15 +36,11 @@ module RuboCop
         # In the future, it would be preferable to return only enabled cops.
         Cop::Registry.all.each do |cop|
           target_offenses = offenses_for_cop(offenses, cop)
+          @offense_count += target_offenses.count
 
           next unless relevant_for_output?(options, target_offenses)
 
-          REXML::Element.new('testcase', @testsuite).tap do |testcase|
-            testcase.attributes['classname'] = classname_attribute_value(file)
-            testcase.attributes['name'] = cop.cop_name
-
-            add_failure_to(testcase, target_offenses, cop.cop_name)
-          end
+          add_testcase_element_to_testsuite_element(file, target_offenses, cop)
         end
       end
 
@@ -52,16 +52,31 @@ module RuboCop
         all_offenses.select { |offense| offense.cop_name == cop.cop_name }
       end
 
+      def add_testcase_element_to_testsuite_element(file, target_offenses, cop)
+        REXML::Element.new('testcase', @testsuite).tap do |testcase|
+          testcase.attributes['classname'] = classname_attribute_value(file)
+          testcase.attributes['name'] = cop.cop_name
+
+          add_failure_to(testcase, target_offenses, cop.cop_name)
+        end
+      end
+
       def classname_attribute_value(file)
         file.gsub(/\.rb\Z/, '').gsub("#{Dir.pwd}/", '').tr('/', '.')
       end
 
       def finished(_inspected_files)
+        @testsuite.add_attributes('tests' => @inspected_file_count, 'failures' => @offense_count)
         @document.write(output, 2)
       end
 
       private
 
+      def reset_count
+        @inspected_file_count = 0
+        @offense_count = 0
+      end
+
       def add_failure_to(testcase, offenses, cop_name)
         # One failure per offense. Zero failures is a passing test case,
         # for most surefire/nUnit parsers.

data/lib/rubocop/options.rb

@@ -12,9 +12,9 @@ module RuboCop
   # @api private
   class Options
     E_STDIN_NO_PATH = '-s/--stdin requires exactly one path, relative to the ' \
-      'root of the project. RuboCop will use this path to determine which ' \
-      'cops are enabled (via eg. Include/Exclude), and so that certain cops ' \
-      'like Naming/FileName can be checked.'
+                      'root of the project. RuboCop will use this path to determine which ' \
+                      'cops are enabled (via eg. Include/Exclude), and so that certain cops ' \
+                      'like Naming/FileName can be checked.'
     EXITING_OPTIONS = %i[version verbose_version show_cops].freeze
     DEFAULT_MAXIMUM_EXCLUSION_ITEMS = 15
 
@@ -292,12 +292,12 @@ module RuboCop
 
       if display_only_fail_level_offenses_with_autocorrect?
         raise OptionArgumentError, '--autocorrect cannot be used with ' \
-          '--display-only-fail-level-offenses'
+                                   '--display-only-fail-level-offenses'
       end
       validate_auto_gen_config
       validate_auto_correct
       validate_display_only_failed
-      validate_parallel
+      disable_parallel_when_invalid_option_combo
 
       return if incompatible_options.size <= 1
 
@@ -334,33 +334,27 @@ module RuboCop
             format('--disable-uncorrectable can only be used together with --auto-correct.')
     end
 
-    def validate_parallel
+    def disable_parallel_when_invalid_option_combo
       return unless @options.key?(:parallel)
 
-      if @options[:cache] == 'false'
-        raise OptionArgumentError, '-P/--parallel uses caching to speed up ' \
-                                   'execution, so combining with --cache ' \
-                                   'false is not allowed.'
-      end
-
-      disable_parallel_when_invalid_combo
-    end
+      invalid_options = [
+        { name: :auto_gen_config, value: true, flag: '--auto-gen-config' },
+        { name: :fail_fast, value: true, flag: '-F/--fail-fast.' },
+        { name: :auto_correct, value: true, flag: '--auto-correct.' },
+        { name: :cache, value: 'false', flag: '--cache false' }
+      ]
 
-    def disable_parallel_when_invalid_combo
-      combos = {
-        auto_gen_config: '--auto-gen-config',
-        fail_fast: '-F/--fail-fast.',
-        auto_correct: '--auto-correct.'
-      }
-
-      invalid_combos = combos.select { |key, _flag| @options.key?(key) }
+      invalid_flags = invalid_options.each_with_object([]) do |option, flags|
+        # `>` rather than `>=` because `@options` will also contain `parallel: true`
+        flags << option[:flag] if @options > { option[:name] => option[:value] }
+      end
 
-      return if invalid_combos.empty?
+      return if invalid_flags.empty?
 
       @options.delete(:parallel)
 
       puts '-P/--parallel is being ignored because ' \
-           "it is not compatible with #{invalid_combos.values.join(', ')}"
+           "it is not compatible with #{invalid_flags.join(', ')}"
     end
 
     def only_includes_redundant_disable?

data/lib/rubocop/rake_task.rb

@@ -70,7 +70,7 @@ module RuboCop
             options = full_options.unshift('--auto-correct-all')
             # `parallel` will automatically be removed from the options internally.
             # This is a nice to have to suppress the warning message
-            # about parallel and auto-corrent not being compatible.
+            # about parallel and auto-correct not being compatible.
             options.delete('--parallel')
             run_cli(verbose, options)
           end

data/lib/rubocop/remote_config.rb

@@ -55,6 +55,7 @@ module RuboCop
     def generate_request(uri)
       request = Net::HTTP::Get.new(uri.request_uri)
 
+      request.basic_auth(uri.user, uri.password) if uri.user
       request['If-Modified-Since'] = File.stat(cache_path).mtime.rfc2822 if cache_path_exists?
 
       yield request
@@ -70,7 +71,7 @@ module RuboCop
         begin
           response.error!
         rescue StandardError => e
-          message = "#{e.message} while downloading remote config file #{uri}"
+          message = "#{e.message} while downloading remote config file #{cloned_url}"
           raise e, message
         end
       end
@@ -94,9 +95,16 @@ module RuboCop
     end
 
     def cache_name_from_uri
-      uri = @uri.clone
+      uri = cloned_url
       uri.query = nil
       uri.to_s.gsub!(/[^0-9A-Za-z]/, '-')
     end
+
+    def cloned_url
+      uri = @uri.clone
+      uri.user = nil if uri.user
+      uri.password = nil if uri.password
+      uri
+    end
   end
 end

data/lib/rubocop/rspec/cop_helper.rb

@@ -15,7 +15,7 @@ module CopHelper
     processed_source = parse_source(source, file)
     unless processed_source.valid_syntax?
       raise 'Error parsing example code: ' \
-        "#{processed_source.diagnostics.map(&:render).join("\n")}"
+            "#{processed_source.diagnostics.map(&:render).join("\n")}"
     end
 
     _investigate(cop, processed_source)

data/lib/rubocop/rspec/expect_offense.rb

@@ -195,7 +195,7 @@ module RuboCop
         return processed_source if processed_source.valid_syntax?
 
         raise 'Error parsing example code: ' \
-          "#{processed_source.diagnostics.map(&:render).join("\n")}"
+              "#{processed_source.diagnostics.map(&:render).join("\n")}"
       end
 
       def set_formatter_options

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.14.0'
+    STRING = '1.18.0'
 
     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.14.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -100,7 +100,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -110,7 +110,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -319,6 +319,7 @@ files:
 - lib/rubocop/cop/layout/initial_indentation.rb
 - lib/rubocop/cop/layout/leading_comment_space.rb
 - lib/rubocop/cop/layout/leading_empty_lines.rb
+- lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb
 - lib/rubocop/cop/layout/line_length.rb
 - lib/rubocop/cop/layout/multiline_array_brace_layout.rb
 - lib/rubocop/cop/layout/multiline_array_line_breaks.rb
@@ -397,6 +398,7 @@ files:
 - lib/rubocop/cop/lint/empty_ensure.rb
 - lib/rubocop/cop/lint/empty_expression.rb
 - lib/rubocop/cop/lint/empty_file.rb
+- lib/rubocop/cop/lint/empty_in_pattern.rb
 - lib/rubocop/cop/lint/empty_interpolation.rb
 - lib/rubocop/cop/lint/empty_when.rb
 - lib/rubocop/cop/lint/ensure_return.rb
@@ -562,6 +564,7 @@ files:
 - lib/rubocop/cop/mixin/string_help.rb
 - lib/rubocop/cop/mixin/string_literals_help.rb
 - lib/rubocop/cop/mixin/surrounding_space.rb
+- lib/rubocop/cop/mixin/symbol_help.rb
 - lib/rubocop/cop/mixin/target_ruby_version.rb
 - lib/rubocop/cop/mixin/trailing_body.rb
 - lib/rubocop/cop/mixin/trailing_comma.rb
@@ -577,6 +580,7 @@ files:
 - lib/rubocop/cop/naming/file_name.rb
 - lib/rubocop/cop/naming/heredoc_delimiter_case.rb
 - lib/rubocop/cop/naming/heredoc_delimiter_naming.rb
+- lib/rubocop/cop/naming/inclusive_language.rb
 - lib/rubocop/cop/naming/memoized_instance_variable_name.rb
 - lib/rubocop/cop/naming/method_name.rb
 - lib/rubocop/cop/naming/method_parameter_name.rb
@@ -676,6 +680,7 @@ files:
 - lib/rubocop/cop/style/if_with_boolean_literal_branches.rb
 - lib/rubocop/cop/style/if_with_semicolon.rb
 - lib/rubocop/cop/style/implicit_runtime_error.rb
+- lib/rubocop/cop/style/in_pattern_then.rb
 - lib/rubocop/cop/style/infinite_loop.rb
 - lib/rubocop/cop/style/inline_comment.rb
 - lib/rubocop/cop/style/inverse_methods.rb
@@ -699,6 +704,7 @@ files:
 - lib/rubocop/cop/style/multiline_block_chain.rb
 - lib/rubocop/cop/style/multiline_if_modifier.rb
 - lib/rubocop/cop/style/multiline_if_then.rb
+- lib/rubocop/cop/style/multiline_in_pattern_then.rb
 - lib/rubocop/cop/style/multiline_memoization.rb
 - lib/rubocop/cop/style/multiline_method_signature.rb
 - lib/rubocop/cop/style/multiline_ternary_operator.rb
@@ -732,6 +738,7 @@ files:
 - lib/rubocop/cop/style/perl_backrefs.rb
 - lib/rubocop/cop/style/preferred_hash_methods.rb
 - lib/rubocop/cop/style/proc.rb
+- lib/rubocop/cop/style/quoted_symbols.rb
 - lib/rubocop/cop/style/raise_args.rb
 - lib/rubocop/cop/style/random_with_offset.rb
 - lib/rubocop/cop/style/redundant_argument.rb
@@ -786,6 +793,7 @@ files:
 - lib/rubocop/cop/style/symbol_literal.rb
 - lib/rubocop/cop/style/symbol_proc.rb
 - lib/rubocop/cop/style/ternary_parentheses.rb
+- lib/rubocop/cop/style/top_level_method_definition.rb
 - lib/rubocop/cop/style/trailing_body_on_class.rb
 - lib/rubocop/cop/style/trailing_body_on_method_definition.rb
 - lib/rubocop/cop/style/trailing_body_on_module.rb
@@ -875,7 +883,7 @@ metadata:
   homepage_uri: https://rubocop.org/
   changelog_uri: https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop/rubocop/
-  documentation_uri: https://docs.rubocop.org/rubocop/1.14/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.18/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues
 post_install_message: 
 rdoc_options: []