rubocop 0.87.1 → 0.91.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/bin/rubocop-profile +32 -0
- data/config/default.yml +267 -33
- data/lib/rubocop.rb +45 -5
- data/lib/rubocop/cached_data.rb +1 -0
- data/lib/rubocop/cli.rb +2 -2
- data/lib/rubocop/cli/command.rb +1 -0
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +4 -3
- data/lib/rubocop/cli/command/base.rb +2 -0
- data/lib/rubocop/cli/command/execute_runner.rb +10 -1
- data/lib/rubocop/cli/command/init_dotfile.rb +1 -0
- data/lib/rubocop/cli/command/show_cops.rb +3 -2
- data/lib/rubocop/cli/command/version.rb +3 -2
- data/lib/rubocop/cli/environment.rb +1 -0
- data/lib/rubocop/comment_config.rb +10 -7
- data/lib/rubocop/config.rb +20 -3
- data/lib/rubocop/config_loader.rb +42 -18
- data/lib/rubocop/config_loader_resolver.rb +4 -3
- data/lib/rubocop/config_obsoletion.rb +7 -1
- data/lib/rubocop/config_store.rb +7 -3
- data/lib/rubocop/config_validator.rb +5 -4
- data/lib/rubocop/cop/autocorrect_logic.rb +1 -1
- data/lib/rubocop/cop/badge.rb +1 -1
- data/lib/rubocop/cop/base.rb +37 -6
- data/lib/rubocop/cop/bundler/duplicated_gem.rb +5 -1
- data/lib/rubocop/cop/bundler/gem_comment.rb +8 -3
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +2 -0
- data/lib/rubocop/cop/commissioner.rb +47 -8
- data/lib/rubocop/cop/cop.rb +1 -1
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +4 -4
- data/lib/rubocop/cop/correctors/condition_corrector.rb +3 -5
- data/lib/rubocop/cop/correctors/empty_line_corrector.rb +9 -10
- data/lib/rubocop/cop/correctors/line_break_corrector.rb +6 -6
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +34 -3
- data/lib/rubocop/cop/correctors/parentheses_corrector.rb +5 -8
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +6 -11
- data/lib/rubocop/cop/correctors/punctuation_corrector.rb +8 -10
- data/lib/rubocop/cop/correctors/unused_arg_corrector.rb +15 -18
- data/lib/rubocop/cop/documentation.rb +22 -0
- data/lib/rubocop/cop/force.rb +1 -0
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +38 -12
- data/lib/rubocop/cop/generator.rb +2 -1
- data/lib/rubocop/cop/generator/configuration_injector.rb +2 -2
- data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +5 -12
- data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +9 -8
- data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +11 -7
- data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +8 -8
- data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +2 -2
- data/lib/rubocop/cop/layout/begin_end_alignment.rb +77 -0
- data/lib/rubocop/cop/layout/block_alignment.rb +24 -20
- data/lib/rubocop/cop/layout/class_structure.rb +13 -16
- data/lib/rubocop/cop/layout/closing_heredoc_indentation.rb +4 -6
- data/lib/rubocop/cop/layout/comment_indentation.rb +1 -1
- data/lib/rubocop/cop/layout/condition_position.rb +13 -15
- data/lib/rubocop/cop/layout/def_end_alignment.rb +8 -5
- data/lib/rubocop/cop/layout/dot_position.rb +21 -17
- data/lib/rubocop/cop/layout/empty_comment.rb +30 -23
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +19 -16
- data/lib/rubocop/cop/layout/empty_line_after_magic_comment.rb +13 -13
- data/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb +145 -0
- data/lib/rubocop/cop/layout/empty_line_between_defs.rb +21 -23
- data/lib/rubocop/cop/layout/empty_lines.rb +6 -9
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +5 -6
- data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +7 -8
- data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +3 -6
- data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +2 -5
- data/lib/rubocop/cop/layout/end_alignment.rb +14 -19
- data/lib/rubocop/cop/layout/extra_spacing.rb +22 -36
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +2 -5
- data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +2 -5
- data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +5 -9
- data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +2 -5
- data/lib/rubocop/cop/layout/hash_alignment.rb +17 -20
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +15 -14
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +16 -13
- data/lib/rubocop/cop/layout/indentation_style.rb +0 -2
- data/lib/rubocop/cop/layout/initial_indentation.rb +6 -7
- data/lib/rubocop/cop/layout/leading_comment_space.rb +12 -10
- data/lib/rubocop/cop/layout/leading_empty_lines.rb +6 -11
- data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +10 -14
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +37 -24
- data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +5 -9
- data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +2 -5
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +32 -24
- data/lib/rubocop/cop/layout/space_after_colon.rb +11 -7
- data/lib/rubocop/cop/layout/space_after_comma.rb +2 -5
- data/lib/rubocop/cop/layout/space_after_method_name.rb +5 -6
- data/lib/rubocop/cop/layout/space_after_not.rb +9 -11
- data/lib/rubocop/cop/layout/space_after_semicolon.rb +2 -5
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +3 -2
- data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +20 -15
- data/lib/rubocop/cop/layout/space_around_keyword.rb +17 -18
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +33 -66
- data/lib/rubocop/cop/layout/space_around_operators.rb +17 -16
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +23 -22
- data/lib/rubocop/cop/layout/space_before_comma.rb +3 -5
- data/lib/rubocop/cop/layout/space_before_comment.rb +10 -7
- data/lib/rubocop/cop/layout/space_before_first_arg.rb +7 -7
- data/lib/rubocop/cop/layout/space_before_semicolon.rb +2 -5
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +9 -17
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +16 -18
- data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +3 -8
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +17 -16
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +15 -19
- data/lib/rubocop/cop/layout/space_inside_parens.rb +9 -14
- data/lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb +5 -10
- data/lib/rubocop/cop/layout/space_inside_range_literal.rb +8 -17
- data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +14 -22
- data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +10 -11
- data/lib/rubocop/cop/layout/trailing_empty_lines.rb +10 -15
- data/lib/rubocop/cop/layout/trailing_whitespace.rb +11 -11
- data/lib/rubocop/cop/lint/ambiguous_block_association.rb +7 -4
- data/lib/rubocop/cop/lint/ambiguous_operator.rb +17 -10
- data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +11 -13
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +2 -2
- data/lib/rubocop/cop/lint/big_decimal_new.rb +9 -10
- data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +50 -0
- data/lib/rubocop/cop/lint/boolean_symbol.rb +16 -11
- data/lib/rubocop/cop/lint/circular_argument_reference.rb +1 -1
- data/lib/rubocop/cop/lint/constant_definition_in_block.rb +54 -0
- data/lib/rubocop/cop/lint/constant_resolution.rb +2 -2
- data/lib/rubocop/cop/lint/debugger.rb +6 -1
- data/lib/rubocop/cop/lint/deprecated_class_methods.rb +7 -10
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +17 -13
- data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +8 -2
- data/lib/rubocop/cop/lint/duplicate_case_condition.rb +1 -1
- data/lib/rubocop/cop/lint/duplicate_elsif_condition.rb +39 -0
- data/lib/rubocop/cop/lint/duplicate_hash_key.rb +1 -1
- data/lib/rubocop/cop/lint/duplicate_methods.rb +7 -6
- data/lib/rubocop/cop/lint/duplicate_require.rb +46 -0
- data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +49 -0
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +2 -1
- data/lib/rubocop/cop/lint/else_layout.rb +1 -1
- data/lib/rubocop/cop/lint/empty_conditional_body.rb +67 -0
- data/lib/rubocop/cop/lint/empty_ensure.rb +5 -5
- data/lib/rubocop/cop/lint/empty_expression.rb +2 -2
- data/lib/rubocop/cop/lint/empty_file.rb +50 -0
- data/lib/rubocop/cop/lint/empty_interpolation.rb +5 -6
- data/lib/rubocop/cop/lint/empty_when.rb +2 -2
- data/lib/rubocop/cop/lint/ensure_return.rb +27 -29
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +13 -10
- data/lib/rubocop/cop/lint/flip_flop.rb +1 -1
- data/lib/rubocop/cop/lint/float_comparison.rb +93 -0
- data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -1
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +4 -3
- data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +13 -14
- data/lib/rubocop/cop/lint/identity_comparison.rb +49 -0
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +5 -4
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +8 -8
- data/lib/rubocop/cop/lint/inherit_exception.rb +12 -7
- data/lib/rubocop/cop/lint/interpolation_check.rb +18 -15
- data/lib/rubocop/cop/lint/literal_as_condition.rb +14 -2
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +7 -7
- data/lib/rubocop/cop/lint/loop.rb +23 -2
- data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +6 -5
- data/lib/rubocop/cop/lint/missing_super.rb +99 -0
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +3 -36
- data/lib/rubocop/cop/lint/multiple_comparison.rb +9 -10
- data/lib/rubocop/cop/lint/nested_method_definition.rb +14 -20
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +1 -1
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -1
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +82 -11
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +2 -2
- data/lib/rubocop/cop/lint/number_conversion.rb +7 -9
- data/lib/rubocop/cop/lint/ordered_magic_comments.rb +11 -13
- data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +79 -0
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +4 -10
- data/lib/rubocop/cop/lint/percent_string_array.rb +3 -6
- data/lib/rubocop/cop/lint/percent_symbol_array.rb +13 -12
- data/lib/rubocop/cop/lint/raise_exception.rb +13 -10
- data/lib/rubocop/cop/lint/rand_one.rb +2 -1
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +16 -19
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +7 -11
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +5 -7
- data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +13 -9
- data/lib/rubocop/cop/lint/redundant_string_coercion.rb +6 -13
- data/lib/rubocop/cop/lint/redundant_with_index.rb +11 -14
- data/lib/rubocop/cop/lint/redundant_with_object.rb +11 -14
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +4 -6
- data/lib/rubocop/cop/lint/require_parentheses.rb +2 -2
- data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
- data/lib/rubocop/cop/lint/rescue_type.rb +8 -8
- data/lib/rubocop/cop/lint/return_in_void_context.rb +2 -4
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +3 -6
- data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +14 -10
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +7 -7
- data/lib/rubocop/cop/lint/script_permission.rb +10 -7
- data/lib/rubocop/cop/lint/self_assignment.rb +78 -0
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +8 -12
- data/lib/rubocop/cop/lint/shadowed_argument.rb +3 -3
- data/lib/rubocop/cop/lint/shadowed_exception.rb +2 -2
- data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +7 -7
- data/lib/rubocop/cop/lint/struct_new_override.rb +2 -1
- data/lib/rubocop/cop/lint/suppressed_exception.rb +4 -7
- data/lib/rubocop/cop/lint/to_json.rb +20 -11
- data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +34 -0
- data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +57 -0
- data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +4 -4
- data/lib/rubocop/cop/lint/unified_integer.rb +4 -6
- data/lib/rubocop/cop/lint/unreachable_code.rb +1 -1
- data/lib/rubocop/cop/lint/unreachable_loop.rb +175 -0
- data/lib/rubocop/cop/lint/unused_block_argument.rb +8 -3
- data/lib/rubocop/cop/lint/unused_method_argument.rb +8 -3
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +4 -2
- data/lib/rubocop/cop/lint/uri_regexp.rb +12 -47
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +25 -15
- data/lib/rubocop/cop/lint/useless_assignment.rb +4 -4
- data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +6 -15
- data/lib/rubocop/cop/lint/useless_method_definition.rb +70 -0
- data/lib/rubocop/cop/lint/useless_setter_call.rb +4 -6
- data/lib/rubocop/cop/lint/useless_times.rb +97 -0
- data/lib/rubocop/cop/lint/void.rb +3 -7
- data/lib/rubocop/cop/metrics/abc_size.rb +1 -1
- data/lib/rubocop/cop/metrics/block_length.rb +2 -2
- data/lib/rubocop/cop/metrics/block_nesting.rb +2 -2
- data/lib/rubocop/cop/metrics/class_length.rb +2 -2
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +2 -1
- data/lib/rubocop/cop/metrics/method_length.rb +2 -2
- data/lib/rubocop/cop/metrics/module_length.rb +2 -2
- data/lib/rubocop/cop/metrics/parameter_lists.rb +2 -6
- data/lib/rubocop/cop/metrics/perceived_complexity.rb +7 -8
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +50 -5
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +53 -24
- data/lib/rubocop/cop/metrics/utils/repeated_csend_discount.rb +37 -0
- data/lib/rubocop/cop/migration/department_name.rb +14 -16
- data/lib/rubocop/cop/mixin/alignment.rb +5 -1
- data/lib/rubocop/cop/mixin/allowed_methods.rb +2 -0
- data/lib/rubocop/cop/mixin/annotation_comment.rb +5 -0
- data/lib/rubocop/cop/mixin/array_min_size.rb +1 -1
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +17 -8
- data/lib/rubocop/cop/mixin/code_length.rb +22 -5
- data/lib/rubocop/cop/mixin/comments_help.rb +48 -0
- data/lib/rubocop/cop/mixin/configurable_naming.rb +2 -2
- data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +8 -7
- data/lib/rubocop/cop/mixin/empty_parameter.rb +3 -1
- data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +12 -1
- data/lib/rubocop/cop/mixin/first_element_line_break.rb +3 -1
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +31 -12
- data/lib/rubocop/cop/mixin/line_length_help.rb +1 -3
- data/lib/rubocop/cop/mixin/method_complexity.rb +10 -2
- data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +3 -1
- data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +13 -12
- data/lib/rubocop/cop/mixin/negative_conditional.rb +2 -2
- data/lib/rubocop/cop/mixin/percent_array.rb +16 -9
- data/lib/rubocop/cop/mixin/range_help.rb +18 -4
- data/lib/rubocop/cop/mixin/regexp_literal_help.rb +1 -1
- data/lib/rubocop/cop/mixin/rescue_node.rb +10 -1
- data/lib/rubocop/cop/mixin/space_after_punctuation.rb +4 -3
- data/lib/rubocop/cop/mixin/space_before_punctuation.rb +4 -3
- data/lib/rubocop/cop/mixin/statement_modifier.rb +39 -10
- data/lib/rubocop/cop/mixin/surrounding_space.rb +8 -29
- data/lib/rubocop/cop/mixin/trailing_comma.rb +9 -11
- data/lib/rubocop/cop/mixin/uncommunicative_name.rb +6 -13
- data/lib/rubocop/cop/mixin/unused_argument.rb +4 -6
- data/lib/rubocop/cop/naming/accessor_method_name.rb +4 -2
- data/lib/rubocop/cop/naming/ascii_identifiers.rb +3 -3
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +2 -2
- data/lib/rubocop/cop/naming/block_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +2 -2
- data/lib/rubocop/cop/naming/constant_name.rb +2 -2
- data/lib/rubocop/cop/naming/file_name.rb +4 -4
- data/lib/rubocop/cop/naming/heredoc_delimiter_case.rb +2 -2
- data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +2 -2
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +2 -2
- data/lib/rubocop/cop/naming/method_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/predicate_name.rb +3 -5
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +12 -11
- data/lib/rubocop/cop/offense.rb +1 -0
- data/lib/rubocop/cop/registry.rb +3 -3
- data/lib/rubocop/cop/security/eval.rb +3 -2
- data/lib/rubocop/cop/security/json_load.rb +7 -8
- data/lib/rubocop/cop/security/marshal_load.rb +3 -4
- data/lib/rubocop/cop/security/open.rb +3 -2
- data/lib/rubocop/cop/security/yaml_load.rb +7 -6
- data/lib/rubocop/cop/severity.rb +0 -8
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +7 -8
- data/lib/rubocop/cop/style/accessor_grouping.rb +29 -20
- data/lib/rubocop/cop/style/alias.rb +43 -36
- data/lib/rubocop/cop/style/and_or.rb +9 -11
- data/lib/rubocop/cop/style/array_coercion.rb +63 -0
- data/lib/rubocop/cop/style/array_join.rb +7 -8
- data/lib/rubocop/cop/style/ascii_comments.rb +4 -4
- data/lib/rubocop/cop/style/attr.rb +12 -9
- data/lib/rubocop/cop/style/auto_resource_cleanup.rb +7 -7
- data/lib/rubocop/cop/style/bare_percent_literals.rb +10 -12
- data/lib/rubocop/cop/style/begin_block.rb +2 -2
- data/lib/rubocop/cop/style/bisected_attr_accessor.rb +14 -18
- data/lib/rubocop/cop/style/block_comments.rb +14 -18
- data/lib/rubocop/cop/style/block_delimiters.rb +23 -23
- data/lib/rubocop/cop/style/case_equality.rb +32 -5
- data/lib/rubocop/cop/style/case_like_if.rb +236 -0
- data/lib/rubocop/cop/style/class_and_module_children.rb +16 -11
- data/lib/rubocop/cop/style/class_check.rb +6 -11
- data/lib/rubocop/cop/style/class_methods.rb +7 -11
- data/lib/rubocop/cop/style/class_methods_definitions.rb +157 -0
- data/lib/rubocop/cop/style/class_vars.rb +7 -12
- data/lib/rubocop/cop/style/collection_methods.rb +11 -17
- data/lib/rubocop/cop/style/colon_method_call.rb +8 -9
- data/lib/rubocop/cop/style/colon_method_definition.rb +6 -6
- data/lib/rubocop/cop/style/combinable_loops.rb +89 -0
- data/lib/rubocop/cop/style/command_literal.rb +23 -24
- data/lib/rubocop/cop/style/comment_annotation.rb +15 -15
- data/lib/rubocop/cop/style/commented_keyword.rb +6 -3
- data/lib/rubocop/cop/style/conditional_assignment.rb +62 -64
- data/lib/rubocop/cop/style/constant_visibility.rb +3 -2
- data/lib/rubocop/cop/style/copyright.rb +12 -12
- data/lib/rubocop/cop/style/date_time.rb +1 -1
- data/lib/rubocop/cop/style/def_with_parentheses.rb +8 -10
- data/lib/rubocop/cop/style/dir.rb +8 -10
- data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +7 -9
- data/lib/rubocop/cop/style/documentation.rb +6 -8
- data/lib/rubocop/cop/style/documentation_method.rb +1 -1
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +12 -15
- data/lib/rubocop/cop/style/double_negation.rb +3 -2
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +5 -8
- data/lib/rubocop/cop/style/each_with_object.rb +16 -19
- data/lib/rubocop/cop/style/empty_block_parameter.rb +9 -10
- data/lib/rubocop/cop/style/empty_case_condition.rb +19 -20
- data/lib/rubocop/cop/style/empty_else.rb +17 -19
- data/lib/rubocop/cop/style/empty_lambda_parameter.rb +9 -10
- data/lib/rubocop/cop/style/empty_literal.rb +18 -17
- data/lib/rubocop/cop/style/empty_method.rb +10 -13
- data/lib/rubocop/cop/style/encoding.rb +5 -9
- data/lib/rubocop/cop/style/end_block.rb +4 -6
- data/lib/rubocop/cop/style/eval_with_location.rb +7 -7
- data/lib/rubocop/cop/style/even_odd.rb +8 -11
- data/lib/rubocop/cop/style/expand_path_arguments.rb +22 -21
- data/lib/rubocop/cop/style/explicit_block_argument.rb +102 -0
- data/lib/rubocop/cop/style/exponential_notation.rb +7 -9
- data/lib/rubocop/cop/style/float_division.rb +10 -11
- data/lib/rubocop/cop/style/for.rb +11 -15
- data/lib/rubocop/cop/style/format_string.rb +18 -19
- data/lib/rubocop/cop/style/format_string_token.rb +10 -12
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +19 -41
- data/lib/rubocop/cop/style/global_std_stream.rb +65 -0
- data/lib/rubocop/cop/style/global_vars.rb +2 -2
- data/lib/rubocop/cop/style/guard_clause.rb +6 -6
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +79 -0
- data/lib/rubocop/cop/style/hash_each_methods.rb +5 -8
- data/lib/rubocop/cop/style/hash_like_case.rb +76 -0
- data/lib/rubocop/cop/style/hash_syntax.rb +10 -8
- data/lib/rubocop/cop/style/hash_transform_keys.rb +19 -11
- data/lib/rubocop/cop/style/hash_transform_values.rb +18 -10
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +2 -2
- data/lib/rubocop/cop/style/if_inside_else.rb +3 -3
- data/lib/rubocop/cop/style/if_unless_modifier.rb +19 -41
- data/lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb +3 -7
- data/lib/rubocop/cop/style/if_with_semicolon.rb +3 -6
- data/lib/rubocop/cop/style/implicit_runtime_error.rb +2 -1
- data/lib/rubocop/cop/style/infinite_loop.rb +24 -24
- data/lib/rubocop/cop/style/inline_comment.rb +3 -3
- data/lib/rubocop/cop/style/inverse_methods.rb +22 -32
- data/lib/rubocop/cop/style/keyword_parameters_order.rb +58 -0
- data/lib/rubocop/cop/style/lambda.rb +7 -12
- data/lib/rubocop/cop/style/lambda_call.rb +17 -14
- data/lib/rubocop/cop/style/line_end_concatenation.rb +19 -16
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +2 -1
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +16 -11
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +4 -8
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +8 -7
- data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +12 -3
- data/lib/rubocop/cop/style/method_def_parentheses.rb +11 -16
- data/lib/rubocop/cop/style/min_max.rb +8 -12
- data/lib/rubocop/cop/style/missing_else.rb +11 -21
- data/lib/rubocop/cop/style/missing_respond_to_missing.rb +10 -3
- data/lib/rubocop/cop/style/mixin_grouping.rb +24 -27
- data/lib/rubocop/cop/style/mixin_usage.rb +2 -1
- data/lib/rubocop/cop/style/module_function.rb +10 -13
- data/lib/rubocop/cop/style/multiline_if_modifier.rb +3 -10
- data/lib/rubocop/cop/style/multiline_if_then.rb +4 -10
- data/lib/rubocop/cop/style/multiline_memoization.rb +14 -12
- data/lib/rubocop/cop/style/multiline_method_signature.rb +2 -2
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +17 -6
- data/lib/rubocop/cop/style/multiline_when_then.rb +9 -11
- data/lib/rubocop/cop/style/multiple_comparison.rb +1 -1
- data/lib/rubocop/cop/style/mutable_constant.rb +23 -20
- data/lib/rubocop/cop/style/negated_if.rb +6 -6
- data/lib/rubocop/cop/style/negated_unless.rb +6 -6
- data/lib/rubocop/cop/style/negated_while.rb +7 -15
- data/lib/rubocop/cop/style/nested_modifier.rb +10 -13
- data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +14 -12
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +14 -16
- data/lib/rubocop/cop/style/next.rb +10 -14
- data/lib/rubocop/cop/style/nil_comparison.rb +13 -11
- data/lib/rubocop/cop/style/non_nil_check.rb +34 -26
- data/lib/rubocop/cop/style/not.rb +20 -26
- data/lib/rubocop/cop/style/numeric_literal_prefix.rb +4 -9
- data/lib/rubocop/cop/style/numeric_predicate.rb +9 -15
- data/lib/rubocop/cop/style/one_line_conditional.rb +71 -23
- data/lib/rubocop/cop/style/option_hash.rb +1 -1
- data/lib/rubocop/cop/style/optional_arguments.rb +1 -1
- data/lib/rubocop/cop/style/optional_boolean_parameter.rb +42 -0
- data/lib/rubocop/cop/style/or_assignment.rb +13 -10
- data/lib/rubocop/cop/style/parallel_assignment.rb +18 -18
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +6 -6
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +14 -20
- data/lib/rubocop/cop/style/percent_q_literals.rb +8 -10
- data/lib/rubocop/cop/style/perl_backrefs.rb +8 -10
- data/lib/rubocop/cop/style/preferred_hash_methods.rb +11 -14
- data/lib/rubocop/cop/style/proc.rb +6 -6
- data/lib/rubocop/cop/style/raise_args.rb +15 -24
- data/lib/rubocop/cop/style/random_with_offset.rb +17 -16
- data/lib/rubocop/cop/style/redundant_assignment.rb +8 -10
- data/lib/rubocop/cop/style/redundant_begin.rb +7 -9
- data/lib/rubocop/cop/style/redundant_capital_w.rb +6 -9
- data/lib/rubocop/cop/style/redundant_condition.rb +20 -9
- data/lib/rubocop/cop/style/redundant_exception.rb +2 -0
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +3 -12
- data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +51 -0
- data/lib/rubocop/cop/style/redundant_freeze.rb +5 -7
- data/lib/rubocop/cop/style/redundant_interpolation.rb +25 -24
- data/lib/rubocop/cop/style/redundant_parentheses.rb +19 -12
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +6 -13
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +14 -23
- data/lib/rubocop/cop/style/redundant_self.rb +2 -2
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +116 -0
- data/lib/rubocop/cop/style/redundant_sort.rb +21 -13
- data/lib/rubocop/cop/style/regexp_literal.rb +10 -21
- data/lib/rubocop/cop/style/rescue_modifier.rb +29 -9
- data/lib/rubocop/cop/style/return_nil.rb +5 -5
- data/lib/rubocop/cop/style/safe_navigation.rb +22 -16
- data/lib/rubocop/cop/style/sample.rb +12 -14
- data/lib/rubocop/cop/style/self_assignment.rb +26 -22
- data/lib/rubocop/cop/style/semicolon.rb +6 -9
- data/lib/rubocop/cop/style/send.rb +4 -5
- data/lib/rubocop/cop/style/signal_exception.rb +25 -19
- data/lib/rubocop/cop/style/single_argument_dig.rb +55 -0
- data/lib/rubocop/cop/style/single_line_block_params.rb +4 -2
- data/lib/rubocop/cop/style/single_line_methods.rb +18 -17
- data/lib/rubocop/cop/style/slicing_with_range.rb +6 -8
- data/lib/rubocop/cop/style/sole_nested_conditional.rb +66 -0
- data/lib/rubocop/cop/style/special_global_vars.rb +10 -15
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +17 -20
- data/lib/rubocop/cop/style/stderr_puts.rb +5 -6
- data/lib/rubocop/cop/style/string_concatenation.rb +106 -0
- data/lib/rubocop/cop/style/string_hash_keys.rb +6 -7
- data/lib/rubocop/cop/style/string_methods.rb +7 -17
- data/lib/rubocop/cop/style/strip.rb +9 -14
- data/lib/rubocop/cop/style/struct_inheritance.rb +4 -7
- data/lib/rubocop/cop/style/symbol_array.rb +6 -17
- data/lib/rubocop/cop/style/symbol_literal.rb +4 -6
- data/lib/rubocop/cop/style/symbol_proc.rb +15 -19
- data/lib/rubocop/cop/style/ternary_parentheses.rb +21 -20
- data/lib/rubocop/cop/style/trailing_body_on_class.rb +3 -6
- data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +4 -7
- data/lib/rubocop/cop/style/trailing_body_on_module.rb +3 -6
- data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +2 -5
- data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +2 -5
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +7 -6
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +2 -5
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +9 -32
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +8 -17
- data/lib/rubocop/cop/style/trivial_accessors.rb +26 -30
- data/lib/rubocop/cop/style/unless_else.rb +5 -8
- data/lib/rubocop/cop/style/unpack_first.rb +5 -8
- data/lib/rubocop/cop/style/variable_interpolation.rb +7 -10
- data/lib/rubocop/cop/style/when_then.rb +4 -6
- data/lib/rubocop/cop/style/while_until_do.rb +6 -16
- data/lib/rubocop/cop/style/while_until_modifier.rb +6 -20
- data/lib/rubocop/cop/style/word_array.rb +5 -23
- data/lib/rubocop/cop/style/yoda_condition.rb +4 -15
- data/lib/rubocop/cop/style/zero_length_predicate.rb +17 -19
- data/lib/rubocop/cop/team.rb +2 -1
- data/lib/rubocop/cop/tokens_util.rb +84 -0
- data/lib/rubocop/cop/util.rb +3 -13
- data/lib/rubocop/cop/utils/format_string.rb +3 -5
- data/lib/rubocop/cop/variable_force.rb +2 -2
- data/lib/rubocop/cop/variable_force/branch.rb +1 -0
- data/lib/rubocop/cop/variable_force/variable.rb +7 -5
- data/lib/rubocop/cops_documentation_generator.rb +284 -0
- data/lib/rubocop/core_ext/string.rb +2 -2
- data/lib/rubocop/error.rb +1 -0
- data/lib/rubocop/ext/regexp_node.rb +46 -0
- data/lib/rubocop/file_finder.rb +13 -12
- data/lib/rubocop/formatter/auto_gen_config_formatter.rb +2 -1
- data/lib/rubocop/formatter/disabled_config_formatter.rb +1 -1
- data/lib/rubocop/formatter/formatter_set.rb +1 -0
- data/lib/rubocop/formatter/html_formatter.rb +2 -0
- data/lib/rubocop/formatter/junit_formatter.rb +1 -1
- data/lib/rubocop/formatter/progress_formatter.rb +2 -1
- data/lib/rubocop/formatter/quiet_formatter.rb +1 -1
- data/lib/rubocop/formatter/simple_text_formatter.rb +36 -6
- data/lib/rubocop/name_similarity.rb +1 -0
- data/lib/rubocop/options.rb +25 -4
- data/lib/rubocop/path_util.rb +17 -17
- data/lib/rubocop/rake_task.rb +1 -0
- data/lib/rubocop/remote_config.rb +1 -0
- data/lib/rubocop/result_cache.rb +37 -15
- data/lib/rubocop/rspec/cop_helper.rb +4 -1
- data/lib/rubocop/rspec/expect_offense.rb +37 -6
- data/lib/rubocop/rspec/shared_contexts.rb +25 -14
- data/lib/rubocop/runner.rb +36 -21
- data/lib/rubocop/string_interpreter.rb +3 -0
- data/lib/rubocop/target_finder.rb +14 -10
- data/lib/rubocop/target_ruby.rb +6 -0
- data/lib/rubocop/version.rb +3 -2
- data/lib/rubocop/yaml_duplication_checker.rb +1 -0
- metadata +45 -8
- data/lib/rubocop/cop/lint/useless_comparison.rb +0 -28
- data/lib/rubocop/cop/mixin/parser_diagnostic.rb +0 -37
- data/lib/rubocop/cop/mixin/too_many_lines.rb +0 -25
- data/lib/rubocop/cop/style/method_missing_super.rb +0 -34
data/lib/rubocop/config.rb
CHANGED
@@ -24,7 +24,7 @@ module RuboCop
|
|
24
24
|
def initialize(hash = {}, loaded_path = nil)
|
25
25
|
@loaded_path = loaded_path
|
26
26
|
@for_cop = Hash.new do |h, cop|
|
27
|
-
qualified_cop_name = Cop::
|
27
|
+
qualified_cop_name = Cop::Registry.qualified_cop_name(cop, loaded_path)
|
28
28
|
cop_options = self[qualified_cop_name] || {}
|
29
29
|
cop_options['Enabled'] = enable_cop?(qualified_cop_name, cop_options)
|
30
30
|
h[cop] = cop_options
|
@@ -47,7 +47,7 @@ module RuboCop
|
|
47
47
|
end
|
48
48
|
|
49
49
|
def_delegators :@hash, :[], :[]=, :delete, :each, :key?, :keys, :each_key,
|
50
|
-
:map, :merge, :to_h, :to_hash, :transform_values
|
50
|
+
:fetch, :map, :merge, :to_h, :to_hash, :transform_values
|
51
51
|
def_delegators :@validator, :validate, :target_ruby_version
|
52
52
|
|
53
53
|
def to_s
|
@@ -104,12 +104,29 @@ module RuboCop
|
|
104
104
|
end
|
105
105
|
end
|
106
106
|
|
107
|
+
# @return [Config] for the given cop / cop name.
|
108
|
+
# Note: the 'Enabled' attribute is calculated according to the department's
|
109
|
+
# and 'AllCops' configuration; other attributes are not inherited.
|
107
110
|
def for_cop(cop)
|
108
111
|
@for_cop[cop.respond_to?(:cop_name) ? cop.cop_name : cop]
|
109
112
|
end
|
110
113
|
|
114
|
+
# @return [Config] for the given cop merged with that of its department (if any)
|
115
|
+
# Note: the 'Enabled' attribute is same as that returned by `for_cop`
|
116
|
+
def for_badge(badge)
|
117
|
+
cop_config = for_cop(badge.to_s)
|
118
|
+
fetch(badge.department.to_s) { return cop_config }
|
119
|
+
.merge(cop_config)
|
120
|
+
end
|
121
|
+
|
122
|
+
# @return [Config] for the given department name.
|
123
|
+
# Note: the 'Enabled' attribute will be present only if specified
|
124
|
+
# at the department's level
|
111
125
|
def for_department(department_name)
|
112
|
-
@
|
126
|
+
@for_department ||= Hash.new do |h, dept|
|
127
|
+
h[dept] = self[dept] || {}
|
128
|
+
end
|
129
|
+
@for_department[department_name.to_s]
|
113
130
|
end
|
114
131
|
|
115
132
|
def for_all_cops
|
@@ -24,7 +24,7 @@ module RuboCop
|
|
24
24
|
|
25
25
|
attr_accessor :debug, :ignore_parent_exclusion,
|
26
26
|
:disable_pending_cops, :enable_pending_cops
|
27
|
-
attr_writer :default_configuration
|
27
|
+
attr_writer :default_configuration, :project_root
|
28
28
|
|
29
29
|
alias debug? debug
|
30
30
|
alias ignore_parent_exclusion? ignore_parent_exclusion
|
@@ -34,7 +34,7 @@ module RuboCop
|
|
34
34
|
FileFinder.root_level = nil
|
35
35
|
end
|
36
36
|
|
37
|
-
def load_file(file)
|
37
|
+
def load_file(file)
|
38
38
|
path = File.absolute_path(file.is_a?(RemoteConfig) ? file.file : file)
|
39
39
|
|
40
40
|
hash = load_yaml_configuration(path)
|
@@ -73,7 +73,7 @@ module RuboCop
|
|
73
73
|
# `can't add a new key into hash during iteration` error
|
74
74
|
hash_keys = hash.keys
|
75
75
|
hash_keys.each do |key|
|
76
|
-
q = Cop::
|
76
|
+
q = Cop::Registry.qualified_cop_name(key, path)
|
77
77
|
next if q == key
|
78
78
|
|
79
79
|
hash[q] = hash.delete(key)
|
@@ -118,39 +118,55 @@ module RuboCop
|
|
118
118
|
end
|
119
119
|
|
120
120
|
def add_excludes_from_files(config, config_file)
|
121
|
-
|
121
|
+
exclusion_file = find_last_file_upwards(DOTFILE, config_file, project_root)
|
122
122
|
|
123
|
-
return
|
124
|
-
return if PathUtil.relative_path(
|
125
|
-
PathUtil.relative_path(config_file)
|
123
|
+
return unless exclusion_file
|
124
|
+
return if PathUtil.relative_path(exclusion_file) == PathUtil.relative_path(config_file)
|
126
125
|
|
127
126
|
print 'AllCops/Exclude ' if debug?
|
128
|
-
config.add_excludes_from_higher_level(load_file(
|
127
|
+
config.add_excludes_from_higher_level(load_file(exclusion_file))
|
129
128
|
end
|
130
129
|
|
131
130
|
def default_configuration
|
132
131
|
@default_configuration ||= begin
|
133
|
-
|
134
|
-
|
135
|
-
|
132
|
+
print 'Default ' if debug?
|
133
|
+
load_file(DEFAULT_FILE)
|
134
|
+
end
|
135
|
+
end
|
136
|
+
|
137
|
+
# Returns the path rubocop inferred as the root of the project. No file
|
138
|
+
# searches will go past this directory.
|
139
|
+
def project_root
|
140
|
+
@project_root ||= find_project_root
|
136
141
|
end
|
137
142
|
|
143
|
+
PENDING_BANNER = <<~BANNER
|
144
|
+
The following cops were added to RuboCop, but are not configured. Please set Enabled to either `true` or `false` in your `.rubocop.yml` file.
|
145
|
+
|
146
|
+
Please also note that can also opt-in to new cops by default by adding this to your config:
|
147
|
+
AllCops:
|
148
|
+
NewCops: enable
|
149
|
+
BANNER
|
150
|
+
|
138
151
|
def warn_on_pending_cops(pending_cops)
|
139
152
|
return if pending_cops.empty?
|
140
153
|
|
141
|
-
warn Rainbow(
|
142
|
-
'configured. Please set Enabled to either `true` or ' \
|
143
|
-
'`false` in your `.rubocop.yml` file:').yellow
|
154
|
+
warn Rainbow(PENDING_BANNER).yellow
|
144
155
|
|
145
156
|
pending_cops.each do |cop|
|
146
|
-
|
147
|
-
|
148
|
-
warn Rainbow(" - #{cop.name} (#{version})").yellow
|
157
|
+
warn_pending_cop cop
|
149
158
|
end
|
150
159
|
|
151
160
|
warn Rainbow('For more information: https://docs.rubocop.org/rubocop/versioning.html').yellow
|
152
161
|
end
|
153
162
|
|
163
|
+
def warn_pending_cop(cop)
|
164
|
+
version = cop.metadata['VersionAdded'] || 'N/A'
|
165
|
+
|
166
|
+
warn Rainbow("#{cop.name}: # (new in #{version})").yellow
|
167
|
+
warn Rainbow(' Enabled: true').yellow
|
168
|
+
end
|
169
|
+
|
154
170
|
# Merges the given configuration with the default one.
|
155
171
|
def merge_with_default(config, config_file, unset_nil: true)
|
156
172
|
resolver.merge_with_default(config, config_file, unset_nil: unset_nil)
|
@@ -159,7 +175,15 @@ module RuboCop
|
|
159
175
|
private
|
160
176
|
|
161
177
|
def find_project_dotfile(target_dir)
|
162
|
-
find_file_upwards(DOTFILE, target_dir)
|
178
|
+
find_file_upwards(DOTFILE, target_dir, project_root)
|
179
|
+
end
|
180
|
+
|
181
|
+
def find_project_root
|
182
|
+
pwd = Dir.pwd
|
183
|
+
gems_file = find_last_file_upwards('Gemfile', pwd) || find_last_file_upwards('gems.rb', pwd)
|
184
|
+
return unless gems_file
|
185
|
+
|
186
|
+
File.dirname(gems_file)
|
163
187
|
end
|
164
188
|
|
165
189
|
def find_user_dotfile
|
@@ -5,6 +5,7 @@ require 'pathname'
|
|
5
5
|
|
6
6
|
module RuboCop
|
7
7
|
# A help class for ConfigLoader that handles configuration resolution.
|
8
|
+
# @api private
|
8
9
|
class ConfigLoaderResolver
|
9
10
|
def resolve_requires(path, hash)
|
10
11
|
config_dir = File.dirname(path)
|
@@ -201,7 +202,7 @@ module RuboCop
|
|
201
202
|
next unless dept_params['Enabled']
|
202
203
|
|
203
204
|
new_default_configuration.each do |cop, params|
|
204
|
-
next unless cop.start_with?(dept
|
205
|
+
next unless cop.start_with?("#{dept}/")
|
205
206
|
|
206
207
|
# Retain original default configuration for cops in the department.
|
207
208
|
params['Enabled'] = ConfigLoader.default_configuration[cop]['Enabled']
|
@@ -213,8 +214,8 @@ module RuboCop
|
|
213
214
|
end
|
214
215
|
end
|
215
216
|
|
216
|
-
def transform(config)
|
217
|
-
config.transform_values
|
217
|
+
def transform(config, &block)
|
218
|
+
config.transform_values(&block)
|
218
219
|
end
|
219
220
|
|
220
221
|
def gem_config_path(gem_name, relative_config_path)
|
@@ -2,6 +2,7 @@
|
|
2
2
|
|
3
3
|
module RuboCop
|
4
4
|
# This class handles obsolete configuration.
|
5
|
+
# @api private
|
5
6
|
class ConfigObsoletion
|
6
7
|
RENAMED_COPS = {
|
7
8
|
'Layout/AlignArguments' => 'Layout/ArgumentAlignment',
|
@@ -84,7 +85,12 @@ module RuboCop
|
|
84
85
|
'Lint/InvalidCharacterLiteral' => 'it was never being actually triggered',
|
85
86
|
'Lint/SpaceBeforeFirstArg' =>
|
86
87
|
'it was a duplicate of `Layout/SpaceBeforeFirstArg`. Please use ' \
|
87
|
-
'`Layout/SpaceBeforeFirstArg` instead'
|
88
|
+
'`Layout/SpaceBeforeFirstArg` instead',
|
89
|
+
'Style/MethodMissingSuper' => 'it has been superseded by `Lint/MissingSuper`. Please use ' \
|
90
|
+
'`Lint/MissingSuper` instead',
|
91
|
+
'Lint/UselessComparison' => 'it has been superseded by '\
|
92
|
+
'`Lint/BinaryOperatorWithIdenticalOperands`. Please use '\
|
93
|
+
'`Lint/BinaryOperatorWithIdenticalOperands` instead'
|
88
94
|
}.map do |cop_name, reason|
|
89
95
|
[cop_name, "The `#{cop_name}` cop has been removed since #{reason}."]
|
90
96
|
end
|
data/lib/rubocop/config_store.rb
CHANGED
@@ -33,6 +33,10 @@ module RuboCop
|
|
33
33
|
for_dir(File.dirname(file))
|
34
34
|
end
|
35
35
|
|
36
|
+
def for_pwd
|
37
|
+
for_dir(Dir.pwd)
|
38
|
+
end
|
39
|
+
|
36
40
|
# If type (file/dir) is known beforehand,
|
37
41
|
# prefer using #for_file or #for_dir for improved performance
|
38
42
|
def for(file_or_dir)
|
@@ -50,9 +54,9 @@ module RuboCop
|
|
50
54
|
@path_cache[dir] ||= ConfigLoader.configuration_file_for(dir)
|
51
55
|
path = @path_cache[dir]
|
52
56
|
@object_cache[path] ||= begin
|
53
|
-
|
54
|
-
|
55
|
-
|
57
|
+
print "For #{dir}: " if ConfigLoader.debug?
|
58
|
+
ConfigLoader.configuration_from_file(path)
|
59
|
+
end
|
56
60
|
end
|
57
61
|
end
|
58
62
|
end
|
@@ -8,11 +8,14 @@ module RuboCop
|
|
8
8
|
class ConfigValidator
|
9
9
|
extend Forwardable
|
10
10
|
|
11
|
+
# @api private
|
11
12
|
COMMON_PARAMS = %w[Exclude Include Severity inherit_mode
|
12
13
|
AutoCorrect StyleGuide Details].freeze
|
14
|
+
# @api private
|
13
15
|
INTERNAL_PARAMS = %w[Description StyleGuide
|
14
16
|
VersionAdded VersionChanged VersionRemoved
|
15
17
|
Reference Safe SafeAutoCorrect].freeze
|
18
|
+
# @api private
|
16
19
|
NEW_COPS_VALUES = %w[pending disable enable].freeze
|
17
20
|
|
18
21
|
def_delegators :@config, :smart_loaded_path, :for_all_cops
|
@@ -23,7 +26,6 @@ module RuboCop
|
|
23
26
|
@target_ruby = TargetRuby.new(config)
|
24
27
|
end
|
25
28
|
|
26
|
-
# rubocop:disable Metrics/AbcSize
|
27
29
|
def validate
|
28
30
|
check_cop_config_value(@config)
|
29
31
|
reject_conflicting_safe_settings
|
@@ -45,7 +47,6 @@ module RuboCop
|
|
45
47
|
validate_syntax_cop
|
46
48
|
reject_mutually_exclusive_defaults
|
47
49
|
end
|
48
|
-
# rubocop:enable Metrics/AbcSize
|
49
50
|
|
50
51
|
def target_ruby_version
|
51
52
|
target_ruby.version
|
@@ -86,7 +87,7 @@ module RuboCop
|
|
86
87
|
unknown_cops = []
|
87
88
|
invalid_cop_names.each do |name|
|
88
89
|
# There could be a custom cop with this name. If so, don't warn
|
89
|
-
next if Cop::
|
90
|
+
next if Cop::Registry.global.contains_cop_matching?([name])
|
90
91
|
|
91
92
|
# Special case for inherit_mode, which is a directive that we keep in
|
92
93
|
# the configuration (even though it's not a cop), because it's easier
|
@@ -150,7 +151,7 @@ module RuboCop
|
|
150
151
|
end
|
151
152
|
end
|
152
153
|
|
153
|
-
def validate_enforced_styles(valid_cop_names)
|
154
|
+
def validate_enforced_styles(valid_cop_names) # rubocop:todo Metrics/AbcSize
|
154
155
|
valid_cop_names.each do |name|
|
155
156
|
styles = @config[name].select { |key, _| key.start_with?('Enforced') }
|
156
157
|
|
data/lib/rubocop/cop/badge.rb
CHANGED
data/lib/rubocop/cop/base.rb
CHANGED
@@ -46,6 +46,9 @@ module RuboCop
|
|
46
46
|
# Consider creation API private
|
47
47
|
InvestigationReport = Struct.new(:cop, :processed_source, :offenses, :corrector)
|
48
48
|
|
49
|
+
# List of methods names to restrict calls for `on_send` / `on_csend`
|
50
|
+
RESTRICT_ON_SEND = Set[].freeze
|
51
|
+
|
49
52
|
# List of cops that should not try to autocorrect at the same
|
50
53
|
# time as this cop
|
51
54
|
#
|
@@ -56,6 +59,14 @@ module RuboCop
|
|
56
59
|
[]
|
57
60
|
end
|
58
61
|
|
62
|
+
# Cops (other than builtin) are encouraged to implement this
|
63
|
+
# @return [String, nil]
|
64
|
+
#
|
65
|
+
# @api public
|
66
|
+
def self.documentation_url
|
67
|
+
Documentation.url_for(self) if builtin?
|
68
|
+
end
|
69
|
+
|
59
70
|
def initialize(config = nil, options = nil)
|
60
71
|
@config = config || Config.new
|
61
72
|
@options = options || { debug: false }
|
@@ -105,7 +116,7 @@ module RuboCop
|
|
105
116
|
# If message is not specified, the method `message` will be called.
|
106
117
|
def add_offense(node_or_range, message: nil, severity: nil, &block)
|
107
118
|
range = range_from_node_or_range(node_or_range)
|
108
|
-
return unless
|
119
|
+
return unless current_offense_locations.add?(range)
|
109
120
|
|
110
121
|
range_to_pass = callback_argument(range)
|
111
122
|
|
@@ -137,6 +148,7 @@ module RuboCop
|
|
137
148
|
end
|
138
149
|
|
139
150
|
def self.inherited(subclass)
|
151
|
+
super
|
140
152
|
Registry.global.enlist(subclass)
|
141
153
|
end
|
142
154
|
|
@@ -189,8 +201,7 @@ module RuboCop
|
|
189
201
|
def cop_config
|
190
202
|
# Use department configuration as basis, but let individual cop
|
191
203
|
# configuration override.
|
192
|
-
@cop_config ||= @config.
|
193
|
-
.merge(@config.for_cop(self))
|
204
|
+
@cop_config ||= @config.for_badge(self.class.badge)
|
194
205
|
end
|
195
206
|
|
196
207
|
def config_to_allow_offenses
|
@@ -271,11 +282,23 @@ module RuboCop
|
|
271
282
|
|
272
283
|
### Reserved for Commissioner:
|
273
284
|
|
285
|
+
def current_offense_locations
|
286
|
+
@current_offense_locations ||= Set.new
|
287
|
+
end
|
288
|
+
|
289
|
+
def currently_disabled_lines
|
290
|
+
@currently_disabled_lines ||= Set.new
|
291
|
+
end
|
292
|
+
|
293
|
+
private_class_method def self.restrict_on_send
|
294
|
+
@restrict_on_send ||= self::RESTRICT_ON_SEND.to_set.freeze
|
295
|
+
end
|
296
|
+
|
274
297
|
# Called before any investigation
|
275
298
|
def begin_investigation(processed_source)
|
276
299
|
@current_offenses = []
|
277
|
-
@current_offense_locations =
|
278
|
-
@currently_disabled_lines =
|
300
|
+
@current_offense_locations = nil
|
301
|
+
@currently_disabled_lines = nil
|
279
302
|
@processed_source = processed_source
|
280
303
|
@current_corrector = Corrector.new(@processed_source) if @processed_source.valid_syntax?
|
281
304
|
end
|
@@ -289,6 +312,14 @@ module RuboCop
|
|
289
312
|
|
290
313
|
### Actually private methods
|
291
314
|
|
315
|
+
def self.builtin?
|
316
|
+
return false unless (m = instance_methods(false).first) # any custom method will do
|
317
|
+
|
318
|
+
path, _line = instance_method(m).source_location
|
319
|
+
path.start_with?(__dir__)
|
320
|
+
end
|
321
|
+
private_class_method :builtin?
|
322
|
+
|
292
323
|
def reset_investigation
|
293
324
|
@currently_disabled_lines = @current_offenses = @processed_source = @current_corrector = nil
|
294
325
|
end
|
@@ -327,7 +358,7 @@ module RuboCop
|
|
327
358
|
|
328
359
|
def disable_uncorrectable(range)
|
329
360
|
line = range.line
|
330
|
-
return unless
|
361
|
+
return unless currently_disabled_lines.add?(line)
|
331
362
|
|
332
363
|
disable_offense(range)
|
333
364
|
end
|
@@ -53,7 +53,11 @@ module RuboCop
|
|
53
53
|
gem_declarations(processed_source.ast)
|
54
54
|
.group_by(&:first_argument)
|
55
55
|
.values
|
56
|
-
.select { |nodes| nodes.size > 1 }
|
56
|
+
.select { |nodes| nodes.size > 1 && !condition?(nodes) }
|
57
|
+
end
|
58
|
+
|
59
|
+
def condition?(nodes)
|
60
|
+
nodes[0].parent&.if_type? && nodes[0].parent == nodes[1].parent
|
57
61
|
end
|
58
62
|
|
59
63
|
def register_offense(node, gem_name, line_of_first_occurrence)
|
@@ -64,13 +64,14 @@ module RuboCop
|
|
64
64
|
MSG = 'Missing gem description comment.'
|
65
65
|
CHECKED_OPTIONS_CONFIG = 'OnlyFor'
|
66
66
|
VERSION_SPECIFIERS_OPTION = 'version_specifiers'
|
67
|
+
RESTRICT_ON_SEND = %i[gem].freeze
|
67
68
|
|
68
69
|
def_node_matcher :gem_declaration?, '(send nil? :gem str ...)'
|
69
70
|
|
70
71
|
def on_send(node)
|
71
72
|
return unless gem_declaration?(node)
|
72
73
|
return if ignored_gem?(node)
|
73
|
-
return if
|
74
|
+
return if commented_any_descendant?(node)
|
74
75
|
return if cop_config[CHECKED_OPTIONS_CONFIG].any? && !checked_options_present?(node)
|
75
76
|
|
76
77
|
add_offense(node)
|
@@ -78,6 +79,10 @@ module RuboCop
|
|
78
79
|
|
79
80
|
private
|
80
81
|
|
82
|
+
def commented_any_descendant?(node)
|
83
|
+
commented?(node) || node.each_descendant.any? { |n| commented?(n) }
|
84
|
+
end
|
85
|
+
|
81
86
|
def commented?(node)
|
82
87
|
preceding_lines = preceding_lines(node)
|
83
88
|
preceding_comment?(node, preceding_lines.last)
|
@@ -86,12 +91,12 @@ module RuboCop
|
|
86
91
|
# The args node1 & node2 may represent a RuboCop::AST::Node
|
87
92
|
# or a Parser::Source::Comment. Both respond to #loc.
|
88
93
|
def precede?(node1, node2)
|
89
|
-
node2.loc.line - node1.loc.line
|
94
|
+
node2.loc.line - node1.loc.line <= 1
|
90
95
|
end
|
91
96
|
|
92
97
|
def preceding_lines(node)
|
93
98
|
processed_source.ast_with_comments[node].select do |line|
|
94
|
-
line.loc.line
|
99
|
+
line.loc.line <= node.loc.line
|
95
100
|
end
|
96
101
|
end
|
97
102
|
|