rubocop 0.47.1 → 0.48.0

data/lib/rubocop/rspec/shared_contexts.rb

@@ -42,6 +42,8 @@ shared_context 'config', :config do
     end
 
     hash = { 'AllCops' => { 'TargetRubyVersion' => ruby_version } }
+    hash['Rails'] = { 'Enabled' => true } if enabled_rails
+    hash['AllCops']['TargetRailsVersion'] = rails_version if rails_version
     if respond_to?(:cop_config)
       cop_name = described_class.cop_name
       hash[cop_name] = RuboCop::ConfigLoader
@@ -49,6 +51,8 @@ shared_context 'config', :config do
                        .merge(cop_config)
     end
 
+    hash = other_cops.merge hash if respond_to?(:other_cops)
+
     RuboCop::Config.new(hash, "#{Dir.pwd}/.rubocop.yml")
   end
 end
@@ -76,3 +80,19 @@ end
 shared_context 'ruby 2.4', :ruby24 do
   let(:ruby_version) { 2.4 }
 end
+
+shared_context 'with Rails', :enabled_rails do
+  let(:enabled_rails) { true }
+end
+
+shared_context 'with Rails 3', :rails3 do
+  let(:rails_version) { 3.0 }
+end
+
+shared_context 'with Rails 4', :rails4 do
+  let(:rails_version) { 4.0 }
+end
+
+shared_context 'with Rails 5', :rails5 do
+  let(:rails_version) { 5.0 }
+end

data/lib/rubocop/rspec/shared_examples.rb

@@ -22,7 +22,7 @@ shared_examples_for 'mimics MRI 2.1' do |grep_mri_warning|
         offense_by_mri = offenses_by_mri[index]
         # Exclude column attribute since MRI does not
         # output column number.
-        [:severity, :line, :cop_name].each do |a|
+        %i(severity line cop_name).each do |a|
           expect(offense_by_cop.send(a)).to eq(offense_by_mri.send(a))
         end
       end

data/lib/rubocop/runner.rb

@@ -118,7 +118,7 @@ module RuboCop
     def add_unneeded_disables(file, offenses, source)
       if check_for_unneded_disables?(source)
         config = @config_store.for(file)
-        if config.cop_enabled?(Cop::Lint::UnneededDisable)
+        if config.for_cop(Cop::Lint::UnneededDisable).fetch('Enabled')
           cop = Cop::Lint::UnneededDisable.new(config, @options)
           if cop.relevant_file?(file)
             cop.check(offenses, source.disabled_line_ranges, source.comments)
@@ -261,7 +261,7 @@ module RuboCop
       @mobilized_cop_classes[config.object_id] ||= begin
         cop_classes = Cop::Cop.all
 
-        [:only, :except].each do |opt|
+        %i(only except).each do |opt|
           OptionsValidator.validate_cop_list(@options[opt])
         end
 

data/lib/rubocop/target_finder.rb

@@ -3,6 +3,53 @@
 require 'set'
 
 module RuboCop
+  RUBY_EXTENSIONS = %w(.rb
+                       .builder
+                       .fcgi
+                       .gemspec
+                       .god
+                       .jbuilder
+                       .mspec
+                       .pluginspec
+                       .podspec
+                       .rabl
+                       .rake
+                       .rbuild
+                       .rbw
+                       .rbx
+                       .ru
+                       .ruby
+                       .spec
+                       .thor
+                       .watchr).freeze
+
+  RUBY_INTERPRETERS = %w(ruby
+                         macruby
+                         rake
+                         jruby
+                         rbx).freeze
+
+  RUBY_FILENAMES = %w(.irbrc
+                      .pryrc
+                      Appraisals
+                      Berksfile
+                      Brewfile
+                      Buildfile
+                      Dangerfile
+                      Deliverfile
+                      Fastfile
+                      Gemfile
+                      Guardfile
+                      Jarfile
+                      Mavenfile
+                      Podfile
+                      Puppetfile
+                      Rakefile
+                      Snapfile
+                      Thorfile
+                      Vagrantfile
+                      buildfile).freeze
+
   # This class finds target files to inspect by scanning the directory tree
   # and picking ruby files.
   class TargetFinder
@@ -73,10 +120,7 @@ module RuboCop
 
     def to_inspect?(file, hidden_files, base_dir_config)
       return false if base_dir_config.file_to_exclude?(file)
-      unless hidden_files.include?(file)
-        return true if File.extname(file) == '.rb'
-        return true if ruby_executable?(file)
-      end
+      return true if !hidden_files.include?(file) && ruby_file?(file)
       base_dir_config.file_to_include?(file)
     end
 
@@ -116,18 +160,32 @@ module RuboCop
       dir_tree_excludes.map { |pattern| pattern.sub(%r{/\*\*/\*$}, '') }
     end
 
+    def ruby_extension?(file)
+      RUBY_EXTENSIONS.include?(File.extname(file))
+    end
+
+    def ruby_filename?(file)
+      RUBY_FILENAMES.include?(File.basename(file))
+    end
+
     def ruby_executable?(file)
-      return false unless File.extname(file).empty?
+      return false unless File.extname(file).empty? && File.exist?(file)
       first_line = File.open(file, &:readline)
-      first_line =~ /#!.*ruby/
+      !(first_line =~ /#!.*(#{RUBY_INTERPRETERS.join('|')})/).nil?
     rescue EOFError, ArgumentError => e
       warn "Unprocessable file #{file}: #{e.class}, #{e.message}" if debug?
       false
     end
 
+    def ruby_file?(file)
+      ruby_extension?(file) || ruby_filename?(file) || ruby_executable?(file)
+    end
+
     def process_explicit_path(path)
       files = path.include?('*') ? Dir[path] : [path]
 
+      files.select! { |file| ruby_file?(file) }
+
       return files unless force_exclusion?
 
       files.reject do |file|

data/lib/rubocop/version.rb

@@ -3,13 +3,11 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.47.1'.freeze
+    STRING = '0.48.0'.freeze
 
     MSG = '%s (using Parser %s, running on %s %s %s)'.freeze
 
-    module_function
-
-    def version(debug = false)
+    def self.version(debug = false)
       if debug
         format(MSG, STRING, Parser::VERSION,
                RUBY_ENGINE, RUBY_VERSION, RUBY_PLATFORM)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.47.1
+  version: 0.48.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -136,16 +136,23 @@ files:
 - lib/rubocop.rb
 - lib/rubocop/ast/builder.rb
 - lib/rubocop/ast/node.rb
+- lib/rubocop/ast/node/and_node.rb
 - lib/rubocop/ast/node/array_node.rb
 - lib/rubocop/ast/node/case_node.rb
+- lib/rubocop/ast/node/ensure_node.rb
 - lib/rubocop/ast/node/for_node.rb
 - 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/binary_operator_node.rb
 - lib/rubocop/ast/node/mixin/conditional_node.rb
 - lib/rubocop/ast/node/mixin/hash_element_node.rb
 - lib/rubocop/ast/node/mixin/modifier_node.rb
+- lib/rubocop/ast/node/mixin/predicate_operator_node.rb
+- lib/rubocop/ast/node/or_node.rb
 - lib/rubocop/ast/node/pair_node.rb
+- lib/rubocop/ast/node/resbody_node.rb
+- lib/rubocop/ast/node/send_node.rb
 - lib/rubocop/ast/node/until_node.rb
 - lib/rubocop/ast/node/when_node.rb
 - lib/rubocop/ast/node/while_node.rb
@@ -167,6 +174,7 @@ files:
 - lib/rubocop/cop/corrector.rb
 - lib/rubocop/cop/force.rb
 - lib/rubocop/cop/ignored_node.rb
+- lib/rubocop/cop/lint/ambiguous_block_association.rb
 - lib/rubocop/cop/lint/ambiguous_operator.rb
 - lib/rubocop/cop/lint/ambiguous_regexp_literal.rb
 - lib/rubocop/cop/lint/assignment_in_condition.rb
@@ -258,6 +266,7 @@ files:
 - lib/rubocop/cop/mixin/first_element_line_break.rb
 - lib/rubocop/cop/mixin/frozen_string_literal.rb
 - lib/rubocop/cop/mixin/hash_alignment.rb
+- lib/rubocop/cop/mixin/ignored_pattern.rb
 - lib/rubocop/cop/mixin/integer_node.rb
 - lib/rubocop/cop/mixin/match_range.rb
 - lib/rubocop/cop/mixin/method_complexity.rb
@@ -272,6 +281,7 @@ files:
 - lib/rubocop/cop/mixin/parser_diagnostic.rb
 - lib/rubocop/cop/mixin/percent_literal.rb
 - lib/rubocop/cop/mixin/preceding_following_alignment.rb
+- lib/rubocop/cop/mixin/rescue_node.rb
 - lib/rubocop/cop/mixin/safe_assignment.rb
 - lib/rubocop/cop/mixin/safe_mode.rb
 - lib/rubocop/cop/mixin/space_after_punctuation.rb
@@ -281,6 +291,7 @@ files:
 - lib/rubocop/cop/mixin/string_help.rb
 - lib/rubocop/cop/mixin/string_literals_help.rb
 - lib/rubocop/cop/mixin/surrounding_space.rb
+- lib/rubocop/cop/mixin/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_comma.rb
@@ -310,6 +321,8 @@ files:
 - lib/rubocop/cop/performance/string_replacement.rb
 - lib/rubocop/cop/performance/times_map.rb
 - lib/rubocop/cop/rails/action_filter.rb
+- lib/rubocop/cop/rails/active_support_aliases.rb
+- lib/rubocop/cop/rails/blank.rb
 - lib/rubocop/cop/rails/date.rb
 - lib/rubocop/cop/rails/delegate.rb
 - lib/rubocop/cop/rails/delegate_allow_blank.rb
@@ -325,7 +338,9 @@ files:
 - lib/rubocop/cop/rails/output.rb
 - lib/rubocop/cop/rails/output_safety.rb
 - lib/rubocop/cop/rails/pluralization_grammar.rb
+- lib/rubocop/cop/rails/present.rb
 - lib/rubocop/cop/rails/read_write_attribute.rb
+- lib/rubocop/cop/rails/relative_date_constant.rb
 - lib/rubocop/cop/rails/request_referer.rb
 - lib/rubocop/cop/rails/reversible_migration.rb
 - lib/rubocop/cop/rails/safe_navigation.rb
@@ -386,11 +401,14 @@ files:
 - lib/rubocop/cop/style/else_alignment.rb
 - lib/rubocop/cop/style/empty_case_condition.rb
 - lib/rubocop/cop/style/empty_else.rb
+- lib/rubocop/cop/style/empty_line_after_magic_comment.rb
 - lib/rubocop/cop/style/empty_line_between_defs.rb
 - lib/rubocop/cop/style/empty_lines.rb
 - lib/rubocop/cop/style/empty_lines_around_access_modifier.rb
+- lib/rubocop/cop/style/empty_lines_around_begin_body.rb
 - lib/rubocop/cop/style/empty_lines_around_block_body.rb
 - lib/rubocop/cop/style/empty_lines_around_class_body.rb
+- lib/rubocop/cop/style/empty_lines_around_exception_handling_keywords.rb
 - lib/rubocop/cop/style/empty_lines_around_method_body.rb
 - lib/rubocop/cop/style/empty_lines_around_module_body.rb
 - lib/rubocop/cop/style/empty_literal.rb
@@ -422,11 +440,13 @@ files:
 - lib/rubocop/cop/style/indent_array.rb
 - lib/rubocop/cop/style/indent_assignment.rb
 - lib/rubocop/cop/style/indent_hash.rb
+- lib/rubocop/cop/style/indent_heredoc.rb
 - lib/rubocop/cop/style/indentation_consistency.rb
 - lib/rubocop/cop/style/indentation_width.rb
 - lib/rubocop/cop/style/infinite_loop.rb
 - lib/rubocop/cop/style/initial_indentation.rb
 - lib/rubocop/cop/style/inline_comment.rb
+- lib/rubocop/cop/style/inverse_methods.rb
 - lib/rubocop/cop/style/lambda.rb
 - lib/rubocop/cop/style/lambda_call.rb
 - lib/rubocop/cop/style/leading_comment_space.rb
@@ -438,6 +458,7 @@ files:
 - lib/rubocop/cop/style/method_missing.rb
 - lib/rubocop/cop/style/method_name.rb
 - lib/rubocop/cop/style/missing_else.rb
+- lib/rubocop/cop/style/mixin_grouping.rb
 - lib/rubocop/cop/style/module_function.rb
 - lib/rubocop/cop/style/multiline_array_brace_layout.rb
 - lib/rubocop/cop/style/multiline_assignment_layout.rb
@@ -550,7 +571,8 @@ files:
 - lib/rubocop/cop/util.rb
 - lib/rubocop/cop/variable_force.rb
 - lib/rubocop/cop/variable_force/assignment.rb
-- lib/rubocop/cop/variable_force/locatable.rb
+- lib/rubocop/cop/variable_force/branch.rb
+- lib/rubocop/cop/variable_force/branchable.rb
 - lib/rubocop/cop/variable_force/reference.rb
 - lib/rubocop/cop/variable_force/scope.rb
 - lib/rubocop/cop/variable_force/variable.rb
@@ -577,6 +599,7 @@ files:
 - lib/rubocop/node_pattern.rb
 - lib/rubocop/options.rb
 - lib/rubocop/path_util.rb
+- lib/rubocop/platform.rb
 - lib/rubocop/processed_source.rb
 - lib/rubocop/rake_task.rb
 - lib/rubocop/remote_config.rb
@@ -613,7 +636,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Automatic Ruby code style checking tool.

data/lib/rubocop/cop/variable_force/locatable.rb

@@ -1,200 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    class VariableForce
-      # This module provides a way to locate the conditional branch the node is
-      # in. This is intended to be used as mix-in.
-      module Locatable
-        BRANCH_TYPES = [:if, :case].freeze
-        CONDITION_INDEX_OF_BRANCH_NODE = 0
-
-        LOGICAL_OPERATOR_TYPES = [:and, :or].freeze
-        LEFT_SIDE_INDEX_OF_LOGICAL_OPERATOR_NODE = 0
-
-        ENSURE_TYPE = :ensure
-        ENSURE_INDEX_OF_ENSURE_NODE = 1
-
-        FOR_LOOP_TYPE = :for
-        FOR_LOOP_CHILD_INDEX = 2
-
-        NON_FOR_LOOP_TYPES = LOOP_TYPES - [FOR_LOOP_TYPE]
-        NON_FOR_LOOP_TYPES_CHILD_INDEX = 1
-
-        def initialize(*)
-          @branch_point_node = @branch_body_node = nil
-
-          super()
-        end
-
-        def node
-          raise '#node must be declared!'
-        end
-
-        def scope
-          raise '#scope must be declared!'
-        end
-
-        def inside_of_branch?
-          branch_point_node
-        end
-
-        def run_exclusively_with?(other)
-          return false unless branch_point_node.equal?(other.branch_point_node)
-          return false if branch_body_node.equal?(other.branch_body_node)
-
-          # Main body of rescue is always run:
-          #
-          #   begin
-          #     # main
-          #   rescue
-          #     # resbody
-          #   end
-          if branch_point_node.rescue_type? &&
-             (branch_body_name == 'main' || other.branch_body_name == 'main')
-            return false
-          end
-
-          true
-        end
-
-        def branch_id
-          return nil unless inside_of_branch?
-          @branch_id ||= [branch_point_node.object_id, branch_type].join('_')
-        end
-
-        def branch_type
-          return nil unless inside_of_branch?
-          @branch_type ||= [branch_point_node.type, branch_body_name].join('_')
-        end
-
-        # Inner if, case, rescue, or ensure node.
-        def branch_point_node
-          return @branch_point_node if @branch_point_node
-
-          set_branch_point_and_body_nodes!
-          @branch_point_node
-        end
-
-        # A child node of #branch_point_node this assignment belongs.
-        def branch_body_node
-          return @branch_body_node if @branch_body_node
-
-          set_branch_point_and_body_nodes!
-          @branch_body_node
-        end
-
-        # TODO: Replace case statement with function mapping
-        def branch_body_name
-          case branch_point_node.type
-          when :if                     then if_body_name
-          when :case                   then case_body_name
-          when RESCUE_TYPE             then rescue_body_name
-          when ENSURE_TYPE             then ensure_body_name
-          when *LOGICAL_OPERATOR_TYPES then logical_operator_body_name
-          when *LOOP_TYPES             then loop_body_name
-          else
-            raise InvalidBranchBodyError, "Invalid body index #{body_index} " \
-                                          "of #{branch_point_node.type}"
-          end
-        end
-
-        private
-
-        def if_body_name
-          case body_index
-          when 1 then 'true'
-          when 2 then 'false'
-          else raise InvalidBranchBodyError
-          end
-        end
-
-        def case_body_name
-          if branch_body_node.when_type?
-            "when#{body_index - 1}"
-          else
-            'else'
-          end
-        end
-
-        def logical_operator_body_name
-          case body_index
-          when 1 then 'right'
-          else raise InvalidBranchBodyError
-          end
-        end
-
-        def rescue_body_name
-          if body_index.zero?
-            'main'
-          elsif branch_body_node.type == :resbody
-            "rescue#{body_index - 1}"
-          else
-            'else'
-          end
-        end
-
-        def ensure_body_name
-          case body_index
-          when 0 then 'main'
-          else raise InvalidBranchBodyError
-          end
-        end
-
-        def loop_body_name
-          loop_indices = [FOR_LOOP_CHILD_INDEX, NON_FOR_LOOP_TYPES_CHILD_INDEX]
-
-          raise InvalidBranchBodyError unless loop_indices.include?(body_index)
-
-          'main'
-        end
-
-        def body_index
-          branch_point_node.children.index { |n| n.equal?(branch_body_node) }
-        end
-
-        def set_branch_point_and_body_nodes!
-          self_and_ancestor_nodes = [node] + ancestor_nodes_in_scope
-
-          self_and_ancestor_nodes.each_cons(2) do |child, parent|
-            next unless branch?(parent, child)
-            @branch_point_node = parent
-            @branch_body_node = child
-            break
-          end
-        end
-
-        def ancestor_nodes_in_scope
-          node.each_ancestor.take_while do |ancestor_node|
-            !ancestor_node.equal?(scope.node)
-          end
-        end
-
-        # rubocop:disable Metrics/MethodLength
-        def branch?(parent_node, child_node)
-          child_index = parent_node.children.index(child_node)
-
-          case parent_node.type
-          when RESCUE_TYPE
-            true
-          when ENSURE_TYPE
-            child_index != ENSURE_INDEX_OF_ENSURE_NODE
-          when FOR_LOOP_TYPE
-            child_index == FOR_LOOP_CHILD_INDEX
-          when *BRANCH_TYPES
-            child_index != CONDITION_INDEX_OF_BRANCH_NODE
-          when *LOGICAL_OPERATOR_TYPES
-            child_index != LEFT_SIDE_INDEX_OF_LOGICAL_OPERATOR_NODE
-          when *NON_FOR_LOOP_TYPES
-            child_index == NON_FOR_LOOP_TYPES_CHILD_INDEX
-          else
-            false
-          end
-        end
-        # rubocop:enable Metrics/MethodLength
-
-        class InvalidBranchBodyError < StandardError; end
-      end
-    end
-  end
-end