rubocop 0.29.0 → 0.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1f32b26b9ff39fe0348f90855ab63dccc0e3c8
-  data.tar.gz: 30d21bcc89c00bb7cd629b9c5089fc4d041afeb7
+  metadata.gz: df6ad6e09fd8b5948ba0e46ebe68fae1ffd6d391
+  data.tar.gz: b72c490888b7453005265d7bd96414e8b1bab28b
 SHA512:
-  metadata.gz: a82dd617f97b5bf6bacc3cab91c1888ba9db3d78dd866ae8a5c58fdf2235cff8ffc354ee0c99e69506db4353571d7292fc1ed4e03b20d1b590597be8dfeea45e
-  data.tar.gz: af859406fb7c0100a90e2cd1356550124b7d473c252da59b15034d55a08a9c786cad6c3efd5906100a565acfd62ce5cf6488483561db2e8903f82c9a5adf762a
+  metadata.gz: 8c7437f405d30ba9571b0d2088b1bc0398857d55bd846437c1415bc39a573bdcf19c0e4f920e1ea2b835f18bcc4c6d733ffc72eea941e736080e8632e01d4d86
+  data.tar.gz: d140fbca7c9cc078c467491f00a5252272f81abaca6701647fd2a085f1c682170724e9601d46930dbae0f2faf0a38f4c1face6ac77e925ea33e2e1342c3b7ce8

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## master (unreleased)
 
+## 0.29.1 (13/02/2015)
+
+### Bugs fixed
+
+* [#1638](https://github.com/bbatsov/rubocop/issues/1638): Use Parser functionality rather than regular expressions for matching comments in `FirstParameterIndentation`. ([@jonas054][])
+* [#1642](https://github.com/bbatsov/rubocop/issues/1642): Raise the correct exception if the configuration file is malformed. ([@bquorning][])
+* [#1647](https://github.com/bbatsov/rubocop/issues/1647): Skip `SpaceAroundBlockParameters` when lambda has no argument. ([@eitoball][])
+* [#1649](https://github.com/bbatsov/rubocop/issues/1649): Handle exception assignments in `UselessSetterCall`. ([@bbatsov][])
+* [#1644](https://github.com/bbatsov/rubocop/issues/1644): Don't search the entire file system when a folder is named `,`. ([@bquorning][])
+
 ## 0.29.0 (05/02/2015)
 
 ### New features
@@ -1249,3 +1259,4 @@
 [@mmozuras]: https://github.com/mmozuras
 [@d4rk5eed]: https://github.com/d4rk5eed
 [@cshaffer]: https://github.com/cshaffer
+[@eitoball]: https://github.com/eitoball

data/lib/rubocop/cli.rb

@@ -29,7 +29,7 @@ module RuboCop
       $stderr.puts "Ambiguous cop name #{e.message} needs namespace " \
                    'qualifier.'
       return 1
-    rescue => e
+    rescue StandardError, SyntaxError => e
       $stderr.puts e.message
       $stderr.puts e.backtrace
       return 1

data/lib/rubocop/cop/lint/useless_setter_call.rb

@@ -80,7 +80,7 @@ module RuboCop
                 process_binary_operator_assignment(node)
               when *ASSIGNMENT_TYPES
                 _, rhs_node = *node
-                process_assignment(node, rhs_node)
+                process_assignment(node, rhs_node) if rhs_node
               end
             end
 

data/lib/rubocop/cop/style/first_parameter_indentation.rb

@@ -22,8 +22,6 @@ module RuboCop
         include AutocorrectAlignment
         include ConfigurableEnforcedStyle
 
-        COMMENT_OR_BLANK_LINE = /^\s*(#.*)?$/
-
         def on_send(node)
           _receiver, method_name, *args = *node
           return if args.empty?
@@ -93,8 +91,13 @@ module RuboCop
         # containing the previous line that's not a comment line or a blank
         # line.
         def previous_code_line(line_number)
+          @comment_lines ||=
+            processed_source.comments
+            .select { |c| begins_its_line?(c.loc.expression) }
+            .map { |c| c.loc.line }
+
           line = ''
-          while line =~ COMMENT_OR_BLANK_LINE
+          while line =~ /^\s*$/ || @comment_lines.include?(line_number)
             line_number -= 1
             line = processed_source.lines[line_number - 1]
           end

data/lib/rubocop/cop/style/space_around_block_parameters.rb

@@ -18,7 +18,7 @@ module RuboCop
         def on_block(node)
           _method, args, body = *node
           opening_pipe, closing_pipe = args.loc.begin, args.loc.end
-          return unless opening_pipe
+          return unless !args.children.empty? && opening_pipe
 
           check_inside_pipes(args.children, opening_pipe, closing_pipe)
 

data/lib/rubocop/runner.rb

@@ -27,13 +27,28 @@ module RuboCop
 
     def run(paths)
       target_files = find_target_files(paths)
+      inspect_files(target_files)
+    end
+
+    def abort
+      @aborting = true
+    end
+
+    private
+
+    def find_target_files(paths)
+      target_finder = TargetFinder.new(@config_store, @options)
+      target_files = target_finder.find(paths)
+      target_files.each(&:freeze).freeze
+    end
 
+    def inspect_files(files)
       inspected_files = []
       all_passed = true
 
-      formatter_set.started(target_files)
+      formatter_set.started(files)
 
-      target_files.each do |file|
+      files.each do |file|
         break if aborting?
         offenses = process_file(file)
         all_passed = false if offenses.any? { |o| considered_failure?(o) }
@@ -47,18 +62,6 @@ module RuboCop
       formatter_set.close_output_files
     end
 
-    def abort
-      @aborting = true
-    end
-
-    private
-
-    def find_target_files(paths)
-      target_finder = TargetFinder.new(@config_store, @options)
-      target_files = target_finder.find(paths)
-      target_files.each(&:freeze).freeze
-    end
-
     def process_file(file)
       puts "Scanning #{file}" if @options[:debug]
 

data/lib/rubocop/target_finder.rb

@@ -88,6 +88,7 @@ module RuboCop
     def find_files(base_dir, flags)
       wanted_toplevel_dirs = toplevel_dirs(base_dir, flags) -
                              excluded_dirs(base_dir)
+      wanted_toplevel_dirs.map! { |dir| dir.gsub(',', '\,') }
 
       pattern = if wanted_toplevel_dirs.empty?
                   # We need this special case to avoid creating the pattern

data/lib/rubocop/version.rb

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

data/relnotes/v0.29.1.md

@@ -0,0 +1,12 @@
+### Bugs fixed
+
+* [#1638](https://github.com/bbatsov/rubocop/issues/1638): Use Parser functionality rather than regular expressions for matching comments in `FirstParameterIndentation`. ([@jonas054][])
+* [#1642](https://github.com/bbatsov/rubocop/issues/1642): Raise the correct exception if the configuration file is malformed. ([@bquorning][])
+* [#1647](https://github.com/bbatsov/rubocop/issues/1647): Skip `SpaceAroundBlockParameters` when lambda has no argument. ([@eitoball][])
+* [#1649](https://github.com/bbatsov/rubocop/issues/1649): Handle exception assignments in `UselessSetterCall`. ([@bbatsov][])
+* [#1644](https://github.com/bbatsov/rubocop/issues/1644): Don't search the entire file system when a folder is named `,`. ([@bquorning][])
+
+[@bbatsov]: https://github.com/bbatsov
+[@jonas054]: https://github.com/jonas054
+[@bquorning]: https://github.com/bquorning
+[@eitoball]: https://github.com/eitoball

data/spec/rubocop/cli_spec.rb

@@ -2692,6 +2692,17 @@ describe RuboCop::CLI, :isolated_environment do
                 ''].join("\n"))
     end
 
+    it 'fails when a configuration file has invalid YAML syntax' do
+      create_file('example/.rubocop.yml', ['AllCops:',
+                                           '  Exclude:',
+                                           '    - **/*_old.rb'])
+
+      cli.run(['example'])
+      expect($stderr.string)
+        .to start_with('(<unknown>): did not find expected alphabetic or ' \
+          'numeric character while scanning an alias at line 3 column 7')
+    end
+
     context 'when a file inherits from the old auto generated file' do
       before do
         create_file('rubocop-todo.yml', '')

data/spec/rubocop/cop/lint/useless_setter_call_spec.rb

@@ -196,4 +196,16 @@ describe RuboCop::Cop::Lint::UselessSetterCall do
                    ])
     expect(cop.offenses).to be_empty
   end
+
+  it 'handles exception assignments without exploding' do
+    inspect_source(cop,
+                   ['def foo(bar)',
+                    '  begin',
+                    '  rescue StandardError => _',
+                    '  end',
+                    '  bar[:baz] = true',
+                    'end'
+                   ])
+    expect(cop.offenses).to be_empty
+  end
 end

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

@@ -102,7 +102,7 @@ describe RuboCop::Cop::Style::FirstParameterIndentation, :config do
         context 'when preceded by a comment line' do
           it 'accepts a correctly indented first parameter' do
             inspect_source(cop, ['puts x.',
-                                 '  merge(',
+                                 '  merge( # EOL comment',
                                  '    # comment',
                                  '    b: 2',
                                  '  )'])
@@ -239,6 +239,17 @@ describe RuboCop::Cop::Style::FirstParameterIndentation, :config do
                                       'more than the previous line.'])
           expect(cop.highlights).to eq(['bar: 3'])
         end
+
+        it 'accepts a correctly indented first parameter in interpolation' do
+          inspect_source(cop, ['puts %(',
+                               '  <p>',
+                               '    #{Array(',
+                               '      42',
+                               '    )}',
+                               '  </p>',
+                               ')'])
+          expect(cop.offenses).to be_empty
+        end
       end
 
       context 'without outer parentheses' do

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

@@ -10,6 +10,11 @@ describe RuboCop::Cop::Style::SpaceAroundBlockParameters, :config do
       inspect_source(cop, '{}.each {}')
       expect(cop.offenses).to be_empty
     end
+
+    it 'skips lambda without args' do
+      inspect_source(cop, '->() { puts "a" }')
+      expect(cop.offenses).to be_empty
+    end
   end
 
   context 'when EnforcedStyleInsidePipes is no_space' do

data/spec/rubocop/target_finder_spec.rb

@@ -140,6 +140,19 @@ describe RuboCop::TargetFinder, :isolated_environment do
       expect(found_basenames).not_to include('ruby1.rb')
       expect(found_basenames).to include('ruby3.rb')
     end
+
+    it 'works also if a folder is named ","' do
+      create_file(',/ruby4.rb', '# encoding: utf-8')
+
+      config = double('config')
+      exclude_property = { 'Exclude' => [File.expand_path('dir1/**/*')] }
+      allow(config).to receive(:[]).with('AllCops').and_return(exclude_property)
+      allow(config_store).to receive(:for).and_return(config)
+
+      expect(found_basenames).not_to include('ruby1.rb')
+      expect(found_basenames).to include('ruby3.rb')
+      expect(found_basenames).to include('ruby4.rb')
+    end
   end
 
   describe '#target_files_in_dir' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.29.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -491,6 +491,7 @@ files:
 - relnotes/v0.27.1.md
 - relnotes/v0.28.0.md
 - relnotes/v0.29.0.md
+- relnotes/v0.29.1.md
 - rubocop.gemspec
 - spec/.rubocop.yml
 - spec/fixtures/html_formatter/expected.html