rubocop 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30651383f11c3dcaac288e77b0055e6523b509fe
-  data.tar.gz: 245cd91aaf840d894118ed9f0530c1d3019b9c1f
+  metadata.gz: 31c46dfc62c89c6d6c760fca39e95d4ddbc6d86a
+  data.tar.gz: a341a023513b18cf578c889b4f563e656ce0d762
 SHA512:
-  metadata.gz: 56e26bc6f778104eae7226a633e6eca1f5302d263c1ae4d8a208031c08bc688011817dc55272a8962c586cc436639749b504b208f4ac415d87f11aaedda40a49
-  data.tar.gz: f457149f614495b72eabfc4fece9f96007aa18f6debb384bc4dadb6bd580b45ac3bcf0818d8241cf3a5524f04ca881324c0c7ee4238f03973b41148f74e21f76
+  metadata.gz: d924beb2cc52e477d0a9283cb23ffd269e64236c3ed454e29069c7f6eac037ecf512b8a670732c6dbb8335323f3c0aa527e169fc4b2abc24ec444f804689c628
+  data.tar.gz: 3494d55e372c564d29f33cfe6fe6af6d6071262ba5bd80298a735d7963f1accd84c769716c688b21489bf47325e804b0e1a8a2c3b4afc34f3263b7107a4da0a3

data/.rubocop_todo.yml

@@ -7,7 +7,7 @@
 
 # Offense count: 116
 Metrics/AbcSize:
-  Max: 33
+  Max: 38
 
 # Offense count: 10
 # Configuration parameters: CountComments.

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## master (unreleased)
 
+## 0.27.1 (08/11/2014)
+
+### Changes
+
+* [#1343](https://github.com/bbatsov/rubocop/issues/1343): Remove auto-correct from `RescueException` cop. ([@bbatsov][])
+* [#1425](https://github.com/bbatsov/rubocop/issues/1425): `AllCops/Include` configuration parameters are only taken from the project `.rubocop.yml` and files it inherits from, not from `.rubocop.yml` files in subdirectories. ([@jonas054][])
+
+### Bugs fixed
+
+* [#1411](https://github.com/bbatsov/rubocop/issues/1411): Handle lambda calls without a selector in `MultilineOperationIndentation`. ([@bbatsov][])
+* [#1401](https://github.com/bbatsov/rubocop/issues/1401): Files in hidden directories, i.e. ones beginning with dot, can now be selected through configuration, but are still not included by default. ([@jonas054][])
+* [#1415](https://github.com/bbatsov/rubocop/issues/1415): String literals concatenated with backslashes are now handled correctly by `StringLiteralsInInterpolation`. ([@jonas054][])
+* [#1416](https://github.com/bbatsov/rubocop/issues/1416): Fix handling of `begin/rescue/else/end` in `ElseAlignment`. ([@jonas054][])
+* [#1413](https://github.com/bbatsov/rubocop/issues/1413): Support empty elsif branches in `MultilineIfThen`. ([@janraasch][], [@jonas054][])
+* [#1406](https://github.com/bbatsov/rubocop/issues/1406): Allow a newline in `SpaceInsideRangeLiteral`. ([@bbatsov][])
+
 ## 0.27.0 (30/10/2014)
 
 ### New features
@@ -1133,3 +1149,4 @@
 [@smangelsdorf]: https://github.com/smangelsdorf
 [@mvz]: https://github.com/mvz
 [@jfelchner]: https://github.com/jfelchner
+[@janraasch]: https://github.com/janraasch

data/README.md

@@ -275,11 +275,14 @@ directory, `config/default.yml` will be used.
 
 ### Including/Excluding files
 
-RuboCop checks all files recursively within the directory it is run
-on.  However, it only recognizes files ending with `.rb` or
-extensionless files with a `#!.*ruby` declaration as Ruby files. If
-you'd like it to check other files you'll need to manually pass them
-in, or to add entries for them under `AllCops`/`Include`.  Files and
+RuboCop checks all files found by a recursive search starting from the
+directory it is run in, or directories given as command line
+arguments.  However, it only recognizes files ending with `.rb` or
+extensionless files with a `#!.*ruby` declaration as Ruby files.
+Hidden directories (i.e., directories whose names start with a dot)
+are not searched by default.  If you'd like it to check files that are
+not included by default, you'll need to pass them in on the command
+line, or to add entries for them under `AllCops`/`Include`.  Files and
 directories can also be ignored through `AllCops`/`Exclude`.
 
 Here is an example that might be used for a Rails project:
@@ -310,12 +313,12 @@ correct way to match the file in any directory, including the current, is
 `config`, but this pattern style is deprecated and should be replaced by
 `config/**/*`.
 
-**Note**: The `Exclude` parameter is special. It is valid for the
-directory tree starting where it is defined. It is not shadowed by the
-setting of `Exclude` in other `.rubocop.yml` files in
-subdirectories. This is different from all other parameters, who
-follow RuboCop's general principle that configuration for an inspected
-file is taken from the nearest `.rubocop.yml`, searching upwards.
+**Note**: The `Include` and `Exclude` parameters are special. They are
+valid for the directory tree starting where they are defined. They are not
+shadowed by the setting of `Include` and `Exclude` in other `.rubocop.yml`
+files in subdirectories. This is different from all other parameters, who
+follow RuboCop's general principle that configuration for an inspected file
+is taken from the nearest `.rubocop.yml`, searching upwards.
 
 Cops can be run only on specific sets of files when that's needed (for
 instance you might want to run some Rails model checks only on files whose

data/config/enabled.yml

@@ -271,7 +271,7 @@ Style/IfUnlessModifier:
   Enabled: true
 
 Style/IfWithSemicolon:
-  Description: 'Never use if x; .... Use the ternary operator instead.'
+  Description: 'Do not use if x; .... Use the ternary operator instead.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-semicolon-ifs'
   Enabled: true
 
@@ -352,7 +352,7 @@ Style/MultilineBlockLayout:
   Enabled: true
 
 Style/MultilineIfThen:
-  Description: 'Never use then for multi-line if/unless.'
+  Description: 'Do not use then for multi-line if/unless.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-then'
   Enabled: true
 
@@ -544,7 +544,7 @@ Style/SpaceAfterControlKeyword:
 
 Style/SpaceAfterMethodName:
   Description: >-
-                 Never put a space between a method name and the opening
+                 Do not put a space between a method name and the opening
                  parenthesis in a method definition.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-no-spaces'
   Enabled: true
@@ -670,7 +670,7 @@ Style/TrivialAccessors:
 
 Style/UnlessElse:
   Description: >-
-                 Never use unless with else. Rewrite these with the positive
+                 Do not use unless with else. Rewrite these with the positive
                  case first.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-else-with-unless'
   Enabled: true
@@ -832,7 +832,7 @@ Lint/EndInMethod:
   Enabled: true
 
 Lint/EnsureReturn:
-  Description: 'Never use return in an ensure block.'
+  Description: 'Do not use return in an ensure block.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-return-ensure'
   Enabled: true
 

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

@@ -5,7 +5,7 @@ module RuboCop
     module Lint
       # This cop checks for *return* from an *ensure* block.
       class EnsureReturn < Cop
-        MSG = 'Never return from an `ensure` block.'
+        MSG = 'Do not return from an `ensure` block.'
 
         def on_ensure(node)
           _body, ensure_body = *node

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

@@ -5,7 +5,8 @@ module RuboCop
     module Lint
       # This cop checks for *rescue* blocks targeting the Exception class.
       class RescueException < Cop
-        MSG = 'Avoid rescuing the `Exception` class.'
+        MSG = 'Avoid rescuing the `Exception` class. ' \
+              'Perhaps you meant to rescue `StandardError`?'
 
         def on_resbody(node)
           return unless node.children.first
@@ -18,17 +19,6 @@ module RuboCop
         def targets_exception?(rescue_arg_node)
           Util.const_name(rescue_arg_node) == 'Exception'
         end
-
-        def autocorrect(node)
-          @corrections << lambda do |corrector|
-            corrector.remove(
-              range_with_surrounding_space(
-                node.children.first.children.first.loc.expression,
-                :left
-              )
-            )
-          end
-        end
       end
     end
   end

data/lib/rubocop/cop/mixin/on_normal_if_unless.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    # Common functionality for cops checking if and unless statements.
+    # Common functionality for cops checking if and unless expressions.
     module OnNormalIfUnless
       include IfNode
 

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

@@ -37,18 +37,12 @@ module RuboCop
         def on_rescue(node)
           return unless node.loc.else
 
-          grandparent = node.parent.parent
-          base = case node.parent.type
-                 when :def, :defs
-                   if grandparent && grandparent.type == :send
-                     grandparent.loc.selector
-                   else
-                     node.parent.loc.keyword
-                   end
-                 when :ensure
-                   grandparent.loc.begin
-                 else
-                   node.loc.keyword
+          parent = node.parent
+          base = case parent.type
+                 when :def, :defs then base_for_method_definition(parent)
+                 when :kwbegin    then parent.loc.begin
+                 when :ensure     then parent.parent.loc.begin
+                 else node.loc.keyword
                  end
           check_alignment(base, node.loc.else)
         end
@@ -61,6 +55,15 @@ module RuboCop
 
         private
 
+        def base_for_method_definition(node)
+          parent = node.parent
+          if parent && parent.type == :send
+            parent.loc.selector # For example "private def ..."
+          else
+            node.loc.keyword
+          end
+        end
+
         def check_assignment(node, rhs)
           # If there are method calls chained to the right hand side of the
           # assignment, we let rhs be the receiver of those method calls before

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

@@ -6,9 +6,9 @@ module RuboCop
       # This cop checks for the use of a method, the result of which
       # would be a literal, like an empty array, hash or string.
       class EmptyLiteral < Cop
-        ARR_MSG = 'Use array literal [] instead of Array.new.'
-        HASH_MSG = 'Use hash literal {} instead of Hash.new.'
-        STR_MSG = "Use string literal '' instead of String.new."
+        ARR_MSG = 'Use array literal `[]` instead of `Array.new`.'
+        HASH_MSG = 'Use hash literal `{}` instead of `Hash.new`.'
+        STR_MSG = "Use string literal `''` instead of `String.new`."
 
         # Empty array node
         #

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

@@ -7,7 +7,7 @@ module RuboCop
       class IfWithSemicolon < Cop
         include OnNormalIfUnless
 
-        MSG = 'Never use if x; Use the ternary operator instead.'
+        MSG = 'Do not use if x; Use the ternary operator instead.'
 
         def on_normal_if_unless(node)
           beginning = node.loc.begin

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

@@ -20,38 +20,19 @@ module RuboCop
         include OnNormalIfUnless
 
         def on_normal_if_unless(node)
-          condition, body, else_clause = *node
-          next_thing = if body && body.loc.expression
-                         body.loc.expression.begin
-                       elsif else_clause && else_clause.loc.expression
-                         else_clause.loc.expression.begin
-                       else
-                         node.loc.end # No body, use "end".
-                       end
-          right_after_cond =
-            Parser::Source::Range.new(next_thing.source_buffer,
-                                      end_position(condition),
-                                      next_thing.begin_pos)
-          return unless right_after_cond.source =~ /\A\s*then\s*(#.*)?\s*\n/
-
-          add_offense(node, :expression, message(node))
-        end
-
-        def end_position(conditional_node)
-          conditional_node.loc.expression.end.end_pos
+          return unless node.loc.begin
+          return unless node.loc.begin.source_line =~ /then\s*(#.*)?$/
+          add_offense(node, :begin)
         end
 
         def message(node)
-          "Never use `then` for multi-line `#{node.loc.keyword.source}`."
+          "Do not use `then` for multi-line `#{node.loc.keyword.source}`."
         end
 
         def autocorrect(node)
           @corrections << lambda do |corrector|
-            condition_node, = *node
-            end_of_condition_range = condition_node.loc.expression.end
-            then_range = node.loc.begin
-            whitespaces_and_then_range = end_of_condition_range.join(then_range)
-            corrector.remove(whitespaces_and_then_range)
+            corrector.remove(range_with_surrounding_space(node.loc.begin,
+                                                          :left))
           end
         end
       end

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

@@ -114,10 +114,14 @@ module RuboCop
           if operator?(method_name) && args.any?
             args.first.loc.expression
           elsif send_node.loc.dot &&
+                send_node.loc.selector &&
                 send_node.loc.dot.line == send_node.loc.selector.line
             send_node.loc.dot.join(send_node.loc.selector)
-          else
+          elsif send_node.loc.selector
             send_node.loc.selector
+          elsif send_node.loc.dot.line == send_node.loc.begin.line
+            # lambda.(args)
+            send_node.loc.dot.join(send_node.loc.begin)
           end
         end
 

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

@@ -15,7 +15,7 @@ module RuboCop
       class SpaceAfterMethodName < Cop
         include OnMethodDef
 
-        MSG = 'Never put a space between a method name and the opening ' \
+        MSG = 'Do not put a space between a method name and the opening ' \
               'parenthesis.'
 
         def on_method_def(_node, _method_name, args, _body)

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

@@ -4,6 +4,7 @@ module RuboCop
   module Cop
     module Style
       # Checks for spaces inside range literals.
+      #
       # @example
       #   # bad
       #   1 .. 3
@@ -31,9 +32,13 @@ module RuboCop
 
         def check(node)
           expression = node.loc.expression.source
-          operator = node.loc.operator.source.gsub(/\./, '\.')
+          op = node.loc.operator.source
+          escaped_op = op.gsub(/\./, '\.')
+
+          # account for multiline range literals
+          expression.sub!(/#{escaped_op}\n\s*/, op)
 
-          return unless expression =~ /(\s#{operator})|(#{operator}\s)/
+          return unless expression =~ /(\s#{escaped_op})|(#{escaped_op}\s)/
 
           add_offense(node, :expression)
         end

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

@@ -18,11 +18,13 @@ module RuboCop
         end
 
         def offense?(node)
-          # If it's not a string within a dynamic string, i.e. part of an
-          # expression in an interpolation, then it's not an offense for this
-          # cop.
+          # If it's not a string within an interpolation, then it's not an
+          # offense for this cop. A :begin node inside a :dstr node is an
+          # interpolation.
+          begin_found = false
           return false unless node.each_ancestor.find do |a|
-            a.type == :dstr && within_node?(node, a)
+            begin_found = true if a.type == :begin
+            begin_found && a.type == :dstr
           end
 
           wrong_quotes?(node, style)

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

@@ -5,7 +5,7 @@ module RuboCop
     module Style
       # This cop looks for *unless* expressions with *else* clauses.
       class UnlessElse < Cop
-        MSG = 'Never use `unless` with `else`. Rewrite these with the ' \
+        MSG = 'Do not use `unless` with `else`. Rewrite these with the ' \
               'positive case first.'
 
         def on_if(node)

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

@@ -5,7 +5,7 @@ module RuboCop
     module Style
       # This cop checks for *when;* uses in *case* expressions.
       class WhenThen < Cop
-        MSG = 'Never use `when x;`. Use `when x then` instead.'
+        MSG = 'Do not use `when x;`. Use `when x then` instead.'
 
         def on_when(node)
           return unless node.loc.begin && node.loc.begin.is?(';')

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

@@ -24,7 +24,7 @@ module RuboCop
         private
 
         def error_message(node_type)
-          format('Never use `do` with multi-line `%s`.', node_type)
+          format('Do not use `do` with multi-line `%s`.', node_type)
         end
 
         def autocorrect(node)

data/lib/rubocop/path_util.rb

@@ -21,7 +21,19 @@ module RuboCop
         old_match = basename == pattern || File.fnmatch?(pattern, path)
         new_match = File.fnmatch?(pattern, path, File::FNM_PATHNAME)
         if old_match && !new_match
-          issue_deprecation_warning(basename, pattern, config_path)
+          # Patterns like dir/**/* will produce an old match for files
+          # beginning with dot, but not a new match. That's a special case,
+          # though. Not what we want to handle here. And this is a match that
+          # we overrule. Only patterns like dir/**/.* can be used to match dot
+          # files.
+          return false if basename.start_with?('.')
+
+          # Hidden directories (starting with a dot) will also produce an old
+          # match, just like hidden files. A deprecation warning would be wrong
+          # for these.
+          if path.split(File::SEPARATOR).none? { |s| s.start_with?('.') }
+            issue_deprecation_warning(basename, pattern, config_path)
+          end
         end
         old_match || new_match
       when Regexp

data/lib/rubocop/runner.rb

@@ -109,7 +109,7 @@ module RuboCop
           # filter out Rails cops unless requested
           cop_classes.reject!(&:rails?) unless run_rails_cops?(config)
 
-          # filter out style cops when --lint is passed
+          # select only lint cops when --lint is passed
           cop_classes.select!(&:lint?) if @options[:lint]
         end
 

data/lib/rubocop/target_finder.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'set'
+
 module RuboCop
   # This class finds target files to inspect by scanning the directory tree
   # and picking ruby files.
@@ -55,14 +57,12 @@ module RuboCop
       if File::ALT_SEPARATOR
         base_dir.gsub!(File::ALT_SEPARATOR, File::SEPARATOR)
       end
-      files = Dir["#{base_dir}/**/*"].select { |path| FileTest.file?(path) }
+      all_files = find_files(base_dir, File::FNM_DOTMATCH)
+      hidden_files = Set.new(all_files - find_files(base_dir, 0))
       base_dir_config = @config_store.for(base_dir)
 
-      target_files = files.select do |file|
-        next false if base_dir_config.file_to_exclude?(file)
-        next true if File.extname(file) == '.rb'
-        next true if ruby_executable?(file)
-        @config_store.for(file).file_to_include?(file)
+      target_files = all_files.select do |file|
+        to_inspect?(file, hidden_files, base_dir_config)
       end
 
       # Most recently modified file first.
@@ -71,6 +71,19 @@ module RuboCop
       target_files
     end
 
+    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
+      base_dir_config.file_to_include?(file)
+    end
+
+    def find_files(base_dir, flags)
+      Dir.glob("#{base_dir}/**/*", flags).select { |path| FileTest.file?(path) }
+    end
+
     def ruby_executable?(file)
       return false unless File.extname(file).empty?
       first_line = File.open(file) { |f| f.readline }

data/lib/rubocop/version.rb

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

data/relnotes/v0.27.1.md

@@ -0,0 +1,66 @@
+### Changes
+
+* [#1343](https://github.com/bbatsov/rubocop/issues/1343): Remove auto-correct from `RescueException` cop. ([@bbatsov][])
+* [#1425](https://github.com/bbatsov/rubocop/issues/1425): `AllCops/Include` configuration parameters are only taken from the project `.rubocop.yml` and files it inherits from, not from `.rubocop.yml` files in subdirectories. ([@jonas054][])
+
+### Bugs fixed
+
+* [#1411](https://github.com/bbatsov/rubocop/issues/1411): Handle lambda calls without a selector in `MultilineOperationIndentation`. ([@bbatsov][])
+* [#1401](https://github.com/bbatsov/rubocop/issues/1401): Files in hidden directories, i.e. ones beginning with dot, can now be selected through configuration, but are still not included by default. ([@jonas054][])
+* [#1415](https://github.com/bbatsov/rubocop/issues/1415): String literals concatenated with backslashes are now handled correctly by `StringLiteralsInInterpolation`. ([@jonas054][])
+* [#1416](https://github.com/bbatsov/rubocop/issues/1416): Fix handling of `begin/rescue/else/end` in `ElseAlignment`. ([@jonas054][])
+* [#1413](https://github.com/bbatsov/rubocop/issues/1413): Support empty elsif branches in `MultilineIfThen`. ([@janraasch][], [@jonas054][])
+* [#1406](https://github.com/bbatsov/rubocop/issues/1406): Allow a newline in `SpaceInsideRangeLiteral`. ([@bbatsov][])
+
+[@bbatsov]: https://github.com/bbatsov
+[@jonas054]: https://github.com/jonas054
+[@yujinakayama]: https://github.com/yujinakayama
+[@dblock]: https://github.com/dblock
+[@nevir]: https://github.com/nevir
+[@daviddavis]: https://github.com/daviddavis
+[@sds]: https://github.com/sds
+[@fancyremarker]: https://github.com/fancyremarker
+[@sinisterchipmunk]: https://github.com/sinisterchipmunk
+[@vonTronje]: https://github.com/vonTronje
+[@agrimm]: https://github.com/agrimm
+[@pmenglund]: https://github.com/pmenglund
+[@chulkilee]: https://github.com/chulkilee
+[@codez]: https://github.com/codez
+[@emou]: https://github.com/emou
+[@skanev]: http://github.com/skanev
+[@claco]: http://github.com/claco
+[@rifraf]: http://github.com/rifraf
+[@scottmatthewman]: https://github.com/scottmatthewman
+[@ma2gedev]: http://github.com/ma2gedev
+[@jeremyolliver]: https://github.com/jeremyolliver
+[@hannestyden]: https://github.com/hannestyden
+[@geniou]: https://github.com/geniou
+[@jkogara]: https://github.com/jkogara
+[@tmorris-fiksu]: https://github.com/tmorris-fiksu
+[@mockdeep]: https://github.com/mockdeep
+[@hiroponz]: https://github.com/hiroponz
+[@tamird]: https://github.com/tamird
+[@fshowalter]: https://github.com/fshowalter
+[@cschramm]: https://github.com/cschramm
+[@bquorning]: https://github.com/bquorning
+[@bcobb]: https://github.com/bcobb
+[@irrationalfab]: https://github.com/irrationalfab
+[@tommeier]: https://github.com/tommeier
+[@sfeldon]: https://github.com/sfeldon
+[@biinari]: https://github.com/biinari
+[@barunio]: https://github.com/barunio
+[@molawson]: https://github.com/molawson
+[@wndhydrnt]: https://github.com/wndhydrnt
+[@ggilder]: https://github.com/ggilder
+[@salbertson]: https://github.com/salbertson
+[@camilleldn]: https://github.com/camilleldn
+[@mcls]: https://github.com/mcls
+[@yous]: https://github.com/yous
+[@vrthra]: https://github.com/vrthra
+[@SkuliOskarsson]: https://github.com/SkuliOskarsson
+[@jspanjers]: https://github.com/jspanjers
+[@sch1zo]: https://github.com/sch1zo
+[@smangelsdorf]: https://github.com/smangelsdorf
+[@mvz]: https://github.com/mvz
+[@jfelchner]: https://github.com/jfelchner
+[@janraasch]: https://github.com/janraasch

data/rubocop.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.summary = 'Automatic Ruby code style checking tool.'
 
   s.add_runtime_dependency('rainbow', '>= 1.99.1', '< 3.0')
-  s.add_runtime_dependency('parser', '>= 2.2.0.pre.6', '< 3.0')
+  s.add_runtime_dependency('parser', '>= 2.2.0.pre.7', '< 3.0')
   s.add_runtime_dependency('powerpack', '~> 0.0.6')
   s.add_runtime_dependency('astrolabe', '~> 1.3')
   s.add_runtime_dependency('ruby-progressbar', '~> 1.4')

data/spec/rubocop/cli_spec.rb

@@ -528,7 +528,7 @@ describe RuboCop::CLI, :isolated_environment do
                                              ''].join("\n"))
         expect($stdout.string)
           .to eq(["#{abs('example.rb')}:2:1: C: [Corrected] Use hash " \
-                  'literal {} instead of Hash.new.',
+                  'literal `{}` instead of `Hash.new`.',
                   "#{abs('example.rb')}:2:9: C: [Corrected] Do not use " \
                   'parentheses for method calls with no arguments.',
                   ''].join("\n"))
@@ -1777,23 +1777,23 @@ describe RuboCop::CLI, :isolated_environment do
     end
 
     it 'finds included files' do
-      create_file('example', ['# encoding: utf-8',
-                              'x = 0',
-                              'puts x'
-                             ])
-      create_file('regexp', ['# encoding: utf-8',
-                             'x = 0',
-                             'puts x'
-                            ])
+      create_file('file.rb', 'x=0') # Included by default
+      create_file('example', 'x=0')
+      create_file('regexp', 'x=0')
+      create_file('.dot1/file.rb', 'x=0') # Hidden but explicitly included
+      create_file('.dot2/file.rb', 'x=0') # Hidden, excluded by default
       create_file('.rubocop.yml', ['AllCops:',
                                    '  Include:',
                                    '    - example',
-                                   '    - !ruby/regexp /regexp$/'
+                                   '    - !ruby/regexp /regexp$/',
+                                   '    - .dot1/**/*'
                                   ])
-      expect(cli.run(%w(--format simple))).to eq(0)
-      expect($stdout.string)
-        .to eq(['', '2 files inspected, no offenses detected',
-                ''].join("\n"))
+      expect(cli.run(%w(--format files))).to eq(1)
+      expect($stderr.string).to eq('')
+      expect($stdout.string.split($RS).sort).to eq([abs('.dot1/file.rb'),
+                                                    abs('example'),
+                                                    abs('file.rb'),
+                                                    abs('regexp')])
     end
 
     it 'ignores excluded files' do
@@ -1822,6 +1822,48 @@ describe RuboCop::CLI, :isolated_environment do
                 ''].join("\n"))
     end
 
+    it 'only reads configuration in explicitly included hidden directories' do
+      create_file('.hidden/example.rb', ['# encoding: utf-8',
+                                         'x=0'])
+      # This file contains configuration for an unknown cop. This would cause a
+      # warning to be printed on stderr if the file was read. But it's in a
+      # hidden directory, so it's not read.
+      create_file('.hidden/.rubocop.yml', ['SymbolName:',
+                                           '  Enabled: false'])
+
+      create_file('.other/example.rb', ['# encoding: utf-8',
+                                        'x=0'])
+      # The .other directory is explicitly included, so the configuration file
+      # is read, and modifies the behavior.
+      create_file('.other/.rubocop.yml', ['Style/SpaceAroundOperators:',
+                                          '  Enabled: false'])
+      create_file('.rubocop.yml', ['AllCops:',
+                                   '  Include:',
+                                   '    - .other/**/*'])
+      expect(cli.run(%w(--format simple))).to eq(1)
+      expect($stderr.string).to eq('')
+      expect($stdout.string)
+        .to eq(['== .other/example.rb ==',
+                'W:  2:  1: Useless assignment to variable - x.',
+                '',
+                '1 file inspected, 1 offense detected',
+                ''].join("\n"))
+    end
+
+    it 'does not consider Include parameters in subdirectories' do
+      create_file('dir/example.ruby', ['# encoding: utf-8',
+                                       'x=0'])
+      create_file('dir/.rubocop.yml', ['AllCops:',
+                                       '  Include:',
+                                       '    - "*.ruby"'])
+      expect(cli.run(%w(--format simple))).to eq(0)
+      expect($stderr.string).to eq('')
+      expect($stdout.string)
+        .to eq(['',
+                '0 files inspected, no offenses detected',
+                ''].join("\n"))
+    end
+
     it 'matches included/excluded files corectly when . argument is given' do
       create_file('example.rb', 'x = 0')
       create_file('special.dsl', ['# encoding: utf-8',
@@ -2071,10 +2113,13 @@ describe RuboCop::CLI, :isolated_environment do
     it 'can exclude directories relative to .rubocop.yml' do
       %w(src etc/test etc/spec tmp/test tmp/spec).each do |dir|
         create_file("example/#{dir}/example1.rb", ['# encoding: utf-8',
-                                                   '#' * 90
-                                                  ])
+                                                   '#' * 90])
       end
 
+      # Hidden subdirectories should also be excluded.
+      create_file('example/etc/.dot/example1.rb', ['# encoding: utf-8',
+                                                   '#' * 90])
+
       create_file('example/.rubocop.yml', ['AllCops:',
                                            '  Exclude:',
                                            '    - src/**',
@@ -2082,8 +2127,8 @@ describe RuboCop::CLI, :isolated_environment do
                                            '    - tmp/spec/**'])
 
       expect(cli.run(%w(--format simple example))).to eq(1)
-      expect($stdout.string).to eq(
-                                   ['== example/tmp/test/example1.rb ==',
+      expect($stderr.string).to eq('')
+      expect($stdout.string).to eq(['== example/tmp/test/example1.rb ==',
                                     'C:  2: 81: Line is too long. [90/80]',
                                     '',
                                     '1 file inspected, 1 offense detected',

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

@@ -120,40 +120,4 @@ describe RuboCop::Cop::Lint::RescueException do
                     'end'])
     expect(cop.offenses).to be_empty
   end
-
-  context 'without exception capture' do
-    let(:source) do
-      ['begin',
-       'rescue Exception',
-       'end']
-    end
-
-    let(:corrected_source) do
-      ['begin', # rubocop:disable Style/WordArray
-       'rescue',
-       'end'].join("\n")
-    end
-
-    it 'autocorrects by unspecifying the exception class' do
-      expect(autocorrect_source(cop, source)).to eq(corrected_source)
-    end
-  end
-
-  context 'with exception capture' do
-    let(:source) do
-      ['begin',
-       'rescue Exception => e',
-       'end']
-    end
-
-    let(:corrected_source) do
-      ['begin',
-       'rescue => e',
-       'end'].join("\n")
-    end
-
-    it 'autocorrects by unspecifying the exception class' do
-      expect(autocorrect_source(cop, source)).to eq(corrected_source)
-    end
-  end
 end

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

@@ -417,6 +417,18 @@ describe RuboCop::Cop::Style::ElseAlignment do
                       'end'])
       expect(cop.messages).to eq(['Align `else` with `begin`.'])
     end
+
+    it 'accepts a correctly aligned else' do
+      inspect_source(cop,
+                     ['begin',
+                      "  raise StandardError.new('Fail') if rand(2).odd?",
+                      'rescue StandardError => error',
+                      '  $stderr.puts error.message',
+                      'else',
+                      "  $stdout.puts 'Lucky you!'",
+                      'end'])
+      expect(cop.offenses).to be_empty
+    end
   end
 
   context 'with def/rescue/else/end' do

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

@@ -11,7 +11,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
                      ['test = Array.new()'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Use array literal [] instead of Array.new.'])
+        .to eq(['Use array literal `[]` instead of `Array.new`.'])
     end
 
     it 'registers an offense for Array.new' do
@@ -19,7 +19,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
                      ['test = Array.new'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Use array literal [] instead of Array.new.'])
+        .to eq(['Use array literal `[]` instead of `Array.new`.'])
     end
 
     it 'does not register an offense for Array.new(3)' do
@@ -40,7 +40,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
                      ['test = Hash.new()'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Use hash literal {} instead of Hash.new.'])
+        .to eq(['Use hash literal `{}` instead of `Hash.new`.'])
     end
 
     it 'registers an offense for Hash.new' do
@@ -48,7 +48,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
                      ['test = Hash.new'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(['Use hash literal {} instead of Hash.new.'])
+        .to eq(['Use hash literal `{}` instead of `Hash.new`.'])
     end
 
     it 'does not register an offense for Hash.new(3)' do
@@ -75,7 +75,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
                      ['test = String.new()'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(["Use string literal '' instead of String.new."])
+        .to eq(["Use string literal `''` instead of `String.new`."])
     end
 
     it 'registers an offense for String.new' do
@@ -83,7 +83,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
                      ['test = String.new'])
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
-        .to eq(["Use string literal '' instead of String.new."])
+        .to eq(["Use string literal `''` instead of `String.new`."])
     end
 
     it 'does not register an offense for String.new("top")' do

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

@@ -8,7 +8,7 @@ describe RuboCop::Cop::Style::IfWithSemicolon do
   it 'registers an offense for one line if/;/end' do
     inspect_source(cop, ['if cond; run else dont end'])
     expect(cop.messages).to eq(
-      ['Never use if x; Use the ternary operator instead.'])
+      ['Do not use if x; Use the ternary operator instead.'])
   end
 
   it 'accepts one line if/then/end' do

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

@@ -7,6 +7,13 @@ describe RuboCop::Cop::Style::MultilineIfThen do
 
   # if
 
+  it 'does not get confused by empty elsif branch' do
+    inspect_source(cop, ['if cond',
+                         'elsif cond',
+                         'end'])
+    expect(cop.offenses).to be_empty
+  end
+
   it 'registers an offense for then in multiline if' do
     inspect_source(cop, ['if cond then',
                          'end',
@@ -19,7 +26,20 @@ describe RuboCop::Cop::Style::MultilineIfThen do
                          'end',
                          'if cond then # bad',
                          'end'])
-    expect(cop.offenses.map(&:line)).to eq([1, 3, 5, 7, 10])
+    expect(cop.offenses.map(&:line)).to eq([1, 3, 5, 8, 10])
+    expect(cop.highlights).to eq(['then'] * 5)
+    expect(cop.messages).to eq(['Do not use `then` for multi-line `if`.'] * 5)
+  end
+
+  it 'registers an offense for then in multiline elsif' do
+    inspect_source(cop, ['if cond1',
+                         '  a',
+                         'elsif cond2 then',
+                         '  b',
+                         'end'])
+    expect(cop.offenses.map(&:line)).to eq([3])
+    expect(cop.highlights).to eq(['then'])
+    expect(cop.messages).to eq(['Do not use `then` for multi-line `elsif`.'])
   end
 
   it 'accepts multiline if without then' do
@@ -72,7 +92,7 @@ describe RuboCop::Cop::Style::MultilineIfThen do
     inspect_source(cop, ['unless cond then',
                          'end'])
     expect(cop.messages).to eq(
-      ['Never use `then` for multi-line `unless`.'])
+      ['Do not use `then` for multi-line `unless`.'])
   end
 
   it 'accepts multiline unless without then' do

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

@@ -40,6 +40,15 @@ describe RuboCop::Cop::Style::MultilineOperationIndentation do
       expect(cop.highlights).to eq(['.b'])
     end
 
+    it 'registers an offense for proc call without a selector' do
+      inspect_source(cop,
+                     ['a',
+                      ' .(args)'])
+      expect(cop.messages).to eq(['Use 2 (not 1) spaces for indenting an ' \
+                                  'expression spanning multiple lines.'])
+      expect(cop.highlights).to eq(['.('])
+    end
+
     it 'registers an offense for three spaces indentation of second line' do
       inspect_source(cop,
                      ['a ||',

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

@@ -40,6 +40,18 @@ describe RuboCop::Cop::Style::SpaceInsideRangeLiteral do
     expect(cop.offenses).to be_empty
   end
 
+  it 'accepts multiline range literal with no space in it' do
+    inspect_source(cop, ['x = 0..',
+                         '    10'])
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'registers an offense in multiline range literal with space in it' do
+    inspect_source(cop, ['x = 0 ..',
+                         '    10'])
+    expect(cop.offenses.size).to eq(1)
+  end
+
   it 'autocorrects space around .. literal' do
     corrected = autocorrect_source(cop, ['1  .. 2'])
     expect(corrected).to eq '1..2'

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

@@ -8,19 +8,45 @@ describe RuboCop::Cop::Style::StringLiteralsInInterpolation, :config do
   context 'configured with single quotes preferred' do
     let(:cop_config) { { 'EnforcedStyle' => 'single_quotes' } }
 
-    it 'detects unneeded double quotes within embedded expression' do
+    it 'registers an offense for double quotes within embedded expression' do
       src = ['"#{"A"}"']
       inspect_source(cop, src)
       expect(cop.messages)
         .to eq(['Prefer single-quoted strings inside interpolations.'])
     end
 
+    it 'registers an offense for double quotes within embedded expression in ' \
+       'a heredoc string' do
+      src = ['<<END',
+             '#{"A"}',
+             'END']
+      inspect_source(cop, src)
+      expect(cop.messages)
+        .to eq(['Prefer single-quoted strings inside interpolations.'])
+    end
+
     it 'accepts double quotes on a static string' do
       src = ['"A"']
       inspect_source(cop, src)
       expect(cop.offenses).to be_empty
     end
 
+    it 'accepts double quotes on a broken static string' do
+      src = ['"A" \\',
+             '  "B"']
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts double quotes on static strings within a method' do
+      src = ['def m',
+             '  puts "A"',
+             '  puts "B"',
+             'end']
+      inspect_source(cop, src)
+      expect(cop.offenses).to be_empty
+    end
+
     it 'can handle a built-in constant parsed as string' do
       # Parser will produce str nodes for constants such as __FILE__.
       src = ['if __FILE__ == $PROGRAM_NAME',
@@ -50,6 +76,16 @@ describe RuboCop::Cop::Style::StringLiteralsInInterpolation, :config do
       expect(cop.messages)
         .to eq(['Prefer double-quoted strings inside interpolations.'])
     end
+
+    it 'registers an offense for single quotes within embedded expression in ' \
+       'a heredoc string' do
+      src = ['<<END',
+             '#{\'A\'}',
+             'END']
+      inspect_source(cop, src)
+      expect(cop.messages)
+        .to eq(['Prefer double-quoted strings inside interpolations.'])
+    end
   end
 
   context 'when configured with a bad value' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0.pre.6
+        version: 2.2.0.pre.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0.pre.6
+        version: 2.2.0.pre.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -481,6 +481,7 @@ files:
 - relnotes/v0.26.0.md
 - relnotes/v0.26.1.md
 - relnotes/v0.27.0.md
+- relnotes/v0.27.1.md
 - rubocop.gemspec
 - spec/.rubocop.yml
 - spec/fixtures/html_formatter/expected.html