rubocop 0.52.1 → 0.53.0

data/lib/rubocop/remote_config.rb

@@ -21,7 +21,7 @@ module RuboCop
       request do |response|
         next if response.is_a?(Net::HTTPNotModified)
         next if response.is_a?(SocketError)
-        open cache_path, 'w' do |io|
+        File.open cache_path, 'w' do |io|
           io.write response.body
         end
       end

data/lib/rubocop/result_cache.rb

@@ -132,7 +132,7 @@ module RuboCop
     end
 
     def file_checksum(file, config_store)
-      Digest::MD5.hexdigest(Dir.pwd + file + IO.read(file) +
+      Digest::MD5.hexdigest(Dir.pwd + file + IO.binread(file) +
                             File.stat(file).mode.to_s +
                             config_store.for(file).to_s)
     rescue Errno::ENOENT

data/lib/rubocop/rspec/cop_helper.rb

@@ -92,7 +92,3 @@ module RuboCop
     end
   end
 end
-
-RSpec.configure do |config|
-  config.include CopHelper
-end

data/lib/rubocop/rspec/host_environment_simulation_helper.rb

@@ -26,7 +26,3 @@ module HostEnvironmentSimulatorHelper
     end
   end
 end
-
-RSpec.configure do |config|
-  config.include HostEnvironmentSimulatorHelper
-end

data/lib/rubocop/rspec/shared_contexts.rb

@@ -13,7 +13,7 @@ shared_context 'isolated environment', :isolated_environment do
       tmpdir = File.realpath(tmpdir)
 
       # Make upwards search for .rubocop.yml files stop at this directory.
-      RuboCop::ConfigLoader.root_level = tmpdir
+      RuboCop::FileFinder.root_level = tmpdir
 
       begin
         virtual_home = File.expand_path(File.join(tmpdir, 'home'))
@@ -28,6 +28,8 @@ shared_context 'isolated environment', :isolated_environment do
         end
       ensure
         ENV['HOME'] = original_home
+
+        RuboCop::FileFinder.root_level = nil
       end
     end
   end

data/lib/rubocop/rspec/shared_examples.rb

@@ -32,34 +32,32 @@ shared_examples_for 'mimics MRI 2.1' do |grep_mri_warning|
   end
 end
 
-shared_examples_for 'misaligned' do |prefix, alignment_base, arg, end_kw, name|
-  name ||= alignment_base
-  source = ["#{prefix}#{alignment_base} #{arg}",
-            end_kw]
+shared_examples_for 'misaligned' do |annotated_source, used_style|
+  config_to_allow_offenses = if used_style
+                               { 'EnforcedStyleAlignWith' => used_style.to_s }
+                             else
+                               { 'Enabled' => false }
+                             end
+  annotated_source.strip_indent.split(/\n\n/).each do |chunk|
+    chunk << "\n" unless chunk.end_with?("\n")
+    source = chunk.lines.reject { |line| line =~ /^ *\^/ }.join
+    name = source.gsub(/\n(?=[a-z ])/, ' <newline> ').gsub(/\s+/, ' ')
 
-  it "registers an offense for mismatched #{name} ... end" do
-    inspect_source(source)
-    expect(cop.offenses.size).to eq(1)
-    base_regexp = Regexp.escape(alignment_base)
-    regexp = /`end` at 2, \d+ is not aligned with `#{base_regexp}` at 1,/
-    expect(cop.messages.first).to match(regexp)
-    expect(cop.highlights.first).to eq('end')
+    it "registers an offense for mismatched #{name}" do
+      expect_offense(chunk)
+      expect(cop.config_to_allow_offenses).to eq(config_to_allow_offenses)
+    end
 
-    other_styles = (cop.supported_styles - [cop.style]).map(&:to_s)
-    # In some cases, the code under test will happen to match an alternative
-    # style. In other cases, it won't match any style at all
-    expect(cop.config_to_allow_offenses).to(
-      eq('Enabled' => false).or(
-        satisfy { |h| other_styles.include?(h['EnforcedStyleAlignWith']) }
-      )
-    )
-  end
+    it "auto-corrects mismatched #{name}" do
+      raise if chunk !~
+               /\^\^\^ `end` at (\d), \d is not aligned with `.*` at \d, (\d)./
 
-  it "auto-corrects mismatched #{name} ... end" do
-    aligned_source = ["#{prefix}#{alignment_base} #{arg}",
-                      "#{' ' * prefix.length}#{end_kw.strip}"].join("\n")
-    corrected = autocorrect_source(source)
-    expect(corrected).to eq(aligned_source)
+      line_index = Integer(Regexp.last_match(1)) - 1
+      correct_indentation = ' ' * Integer(Regexp.last_match(2))
+      expect(autocorrect_source(source))
+        .to eq(source.lines[0...line_index].join +
+               "#{correct_indentation}#{source.lines[line_index].strip}\n")
+    end
   end
 end
 

data/lib/rubocop/rspec/support.rb

@@ -7,3 +7,8 @@ require_relative 'host_environment_simulation_helper'
 require_relative 'shared_contexts'
 require_relative 'shared_examples'
 require_relative 'expect_offense'
+
+RSpec.configure do |config|
+  config.include CopHelper
+  config.include HostEnvironmentSimulatorHelper
+end

data/lib/rubocop/runner.rb

@@ -128,8 +128,9 @@ module RuboCop
     def add_unneeded_disables(file, offenses, source)
       if check_for_unneeded_disables?(source)
         config = @config_store.for(file)
-        if config.for_cop(Cop::Lint::UnneededDisable).fetch('Enabled')
-          cop = Cop::Lint::UnneededDisable.new(config, @options)
+        if config.for_cop(Cop::Lint::UnneededCopDisableDirective)
+                 .fetch('Enabled')
+          cop = Cop::Lint::UnneededCopDisableDirective.new(config, @options)
           if cop.relevant_file?(file)
             cop.check(offenses, source.disabled_line_ranges, source.comments)
             offenses += cop.offenses

data/lib/rubocop/string_util.rb

@@ -18,13 +18,13 @@ module RuboCop
         new(*args).distance
       end
 
-      def initialize(a, b)
-        if a.size < b.size
-          @shorter = a
-          @longer = b
+      def initialize(string_a, string_b)
+        if string_a.size < string_b.size
+          @shorter = string_a
+          @longer = string_b
         else
-          @shorter = b
-          @longer = a
+          @shorter = string_b
+          @longer = string_a
         end
       end
 
@@ -95,7 +95,7 @@ module RuboCop
       end
 
       def matching_window
-        @matching_window ||= (longer.size / 2).to_i - 1
+        @matching_window ||= (longer.size / 2) - 1
       end
     end
 
@@ -116,8 +116,9 @@ module RuboCop
 
       attr_reader :boost_threshold, :scaling_factor
 
-      def initialize(a, b, boost_threshold = nil, scaling_factor = nil)
-        super(a, b)
+      def initialize(string_a, string_b,
+                     boost_threshold = nil, scaling_factor = nil)
+        super(string_a, string_b)
         @boost_threshold = boost_threshold || DEFAULT_BOOST_THRESHOLD
         @scaling_factor = scaling_factor || DEFAULT_SCALING_FACTOR
       end

data/lib/rubocop/target_finder.rb

@@ -4,8 +4,11 @@ require 'set'
 
 module RuboCop
   RUBY_EXTENSIONS = %w[.rb
+                       .arb
+                       .axlsx
                        .builder
                        .fcgi
+                       .gemfile
                        .gemspec
                        .god
                        .jb
@@ -118,7 +121,7 @@ module RuboCop
       end
 
       # Most recently modified file first.
-      target_files.sort_by! { |path| -File.mtime(path).to_i } if fail_fast?
+      target_files.sort_by! { |path| Integer(-File.mtime(path)) } if fail_fast?
 
       target_files
     end

data/lib/rubocop/token.rb

@@ -19,21 +19,37 @@ module RuboCop
     end
 
     def line
-      pos.line
+      @pos.line
     end
 
     def column
-      pos.column
+      @pos.column
     end
 
     def begin_pos
-      pos.begin_pos
+      @pos.begin_pos
     end
 
     def end_pos
-      pos.end_pos
+      @pos.end_pos
     end
 
+    def to_s
+      "[[#{line}, #{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
+
+    ## Type Predicates
+
     def comment?
       type == :tCOMMENT
     end
@@ -82,22 +98,16 @@ module RuboCop
       type == :tCOMMA
     end
 
-    def equal_sign?
-      %i[tEQL tOP_ASGN].include?(type)
+    def rescue_modifier?
+      type == :kRESCUE_MOD
     end
 
-    def to_s
-      "[[#{@pos.line}, #{@pos.column}], #{@type}, #{@text.inspect}]"
+    def end?
+      type == :kEND
     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)
+    def equal_sign?
+      %i[tEQL tOP_ASGN].include?(type)
     end
   end
 end

data/lib/rubocop/version.rb

@@ -3,14 +3,16 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.52.1'.freeze
+    STRING = '0.53.0'.freeze
 
-    MSG = '%s (using Parser %s, running on %s %s %s)'.freeze
+    MSG = '%<version>s (using Parser %<parser_version>s, running on ' \
+          '%<ruby_engine>s %<ruby_version>s %<ruby_platform>s)'.freeze
 
     def self.version(debug = false)
       if debug
-        format(MSG, STRING, Parser::VERSION,
-               RUBY_ENGINE, RUBY_VERSION, RUBY_PLATFORM)
+        format(MSG, version: STRING, parser_version: Parser::VERSION,
+                    ruby_engine: RUBY_ENGINE, ruby_version: RUBY_VERSION,
+                    ruby_platform: RUBY_PLATFORM)
       else
         STRING
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.52.1
+  version: 0.53.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -32,20 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: powerpack
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +197,7 @@ files:
 - lib/rubocop/cop/correctors/alignment_corrector.rb
 - lib/rubocop/cop/correctors/condition_corrector.rb
 - lib/rubocop/cop/correctors/empty_line_corrector.rb
+- lib/rubocop/cop/correctors/line_break_corrector.rb
 - lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb
 - lib/rubocop/cop/correctors/ordered_gem_corrector.rb
 - lib/rubocop/cop/correctors/parentheses_corrector.rb
@@ -228,13 +223,17 @@ files:
 - lib/rubocop/cop/layout/align_array.rb
 - lib/rubocop/cop/layout/align_hash.rb
 - lib/rubocop/cop/layout/align_parameters.rb
+- lib/rubocop/cop/layout/block_alignment.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/condition_position.rb
+- lib/rubocop/cop/layout/def_end_alignment.rb
 - lib/rubocop/cop/layout/dot_position.rb
 - lib/rubocop/cop/layout/else_alignment.rb
+- lib/rubocop/cop/layout/empty_comment.rb
 - lib/rubocop/cop/layout/empty_line_after_magic_comment.rb
 - lib/rubocop/cop/layout/empty_line_between_defs.rb
 - lib/rubocop/cop/layout/empty_lines.rb
@@ -246,6 +245,7 @@ files:
 - lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb
 - lib/rubocop/cop/layout/empty_lines_around_method_body.rb
 - lib/rubocop/cop/layout/empty_lines_around_module_body.rb
+- lib/rubocop/cop/layout/end_alignment.rb
 - lib/rubocop/cop/layout/end_of_line.rb
 - lib/rubocop/cop/layout/extra_spacing.rb
 - lib/rubocop/cop/layout/first_array_element_line_break.rb
@@ -301,12 +301,10 @@ files:
 - lib/rubocop/cop/lint/ambiguous_operator.rb
 - lib/rubocop/cop/lint/ambiguous_regexp_literal.rb
 - lib/rubocop/cop/lint/assignment_in_condition.rb
-- lib/rubocop/cop/lint/block_alignment.rb
+- lib/rubocop/cop/lint/big_decimal_new.rb
 - lib/rubocop/cop/lint/boolean_symbol.rb
 - lib/rubocop/cop/lint/circular_argument_reference.rb
-- lib/rubocop/cop/lint/condition_position.rb
 - lib/rubocop/cop/lint/debugger.rb
-- lib/rubocop/cop/lint/def_end_alignment.rb
 - lib/rubocop/cop/lint/deprecated_class_methods.rb
 - lib/rubocop/cop/lint/duplicate_case_condition.rb
 - lib/rubocop/cop/lint/duplicate_methods.rb
@@ -317,7 +315,6 @@ files:
 - lib/rubocop/cop/lint/empty_expression.rb
 - lib/rubocop/cop/lint/empty_interpolation.rb
 - lib/rubocop/cop/lint/empty_when.rb
-- lib/rubocop/cop/lint/end_alignment.rb
 - lib/rubocop/cop/lint/end_in_method.rb
 - lib/rubocop/cop/lint/ensure_return.rb
 - lib/rubocop/cop/lint/float_out_of_range.rb
@@ -336,6 +333,8 @@ files:
 - 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/number_conversion.rb
+- lib/rubocop/cop/lint/ordered_magic_comments.rb
 - lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb
 - lib/rubocop/cop/lint/percent_string_array.rb
 - lib/rubocop/cop/lint/percent_symbol_array.rb
@@ -356,7 +355,8 @@ files:
 - lib/rubocop/cop/lint/syntax.rb
 - lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb
 - lib/rubocop/cop/lint/unified_integer.rb
-- lib/rubocop/cop/lint/unneeded_disable.rb
+- lib/rubocop/cop/lint/unneeded_cop_disable_directive.rb
+- lib/rubocop/cop/lint/unneeded_cop_enable_directive.rb
 - lib/rubocop/cop/lint/unneeded_require_statement.rb
 - lib/rubocop/cop/lint/unneeded_splat_expansion.rb
 - lib/rubocop/cop/lint/unreachable_code.rb
@@ -414,6 +414,7 @@ files:
 - lib/rubocop/cop/mixin/multiline_expression_indentation.rb
 - lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb
 - lib/rubocop/cop/mixin/negative_conditional.rb
+- lib/rubocop/cop/mixin/nil_methods.rb
 - lib/rubocop/cop/mixin/on_normal_if_unless.rb
 - lib/rubocop/cop/mixin/ordered_gem_node.rb
 - lib/rubocop/cop/mixin/parentheses.rb
@@ -421,6 +422,7 @@ files:
 - lib/rubocop/cop/mixin/percent_array.rb
 - lib/rubocop/cop/mixin/percent_literal.rb
 - lib/rubocop/cop/mixin/preceding_following_alignment.rb
+- lib/rubocop/cop/mixin/range_help.rb
 - lib/rubocop/cop/mixin/rescue_node.rb
 - lib/rubocop/cop/mixin/safe_assignment.rb
 - lib/rubocop/cop/mixin/safe_mode.rb
@@ -433,7 +435,9 @@ files:
 - lib/rubocop/cop/mixin/target_rails_version.rb
 - lib/rubocop/cop/mixin/target_ruby_version.rb
 - lib/rubocop/cop/mixin/too_many_lines.rb
+- lib/rubocop/cop/mixin/trailing_body.rb
 - lib/rubocop/cop/mixin/trailing_comma.rb
+- lib/rubocop/cop/mixin/uncommunicative_name.rb
 - lib/rubocop/cop/mixin/unused_argument.rb
 - lib/rubocop/cop/naming/accessor_method_name.rb
 - lib/rubocop/cop/naming/ascii_identifiers.rb
@@ -443,8 +447,11 @@ files:
 - lib/rubocop/cop/naming/file_name.rb
 - lib/rubocop/cop/naming/heredoc_delimiter_case.rb
 - lib/rubocop/cop/naming/heredoc_delimiter_naming.rb
+- lib/rubocop/cop/naming/memoized_instance_variable_name.rb
 - lib/rubocop/cop/naming/method_name.rb
 - lib/rubocop/cop/naming/predicate_name.rb
+- lib/rubocop/cop/naming/uncommunicative_block_param_name.rb
+- lib/rubocop/cop/naming/uncommunicative_method_param_name.rb
 - lib/rubocop/cop/naming/variable_name.rb
 - lib/rubocop/cop/naming/variable_number.rb
 - lib/rubocop/cop/offense.rb
@@ -458,7 +465,6 @@ files:
 - lib/rubocop/cop/performance/end_with.rb
 - lib/rubocop/cop/performance/fixed_size.rb
 - lib/rubocop/cop/performance/flat_map.rb
-- lib/rubocop/cop/performance/hash_each_methods.rb
 - lib/rubocop/cop/performance/lstrip_rstrip.rb
 - lib/rubocop/cop/performance/range_include.rb
 - lib/rubocop/cop/performance/redundant_block_call.rb
@@ -475,6 +481,7 @@ files:
 - lib/rubocop/cop/performance/unfreeze_string.rb
 - lib/rubocop/cop/performance/uri_default_parser.rb
 - lib/rubocop/cop/rails/action_filter.rb
+- lib/rubocop/cop/rails/active_record_aliases.rb
 - lib/rubocop/cop/rails/active_support_aliases.rb
 - lib/rubocop/cop/rails/application_job.rb
 - lib/rubocop/cop/rails/application_record.rb
@@ -518,6 +525,7 @@ files:
 - lib/rubocop/cop/security/eval.rb
 - lib/rubocop/cop/security/json_load.rb
 - lib/rubocop/cop/security/marshal_load.rb
+- lib/rubocop/cop/security/open.rb
 - lib/rubocop/cop/security/yaml_load.rb
 - lib/rubocop/cop/severity.rb
 - lib/rubocop/cop/style/alias.rb
@@ -557,12 +565,14 @@ files:
 - 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_line_after_guard_clause.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/expand_path_arguments.rb
 - lib/rubocop/cop/style/flip_flop.rb
 - lib/rubocop/cop/style/for.rb
 - lib/rubocop/cop/style/format_string.rb
@@ -655,9 +665,12 @@ 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_class.rb
 - lib/rubocop/cop/style/trailing_body_on_method_definition.rb
+- lib/rubocop/cop/style/trailing_body_on_module.rb
 - lib/rubocop/cop/style/trailing_comma_in_arguments.rb
-- lib/rubocop/cop/style/trailing_comma_in_literal.rb
+- lib/rubocop/cop/style/trailing_comma_in_array_literal.rb
+- lib/rubocop/cop/style/trailing_comma_in_hash_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
@@ -683,6 +696,7 @@ files:
 - lib/rubocop/cop/variable_force/variable.rb
 - lib/rubocop/cop/variable_force/variable_table.rb
 - lib/rubocop/error.rb
+- lib/rubocop/file_finder.rb
 - lib/rubocop/formatter/base_formatter.rb
 - lib/rubocop/formatter/clang_style_formatter.rb
 - lib/rubocop/formatter/colorizable.rb