rubocop 0.17.0 → 0.18.0

data/spec/rubocop/cop/style/trailing_comma_spec.rb

@@ -28,7 +28,7 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
       expect(cop.highlights).to eq([','])
     end
 
-    it 'registers an offence for trailing comma in a method call with hash' +
+    it 'registers an offence for trailing comma in a method call with hash' \
       ' parameters at the end' do
       inspect_source(cop, 'some_method(a, b, c: 0, d: 1, )')
       expect(cop.messages)
@@ -95,7 +95,7 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
         expect(cop.highlights).to eq([','])
       end
 
-      it 'registers an offence for trailing comma in a method call with ' +
+      it 'registers an offence for trailing comma in a method call with ' \
         'hash parameters at the end' do
         inspect_source(cop, ['some_method(',
                              '              a,',
@@ -121,7 +121,7 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
         expect(cop.offences).to be_empty
       end
 
-      it 'accepts a method call with ' +
+      it 'accepts a method call with ' \
         'hash parameters at the end and no trailing comma' do
         inspect_source(cop, ['some_method(a,',
                              '            b,',
@@ -130,6 +130,16 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
                              '           )'])
         expect(cop.offences).to be_empty
       end
+
+      it 'accepts comma inside a heredoc' \
+        ' parameters at the end' do
+        inspect_source(cop, ['route(help: {',
+                             "  'auth' => <<-HELP.chomp",
+                             ',',
+                             'HELP',
+                             '})'])
+        expect(cop.offences).to be_empty
+      end
     end
 
     context 'when EnforcedStyleForMultiline is comma' do
@@ -154,7 +164,7 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
         expect(cop.highlights).to eq(['c: 3333'])
       end
 
-      it 'registers an offence for no trailing comma in a method call with' +
+      it 'registers an offence for no trailing comma in a method call with' \
         ' hash parameters at the end' do
         inspect_source(cop, ['some_method(',
                              '              a,',
@@ -163,7 +173,7 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
                              '              d: 1',
                              '           )'])
         expect(cop.messages)
-          .to eq(['Put a comma after the last parameter of a multiline ' +
+          .to eq(['Put a comma after the last parameter of a multiline ' \
                   'method call.'])
         expect(cop.highlights).to eq(['d: 1'])
       end
@@ -185,7 +195,7 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
         expect(cop.offences).to be_empty
       end
 
-      it 'accepts trailing comma in a method call with hash' +
+      it 'accepts trailing comma in a method call with hash' \
         ' parameters at the end' do
         inspect_source(cop, ['some_method(',
                              '              a,',
@@ -195,6 +205,17 @@ describe Rubocop::Cop::Style::TrailingComma, :config do
                              '           )'])
         expect(cop.offences).to be_empty
       end
+
+      it 'accepts missing comma after a heredoc' do
+        # A heredoc that's the last item in a literal or parameter list can not
+        # have a trailing comma. It's a syntax error.
+        inspect_source(cop, ['route(help: {',
+                             "  'auth' => <<-HELP.chomp",
+                             '...',
+                             'HELP',
+                             '},)']) # We still need a comma after the hash.
+        expect(cop.offences).to be_empty
+      end
     end
   end
 end

data/spec/rubocop/cop/style/unless_else_spec.rb

@@ -12,7 +12,7 @@ describe Rubocop::Cop::Style::UnlessElse do
                          '  a = 0',
                          'end'])
     expect(cop.messages).to eq(
-      ['Never use unless with else. Rewrite these with the ' +
+      ['Never use unless with else. Rewrite these with the ' \
        'positive case first.'])
   end
 

data/spec/rubocop/cop/style/variable_interpolation_spec.rb

@@ -10,7 +10,7 @@ describe Rubocop::Cop::Style::VariableInterpolation do
                    ['puts "this is a #$test"'])
     expect(cop.offences.size).to eq(1)
     expect(cop.messages)
-      .to eq(['Replace interpolated var $test' +
+      .to eq(['Replace interpolated var $test' \
         ' with expression #{$test}.'])
   end
 
@@ -27,7 +27,7 @@ describe Rubocop::Cop::Style::VariableInterpolation do
                    ['puts "this is a #@test"'])
     expect(cop.offences.size).to eq(1)
     expect(cop.messages)
-      .to eq(['Replace interpolated var @test' +
+      .to eq(['Replace interpolated var @test' \
         ' with expression #{@test}.'])
   end
 

data/spec/rubocop/cop/style/word_array_spec.rb

@@ -84,4 +84,14 @@ describe Rubocop::Cop::Style::WordArray, :config do
 
     expect(cop.offences.size).to eq(1)
   end
+
+  it 'auto-corrects an array of words' do
+    new_source = autocorrect_source(cop, "['one', %q(two), 'three']")
+    expect(new_source).to eq('%w(one two three)')
+  end
+
+  it 'auto-corrects an array of words and character constants' do
+    new_source = autocorrect_source(cop, '[%{one}, %Q(two), ?\n, ?\t]')
+    expect(new_source).to eq('%W(one two \n \t)')
+  end
 end

data/spec/rubocop/cop/variable_inspector/variable_table_spec.rb

@@ -89,7 +89,7 @@ describe Rubocop::Cop::VariableInspector::VariableTable do
         variable_table.push_scope(s(:block))
       end
 
-      context 'when a variable with the target name exists ' +
+      context 'when a variable with the target name exists ' \
               'in current scope' do
         before do
           variable_table.declare_variable(:foo, s(:lvasgn, :foo))
@@ -118,7 +118,7 @@ describe Rubocop::Cop::VariableInspector::VariableTable do
         end
       end
 
-      context 'when a variable with the target name does not exist ' +
+      context 'when a variable with the target name does not exist ' \
               'in current scope' do
         context 'but exists in the direct outer scope' do
           it 'returns the direct outer scope variable' do
@@ -165,7 +165,7 @@ describe Rubocop::Cop::VariableInspector::VariableTable do
         variable_table.push_scope(s(:def))
       end
 
-      context 'when a variable with the target name exists ' +
+      context 'when a variable with the target name exists ' \
               'in current scope' do
         before do
           variable_table.declare_variable(:foo, s(:lvasgn, :foo))
@@ -190,7 +190,7 @@ describe Rubocop::Cop::VariableInspector::VariableTable do
         end
       end
 
-      context 'when a variable with the target name does not exist ' +
+      context 'when a variable with the target name does not exist ' \
               'in current scope' do
         context 'but exists in the direct outer scope' do
           it 'returns nil' do

data/spec/rubocop/formatter/disabled_config_formatter_spec.rb

@@ -40,7 +40,7 @@ module Rubocop
           expect($stdout.string)
             .to eq(['Created rubocop-todo.yml.',
                     'Run rubocop with --config rubocop-todo.yml, or',
-                    'add inherit_from: rubocop-todo.yml in a .rubocop.yml ' +
+                    'add inherit_from: rubocop-todo.yml in a .rubocop.yml ' \
                     'file.',
                     ''].join("\n"))
         end

data/spec/rubocop/formatter/formatter_set_spec.rb

@@ -96,7 +96,7 @@ module Rubocop
             .to eq(SimpleTextFormatter)
         end
 
-        it 'returns class whose first letter of alias name ' +
+        it 'returns class whose first letter of alias name ' \
            'matches passed letter' do
           expect(builtin_formatter_class('s'))
             .to eq(SimpleTextFormatter)

data/spec/rubocop/path_util_spec.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+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')
+    end
+
+    it 'supports custom base paths' do
+      expect(subject.relative_path('/foo/bar', '/foo')).to eq('bar')
+    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
+    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
+    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
+    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
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -91,7 +91,9 @@ end
 
 def parse_source(source, file = nil)
   source = source.join($RS) if source.is_a?(Array)
-  if file
+  if file.is_a? String
+    Rubocop::SourceParser.parse(source, file)
+  elsif file
     file.write(source)
     file.rewind
     Rubocop::SourceParser.parse(source, file.path)

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Bozhidar Batsov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.99.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.99.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +62,22 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +200,7 @@ files:
 - lib/rubocop/cop/lint/literal_in_condition.rb
 - lib/rubocop/cop/lint/loop.rb
 - lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb
+- lib/rubocop/cop/lint/require_parentheses.rb
 - lib/rubocop/cop/lint/rescue_exception.rb
 - lib/rubocop/cop/lint/shadowing_outer_local_variable.rb
 - lib/rubocop/cop/lint/syntax.rb
@@ -277,6 +290,7 @@ files:
 - lib/rubocop/cop/style/lambda.rb
 - lib/rubocop/cop/style/lambda_call.rb
 - lib/rubocop/cop/style/leading_comment_space.rb
+- lib/rubocop/cop/style/line_end_concatenation.rb
 - lib/rubocop/cop/style/line_length.rb
 - lib/rubocop/cop/style/method_call_parentheses.rb
 - lib/rubocop/cop/style/method_called_on_do_end_block.rb
@@ -359,6 +373,7 @@ files:
 - lib/rubocop/formatter/progress_formatter.rb
 - lib/rubocop/formatter/simple_text_formatter.rb
 - lib/rubocop/options.rb
+- lib/rubocop/path_util.rb
 - lib/rubocop/processed_source.rb
 - lib/rubocop/rake_task.rb
 - lib/rubocop/source_parser.rb
@@ -394,6 +409,7 @@ files:
 - spec/rubocop/cop/lint/literal_in_condition_spec.rb
 - spec/rubocop/cop/lint/loop_spec.rb
 - spec/rubocop/cop/lint/parentheses_as_grouped_expression_spec.rb
+- spec/rubocop/cop/lint/require_parentheses_spec.rb
 - spec/rubocop/cop/lint/rescue_exception_spec.rb
 - spec/rubocop/cop/lint/shadowing_outer_local_variable_spec.rb
 - spec/rubocop/cop/lint/syntax_spec.rb
@@ -465,6 +481,7 @@ files:
 - spec/rubocop/cop/style/lambda_call_spec.rb
 - spec/rubocop/cop/style/lambda_spec.rb
 - spec/rubocop/cop/style/leading_comment_space_spec.rb
+- spec/rubocop/cop/style/line_end_concatenation_spec.rb
 - spec/rubocop/cop/style/line_length_spec.rb
 - spec/rubocop/cop/style/method_call_parentheses_spec.rb
 - spec/rubocop/cop/style/method_called_on_do_end_block_spec.rb
@@ -546,6 +563,7 @@ files:
 - spec/rubocop/formatter/progress_formatter_spec.rb
 - spec/rubocop/formatter/simple_text_formatter_spec.rb
 - spec/rubocop/options_spec.rb
+- spec/rubocop/path_util_spec.rb
 - spec/rubocop/processed_source_spec.rb
 - spec/rubocop/source_parser_spec.rb
 - spec/rubocop/target_finder_spec.rb
@@ -610,6 +628,7 @@ test_files:
 - spec/rubocop/cop/lint/literal_in_condition_spec.rb
 - spec/rubocop/cop/lint/loop_spec.rb
 - spec/rubocop/cop/lint/parentheses_as_grouped_expression_spec.rb
+- spec/rubocop/cop/lint/require_parentheses_spec.rb
 - spec/rubocop/cop/lint/rescue_exception_spec.rb
 - spec/rubocop/cop/lint/shadowing_outer_local_variable_spec.rb
 - spec/rubocop/cop/lint/syntax_spec.rb
@@ -681,6 +700,7 @@ test_files:
 - spec/rubocop/cop/style/lambda_call_spec.rb
 - spec/rubocop/cop/style/lambda_spec.rb
 - spec/rubocop/cop/style/leading_comment_space_spec.rb
+- spec/rubocop/cop/style/line_end_concatenation_spec.rb
 - spec/rubocop/cop/style/line_length_spec.rb
 - spec/rubocop/cop/style/method_call_parentheses_spec.rb
 - spec/rubocop/cop/style/method_called_on_do_end_block_spec.rb
@@ -762,6 +782,7 @@ test_files:
 - spec/rubocop/formatter/progress_formatter_spec.rb
 - spec/rubocop/formatter/simple_text_formatter_spec.rb
 - spec/rubocop/options_spec.rb
+- spec/rubocop/path_util_spec.rb
 - spec/rubocop/processed_source_spec.rb
 - spec/rubocop/source_parser_spec.rb
 - spec/rubocop/target_finder_spec.rb