rubocop 0.51.0 → 0.52.0

data/lib/rubocop/formatter/json_formatter.rb

@@ -64,9 +64,15 @@ module RuboCop
       # TODO: Consider better solution for Offense#real_column.
       def hash_for_location(offense)
         {
-          line:   offense.line,
-          column: offense.real_column,
-          length: offense.location.length
+          start_line:        offense.line,
+          start_column:      offense.real_column,
+          last_line:   offense.last_line,
+          last_column: offense.last_column,
+          length:      offense.location.length,
+          # `line` and `column` exist for compatibility.
+          # Use `start_line` and `start_column` instead.
+          line:        offense.line,
+          column:      offense.real_column
         }
       end
     end

data/lib/rubocop/formatter/quiet_formatter.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Formatter
+    # If no offenses are found, no output is displayed.
+    # Otherwise, SimpleTextFormatter's output is displayed.
+    class QuietFormatter < SimpleTextFormatter
+      def report_summary(file_count, offense_count, correction_count)
+        super unless offense_count.zero?
+      end
+    end
+  end
+end

data/lib/rubocop/node_pattern.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ClassLength
-# rubocop:disable Metrics/CyclomaticComplexity
-
+# rubocop:disable Metrics/ClassLength, Metrics/CyclomaticComplexity
 module RuboCop
   # This class performs a pattern-matching operation on an AST node.
   #
@@ -559,3 +557,4 @@ module RuboCop
     end
   end
 end
+# rubocop:enable Metrics/ClassLength, Metrics/CyclomaticComplexity

data/lib/rubocop/options.rb

@@ -17,9 +17,6 @@ module RuboCop
     def parse(command_line_args)
       args = args_from_file.concat(args_from_env).concat(command_line_args)
       define_options(args).parse!(args)
-      # The --no-color CLI option sets `color: false` so we don't want the
-      # `no_color` key, which is created automatically.
-      @options.delete(:no_color)
 
       @validator.validate_compatibility
 
@@ -143,7 +140,7 @@ module RuboCop
       option(opts, '-F', '--fail-fast')
       option(opts, '-C', '--cache FLAG')
       option(opts, '-d', '--debug')
-      option(opts, '-D', '--display-cop-names')
+      option(opts, '-D', '--[no-]display-cop-names')
       option(opts, '-E', '--extra-details')
       option(opts, '-S', '--display-style-guide')
       option(opts, '-R', '--rails')
@@ -153,7 +150,7 @@ module RuboCop
       end
       option(opts, '-a', '--auto-correct')
 
-      option(opts, '--[no-]color') { |c| @options[:color] = c }
+      option(opts, '--[no-]color')
 
       option(opts, '-v', '--version')
       option(opts, '-V', '--verbose-version')
@@ -179,7 +176,8 @@ module RuboCop
     # e.g. [..., '--auto-correct', ...] to :auto_correct.
     def long_opt_symbol(args)
       long_opt = args.find { |arg| arg.start_with?('--') }
-      long_opt[2..-1].sub(/ .*/, '').tr('-', '_').gsub(/[\[\]]/, '').to_sym
+      long_opt[2..-1].sub('[no-]', '').sub(/ .*/, '')
+                     .tr('-', '_').gsub(/[\[\]]/, '').to_sym
     end
   end
 
@@ -324,6 +322,7 @@ module RuboCop
                              '  [o]ffenses',
                              '  [w]orst',
                              '  [t]ap',
+                             '  [q]uiet',
                              '  custom formatter class name'],
       out:                  ['Write output to a file instead of STDOUT.',
                              'This option applies to the previously',
@@ -341,14 +340,15 @@ module RuboCop
                              '(FLAG=false), default determined by',
                              'configuration parameter AllCops: UseCache.'],
       debug:                 'Display debug info.',
-      display_cop_names:     'Display cop names in offense messages.',
+      display_cop_names:     ['Display cop names in offense messages.',
+                              'Default is true.'],
       display_style_guide:   'Display style guide URLs in offense messages.',
       extra_details:         'Display extra details in offense messages.',
       rails:                 'Run extra Rails cops.',
       lint:                  'Run only lint cops.',
       list_target_files:     'List all files RuboCop will inspect.',
       auto_correct:          'Auto-correct offenses.',
-      no_color:              'Force color output on or off.',
+      color:                 'Force color output on or off.',
       version:               'Display version.',
       verbose_version:       'Display verbose version.',
       parallel:             ['Use available CPUs to execute inspection in',

data/lib/rubocop/path_util.rb

@@ -5,10 +5,14 @@ module RuboCop
   module PathUtil
     module_function
 
-    def relative_path(path, base_dir = Dir.pwd)
+    def relative_path(path, base_dir = PathUtil.pwd)
       # Optimization for the common case where path begins with the base
       # dir. Just cut off the first part.
-      return path[(base_dir.length + 1)..-1] if path.start_with?(base_dir)
+      if path.start_with?(base_dir)
+        base_dir_length = base_dir.length
+        result_length = path.length - base_dir_length - 1
+        return path[base_dir_length + 1, result_length]
+      end
 
       path_name = Pathname.new(File.expand_path(path))
       path_name.relative_path_from(Pathname.new(base_dir)).to_s
@@ -16,7 +20,7 @@ module RuboCop
 
     def smart_path(path)
       # Ideally, we calculate this relative to the project root.
-      base_dir = Dir.pwd
+      base_dir = PathUtil.pwd
 
       if path.start_with? base_dir
         relative_path(path, base_dir)
@@ -43,5 +47,13 @@ module RuboCop
     def absolute?(path)
       path =~ %r{\A([A-Z]:)?/}
     end
+
+    def self.pwd
+      @pwd ||= Dir.pwd
+    end
+
+    def self.reset_pwd
+      @pwd = nil
+    end
   end
 end

data/lib/rubocop/processed_source.rb

@@ -54,7 +54,7 @@ module RuboCop
     def lines
       @lines ||= begin
         all_lines = @buffer.source_lines
-        last_token_line = tokens.any? ? tokens.last.pos.line : all_lines.size
+        last_token_line = tokens.any? ? tokens.last.line : all_lines.size
         result = []
         all_lines.each_with_index do |line, ix|
           break if ix >= last_token_line && line == '__END__'
@@ -122,6 +122,9 @@ module RuboCop
       when 2.4
         require 'parser/ruby24'
         Parser::Ruby24
+      when 2.5
+        require 'parser/ruby25'
+        Parser::Ruby25
       else
         raise ArgumentError, "Unknown Ruby version: #{ruby_version.inspect}"
       end
@@ -132,7 +135,7 @@ module RuboCop
       builder = RuboCop::AST::Builder.new
 
       parser_class(ruby_version).new(builder).tap do |parser|
-        # On JRuby and Rubinius, there's a risk that we hang in tokenize() if we
+        # On JRuby there's a risk that we hang in tokenize() if we
         # don't set the all errors as fatal flag. The problem is caused by a bug
         # in Racc that is discussed in issue #93 of the whitequark/parser
         # project on GitHub.

data/lib/rubocop/rspec/shared_contexts.rb

@@ -73,6 +73,10 @@ shared_context 'ruby 2.4', :ruby24 do
   let(:ruby_version) { 2.4 }
 end
 
+shared_context 'ruby 2.5', :ruby25 do
+  let(:ruby_version) { 2.5 }
+end
+
 shared_context 'with Rails', :enabled_rails do
   let(:enabled_rails) { true }
 end

data/lib/rubocop/runner.rb

@@ -47,7 +47,7 @@ module RuboCop
     private
 
     # Warms up the RuboCop cache by forking a suitable number of rubocop
-    # instances that each inspects its alotted group of files.
+    # instances that each inspects its allotted group of files.
     def warm_cache(target_files)
       puts 'Running parallel inspection' if @options[:debug]
       Parallel.each(target_files, &method(:file_offenses))

data/lib/rubocop/token.rb

@@ -18,8 +18,82 @@ module RuboCop
       @text = text.to_s
     end
 
+    def line
+      pos.line
+    end
+
+    def column
+      pos.column
+    end
+
+    def begin_pos
+      pos.begin_pos
+    end
+
+    def end_pos
+      pos.end_pos
+    end
+
+    def comment?
+      type == :tCOMMENT
+    end
+
+    def semicolon?
+      type == :tSEMI
+    end
+
+    def left_array_bracket?
+      type == :tLBRACK
+    end
+
+    def left_ref_bracket?
+      type == :tLBRACK2
+    end
+
+    def right_bracket?
+      type == :tRBRACK
+    end
+
+    def left_brace?
+      type == :tLBRACE
+    end
+
+    def left_curly_brace?
+      type == :tLCURLY
+    end
+
+    def right_curly_brace?
+      type == :tRCURLY
+    end
+
+    def left_parens?
+      %i[tLPAREN tLPAREN2].include?(type)
+    end
+
+    def right_parens?
+      type == :tRPAREN
+    end
+
+    def comma?
+      type == :tCOMMA
+    end
+
+    def equal_sign?
+      %i[tEQL tOP_ASGN].include?(type)
+    end
+
     def to_s
       "[[#{@pos.line}, #{@pos.column}], #{@type}, #{@text.inspect}]"
     end
+
+    # Checks if there is whitespace after token
+    def space_after?
+      pos.source_buffer.source.match(/\G\s/, end_pos)
+    end
+
+    # Checks if there is whitespace before token
+    def space_before?
+      pos.source_buffer.source.match(/\G\s/, begin_pos - 1)
+    end
   end
 end

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.51.0'.freeze
+    STRING = '0.52.0'.freeze
 
     MSG = '%s (using Parser %s, running on %s %s %s)'.freeze
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.52.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -32,7 +32,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.3.1
+        version: 2.4.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.3.1
+        version: 2.4.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -69,7 +69,7 @@ dependencies:
         version: 2.2.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: 2.2.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,7 @@ files:
 - lib/rubocop/ast/node/hash_node.rb
 - lib/rubocop/ast/node/if_node.rb
 - lib/rubocop/ast/node/keyword_splat_node.rb
+- lib/rubocop/ast/node/mixin/basic_literal_node.rb
 - lib/rubocop/ast/node/mixin/binary_operator_node.rb
 - lib/rubocop/ast/node/mixin/collection_node.rb
 - lib/rubocop/ast/node/mixin/conditional_node.rb
@@ -175,7 +176,9 @@ files:
 - lib/rubocop/ast/node/regexp_node.rb
 - lib/rubocop/ast/node/resbody_node.rb
 - lib/rubocop/ast/node/send_node.rb
+- lib/rubocop/ast/node/str_node.rb
 - lib/rubocop/ast/node/super_node.rb
+- lib/rubocop/ast/node/symbol_node.rb
 - lib/rubocop/ast/node/until_node.rb
 - lib/rubocop/ast/node/when_node.rb
 - lib/rubocop/ast/node/while_node.rb
@@ -198,11 +201,13 @@ files:
 - lib/rubocop/cop/cop.rb
 - lib/rubocop/cop/corrector.rb
 - lib/rubocop/cop/force.rb
+- lib/rubocop/cop/gemspec/duplicated_assignment.rb
 - lib/rubocop/cop/gemspec/ordered_dependencies.rb
+- lib/rubocop/cop/gemspec/required_ruby_version.rb
 - lib/rubocop/cop/generator.rb
 - lib/rubocop/cop/ignored_node.rb
 - lib/rubocop/cop/internal_affairs.rb
-- lib/rubocop/cop/internal_affairs/deprecated_positional_arguments.rb
+- lib/rubocop/cop/internal_affairs/node_destructuring.rb
 - lib/rubocop/cop/internal_affairs/node_type_predicate.rb
 - lib/rubocop/cop/internal_affairs/offense_location_keyword.rb
 - lib/rubocop/cop/internal_affairs/redundant_location_argument.rb
@@ -214,6 +219,7 @@ files:
 - lib/rubocop/cop/layout/align_parameters.rb
 - lib/rubocop/cop/layout/block_end_newline.rb
 - lib/rubocop/cop/layout/case_indentation.rb
+- lib/rubocop/cop/layout/class_structure.rb
 - lib/rubocop/cop/layout/closing_parenthesis_indentation.rb
 - lib/rubocop/cop/layout/comment_indentation.rb
 - lib/rubocop/cop/layout/dot_position.rb
@@ -222,6 +228,7 @@ files:
 - lib/rubocop/cop/layout/empty_line_between_defs.rb
 - lib/rubocop/cop/layout/empty_lines.rb
 - lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb
+- lib/rubocop/cop/layout/empty_lines_around_arguments.rb
 - lib/rubocop/cop/layout/empty_lines_around_begin_body.rb
 - lib/rubocop/cop/layout/empty_lines_around_block_body.rb
 - lib/rubocop/cop/layout/empty_lines_around_class_body.rb
@@ -267,13 +274,14 @@ files:
 - lib/rubocop/cop/layout/space_before_first_arg.rb
 - lib/rubocop/cop/layout/space_before_semicolon.rb
 - lib/rubocop/cop/layout/space_in_lambda_literal.rb
+- lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb
 - lib/rubocop/cop/layout/space_inside_array_percent_literal.rb
 - lib/rubocop/cop/layout/space_inside_block_braces.rb
-- lib/rubocop/cop/layout/space_inside_brackets.rb
 - lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb
 - lib/rubocop/cop/layout/space_inside_parens.rb
 - lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb
 - lib/rubocop/cop/layout/space_inside_range_literal.rb
+- lib/rubocop/cop/layout/space_inside_reference_brackets.rb
 - lib/rubocop/cop/layout/space_inside_string_interpolation.rb
 - lib/rubocop/cop/layout/tab.rb
 - lib/rubocop/cop/layout/trailing_blank_lines.rb
@@ -311,8 +319,10 @@ files:
 - lib/rubocop/cop/lint/literal_as_condition.rb
 - lib/rubocop/cop/lint/literal_in_interpolation.rb
 - lib/rubocop/cop/lint/loop.rb
+- lib/rubocop/cop/lint/missing_cop_enable_directive.rb
 - lib/rubocop/cop/lint/multiple_compare.rb
 - lib/rubocop/cop/lint/nested_method_definition.rb
+- lib/rubocop/cop/lint/nested_percent_literal.rb
 - lib/rubocop/cop/lint/next_without_accumulator.rb
 - lib/rubocop/cop/lint/non_local_exit_from_iterator.rb
 - lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb
@@ -325,10 +335,10 @@ files:
 - lib/rubocop/cop/lint/require_parentheses.rb
 - lib/rubocop/cop/lint/rescue_exception.rb
 - lib/rubocop/cop/lint/rescue_type.rb
-- lib/rubocop/cop/lint/rescue_without_error_class.rb
 - lib/rubocop/cop/lint/return_in_void_context.rb
 - lib/rubocop/cop/lint/safe_navigation_chain.rb
 - lib/rubocop/cop/lint/script_permission.rb
+- lib/rubocop/cop/lint/shadowed_argument.rb
 - lib/rubocop/cop/lint/shadowed_exception.rb
 - lib/rubocop/cop/lint/shadowing_outer_local_variable.rb
 - lib/rubocop/cop/lint/string_conversion_in_interpolation.rb
@@ -377,6 +387,7 @@ files:
 - lib/rubocop/cop/mixin/documentation_comment.rb
 - lib/rubocop/cop/mixin/duplication.rb
 - lib/rubocop/cop/mixin/empty_lines_around_body.rb
+- lib/rubocop/cop/mixin/empty_parameter.rb
 - lib/rubocop/cop/mixin/end_keyword_alignment.rb
 - lib/rubocop/cop/mixin/enforce_superclass.rb
 - lib/rubocop/cop/mixin/first_element_line_break.rb
@@ -404,7 +415,6 @@ files:
 - lib/rubocop/cop/mixin/safe_mode.rb
 - lib/rubocop/cop/mixin/space_after_punctuation.rb
 - lib/rubocop/cop/mixin/space_before_punctuation.rb
-- lib/rubocop/cop/mixin/space_inside.rb
 - lib/rubocop/cop/mixin/statement_modifier.rb
 - lib/rubocop/cop/mixin/string_help.rb
 - lib/rubocop/cop/mixin/string_literals_help.rb
@@ -458,11 +468,13 @@ files:
 - lib/rubocop/cop/rails/application_job.rb
 - lib/rubocop/cop/rails/application_record.rb
 - lib/rubocop/cop/rails/blank.rb
+- lib/rubocop/cop/rails/create_table_with_timestamps.rb
 - lib/rubocop/cop/rails/date.rb
 - lib/rubocop/cop/rails/delegate.rb
 - lib/rubocop/cop/rails/delegate_allow_blank.rb
 - lib/rubocop/cop/rails/dynamic_find_by.rb
 - lib/rubocop/cop/rails/enum_uniqueness.rb
+- lib/rubocop/cop/rails/environment_comparison.rb
 - lib/rubocop/cop/rails/exit.rb
 - lib/rubocop/cop/rails/file_path.rb
 - lib/rubocop/cop/rails/find_by.rb
@@ -470,12 +482,16 @@ files:
 - lib/rubocop/cop/rails/has_and_belongs_to_many.rb
 - lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb
 - lib/rubocop/cop/rails/http_positional_arguments.rb
+- lib/rubocop/cop/rails/inverse_of.rb
+- lib/rubocop/cop/rails/lexically_scoped_action_filter.rb
 - lib/rubocop/cop/rails/not_null_column.rb
 - lib/rubocop/cop/rails/output.rb
 - lib/rubocop/cop/rails/output_safety.rb
 - lib/rubocop/cop/rails/pluralization_grammar.rb
+- lib/rubocop/cop/rails/presence.rb
 - lib/rubocop/cop/rails/present.rb
 - lib/rubocop/cop/rails/read_write_attribute.rb
+- lib/rubocop/cop/rails/redundant_receiver_in_with_options.rb
 - lib/rubocop/cop/rails/relative_date_constant.rb
 - lib/rubocop/cop/rails/request_referer.rb
 - lib/rubocop/cop/rails/reversible_migration.rb
@@ -512,6 +528,7 @@ files:
 - lib/rubocop/cop/style/class_vars.rb
 - lib/rubocop/cop/style/collection_methods.rb
 - lib/rubocop/cop/style/colon_method_call.rb
+- lib/rubocop/cop/style/colon_method_definition.rb
 - lib/rubocop/cop/style/command_literal.rb
 - lib/rubocop/cop/style/comment_annotation.rb
 - lib/rubocop/cop/style/commented_keyword.rb
@@ -525,13 +542,17 @@ files:
 - lib/rubocop/cop/style/double_negation.rb
 - lib/rubocop/cop/style/each_for_simple_loop.rb
 - lib/rubocop/cop/style/each_with_object.rb
+- lib/rubocop/cop/style/empty_block_parameter.rb
 - lib/rubocop/cop/style/empty_case_condition.rb
 - lib/rubocop/cop/style/empty_else.rb
+- lib/rubocop/cop/style/empty_lambda_parameter.rb
 - lib/rubocop/cop/style/empty_literal.rb
 - lib/rubocop/cop/style/empty_method.rb
 - lib/rubocop/cop/style/encoding.rb
 - lib/rubocop/cop/style/end_block.rb
+- lib/rubocop/cop/style/eval_with_location.rb
 - lib/rubocop/cop/style/even_odd.rb
+- lib/rubocop/cop/style/extend_self.rb
 - lib/rubocop/cop/style/flip_flop.rb
 - lib/rubocop/cop/style/for.rb
 - lib/rubocop/cop/style/format_string.rb
@@ -593,6 +614,7 @@ files:
 - lib/rubocop/cop/style/preferred_hash_methods.rb
 - lib/rubocop/cop/style/proc.rb
 - lib/rubocop/cop/style/raise_args.rb
+- lib/rubocop/cop/style/random_with_offset.rb
 - lib/rubocop/cop/style/redundant_begin.rb
 - lib/rubocop/cop/style/redundant_conditional.rb
 - lib/rubocop/cop/style/redundant_exception.rb
@@ -602,6 +624,7 @@ files:
 - lib/rubocop/cop/style/redundant_self.rb
 - lib/rubocop/cop/style/regexp_literal.rb
 - lib/rubocop/cop/style/rescue_modifier.rb
+- lib/rubocop/cop/style/rescue_standard_error.rb
 - lib/rubocop/cop/style/return_nil.rb
 - lib/rubocop/cop/style/safe_navigation.rb
 - lib/rubocop/cop/style/self_assignment.rb
@@ -613,6 +636,7 @@ files:
 - lib/rubocop/cop/style/special_global_vars.rb
 - lib/rubocop/cop/style/stabby_lambda_parentheses.rb
 - lib/rubocop/cop/style/stderr_puts.rb
+- lib/rubocop/cop/style/string_hash_keys.rb
 - lib/rubocop/cop/style/string_literals.rb
 - lib/rubocop/cop/style/string_literals_in_interpolation.rb
 - lib/rubocop/cop/style/string_methods.rb
@@ -621,8 +645,10 @@ files:
 - lib/rubocop/cop/style/symbol_literal.rb
 - lib/rubocop/cop/style/symbol_proc.rb
 - lib/rubocop/cop/style/ternary_parentheses.rb
+- lib/rubocop/cop/style/trailing_body_on_method_definition.rb
 - lib/rubocop/cop/style/trailing_comma_in_arguments.rb
 - lib/rubocop/cop/style/trailing_comma_in_literal.rb
+- lib/rubocop/cop/style/trailing_method_end_statement.rb
 - lib/rubocop/cop/style/trailing_underscore_variable.rb
 - lib/rubocop/cop/style/trivial_accessors.rb
 - lib/rubocop/cop/style/unless_else.rb
@@ -660,6 +686,7 @@ files:
 - lib/rubocop/formatter/json_formatter.rb
 - lib/rubocop/formatter/offense_count_formatter.rb
 - lib/rubocop/formatter/progress_formatter.rb
+- lib/rubocop/formatter/quiet_formatter.rb
 - lib/rubocop/formatter/simple_text_formatter.rb
 - lib/rubocop/formatter/tap_formatter.rb
 - lib/rubocop/formatter/text_util.rb