rubocop 1.9.1 → 1.22.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +17 -14
- data/assets/output.html.erb +1 -1
- data/config/default.yml +326 -73
- data/config/obsoletion.yml +4 -0
- data/exe/rubocop +1 -3
- data/lib/rubocop/cached_data.rb +1 -3
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +9 -19
- data/lib/rubocop/cli/command/execute_runner.rb +1 -1
- data/lib/rubocop/cli/command/init_dotfile.rb +1 -3
- data/lib/rubocop/cli/command/show_cops.rb +1 -4
- data/lib/rubocop/cli/command/suggest_extensions.rb +6 -5
- data/lib/rubocop/cli.rb +21 -5
- data/lib/rubocop/comment_config.rb +45 -101
- data/lib/rubocop/config.rb +16 -26
- data/lib/rubocop/config_loader.rb +11 -15
- data/lib/rubocop/config_loader_resolver.rb +44 -21
- data/lib/rubocop/config_obsoletion/cop_rule.rb +1 -2
- data/lib/rubocop/config_store.rb +1 -2
- data/lib/rubocop/config_validator.rb +37 -21
- data/lib/rubocop/cop/autocorrect_logic.rb +3 -8
- data/lib/rubocop/cop/badge.rb +1 -2
- data/lib/rubocop/cop/base.rb +13 -11
- data/lib/rubocop/cop/bundler/duplicated_gem.rb +4 -4
- data/lib/rubocop/cop/bundler/gem_comment.rb +43 -10
- data/lib/rubocop/cop/bundler/gem_filename.rb +103 -0
- data/lib/rubocop/cop/bundler/gem_version.rb +133 -0
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +46 -21
- data/lib/rubocop/cop/bundler/ordered_gems.rb +5 -16
- data/lib/rubocop/cop/commissioner.rb +2 -8
- data/lib/rubocop/cop/cop.rb +4 -18
- data/lib/rubocop/cop/corrector.rb +5 -8
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +6 -12
- data/lib/rubocop/cop/correctors/each_to_for_corrector.rb +2 -4
- data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +1 -2
- data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +2 -2
- data/lib/rubocop/cop/correctors/line_break_corrector.rb +3 -6
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +1 -3
- data/lib/rubocop/cop/correctors/ordered_gem_corrector.rb +11 -12
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +2 -8
- data/lib/rubocop/cop/correctors/require_library_corrector.rb +23 -0
- data/lib/rubocop/cop/documentation.rb +1 -1
- data/lib/rubocop/cop/gemspec/date_assignment.rb +57 -0
- data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +3 -2
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +5 -16
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +32 -23
- data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +2 -0
- data/lib/rubocop/cop/generator/configuration_injector.rb +1 -2
- data/lib/rubocop/cop/generator/require_file_injector.rb +2 -5
- data/lib/rubocop/cop/generator.rb +18 -15
- data/lib/rubocop/cop/internal_affairs/example_description.rb +8 -5
- data/lib/rubocop/cop/internal_affairs/inherit_deprecated_cop_class.rb +34 -0
- data/lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb +60 -0
- data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +3 -5
- data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +3 -3
- data/lib/rubocop/cop/internal_affairs/node_matcher_directive.rb +151 -0
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +2 -3
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +3 -2
- data/lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/redundant_let_rubocop_config_new.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +3 -0
- data/lib/rubocop/cop/internal_affairs/style_detected_api_use.rb +5 -2
- data/lib/rubocop/cop/internal_affairs/undefined_config.rb +71 -0
- data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +3 -3
- data/lib/rubocop/cop/internal_affairs.rb +4 -0
- data/lib/rubocop/cop/layout/access_modifier_indentation.rb +12 -10
- data/lib/rubocop/cop/layout/argument_alignment.rb +36 -19
- data/lib/rubocop/cop/layout/array_alignment.rb +9 -8
- data/lib/rubocop/cop/layout/assignment_indentation.rb +9 -8
- data/lib/rubocop/cop/layout/begin_end_alignment.rb +1 -4
- data/lib/rubocop/cop/layout/block_alignment.rb +12 -23
- data/lib/rubocop/cop/layout/block_end_newline.rb +4 -8
- data/lib/rubocop/cop/layout/case_indentation.rb +57 -11
- data/lib/rubocop/cop/layout/class_structure.rb +12 -12
- data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +24 -30
- data/lib/rubocop/cop/layout/comment_indentation.rb +18 -22
- data/lib/rubocop/cop/layout/def_end_alignment.rb +2 -6
- data/lib/rubocop/cop/layout/dot_position.rb +42 -9
- data/lib/rubocop/cop/layout/else_alignment.rb +10 -9
- data/lib/rubocop/cop/layout/empty_comment.rb +6 -13
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +44 -23
- data/lib/rubocop/cop/layout/empty_line_between_defs.rb +2 -6
- data/lib/rubocop/cop/layout/empty_lines.rb +1 -3
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +8 -18
- data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +9 -12
- data/lib/rubocop/cop/layout/end_alignment.rb +10 -4
- data/lib/rubocop/cop/layout/end_of_line.rb +1 -1
- data/lib/rubocop/cop/layout/extra_spacing.rb +5 -9
- data/lib/rubocop/cop/layout/first_argument_indentation.rb +12 -6
- data/lib/rubocop/cop/layout/first_array_element_indentation.rb +13 -11
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +37 -21
- data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_parameter_indentation.rb +8 -7
- data/lib/rubocop/cop/layout/hash_alignment.rb +58 -31
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +4 -11
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +2 -13
- data/lib/rubocop/cop/layout/indentation_consistency.rb +9 -6
- data/lib/rubocop/cop/layout/indentation_style.rb +25 -30
- data/lib/rubocop/cop/layout/indentation_width.rb +34 -13
- data/lib/rubocop/cop/layout/initial_indentation.rb +1 -4
- data/lib/rubocop/cop/layout/leading_comment_space.rb +2 -2
- data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb +141 -0
- data/lib/rubocop/cop/layout/line_length.rb +13 -22
- data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +1 -2
- data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +29 -3
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +10 -18
- data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +1 -2
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +4 -2
- data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +22 -15
- data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +13 -8
- data/lib/rubocop/cop/layout/parameter_alignment.rb +8 -7
- data/lib/rubocop/cop/layout/redundant_line_break.rb +140 -0
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +26 -16
- data/lib/rubocop/cop/layout/single_line_block_chain.rb +64 -0
- data/lib/rubocop/cop/layout/space_after_colon.rb +1 -3
- data/lib/rubocop/cop/layout/space_after_method_name.rb +2 -4
- data/lib/rubocop/cop/layout/space_after_not.rb +1 -0
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +6 -14
- data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +2 -2
- data/lib/rubocop/cop/layout/space_around_keyword.rb +33 -8
- data/lib/rubocop/cop/layout/space_around_operators.rb +23 -11
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +2 -3
- data/lib/rubocop/cop/layout/space_before_brackets.rb +3 -4
- data/lib/rubocop/cop/layout/space_before_comment.rb +3 -5
- data/lib/rubocop/cop/layout/space_before_first_arg.rb +5 -11
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +2 -4
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +5 -10
- data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +2 -7
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +6 -11
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +1 -2
- data/lib/rubocop/cop/layout/space_inside_parens.rb +78 -32
- data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +1 -2
- data/lib/rubocop/cop/layout/trailing_whitespace.rb +24 -1
- data/lib/rubocop/cop/legacy/corrections_proxy.rb +2 -8
- data/lib/rubocop/cop/legacy/corrector.rb +1 -3
- data/lib/rubocop/cop/lint/ambiguous_assignment.rb +1 -6
- data/lib/rubocop/cop/lint/ambiguous_block_association.rb +14 -7
- data/lib/rubocop/cop/lint/ambiguous_operator_precedence.rb +111 -0
- data/lib/rubocop/cop/lint/ambiguous_range.rb +105 -0
- data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +5 -2
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +7 -5
- data/lib/rubocop/cop/lint/big_decimal_new.rb +1 -0
- data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +18 -5
- data/lib/rubocop/cop/lint/boolean_symbol.rb +7 -2
- data/lib/rubocop/cop/lint/constant_definition_in_block.rb +2 -0
- data/lib/rubocop/cop/lint/constant_resolution.rb +2 -2
- data/lib/rubocop/cop/lint/debugger.rb +59 -15
- data/lib/rubocop/cop/lint/deprecated_class_methods.rb +83 -41
- data/lib/rubocop/cop/lint/deprecated_constants.rb +5 -4
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +16 -9
- data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +24 -1
- data/lib/rubocop/cop/lint/duplicate_branch.rb +4 -4
- data/lib/rubocop/cop/lint/duplicate_hash_key.rb +1 -3
- data/lib/rubocop/cop/lint/duplicate_methods.rb +14 -12
- data/lib/rubocop/cop/lint/duplicate_require.rb +3 -2
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -0
- data/lib/rubocop/cop/lint/else_layout.rb +12 -10
- data/lib/rubocop/cop/lint/empty_block.rb +18 -2
- data/lib/rubocop/cop/lint/empty_ensure.rb +1 -3
- data/lib/rubocop/cop/lint/empty_file.rb +1 -3
- data/lib/rubocop/cop/lint/empty_in_pattern.rb +62 -0
- data/lib/rubocop/cop/lint/empty_interpolation.rb +1 -3
- data/lib/rubocop/cop/lint/ensure_return.rb +1 -3
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +4 -7
- data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -2
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +4 -6
- data/lib/rubocop/cop/lint/hash_compare_by_identity.rb +13 -3
- data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +1 -2
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +1 -2
- data/lib/rubocop/cop/lint/incompatible_io_select_with_fiber_scheduler.rb +67 -0
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +4 -7
- data/lib/rubocop/cop/lint/inherit_exception.rb +2 -2
- data/lib/rubocop/cop/lint/interpolation_check.rb +8 -11
- data/lib/rubocop/cop/lint/literal_as_condition.rb +13 -1
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +3 -6
- data/lib/rubocop/cop/lint/loop.rb +5 -5
- data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +32 -21
- data/lib/rubocop/cop/lint/missing_super.rb +1 -2
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +1 -2
- data/lib/rubocop/cop/lint/multiple_comparison.rb +5 -4
- data/lib/rubocop/cop/lint/nested_method_definition.rb +4 -2
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +2 -4
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -0
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +13 -4
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +3 -0
- data/lib/rubocop/cop/lint/number_conversion.rb +25 -6
- data/lib/rubocop/cop/lint/numbered_parameter_assignment.rb +1 -1
- data/lib/rubocop/cop/lint/or_assignment_to_constant.rb +4 -2
- data/lib/rubocop/cop/lint/ordered_magic_comments.rb +1 -2
- data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +18 -3
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +1 -3
- data/lib/rubocop/cop/lint/percent_string_array.rb +11 -1
- data/lib/rubocop/cop/lint/percent_symbol_array.rb +2 -4
- data/lib/rubocop/cop/lint/raise_exception.rb +7 -2
- data/lib/rubocop/cop/lint/rand_one.rb +2 -2
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +108 -90
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +5 -0
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +1 -0
- data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +7 -7
- data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +10 -10
- data/lib/rubocop/cop/lint/redundant_string_coercion.rb +2 -2
- data/lib/rubocop/cop/lint/redundant_with_index.rb +2 -4
- data/lib/rubocop/cop/lint/redundant_with_object.rb +2 -4
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +1 -3
- data/lib/rubocop/cop/lint/require_parentheses.rb +2 -4
- data/lib/rubocop/cop/lint/require_relative_self_path.rb +50 -0
- data/lib/rubocop/cop/lint/rescue_exception.rb +1 -2
- data/lib/rubocop/cop/lint/rescue_type.rb +2 -7
- data/lib/rubocop/cop/lint/return_in_void_context.rb +1 -2
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +2 -2
- data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +4 -10
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +2 -2
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +3 -7
- data/lib/rubocop/cop/lint/shadowed_argument.rb +6 -12
- data/lib/rubocop/cop/lint/shadowed_exception.rb +7 -8
- data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +2 -1
- data/lib/rubocop/cop/lint/struct_new_override.rb +2 -2
- data/lib/rubocop/cop/lint/suppressed_exception.rb +44 -1
- data/lib/rubocop/cop/lint/symbol_conversion.rb +86 -11
- data/lib/rubocop/cop/lint/syntax.rb +1 -3
- data/lib/rubocop/cop/lint/to_enum_arguments.rb +3 -0
- data/lib/rubocop/cop/lint/to_json.rb +1 -2
- data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +1 -3
- data/lib/rubocop/cop/lint/triple_quotes.rb +1 -1
- data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +1 -3
- data/lib/rubocop/cop/lint/unexpected_block_arity.rb +8 -3
- data/lib/rubocop/cop/lint/unified_integer.rb +1 -0
- data/lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb +5 -0
- data/lib/rubocop/cop/lint/unreachable_code.rb +3 -5
- data/lib/rubocop/cop/lint/unreachable_loop.rb +15 -7
- data/lib/rubocop/cop/lint/unused_block_argument.rb +10 -8
- data/lib/rubocop/cop/lint/unused_method_argument.rb +4 -5
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +1 -0
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +6 -4
- data/lib/rubocop/cop/lint/useless_assignment.rb +5 -10
- data/lib/rubocop/cop/lint/useless_method_definition.rb +3 -2
- data/lib/rubocop/cop/lint/useless_setter_call.rb +9 -7
- data/lib/rubocop/cop/lint/useless_times.rb +8 -4
- data/lib/rubocop/cop/lint/void.rb +5 -12
- data/lib/rubocop/cop/message_annotator.rb +1 -3
- data/lib/rubocop/cop/metrics/abc_size.rb +6 -0
- data/lib/rubocop/cop/metrics/block_nesting.rb +2 -7
- data/lib/rubocop/cop/metrics/class_length.rb +1 -3
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +1 -2
- data/lib/rubocop/cop/metrics/module_length.rb +3 -6
- data/lib/rubocop/cop/metrics/parameter_lists.rb +8 -7
- data/lib/rubocop/cop/metrics/perceived_complexity.rb +2 -3
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +5 -8
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +8 -6
- data/lib/rubocop/cop/metrics/utils/repeated_attribute_discount.rb +4 -7
- data/lib/rubocop/cop/migration/department_name.rb +4 -6
- data/lib/rubocop/cop/mixin/alignment.rb +12 -7
- data/lib/rubocop/cop/mixin/annotation_comment.rb +57 -34
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +29 -4
- data/lib/rubocop/cop/mixin/code_length.rb +2 -4
- data/lib/rubocop/cop/mixin/comments_help.rb +5 -1
- data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +2 -2
- data/lib/rubocop/cop/mixin/configurable_formatting.rb +3 -8
- data/lib/rubocop/cop/mixin/def_node.rb +3 -5
- data/lib/rubocop/cop/mixin/documentation_comment.rb +8 -8
- data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +6 -7
- data/lib/rubocop/cop/mixin/empty_parameter.rb +2 -3
- data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +2 -5
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +4 -6
- data/lib/rubocop/cop/mixin/first_element_line_break.rb +1 -3
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +30 -8
- data/lib/rubocop/cop/mixin/gem_declaration.rb +13 -0
- data/lib/rubocop/cop/mixin/hash_alignment_styles.rb +17 -9
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +16 -25
- data/lib/rubocop/cop/mixin/heredoc.rb +5 -0
- data/lib/rubocop/cop/mixin/interpolation.rb +1 -3
- data/lib/rubocop/cop/mixin/line_length_help.rb +13 -10
- data/lib/rubocop/cop/mixin/match_range.rb +2 -5
- data/lib/rubocop/cop/mixin/method_complexity.rb +2 -3
- data/lib/rubocop/cop/mixin/method_preference.rb +1 -2
- data/lib/rubocop/cop/mixin/multiline_element_indentation.rb +5 -4
- data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +1 -3
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +13 -42
- data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +2 -3
- data/lib/rubocop/cop/mixin/negative_conditional.rb +4 -2
- data/lib/rubocop/cop/mixin/ordered_gem_node.rb +10 -5
- data/lib/rubocop/cop/mixin/percent_array.rb +17 -8
- data/lib/rubocop/cop/mixin/percent_literal.rb +0 -6
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +14 -12
- data/lib/rubocop/cop/mixin/preferred_delimiters.rb +6 -9
- data/lib/rubocop/cop/mixin/range_help.rb +10 -13
- data/lib/rubocop/cop/mixin/rational_literal.rb +1 -0
- data/lib/rubocop/cop/mixin/require_library.rb +59 -0
- data/lib/rubocop/cop/mixin/rescue_node.rb +2 -6
- data/lib/rubocop/cop/mixin/safe_assignment.rb +6 -2
- data/lib/rubocop/cop/mixin/space_after_punctuation.rb +2 -4
- data/lib/rubocop/cop/mixin/space_before_punctuation.rb +3 -4
- data/lib/rubocop/cop/mixin/statement_modifier.rb +2 -4
- data/lib/rubocop/cop/mixin/string_literals_help.rb +7 -5
- data/lib/rubocop/cop/mixin/symbol_help.rb +13 -0
- data/lib/rubocop/cop/mixin/trailing_body.rb +2 -3
- data/lib/rubocop/cop/mixin/trailing_comma.rb +1 -2
- data/lib/rubocop/cop/mixin/uncommunicative_name.rb +7 -13
- data/lib/rubocop/cop/mixin/unused_argument.rb +1 -3
- data/lib/rubocop/cop/mixin/visibility_help.rb +1 -0
- data/lib/rubocop/cop/naming/ascii_identifiers.rb +2 -7
- 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/constant_name.rb +3 -1
- data/lib/rubocop/cop/naming/file_name.rb +7 -16
- data/lib/rubocop/cop/naming/inclusive_language.rb +266 -0
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +11 -5
- data/lib/rubocop/cop/naming/method_name.rb +4 -2
- data/lib/rubocop/cop/naming/predicate_name.rb +2 -2
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +17 -0
- data/lib/rubocop/cop/offense.rb +3 -8
- data/lib/rubocop/cop/registry.rb +13 -12
- data/lib/rubocop/cop/security/eval.rb +1 -0
- data/lib/rubocop/cop/security/io_methods.rb +49 -0
- data/lib/rubocop/cop/security/json_load.rb +9 -7
- data/lib/rubocop/cop/security/marshal_load.rb +1 -0
- data/lib/rubocop/cop/security/open.rb +5 -0
- data/lib/rubocop/cop/security/yaml_load.rb +5 -0
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +4 -5
- data/lib/rubocop/cop/style/accessor_grouping.rb +3 -5
- data/lib/rubocop/cop/style/alias.rb +6 -12
- data/lib/rubocop/cop/style/and_or.rb +8 -1
- data/lib/rubocop/cop/style/arguments_forwarding.rb +17 -5
- data/lib/rubocop/cop/style/array_coercion.rb +23 -3
- data/lib/rubocop/cop/style/array_join.rb +1 -0
- data/lib/rubocop/cop/style/ascii_comments.rb +1 -5
- data/lib/rubocop/cop/style/attr.rb +2 -3
- data/lib/rubocop/cop/style/auto_resource_cleanup.rb +2 -5
- data/lib/rubocop/cop/style/bisected_attr_accessor/macro.rb +60 -0
- data/lib/rubocop/cop/style/bisected_attr_accessor.rb +59 -71
- data/lib/rubocop/cop/style/block_delimiters.rb +50 -2
- data/lib/rubocop/cop/style/case_equality.rb +8 -10
- data/lib/rubocop/cop/style/case_like_if.rb +21 -6
- data/lib/rubocop/cop/style/character_literal.rb +2 -4
- data/lib/rubocop/cop/style/class_and_module_children.rb +42 -10
- data/lib/rubocop/cop/style/class_equality_comparison.rb +3 -0
- data/lib/rubocop/cop/style/class_methods.rb +1 -3
- data/lib/rubocop/cop/style/collection_compact.rb +10 -8
- data/lib/rubocop/cop/style/collection_methods.rb +8 -6
- data/lib/rubocop/cop/style/colon_method_call.rb +2 -3
- data/lib/rubocop/cop/style/combinable_loops.rb +6 -4
- data/lib/rubocop/cop/style/command_literal.rb +4 -9
- data/lib/rubocop/cop/style/comment_annotation.rb +57 -30
- data/lib/rubocop/cop/style/commented_keyword.rb +16 -16
- data/lib/rubocop/cop/style/conditional_assignment.rb +31 -29
- data/lib/rubocop/cop/style/constant_visibility.rb +28 -0
- data/lib/rubocop/cop/style/copyright.rb +3 -6
- data/lib/rubocop/cop/style/date_time.rb +10 -5
- data/lib/rubocop/cop/style/def_with_parentheses.rb +1 -2
- data/lib/rubocop/cop/style/dir.rb +1 -0
- data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +2 -2
- data/lib/rubocop/cop/style/document_dynamic_eval_definition.rb +1 -1
- data/lib/rubocop/cop/style/documentation.rb +52 -10
- data/lib/rubocop/cop/style/documentation_method.rb +1 -0
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +1 -7
- data/lib/rubocop/cop/style/double_negation.rb +30 -8
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +2 -2
- data/lib/rubocop/cop/style/each_with_object.rb +1 -0
- data/lib/rubocop/cop/style/empty_case_condition.rb +2 -7
- data/lib/rubocop/cop/style/empty_else.rb +3 -9
- data/lib/rubocop/cop/style/empty_literal.rb +21 -9
- data/lib/rubocop/cop/style/empty_method.rb +3 -7
- data/lib/rubocop/cop/style/encoding.rb +26 -15
- data/lib/rubocop/cop/style/end_block.rb +1 -2
- data/lib/rubocop/cop/style/endless_method.rb +2 -3
- data/lib/rubocop/cop/style/eval_with_location.rb +91 -31
- data/lib/rubocop/cop/style/even_odd.rb +1 -0
- data/lib/rubocop/cop/style/expand_path_arguments.rb +4 -3
- data/lib/rubocop/cop/style/explicit_block_argument.rb +48 -15
- data/lib/rubocop/cop/style/exponential_notation.rb +6 -7
- data/lib/rubocop/cop/style/float_division.rb +14 -2
- data/lib/rubocop/cop/style/format_string.rb +2 -0
- data/lib/rubocop/cop/style/format_string_token.rb +2 -4
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +15 -12
- data/lib/rubocop/cop/style/global_std_stream.rb +5 -0
- data/lib/rubocop/cop/style/guard_clause.rb +3 -7
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +11 -0
- data/lib/rubocop/cop/style/hash_conversion.rb +133 -0
- data/lib/rubocop/cop/style/hash_each_methods.rb +25 -3
- data/lib/rubocop/cop/style/hash_except.rb +5 -3
- data/lib/rubocop/cop/style/hash_like_case.rb +2 -2
- data/lib/rubocop/cop/style/hash_syntax.rb +21 -25
- data/lib/rubocop/cop/style/hash_transform_keys.rb +8 -9
- data/lib/rubocop/cop/style/hash_transform_values.rb +8 -6
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +83 -8
- data/lib/rubocop/cop/style/if_unless_modifier.rb +40 -13
- data/lib/rubocop/cop/style/if_with_boolean_literal_branches.rb +20 -4
- data/lib/rubocop/cop/style/implicit_runtime_error.rb +1 -0
- data/lib/rubocop/cop/style/in_pattern_then.rb +56 -0
- data/lib/rubocop/cop/style/infinite_loop.rb +6 -8
- data/lib/rubocop/cop/style/inverse_methods.rb +14 -9
- data/lib/rubocop/cop/style/ip_addresses.rb +1 -2
- data/lib/rubocop/cop/style/lambda.rb +2 -4
- data/lib/rubocop/cop/style/lambda_call.rb +1 -2
- data/lib/rubocop/cop/style/line_end_concatenation.rb +19 -13
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +32 -21
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +47 -3
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +1 -2
- data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +2 -4
- data/lib/rubocop/cop/style/method_def_parentheses.rb +14 -9
- data/lib/rubocop/cop/style/min_max.rb +2 -2
- data/lib/rubocop/cop/style/missing_else.rb +9 -4
- data/lib/rubocop/cop/style/missing_respond_to_missing.rb +1 -2
- data/lib/rubocop/cop/style/mixin_grouping.rb +4 -10
- data/lib/rubocop/cop/style/mixin_usage.rb +3 -2
- data/lib/rubocop/cop/style/module_function.rb +16 -15
- data/lib/rubocop/cop/style/multiline_block_chain.rb +1 -2
- data/lib/rubocop/cop/style/multiline_in_pattern_then.rb +62 -0
- data/lib/rubocop/cop/style/multiline_method_signature.rb +11 -6
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +1 -2
- data/lib/rubocop/cop/style/multiline_when_then.rb +3 -12
- data/lib/rubocop/cop/style/multiple_comparison.rb +23 -6
- data/lib/rubocop/cop/style/mutable_constant.rb +85 -23
- data/lib/rubocop/cop/style/negated_if.rb +1 -2
- data/lib/rubocop/cop/style/negated_if_else_condition.rb +24 -2
- data/lib/rubocop/cop/style/negated_unless.rb +1 -2
- data/lib/rubocop/cop/style/nested_modifier.rb +3 -7
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +2 -3
- data/lib/rubocop/cop/style/next.rb +4 -9
- data/lib/rubocop/cop/style/nil_comparison.rb +3 -0
- data/lib/rubocop/cop/style/nil_lambda.rb +30 -12
- data/lib/rubocop/cop/style/non_nil_check.rb +11 -7
- data/lib/rubocop/cop/style/not.rb +2 -2
- data/lib/rubocop/cop/style/numbered_parameters.rb +46 -0
- data/lib/rubocop/cop/style/numbered_parameters_limit.rb +50 -0
- data/lib/rubocop/cop/style/numeric_literals.rb +6 -15
- data/lib/rubocop/cop/style/numeric_predicate.rb +10 -7
- data/lib/rubocop/cop/style/one_line_conditional.rb +1 -2
- data/lib/rubocop/cop/style/option_hash.rb +2 -3
- data/lib/rubocop/cop/style/optional_arguments.rb +6 -5
- data/lib/rubocop/cop/style/optional_boolean_parameter.rb +14 -4
- data/lib/rubocop/cop/style/or_assignment.rb +4 -6
- data/lib/rubocop/cop/style/parallel_assignment.rb +13 -10
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +1 -0
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +2 -4
- data/lib/rubocop/cop/style/percent_q_literals.rb +3 -4
- data/lib/rubocop/cop/style/perl_backrefs.rb +2 -9
- data/lib/rubocop/cop/style/preferred_hash_methods.rb +10 -8
- data/lib/rubocop/cop/style/proc.rb +2 -2
- data/lib/rubocop/cop/style/quoted_symbols.rb +114 -0
- data/lib/rubocop/cop/style/raise_args.rb +6 -8
- data/lib/rubocop/cop/style/random_with_offset.rb +8 -8
- data/lib/rubocop/cop/style/redundant_argument.rb +21 -20
- data/lib/rubocop/cop/style/redundant_assignment.rb +2 -3
- data/lib/rubocop/cop/style/redundant_begin.rb +72 -7
- data/lib/rubocop/cop/style/redundant_capital_w.rb +1 -2
- data/lib/rubocop/cop/style/redundant_condition.rb +4 -8
- data/lib/rubocop/cop/style/redundant_conditional.rb +5 -6
- data/lib/rubocop/cop/style/redundant_exception.rb +5 -6
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +6 -0
- data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +13 -3
- data/lib/rubocop/cop/style/redundant_freeze.rb +6 -6
- data/lib/rubocop/cop/style/redundant_interpolation.rb +2 -3
- data/lib/rubocop/cop/style/redundant_parentheses.rb +21 -20
- data/lib/rubocop/cop/style/redundant_percent_q.rb +3 -5
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +1 -1
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +1 -4
- data/lib/rubocop/cop/style/redundant_return.rb +6 -4
- data/lib/rubocop/cop/style/redundant_self.rb +42 -10
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +8 -5
- data/lib/rubocop/cop/style/redundant_self_assignment_branch.rb +83 -0
- data/lib/rubocop/cop/style/redundant_sort.rb +56 -25
- data/lib/rubocop/cop/style/redundant_sort_by.rb +1 -0
- data/lib/rubocop/cop/style/regexp_literal.rb +15 -10
- data/lib/rubocop/cop/style/rescue_modifier.rb +21 -14
- data/lib/rubocop/cop/style/rescue_standard_error.rb +5 -7
- data/lib/rubocop/cop/style/return_nil.rb +8 -2
- data/lib/rubocop/cop/style/safe_navigation.rb +25 -23
- data/lib/rubocop/cop/style/sample.rb +1 -0
- data/lib/rubocop/cop/style/select_by_regexp.rb +139 -0
- data/lib/rubocop/cop/style/semicolon.rb +32 -24
- data/lib/rubocop/cop/style/send.rb +1 -2
- data/lib/rubocop/cop/style/signal_exception.rb +6 -7
- data/lib/rubocop/cop/style/single_argument_dig.rb +7 -2
- data/lib/rubocop/cop/style/single_line_block_params.rb +5 -6
- data/lib/rubocop/cop/style/single_line_methods.rb +45 -18
- data/lib/rubocop/cop/style/slicing_with_range.rb +14 -0
- data/lib/rubocop/cop/style/sole_nested_conditional.rb +35 -7
- data/lib/rubocop/cop/style/special_global_vars.rb +33 -20
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +1 -2
- data/lib/rubocop/cop/style/static_class.rb +5 -5
- data/lib/rubocop/cop/style/stderr_puts.rb +3 -6
- data/lib/rubocop/cop/style/string_chars.rb +41 -0
- data/lib/rubocop/cop/style/string_concatenation.rb +45 -15
- data/lib/rubocop/cop/style/string_hash_keys.rb +6 -0
- data/lib/rubocop/cop/style/string_literals.rb +5 -7
- data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +1 -0
- data/lib/rubocop/cop/style/strip.rb +1 -0
- data/lib/rubocop/cop/style/struct_inheritance.rb +15 -0
- data/lib/rubocop/cop/style/swap_values.rb +5 -3
- data/lib/rubocop/cop/style/symbol_array.rb +3 -3
- data/lib/rubocop/cop/style/symbol_literal.rb +1 -3
- data/lib/rubocop/cop/style/symbol_proc.rb +55 -10
- data/lib/rubocop/cop/style/ternary_parentheses.rb +4 -6
- data/lib/rubocop/cop/style/top_level_method_definition.rb +83 -0
- data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +6 -2
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +21 -6
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +3 -6
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +4 -10
- data/lib/rubocop/cop/style/trivial_accessors.rb +69 -5
- data/lib/rubocop/cop/style/unless_else.rb +1 -2
- data/lib/rubocop/cop/style/unless_logical_operators.rb +105 -0
- data/lib/rubocop/cop/style/unpack_first.rb +2 -1
- data/lib/rubocop/cop/style/variable_interpolation.rb +1 -1
- data/lib/rubocop/cop/style/when_then.rb +4 -2
- data/lib/rubocop/cop/style/while_until_modifier.rb +1 -2
- data/lib/rubocop/cop/style/word_array.rb +22 -5
- data/lib/rubocop/cop/style/yoda_condition.rb +28 -18
- data/lib/rubocop/cop/style/zero_length_predicate.rb +12 -2
- data/lib/rubocop/cop/team.rb +2 -5
- data/lib/rubocop/cop/util.rb +29 -16
- data/lib/rubocop/cop/utils/format_string.rb +1 -3
- data/lib/rubocop/cop/variable_force/assignment.rb +1 -2
- data/lib/rubocop/cop/variable_force/branch.rb +16 -2
- data/lib/rubocop/cop/variable_force/reference.rb +1 -3
- data/lib/rubocop/cop/variable_force/scope.rb +4 -8
- data/lib/rubocop/cop/variable_force/variable.rb +2 -4
- data/lib/rubocop/cop/variable_force/variable_table.rb +1 -1
- data/lib/rubocop/cop/variable_force.rb +6 -15
- data/lib/rubocop/cops_documentation_generator.rb +24 -26
- data/lib/rubocop/directive_comment.rb +123 -11
- data/lib/rubocop/ext/regexp_parser.rb +3 -6
- data/lib/rubocop/file_finder.rb +1 -3
- data/lib/rubocop/formatter/clang_style_formatter.rb +4 -2
- data/lib/rubocop/formatter/disabled_config_formatter.rb +3 -8
- data/lib/rubocop/formatter/git_hub_actions_formatter.rb +2 -6
- data/lib/rubocop/formatter/html_formatter.rb +4 -10
- data/lib/rubocop/formatter/json_formatter.rb +1 -5
- data/lib/rubocop/formatter/junit_formatter.rb +23 -14
- data/lib/rubocop/formatter/offense_count_formatter.rb +1 -1
- data/lib/rubocop/formatter/progress_formatter.rb +1 -3
- data/lib/rubocop/formatter/tap_formatter.rb +4 -2
- data/lib/rubocop/formatter/worst_offenders_formatter.rb +1 -1
- data/lib/rubocop/magic_comment.rb +45 -16
- data/lib/rubocop/name_similarity.rb +1 -1
- data/lib/rubocop/options.rb +153 -159
- data/lib/rubocop/path_util.rb +1 -3
- data/lib/rubocop/rake_task.rb +4 -1
- data/lib/rubocop/remote_config.rb +13 -8
- data/lib/rubocop/result_cache.rb +8 -15
- data/lib/rubocop/rspec/cop_helper.rb +3 -3
- data/lib/rubocop/rspec/expect_offense.rb +11 -12
- data/lib/rubocop/rspec/parallel_formatter.rb +90 -0
- data/lib/rubocop/rspec/shared_contexts.rb +8 -15
- data/lib/rubocop/rspec/support.rb +1 -0
- data/lib/rubocop/runner.rb +9 -17
- data/lib/rubocop/target_finder.rb +20 -17
- data/lib/rubocop/target_ruby.rb +25 -21
- data/lib/rubocop/version.rb +1 -1
- data/lib/rubocop.rb +30 -3
- metadata +44 -11
- data/lib/rubocop/core_ext/hash.rb +0 -20
@@ -23,7 +23,7 @@ module RuboCop
|
|
23
23
|
def resolve_inheritance(path, hash, file, debug) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
|
24
24
|
inherited_files = Array(hash['inherit_from'])
|
25
25
|
base_configs(path, inherited_files, file)
|
26
|
-
.
|
26
|
+
.each_with_index.reverse_each do |base_config, index|
|
27
27
|
override_department_setting_for_cops(base_config, hash)
|
28
28
|
override_enabled_for_disabled_departments(base_config, hash)
|
29
29
|
|
@@ -37,16 +37,30 @@ module RuboCop
|
|
37
37
|
inherit_mode: determine_inherit_mode(hash, k))
|
38
38
|
end
|
39
39
|
hash[k] = v
|
40
|
+
fix_include_paths(base_config.loaded_path, hash, path, k, v) if v.key?('Include')
|
40
41
|
end
|
41
42
|
end
|
42
43
|
end
|
43
44
|
|
45
|
+
# When one .rubocop.yml file inherits from another .rubocop.yml file, the Include paths in the
|
46
|
+
# base configuration are relative to the directory where the base configuration file is. For the
|
47
|
+
# derived configuration, we need to make those paths relative to where the derived configuration
|
48
|
+
# file is.
|
49
|
+
def fix_include_paths(base_config_path, hash, path, key, value)
|
50
|
+
return unless File.basename(base_config_path).start_with?('.rubocop')
|
51
|
+
|
52
|
+
base_dir = File.dirname(base_config_path)
|
53
|
+
derived_dir = File.dirname(path)
|
54
|
+
hash[key]['Include'] = value['Include'].map do |include_path|
|
55
|
+
PathUtil.relative_path(File.join(base_dir, include_path), derived_dir)
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
44
59
|
def resolve_inheritance_from_gems(hash)
|
45
60
|
gems = hash.delete('inherit_gem')
|
46
61
|
(gems || {}).each_pair do |gem_name, config_path|
|
47
62
|
if gem_name == 'rubocop'
|
48
|
-
raise ArgumentError,
|
49
|
-
"can't inherit configuration from the rubocop gem"
|
63
|
+
raise ArgumentError, "can't inherit configuration from the rubocop gem"
|
50
64
|
end
|
51
65
|
|
52
66
|
hash['inherit_from'] = Array(hash['inherit_from'])
|
@@ -77,8 +91,7 @@ module RuboCop
|
|
77
91
|
config = handle_disabled_by_default(config, default_configuration) if disabled_by_default
|
78
92
|
override_enabled_for_disabled_departments(default_configuration, config)
|
79
93
|
|
80
|
-
opts = { inherit_mode: config['inherit_mode'] || {},
|
81
|
-
unset_nil: unset_nil }
|
94
|
+
opts = { inherit_mode: config['inherit_mode'] || {}, unset_nil: unset_nil }
|
82
95
|
Config.new(merge(default_configuration, config, **opts), config_file)
|
83
96
|
end
|
84
97
|
|
@@ -95,7 +108,7 @@ module RuboCop
|
|
95
108
|
result.delete(key)
|
96
109
|
elsif merge_hashes?(base_hash, derived_hash, key)
|
97
110
|
result[key] = merge(base_hash[key], derived_hash[key], **opts)
|
98
|
-
elsif should_union?(
|
111
|
+
elsif should_union?(derived_hash, base_hash, opts[:inherit_mode], key)
|
99
112
|
result[key] = base_hash[key] | derived_hash[key]
|
100
113
|
elsif opts[:debug]
|
101
114
|
warn_on_duplicate_setting(base_hash, derived_hash, key, **opts)
|
@@ -112,8 +125,7 @@ module RuboCop
|
|
112
125
|
next unless key =~ %r{(.*)/.*}
|
113
126
|
|
114
127
|
department = Regexp.last_match(1)
|
115
|
-
next unless disabled?(derived_hash, department) ||
|
116
|
-
disabled?(base_hash, department)
|
128
|
+
next unless disabled?(derived_hash, department) || disabled?(base_hash, department)
|
117
129
|
|
118
130
|
# The `override_department` setting for the `Enabled` parameter is an
|
119
131
|
# internal setting that's not documented in the manual. It will cause a
|
@@ -155,13 +167,10 @@ module RuboCop
|
|
155
167
|
end
|
156
168
|
|
157
169
|
def warn_on_duplicate_setting(base_hash, derived_hash, key, **opts)
|
158
|
-
return unless duplicate_setting?(base_hash, derived_hash,
|
159
|
-
key, opts[:inherited_file])
|
170
|
+
return unless duplicate_setting?(base_hash, derived_hash, key, opts[:inherited_file])
|
160
171
|
|
161
|
-
inherit_mode = opts[:inherit_mode]['merge'] ||
|
162
|
-
|
163
|
-
return if base_hash[key].is_a?(Array) &&
|
164
|
-
inherit_mode && inherit_mode.include?(key)
|
172
|
+
inherit_mode = opts[:inherit_mode]['merge'] || opts[:inherit_mode]['override']
|
173
|
+
return if base_hash[key].is_a?(Array) && inherit_mode && inherit_mode.include?(key)
|
165
174
|
|
166
175
|
puts "#{PathUtil.smart_path(opts[:file])}: " \
|
167
176
|
"#{opts[:cop_name]}:#{key} overrides " \
|
@@ -174,11 +183,26 @@ module RuboCop
|
|
174
183
|
local_inherit || hash['inherit_mode'] || {}
|
175
184
|
end
|
176
185
|
|
177
|
-
def should_union?(base_hash,
|
178
|
-
base_hash[key].is_a?(Array)
|
179
|
-
|
180
|
-
|
181
|
-
|
186
|
+
def should_union?(derived_hash, base_hash, root_mode, key)
|
187
|
+
return false unless base_hash[key].is_a?(Array)
|
188
|
+
|
189
|
+
derived_mode = derived_hash['inherit_mode']
|
190
|
+
return false if should_override?(derived_mode, key)
|
191
|
+
return true if should_merge?(derived_mode, key)
|
192
|
+
|
193
|
+
base_mode = base_hash['inherit_mode']
|
194
|
+
return false if should_override?(base_mode, key)
|
195
|
+
return true if should_merge?(base_mode, key)
|
196
|
+
|
197
|
+
should_merge?(root_mode, key)
|
198
|
+
end
|
199
|
+
|
200
|
+
def should_merge?(mode, key)
|
201
|
+
mode && mode['merge'] && mode['merge'].include?(key)
|
202
|
+
end
|
203
|
+
|
204
|
+
def should_override?(mode, key)
|
205
|
+
mode && mode['override'] && mode['override'].include?(key)
|
182
206
|
end
|
183
207
|
|
184
208
|
def merge_hashes?(base_hash, derived_hash, key)
|
@@ -251,8 +275,7 @@ module RuboCop
|
|
251
275
|
|
252
276
|
File.join(gem_path, relative_config_path)
|
253
277
|
rescue Gem::LoadError => e
|
254
|
-
raise Gem::LoadError,
|
255
|
-
"Unable to find gem #{gem_name}; is the gem installed? #{e}"
|
278
|
+
raise Gem::LoadError, "Unable to find gem #{gem_name}; is the gem installed? #{e}"
|
256
279
|
end
|
257
280
|
end
|
258
281
|
end
|
@@ -17,8 +17,7 @@ module RuboCop
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def message
|
20
|
-
rule_message + "\n(obsolete configuration found in "
|
21
|
-
"#{smart_loaded_path}, please update it)"
|
20
|
+
rule_message + "\n(obsolete configuration found in #{smart_loaded_path}, please update it)"
|
22
21
|
end
|
23
22
|
|
24
23
|
# Cop rules currently can only be failures, not warnings
|
data/lib/rubocop/config_store.rb
CHANGED
@@ -27,8 +27,7 @@ module RuboCop
|
|
27
27
|
|
28
28
|
def options_config=(options_config)
|
29
29
|
loaded_config = ConfigLoader.load_file(options_config)
|
30
|
-
@options_config = ConfigLoader.merge_with_default(loaded_config,
|
31
|
-
options_config)
|
30
|
+
@options_config = ConfigLoader.merge_with_default(loaded_config, options_config)
|
32
31
|
end
|
33
32
|
|
34
33
|
def force_default_config!
|
@@ -9,8 +9,7 @@ module RuboCop
|
|
9
9
|
extend Forwardable
|
10
10
|
|
11
11
|
# @api private
|
12
|
-
COMMON_PARAMS = %w[Exclude Include Severity inherit_mode
|
13
|
-
AutoCorrect StyleGuide Details].freeze
|
12
|
+
COMMON_PARAMS = %w[Exclude Include Severity inherit_mode AutoCorrect StyleGuide Details].freeze
|
14
13
|
# @api private
|
15
14
|
INTERNAL_PARAMS = %w[Description StyleGuide
|
16
15
|
VersionAdded VersionChanged VersionRemoved
|
@@ -45,7 +44,6 @@ module RuboCop
|
|
45
44
|
check_obsoletions
|
46
45
|
|
47
46
|
alert_about_unrecognized_cops(invalid_cop_names)
|
48
|
-
check_target_ruby
|
49
47
|
validate_new_cops_parameter
|
50
48
|
validate_parameter_names(valid_cop_names)
|
51
49
|
validate_enforced_styles(valid_cop_names)
|
@@ -53,6 +51,15 @@ module RuboCop
|
|
53
51
|
reject_mutually_exclusive_defaults
|
54
52
|
end
|
55
53
|
|
54
|
+
# Validations that should only be run after all config resolving has
|
55
|
+
# taken place:
|
56
|
+
# * The target ruby version is only checked once the entire inheritance
|
57
|
+
# chain has been loaded so that only the final value is validated, and
|
58
|
+
# any obsolete but overridden values are ignored.
|
59
|
+
def validate_after_resolution
|
60
|
+
check_target_ruby
|
61
|
+
end
|
62
|
+
|
56
63
|
def target_ruby_version
|
57
64
|
target_ruby.version
|
58
65
|
end
|
@@ -60,8 +67,7 @@ module RuboCop
|
|
60
67
|
def validate_section_presence(name)
|
61
68
|
return unless @config.key?(name) && @config[name].nil?
|
62
69
|
|
63
|
-
raise ValidationError,
|
64
|
-
"empty section #{name} found in #{smart_loaded_path}"
|
70
|
+
raise ValidationError, "empty section #{name} found in #{smart_loaded_path}"
|
65
71
|
end
|
66
72
|
|
67
73
|
private
|
@@ -83,11 +89,11 @@ module RuboCop
|
|
83
89
|
|
84
90
|
msg = if last_version
|
85
91
|
"RuboCop found unsupported Ruby version #{target_ruby_version} " \
|
86
|
-
|
87
|
-
|
92
|
+
"in #{source}. #{target_ruby_version}-compatible " \
|
93
|
+
"analysis was dropped after version #{last_version}."
|
88
94
|
else
|
89
95
|
'RuboCop found unknown Ruby version ' \
|
90
|
-
|
96
|
+
"#{target_ruby_version.inspect} in #{source}."
|
91
97
|
end
|
92
98
|
|
93
99
|
msg += "\nSupported versions: #{TargetRuby.supported_versions.join(', ')}"
|
@@ -106,12 +112,9 @@ module RuboCop
|
|
106
112
|
# to do so than to pass the value around to various methods.
|
107
113
|
next if name == 'inherit_mode'
|
108
114
|
|
109
|
-
suggestions = NameSimilarity.find_similar_names(name, Cop::Registry.global.map(&:cop_name))
|
110
|
-
suggestion = "Did you mean `#{suggestions.join('`, `')}`?" if suggestions.any?
|
111
|
-
|
112
115
|
message = <<~MESSAGE.rstrip
|
113
|
-
unrecognized cop #{name} found in #{smart_loaded_path}
|
114
|
-
#{suggestion}
|
116
|
+
unrecognized cop or department #{name} found in #{smart_loaded_path}
|
117
|
+
#{suggestion(name)}
|
115
118
|
MESSAGE
|
116
119
|
|
117
120
|
unknown_cops << message
|
@@ -119,12 +122,27 @@ module RuboCop
|
|
119
122
|
raise ValidationError, unknown_cops.join("\n") if unknown_cops.any?
|
120
123
|
end
|
121
124
|
|
125
|
+
def suggestion(name)
|
126
|
+
registry = Cop::Registry.global
|
127
|
+
departments = registry.departments.map(&:to_s)
|
128
|
+
suggestions = NameSimilarity.find_similar_names(name, departments + registry.map(&:cop_name))
|
129
|
+
if suggestions.any?
|
130
|
+
"Did you mean `#{suggestions.join('`, `')}`?"
|
131
|
+
else
|
132
|
+
# Department names can contain slashes, e.g. Chef/Correctness, but there's no support for
|
133
|
+
# the concept of higher level departments in RuboCop. It's a flat structure. So if the user
|
134
|
+
# tries to configure a "top level department", we hint that it's the bottom level
|
135
|
+
# departments that should be configured.
|
136
|
+
suggestions = departments.select { |department| department.start_with?("#{name}/") }
|
137
|
+
"#{name} is not a department. Use `#{suggestions.join('`, `')}`." if suggestions.any?
|
138
|
+
end
|
139
|
+
end
|
140
|
+
|
122
141
|
def validate_syntax_cop
|
123
142
|
syntax_config = @config['Lint/Syntax']
|
124
143
|
default_config = ConfigLoader.default_configuration['Lint/Syntax']
|
125
144
|
|
126
|
-
return unless syntax_config &&
|
127
|
-
default_config.merge(syntax_config) != default_config
|
145
|
+
return unless syntax_config && default_config.merge(syntax_config) != default_config
|
128
146
|
|
129
147
|
raise ValidationError,
|
130
148
|
"configuration for Syntax cop found in #{smart_loaded_path}\n" \
|
@@ -133,8 +151,7 @@ module RuboCop
|
|
133
151
|
|
134
152
|
def validate_new_cops_parameter
|
135
153
|
new_cop_parameter = @config.for_all_cops['NewCops']
|
136
|
-
return if new_cop_parameter.nil? ||
|
137
|
-
NEW_COPS_VALUES.include?(new_cop_parameter)
|
154
|
+
return if new_cop_parameter.nil? || NEW_COPS_VALUES.include?(new_cop_parameter)
|
138
155
|
|
139
156
|
message = "invalid #{new_cop_parameter} for `NewCops` found in" \
|
140
157
|
"#{smart_loaded_path}\n" \
|
@@ -183,8 +200,8 @@ module RuboCop
|
|
183
200
|
next if validate_support_and_has_list(name, style, valid)
|
184
201
|
|
185
202
|
msg = "invalid #{style_name} '#{style}' for #{name} found in " \
|
186
|
-
|
187
|
-
|
203
|
+
"#{smart_loaded_path}\n" \
|
204
|
+
"Valid choices are: #{valid.join(', ')}"
|
188
205
|
raise ValidationError, msg
|
189
206
|
end
|
190
207
|
end
|
@@ -208,8 +225,7 @@ module RuboCop
|
|
208
225
|
def reject_conflicting_safe_settings
|
209
226
|
@config.each do |name, cop_config|
|
210
227
|
next unless cop_config.is_a?(Hash)
|
211
|
-
next unless cop_config['Safe'] == false &&
|
212
|
-
cop_config['SafeAutoCorrect'] == true
|
228
|
+
next unless cop_config['Safe'] == false && cop_config['SafeAutoCorrect'] == true
|
213
229
|
|
214
230
|
msg = 'Unsafe cops cannot have a safe auto-correction ' \
|
215
231
|
"(section #{name} in #{smart_loaded_path})"
|
@@ -21,8 +21,7 @@ module RuboCop
|
|
21
21
|
end
|
22
22
|
|
23
23
|
def safe_autocorrect?
|
24
|
-
cop_config.fetch('Safe', true) &&
|
25
|
-
cop_config.fetch('SafeAutoCorrect', true)
|
24
|
+
cop_config.fetch('Safe', true) && cop_config.fetch('SafeAutoCorrect', true)
|
26
25
|
end
|
27
26
|
|
28
27
|
def autocorrect_enabled?
|
@@ -68,9 +67,7 @@ module RuboCop
|
|
68
67
|
begin_of_first_line = range.begin_pos - range.column
|
69
68
|
end_of_first_line = begin_of_first_line + range.source_line.length
|
70
69
|
|
71
|
-
Parser::Source::Range.new(range.source_buffer,
|
72
|
-
begin_of_first_line,
|
73
|
-
end_of_first_line)
|
70
|
+
Parser::Source::Range.new(range.source_buffer, begin_of_first_line, end_of_first_line)
|
74
71
|
end
|
75
72
|
|
76
73
|
# Expand the given range to include all of any lines it covers. Does not
|
@@ -82,9 +79,7 @@ module RuboCop
|
|
82
79
|
last_line_offset = last_line.length - range.last_column
|
83
80
|
end_of_last_line = range.end_pos + last_line_offset
|
84
81
|
|
85
|
-
Parser::Source::Range.new(range.source_buffer,
|
86
|
-
begin_of_first_line,
|
87
|
-
end_of_last_line)
|
82
|
+
Parser::Source::Range.new(range.source_buffer, begin_of_first_line, end_of_last_line)
|
88
83
|
end
|
89
84
|
|
90
85
|
def max_line_length
|
data/lib/rubocop/cop/badge.rb
CHANGED
data/lib/rubocop/cop/base.rb
CHANGED
@@ -24,7 +24,7 @@ module RuboCop
|
|
24
24
|
# `add_global_offense`. Use the `processed_source` method to
|
25
25
|
# get the currently processed source being investigated.
|
26
26
|
#
|
27
|
-
# In case of invalid syntax /
|
27
|
+
# In case of invalid syntax / unparsable content,
|
28
28
|
# the callback `on_other_file` is called instead of all the other
|
29
29
|
# `on_...` callbacks.
|
30
30
|
#
|
@@ -187,8 +187,7 @@ module RuboCop
|
|
187
187
|
def self.match?(given_names)
|
188
188
|
return false unless given_names
|
189
189
|
|
190
|
-
given_names.include?(cop_name) ||
|
191
|
-
given_names.include?(department.to_s)
|
190
|
+
given_names.include?(cop_name) || given_names.include?(department.to_s)
|
192
191
|
end
|
193
192
|
|
194
193
|
def cop_name
|
@@ -206,13 +205,11 @@ module RuboCop
|
|
206
205
|
end
|
207
206
|
|
208
207
|
def config_to_allow_offenses
|
209
|
-
Formatter::DisabledConfigFormatter
|
210
|
-
.config_to_allow_offenses[cop_name] ||= {}
|
208
|
+
Formatter::DisabledConfigFormatter.config_to_allow_offenses[cop_name] ||= {}
|
211
209
|
end
|
212
210
|
|
213
211
|
def config_to_allow_offenses=(hash)
|
214
|
-
Formatter::DisabledConfigFormatter.config_to_allow_offenses[cop_name] =
|
215
|
-
hash
|
212
|
+
Formatter::DisabledConfigFormatter.config_to_allow_offenses[cop_name] = hash
|
216
213
|
end
|
217
214
|
|
218
215
|
def target_ruby_version
|
@@ -225,14 +222,19 @@ module RuboCop
|
|
225
222
|
|
226
223
|
def relevant_file?(file)
|
227
224
|
file == RuboCop::AST::ProcessedSource::STRING_SOURCE_NAME ||
|
228
|
-
file_name_matches_any?(file, 'Include', true) &&
|
229
|
-
!file_name_matches_any?(file, 'Exclude', false)
|
225
|
+
(file_name_matches_any?(file, 'Include', true) &&
|
226
|
+
!file_name_matches_any?(file, 'Exclude', false))
|
230
227
|
end
|
231
228
|
|
232
229
|
def excluded_file?(file)
|
233
230
|
!relevant_file?(file)
|
234
231
|
end
|
235
232
|
|
233
|
+
# There should be very limited reasons for a Cop to do it's own parsing
|
234
|
+
def parse(source, path = nil)
|
235
|
+
ProcessedSource.new(source, target_ruby_version, path)
|
236
|
+
end
|
237
|
+
|
236
238
|
### Persistence
|
237
239
|
|
238
240
|
# Override if your cop should be called repeatedly for multiple investigations
|
@@ -259,7 +261,7 @@ module RuboCop
|
|
259
261
|
# @deprecated Make potential errors with previous API more obvious
|
260
262
|
def offenses
|
261
263
|
raise 'The offenses are not directly available; ' \
|
262
|
-
|
264
|
+
'they are returned as the result of the investigation'
|
263
265
|
end
|
264
266
|
|
265
267
|
### Reserved for Commissioner
|
@@ -439,7 +441,7 @@ module RuboCop
|
|
439
441
|
severity.to_sym
|
440
442
|
else
|
441
443
|
message = "Warning: Invalid severity '#{severity}'. " \
|
442
|
-
|
444
|
+
"Valid severities are #{Severity::NAMES.join(', ')}."
|
443
445
|
warn(Rainbow(message).red)
|
444
446
|
end
|
445
447
|
end
|
@@ -30,7 +30,7 @@ module RuboCop
|
|
30
30
|
# if Dir.exist?(local)
|
31
31
|
# gem 'rubocop', path: local
|
32
32
|
# elsif ENV['RUBOCOP_VERSION'] == 'master'
|
33
|
-
# gem 'rubocop', git: 'https://github.com/rubocop
|
33
|
+
# gem 'rubocop', git: 'https://github.com/rubocop/rubocop.git'
|
34
34
|
# else
|
35
35
|
# gem 'rubocop', '~> 0.90.0'
|
36
36
|
# end
|
@@ -39,7 +39,7 @@ module RuboCop
|
|
39
39
|
include RangeHelp
|
40
40
|
|
41
41
|
MSG = 'Gem `%<gem_name>s` requirements already given on line '\
|
42
|
-
|
42
|
+
'%<line_of_first_occurrence>d of the Gemfile.'
|
43
43
|
|
44
44
|
def on_new_investigation
|
45
45
|
return if processed_source.blank?
|
@@ -57,6 +57,7 @@ module RuboCop
|
|
57
57
|
|
58
58
|
private
|
59
59
|
|
60
|
+
# @!method gem_declarations(node)
|
60
61
|
def_node_search :gem_declarations, '(send nil? :gem str ...)'
|
61
62
|
|
62
63
|
def duplicated_gem_nodes
|
@@ -82,8 +83,7 @@ module RuboCop
|
|
82
83
|
|
83
84
|
def register_offense(node, gem_name, line_of_first_occurrence)
|
84
85
|
line_range = node.loc.column...node.loc.last_column
|
85
|
-
offense_location =
|
86
|
-
source_range(processed_source.buffer, node.first_line, line_range)
|
86
|
+
offense_location = source_range(processed_source.buffer, node.first_line, line_range)
|
87
87
|
message = format(
|
88
88
|
MSG,
|
89
89
|
gem_name: gem_name,
|
@@ -3,15 +3,24 @@
|
|
3
3
|
module RuboCop
|
4
4
|
module Cop
|
5
5
|
module Bundler
|
6
|
-
#
|
6
|
+
# Each gem in the Gemfile should have a comment explaining
|
7
|
+
# its purpose in the project, or the reason for its version
|
8
|
+
# or source.
|
7
9
|
#
|
8
|
-
#
|
10
|
+
# The optional "OnlyFor" configuration array
|
9
11
|
# can be used to only register offenses when the gems
|
10
12
|
# use certain options or have version specifiers.
|
11
|
-
# Add "version_specifiers" and/or the gem option names
|
12
|
-
# you want to check.
|
13
13
|
#
|
14
|
-
#
|
14
|
+
# When "version_specifiers" is included, a comment
|
15
|
+
# will be enforced if the gem has any version specifier.
|
16
|
+
#
|
17
|
+
# When "restrictive_version_specifiers" is included, a comment
|
18
|
+
# will be enforced if the gem has a version specifier that
|
19
|
+
# holds back the version of the gem.
|
20
|
+
#
|
21
|
+
# For any other value in the array, a comment will be enforced for
|
22
|
+
# a gem if an option by the same name is present.
|
23
|
+
# A useful use case is to enforce a comment when using
|
15
24
|
# options that change the source of a gem:
|
16
25
|
#
|
17
26
|
# - `bitbucket`
|
@@ -21,7 +30,8 @@ module RuboCop
|
|
21
30
|
# - `source`
|
22
31
|
#
|
23
32
|
# For a full list of options supported by bundler,
|
24
|
-
#
|
33
|
+
# see https://bundler.io/man/gemfile.5.html
|
34
|
+
# .
|
25
35
|
#
|
26
36
|
# @example OnlyFor: [] (default)
|
27
37
|
# # bad
|
@@ -43,6 +53,18 @@ module RuboCop
|
|
43
53
|
# # Version 2.1 introduces breaking change baz
|
44
54
|
# gem 'foo', '< 2.1'
|
45
55
|
#
|
56
|
+
# @example OnlyFor: ['restrictive_version_specifiers']
|
57
|
+
# # bad
|
58
|
+
#
|
59
|
+
# gem 'foo', '< 2.1'
|
60
|
+
#
|
61
|
+
# # good
|
62
|
+
#
|
63
|
+
# gem 'foo', '>= 1.0'
|
64
|
+
#
|
65
|
+
# # Version 2.1 introduces breaking change baz
|
66
|
+
# gem 'foo', '< 2.1'
|
67
|
+
#
|
46
68
|
# @example OnlyFor: ['version_specifiers', 'github']
|
47
69
|
# # bad
|
48
70
|
#
|
@@ -60,14 +82,15 @@ module RuboCop
|
|
60
82
|
#
|
61
83
|
class GemComment < Base
|
62
84
|
include DefNode
|
85
|
+
include GemDeclaration
|
63
86
|
|
64
87
|
MSG = 'Missing gem description comment.'
|
65
88
|
CHECKED_OPTIONS_CONFIG = 'OnlyFor'
|
66
89
|
VERSION_SPECIFIERS_OPTION = 'version_specifiers'
|
90
|
+
RESTRICTIVE_VERSION_SPECIFIERS_OPTION = 'restrictive_version_specifiers'
|
91
|
+
RESTRICTIVE_VERSION_PATTERN = /\A\s*(?:<|~>|\d|=)/.freeze
|
67
92
|
RESTRICT_ON_SEND = %i[gem].freeze
|
68
93
|
|
69
|
-
def_node_matcher :gem_declaration?, '(send nil? :gem str ...)'
|
70
|
-
|
71
94
|
def on_send(node)
|
72
95
|
return unless gem_declaration?(node)
|
73
96
|
return if ignored_gem?(node)
|
@@ -101,8 +124,7 @@ module RuboCop
|
|
101
124
|
end
|
102
125
|
|
103
126
|
def preceding_comment?(node1, node2)
|
104
|
-
node1 && node2 && precede?(node2, node1) &&
|
105
|
-
comment_line?(node2.loc.expression.source)
|
127
|
+
node1 && node2 && precede?(node2, node1) && comment_line?(node2.loc.expression.source)
|
106
128
|
end
|
107
129
|
|
108
130
|
def ignored_gem?(node)
|
@@ -113,6 +135,8 @@ module RuboCop
|
|
113
135
|
def checked_options_present?(node)
|
114
136
|
(cop_config[CHECKED_OPTIONS_CONFIG].include?(VERSION_SPECIFIERS_OPTION) &&
|
115
137
|
version_specified_gem?(node)) ||
|
138
|
+
(cop_config[CHECKED_OPTIONS_CONFIG].include?(RESTRICTIVE_VERSION_SPECIFIERS_OPTION) &&
|
139
|
+
restrictive_version_specified_gem?(node)) ||
|
116
140
|
contains_checked_options?(node)
|
117
141
|
end
|
118
142
|
|
@@ -123,6 +147,15 @@ module RuboCop
|
|
123
147
|
node.arguments[1]&.str_type?
|
124
148
|
end
|
125
149
|
|
150
|
+
# Version specifications that restrict all updates going forward. This excludes versions
|
151
|
+
# like ">= 1.0" or "!= 2.0.3".
|
152
|
+
def restrictive_version_specified_gem?(node)
|
153
|
+
return unless version_specified_gem?(node)
|
154
|
+
|
155
|
+
node.arguments[1..-1]
|
156
|
+
.any? { |arg| arg&.str_type? && RESTRICTIVE_VERSION_PATTERN.match?(arg.value) }
|
157
|
+
end
|
158
|
+
|
126
159
|
def contains_checked_options?(node)
|
127
160
|
(Array(cop_config[CHECKED_OPTIONS_CONFIG]) & gem_options(node).map(&:to_s)).any?
|
128
161
|
end
|
@@ -0,0 +1,103 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module Bundler
|
6
|
+
# This cop verifies that a project contains Gemfile or gems.rb file and correct
|
7
|
+
# associated lock file based on the configuration.
|
8
|
+
#
|
9
|
+
# @example EnforcedStyle: Gemfile (default)
|
10
|
+
# # bad
|
11
|
+
# Project contains gems.rb and gems.locked files
|
12
|
+
#
|
13
|
+
# # bad
|
14
|
+
# Project contains Gemfile and gems.locked file
|
15
|
+
#
|
16
|
+
# # good
|
17
|
+
# Project contains Gemfile and Gemfile.lock
|
18
|
+
#
|
19
|
+
# @example EnforcedStyle: gems.rb
|
20
|
+
# # bad
|
21
|
+
# Project contains Gemfile and Gemfile.lock files
|
22
|
+
#
|
23
|
+
# # bad
|
24
|
+
# Project contains gems.rb and Gemfile.lock file
|
25
|
+
#
|
26
|
+
# # good
|
27
|
+
# Project contains gems.rb and gems.locked files
|
28
|
+
class GemFilename < Base
|
29
|
+
include ConfigurableEnforcedStyle
|
30
|
+
include RangeHelp
|
31
|
+
|
32
|
+
MSG_GEMFILE_REQUIRED = '`gems.rb` file was found but `Gemfile` is required '\
|
33
|
+
'(file path: %<file_path>s).'
|
34
|
+
MSG_GEMS_RB_REQUIRED = '`Gemfile` was found but `gems.rb` file is required '\
|
35
|
+
'(file path: %<file_path>s).'
|
36
|
+
MSG_GEMFILE_MISMATCHED = 'Expected a `Gemfile.lock` with `Gemfile` but found '\
|
37
|
+
'`gems.locked` file (file path: %<file_path>s).'
|
38
|
+
MSG_GEMS_RB_MISMATCHED = 'Expected a `gems.locked` file with `gems.rb` but found '\
|
39
|
+
'`Gemfile.lock` (file path: %<file_path>s).'
|
40
|
+
GEMFILE_FILES = %w[Gemfile Gemfile.lock].freeze
|
41
|
+
GEMS_RB_FILES = %w[gems.rb gems.locked].freeze
|
42
|
+
|
43
|
+
def on_new_investigation
|
44
|
+
file_path = processed_source.file_path
|
45
|
+
basename = File.basename(file_path)
|
46
|
+
return if expected_gemfile?(basename)
|
47
|
+
|
48
|
+
register_offense(file_path, basename)
|
49
|
+
end
|
50
|
+
|
51
|
+
private
|
52
|
+
|
53
|
+
def register_offense(file_path, basename)
|
54
|
+
register_gemfile_offense(file_path, basename) if gemfile_offense?(basename)
|
55
|
+
register_gems_rb_offense(file_path, basename) if gems_rb_offense?(basename)
|
56
|
+
end
|
57
|
+
|
58
|
+
def register_gemfile_offense(file_path, basename)
|
59
|
+
message = case basename
|
60
|
+
when 'gems.rb'
|
61
|
+
MSG_GEMFILE_REQUIRED
|
62
|
+
when 'gems.locked'
|
63
|
+
MSG_GEMFILE_MISMATCHED
|
64
|
+
end
|
65
|
+
|
66
|
+
add_global_offense(format(message, file_path: file_path))
|
67
|
+
end
|
68
|
+
|
69
|
+
def register_gems_rb_offense(file_path, basename)
|
70
|
+
message = case basename
|
71
|
+
when 'Gemfile'
|
72
|
+
MSG_GEMS_RB_REQUIRED
|
73
|
+
when 'Gemfile.lock'
|
74
|
+
MSG_GEMS_RB_MISMATCHED
|
75
|
+
end
|
76
|
+
|
77
|
+
add_global_offense(format(message, file_path: file_path))
|
78
|
+
end
|
79
|
+
|
80
|
+
def gemfile_offense?(basename)
|
81
|
+
gemfile_required? && GEMS_RB_FILES.include?(basename)
|
82
|
+
end
|
83
|
+
|
84
|
+
def gems_rb_offense?(basename)
|
85
|
+
gems_rb_required? && GEMFILE_FILES.include?(basename)
|
86
|
+
end
|
87
|
+
|
88
|
+
def expected_gemfile?(basename)
|
89
|
+
(gemfile_required? && GEMFILE_FILES.include?(basename)) ||
|
90
|
+
(gems_rb_required? && GEMS_RB_FILES.include?(basename))
|
91
|
+
end
|
92
|
+
|
93
|
+
def gemfile_required?
|
94
|
+
style == :Gemfile
|
95
|
+
end
|
96
|
+
|
97
|
+
def gems_rb_required?
|
98
|
+
style == :'gems.rb'
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
102
|
+
end
|
103
|
+
end
|