rubocop 0.20.1 → 0.21.0

data/spec/rubocop/cop/team_spec.rb

@@ -139,4 +139,47 @@ describe Rubocop::Cop::Team do
       end
     end
   end
+
+  describe '#forces' do
+    subject(:forces) { team.forces }
+    let(:cop_classes) { Rubocop::Cop::Cop.non_rails }
+
+    it 'returns force instances' do
+      expect(forces).not_to be_empty
+
+      forces.each do |force|
+        expect(force).to be_a(Rubocop::Cop::Force)
+      end
+    end
+
+    context 'when a cop joined a force' do
+      let(:cop_classes) { [Rubocop::Cop::Lint::UselessAssignment] }
+
+      it 'returns the force' do
+        expect(forces.size).to eq(1)
+        expect(forces.first).to be_a(Rubocop::Cop::VariableForce)
+      end
+    end
+
+    context 'when multiple cops joined a same force' do
+      let(:cop_classes) do
+        [
+          Rubocop::Cop::Lint::UselessAssignment,
+          Rubocop::Cop::Lint::ShadowingOuterLocalVariable
+        ]
+      end
+
+      it 'returns only one force instance' do
+        expect(forces.size).to eq(1)
+      end
+    end
+
+    context 'when no cops joined force' do
+      let(:cop_classes) { [Rubocop::Cop::Style::For] }
+
+      it 'returns nothing' do
+        expect(forces).to be_empty
+      end
+    end
+  end
 end

data/spec/rubocop/cop/{variable_inspector → variable_force}/assignment_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::VariableInspector::Assignment do
+describe Rubocop::Cop::VariableForce::Assignment do
   include ASTHelper
   include AST::Sexp
 
@@ -42,9 +42,9 @@ describe Rubocop::Cop::VariableInspector::Assignment do
   end
 
   let(:name) { lvasgn_node.children.first }
-  let(:scope) { Rubocop::Cop::VariableInspector::Scope.new(def_node) }
+  let(:scope) { Rubocop::Cop::VariableForce::Scope.new(def_node) }
   let(:variable) do
-    Rubocop::Cop::VariableInspector::Variable.new(name, lvasgn_node, scope)
+    Rubocop::Cop::VariableForce::Variable.new(name, lvasgn_node, scope)
   end
   let(:assignment) { described_class.new(lvasgn_node, variable) }
 

data/spec/rubocop/cop/{variable_inspector → variable_force}/locatable_spec.rb

@@ -2,12 +2,12 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::VariableInspector::Locatable do
+describe Rubocop::Cop::VariableForce::Locatable do
   include ASTHelper
   include AST::Sexp
 
   class LocatableObject
-    include Rubocop::Cop::VariableInspector::Locatable
+    include Rubocop::Cop::VariableForce::Locatable
 
     attr_reader :node, :scope
 
@@ -38,7 +38,7 @@ describe Rubocop::Cop::VariableInspector::Locatable do
     found_node
   end
 
-  let(:scope) { Rubocop::Cop::VariableInspector::Scope.new(def_node) }
+  let(:scope) { Rubocop::Cop::VariableForce::Scope.new(def_node) }
   let(:assignment) { LocatableObject.new(lvasgn_node, scope) }
 
   describe '#ancestor_nodes_in_scope' do

data/spec/rubocop/cop/{variable_inspector → variable_force}/scope_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::VariableInspector::Scope do
+describe Rubocop::Cop::VariableForce::Scope do
   include ASTHelper
   include AST::Sexp
 
@@ -24,7 +24,7 @@ describe Rubocop::Cop::VariableInspector::Scope do
 
   let(:ast) do
     ast = Rubocop::SourceParser.parse(source).ast
-    Rubocop::Cop::VariableInspector.wrap_with_top_level_node(ast)
+    Rubocop::Cop::VariableForce.wrap_with_top_level_node(ast)
   end
 
   let(:scope_node_type) { :def }
@@ -39,6 +39,34 @@ describe Rubocop::Cop::VariableInspector::Scope do
 
   subject(:scope) { described_class.new(scope_node) }
 
+  describe '#name' do
+    context 'when the scope is instance method definition' do
+      let(:source) { <<-END }
+        def some_method
+        end
+      END
+
+      let(:scope_node_type) { :def }
+
+      it 'returns the method name' do
+        expect(scope.name).to eq(:some_method)
+      end
+    end
+
+    context 'when the scope is singleton method definition' do
+      let(:source) { <<-END }
+        def self.some_method
+        end
+      END
+
+      let(:scope_node_type) { :defs }
+
+      it 'returns the method name' do
+        expect(scope.name).to eq(:some_method)
+      end
+    end
+  end
+
   describe '#ancestors_of_node' do
     let(:source) do
       <<-END

data/spec/rubocop/cop/{variable_inspector → variable_force}/variable_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::VariableInspector::Variable do
+describe Rubocop::Cop::VariableForce::Variable do
   include AST::Sexp
 
   describe '.new' do
@@ -10,7 +10,7 @@ describe Rubocop::Cop::VariableInspector::Variable do
       it 'raises error' do
         name = :foo
         declaration_node = s(:def)
-        scope = Rubocop::Cop::VariableInspector::Scope.new(s(:class))
+        scope = Rubocop::Cop::VariableForce::Scope.new(s(:class))
         expect { described_class.new(name, declaration_node, scope) }
           .to raise_error(ArgumentError)
       end
@@ -20,50 +20,35 @@ describe Rubocop::Cop::VariableInspector::Variable do
   describe '#referenced?' do
     let(:name) { :foo }
     let(:declaration_node) { s(:arg, name) }
-    let(:scope) { double('scope') }
+    let(:scope) { double('scope').as_null_object }
     let(:variable) { described_class.new(name, declaration_node, scope) }
 
     subject { variable.referenced? }
 
-    context 'when the variable is not yet assigned' do
+    context 'when the variable is not assigned' do
       it { should be_false }
-    end
-
-    context 'when the variable has an assignment' do
-      before do
-        variable.assign(s(:lvasgn, :foo))
-      end
-
-      context 'and the assignment is not yet referenced' do
-        it { should be_false }
-      end
 
-      context 'and the assignment is referenced' do
+      context 'and the variable is referenced' do
         before do
-          variable.assignments.first.reference!
+          variable.reference!(s(:lvar, name))
         end
 
         it { should be_true }
       end
     end
 
-    context 'when the variable has multiple assignments' do
+    context 'when the variable has an assignment' do
       before do
-        variable.assign(s(:lvasgn, :foo))
-        variable.assign(s(:lvasgn, :foo))
+        variable.assign(s(:lvasgn, name))
       end
 
-      context 'and only once assignment is referenced' do
-        before do
-          variable.assignments[1].reference!
-        end
-
-        it { should be_true }
+      context 'and the variable is not yet referenced' do
+        it { should be_false }
       end
 
-      context 'and all assignments are referenced' do
+      context 'and the variable is referenced' do
         before do
-          variable.assignments.each { |a| a.reference! }
+          variable.reference!(s(:lvar, name))
         end
 
         it { should be_true }

data/spec/rubocop/cop/{variable_inspector → variable_force}/variable_table_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::VariableInspector::VariableTable do
+describe Rubocop::Cop::VariableForce::VariableTable do
   include AST::Sexp
 
   subject(:variable_table) { described_class.new }

data/spec/rubocop/cop/{variable_inspector_spec.rb → variable_force_spec.rb}

@@ -2,18 +2,14 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::VariableInspector do
+describe Rubocop::Cop::VariableForce do
   include AST::Sexp
 
-  class ExampleInspector
-    include Rubocop::Cop::VariableInspector
-  end
-
-  subject(:inspector) { ExampleInspector.new }
+  subject(:force) { Rubocop::Cop::VariableForce.new([]) }
 
   describe '#process_node' do
     before do
-      inspector.variable_table.push_scope(s(:def))
+      force.variable_table.push_scope(s(:def))
     end
 
     context 'when processing lvar node' do
@@ -21,7 +17,7 @@ describe Rubocop::Cop::VariableInspector do
 
       context 'when the variable is not yet declared' do
         it 'does not raise error' do
-          expect { inspector.process_node(node) }.not_to raise_error
+          expect { force.process_node(node) }.not_to raise_error
         end
       end
     end

data/spec/rubocop/formatter/base_formatter_spec.rb

@@ -45,7 +45,7 @@ module Rubocop
         describe 'invocation order' do
           subject(:formatter) do
             formatter = double('formatter')
-            def formatter.method_missing(method_name, *args)
+            def formatter.method_missing(method_name, *)
               return if method_name == :output
               puts method_name
             end
@@ -109,7 +109,7 @@ module Rubocop
               class << formatter
                 attr_reader :processed_file_count
 
-                def file_finished(file, offenses)
+                def file_finished(_file, _offenses)
                   @processed_file_count ||= 0
                   @processed_file_count += 1
                 end

data/spec/rubocop/formatter/offense_count_formatter_spec.rb

@@ -40,7 +40,7 @@ module Rubocop
         context 'when an offense is detected' do
           let(:cop_counts) { { 'OffendedCop' => 1 } }
           it 'shows the cop and the offense count' do
-            formatter.report_summary(1, cop_counts)
+            formatter.report_summary(cop_counts)
             expect(output.string).to include(
               "\n1  OffendedCop\n--\n1  Total")
           end

data/spec/rubocop/formatter/progress_formatter_spec.rb

@@ -40,7 +40,7 @@ module Rubocop
 
     describe '#report_file_as_mark' do
       before do
-        formatter.report_file_as_mark(files.first, offenses)
+        formatter.report_file_as_mark(offenses)
       end
 
       def offense_with_severity(severity)

data/spec/rubocop/options_spec.rb

@@ -36,7 +36,7 @@ describe Rubocop::Options, :isolated_environment do
 
         expected_help = <<-END
 Usage: rubocop [options] [file1, file2, ...]
-        --only COP                   Run just one cop.
+        --only [COP1,COP2,...]       Run only the given cop(s).
     -c, --config FILE                Specify configuration file.
         --auto-gen-config            Generate a configuration file acting as a
                                      TODO list.
@@ -62,7 +62,7 @@ Usage: rubocop [options] [file1, file2, ...]
                                      if no format is specified.
     -r, --require FILE               Require Ruby file.
         --fail-level SEVERITY        Minimum severity for exit with error code.
-        --show-cops [cop1,cop2,...]  Shows the given cops, or all cops by
+        --show-cops [COP1,COP2,...]  Shows the given cops, or all cops by
                                      default, and their configurations for the
                                      current directory.
     -d, --debug                      Display debug info.

data/spec/rubocop/path_util_spec.rb

@@ -4,7 +4,6 @@ require 'spec_helper'
 
 describe Rubocop::PathUtil do
   describe '#relative_path' do
-    pending 'builds paths relative to the current project by default'
     it 'builds paths relative to PWD by default as a stop-gap' do
       relative = File.join(Dir.pwd, 'relative')
       expect(subject.relative_path(relative)).to eq('relative')
@@ -15,28 +14,62 @@ describe Rubocop::PathUtil do
     end
   end
 
-  describe '#match_path?' do
-    it 'matches strings to the basename' do
-      expect(subject.match_path?('file', '/dir/file')).to be_true
-      expect(subject.match_path?('file', '/dir/files')).to be_false
-      expect(subject.match_path?('dir', '/dir/file')).to be_false
+  describe '#match_path?', :isolated_environment do
+    include FileHelper
+
+    before do
+      create_file('file', '')
+      create_file('dir/file', '')
+      create_file('dir/files', '')
+      create_file('dir/dir/file', '')
+      create_file('dir/sub/file', '')
+      $stderr = StringIO.new
+    end
+
+    after { $stderr = STDERR }
+
+    context 'with deprecated patterns' do
+      it 'matches dir/** and prints warning' do
+        expect(subject.match_path?('dir/**', 'dir/sub/file', '.rubocop.yml'))
+          .to be_true
+        expect($stderr.string)
+          .to eq("Warning: Deprecated pattern style 'dir/**' in " \
+                 ".rubocop.yml. Change to 'dir/**/*'.\n")
+      end
+
+      it 'matches strings to the basename and prints warning' do
+        expect(subject.match_path?('file', 'dir/file', '.rubocop.yml'))
+          .to be_true
+        expect($stderr.string)
+          .to eq("Warning: Deprecated pattern style 'file' in .rubocop.yml. " \
+                 "Change to '**/file'.\n")
+
+        expect(subject.match_path?('file', 'dir/files', '')).to be_false
+        expect(subject.match_path?('dir', 'dir/file', '')).to be_false
+      end
     end
 
     it 'matches strings to the full path' do
-      expect(subject.match_path?('/dir/file', '/dir/file')).to be_true
-      expect(subject.match_path?('/dir/file', '/dir/dir/file')).to be_false
+      expect(subject.match_path?("#{Dir.pwd}/dir/file",
+                                 "#{Dir.pwd}/dir/file", '')).to be_true
+      expect(subject.match_path?("#{Dir.pwd}/dir/file",
+                                 "#{Dir.pwd}/dir/dir/file", '')).to be_false
     end
 
     it 'matches glob expressions' do
-      expect(subject.match_path?('dir/*', 'dir/file')).to be_true
-      expect(subject.match_path?('dir/*', 'dir/sub/file')).to be_true
-      expect(subject.match_path?('dir/**/*', 'dir/sub/file')).to be_true
-      expect(subject.match_path?('sub/*', 'dir/sub/file')).to be_false
+      expect(subject.match_path?('dir/*',    'dir/file', '')).to be_true
+      expect(subject.match_path?('dir/*/*',  'dir/sub/file', '')).to be_true
+      expect(subject.match_path?('dir/**/*', 'dir/sub/file', '')).to be_true
+      expect(subject.match_path?('dir/**/*', 'dir/file', '')).to be_true
+      expect(subject.match_path?('**/*',     'dir/sub/file', '')).to be_true
+      expect(subject.match_path?('**/file',  'file', '')).to be_true
+
+      expect(subject.match_path?('sub/*',    'dir/sub/file', '')).to be_false
     end
 
     it 'matches regexps' do
-      expect(subject.match_path?(/^d.*e$/, 'dir/file')).to be_true
-      expect(subject.match_path?(/^d.*e$/, 'dir/filez')).to be_false
+      expect(subject.match_path?(/^d.*e$/, 'dir/file', '')).to be_true
+      expect(subject.match_path?(/^d.*e$/, 'dir/filez', '')).to be_false
     end
   end
 end

data/spec/spec_helper.rb

@@ -46,11 +46,11 @@ module ExitCodeMatchers
       end
       actual && actual == code
     end
-    failure_message_for_should do |block|
+    failure_message_for_should do
       "expected block to call exit(#{code}) but exit" +
         (actual.nil? ? ' not called' : "(#{actual}) was called")
     end
-    failure_message_for_should_not do |block|
+    failure_message_for_should_not do
       "expected block not to call exit(#{code})"
     end
     description do
@@ -125,7 +125,13 @@ def autocorrect_source(cop, source, file = nil)
 end
 
 def _investigate(cop, processed_source)
-  commissioner = Rubocop::Cop::Commissioner.new([cop], raise_error: true)
+  forces = Rubocop::Cop::Force.all.each_with_object([]) do |klass, instances|
+    next unless cop.join_force?(klass)
+    instances << klass.new([cop])
+  end
+
+  commissioner =
+    Rubocop::Cop::Commissioner.new([cop], forces, raise_error: true)
   commissioner.investigate(processed_source)
   commissioner
 end

data/spec/support/file_helper.rb

@@ -11,6 +11,8 @@ module FileHelper
 
     File.open(file_path, 'w') do |file|
       case content
+      when ''
+        # Write nothing. Create empty file.
       when String
         file.puts content
       when Array