rubocop 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82c2dad15c79e06c81a7f3bb945c2086d18ac7f6
-  data.tar.gz: ebe3136adc26d0eeddc507e977239efa9ac772b1
+  metadata.gz: b7123eae3f7c324c84d026c2aeb11ebddb376064
+  data.tar.gz: 18fe22cdfb3bebefc347a49510eddfc2ef5bc39b
 SHA512:
-  metadata.gz: c52ae88687c5aa6fd5048689592f311c0da53c89b8da0423f4632861bc11ea6b95a1759e0fccb4981a300a615a15aadae1e8bd8849231aeeeab3e91c26b92883
-  data.tar.gz: 9e844e818bf7891135442313b7807417ade15c002334e982c07fa49baaa82e6960e9cfe40056dc76f6552d501a75a8a4391167cac68a34f923cbdd412f6a56ff
+  metadata.gz: d3435aa3b04824630ecccfbc802c7d4ef8c74f4d8b0c7d697cd2e2b6d535ca0c6e7953ddb2a2f741303f3fc307776725053c6d9e3dc7b7a61d4e73811cadf6bb
+  data.tar.gz: dbc6fd5c8ab02d9f759c416d6a2e111f2715c4a9cb93620980e6bd8dac59b03d3b5c1b349fd59b86f0693b0dff9b66f1924870868e58c2a1245a5d90158c00d1

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## master (unreleased)
 
+## 0.19.1 (17/03/2014)
+
+### Bugs fixed
+
+* [#884](https://github.com/bbatsov/rubocop/issues/884): Fix --auto-gen-config for `NumericLiterals` so MinDigits is correct. ([@tmorris-fiksu][])
+* [#879](https://github.com/bbatsov/rubocop/issues/879): Fix --auto-gen-config for `RegexpLiteral` so we don't generate illegal values for `MaxSlashes`. ([@jonas054][])
+* Fix the name of the `Include` param in the default config of the Rails cops. ([@bbatsov][])
+* [#878](https://github.com/bbatsov/rubocop/pull/878): Blacklist `Rakefile`, `Gemfile` and `Capfile` by default in the `FileName` cop. ([@bbatsov][])
+* [#875](https://github.com/bbatsov/rubocop/issues/875): Handle `separator` style hashes in `IndentHash`. ([@jonas054][])
+* Fix a bug where multiple cli options that result in exit can be specified at once (e.g. `-vV`, `-v --show-cops`). ([@jkogara][])
+* [#889](https://github.com/bbatsov/rubocop/issues/889): Fix a false positive for `LiteralInCondition` when the condition is non-primitive array. ([@bbatsov][])
+
+## 0.19.0 (13/03/2014)
+
 ### New features
 
 * New cop `FileName` makes sure that source files have snake_case names. ([@bbatsov][])
@@ -61,6 +75,7 @@
 * [#862](https://github.com/bbatsov/rubocop/issues/862): Fix a bug where single line `rubocop:disable` comments with indentations were treated as multiline cop disabling comments. ([@yujinakayama][])
 * Fix a bug where `rubocop:disable` comments with a cop name including `all` (e.g. `MethodCallParentheses`) were disabling all cops. ([@yujinakayama][])
 * Fix a bug where string and regexp literals including `# rubocop:disable` were confused with real comments. ([@yujinakayama][])
+* [#877](https://github.com/bbatsov/rubocop/issues/877): Fix bug in `PercentLiteralDelimiters` concerning auto-correct of regular expressions with interpolation. ([@hannestyden][])
 
 ## 0.18.1 (02/02/2014)
 
@@ -349,7 +364,7 @@
 
 * [#449](https://github.com/bbatsov/rubocop/issues/449): Remove whitespaces between condition and `do` with `WhileUntilDo` auto-correction.
 * Continue with file inspection after parser warnings. Give up only on syntax errors.
-* Don’t trigger the HashSyntax cop on digit-starting keys.
+* Don't trigger the HashSyntax cop on digit-starting keys.
 * Fix crashes while inspecting class definition subclassing another class stored in a local variable in `UselessAssignment` (formerly of `UnusedLocalVariable`) and `ShadowingOuterLocalVariable` (like `clazz = Array; class SomeClass < clazz; end`).
 * [#463](https://github.com/bbatsov/rubocop/issues/463): Do not warn if using destructuring in second `reduce` argument (`ReduceArguments`).
 
@@ -755,3 +770,5 @@
 [@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

data/README.md

@@ -70,6 +70,12 @@ automatically fix some of the problems for you.
 $ gem install rubocop
 ```
 
+If you'd rather install RuboCop using `bundler`, don't require it in your `Gemfile`:
+
+```
+gem 'rubocop', require: false
+```
+
 ## Basic Usage
 
 Running `rubocop` with no arguments will check all Ruby source files
@@ -259,14 +265,14 @@ 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,
-which paths match `app/models/*.rb`). All cops support the
+instance you might want to run some Rails model checks only on files whose
+paths match `app/models/*.rb`). All cops support the
 `Include` param.
 
 ```yaml
 DefaultScope:
   Include:
-    - app/models
+    - app/models/*.rb
 ```
 
 Cops can also exclude only specific sets of files when that's needed (for

data/config/default.yml

@@ -200,6 +200,12 @@ EndAlignment:
     - keyword
     - variable
 
+FileName:
+  Exclude:
+    - Rakefile
+    - Gemfile
+    - Capfile
+
 # Checks use of for or each in multiline loops.
 For:
   EnforcedStyle: each
@@ -420,26 +426,26 @@ ActionFilter:
   SupportedStyles:
     - action
     - filter
-  IncludePaths:
-    -app/controllers
+  Include:
+    - app/controllers/*.rb
 
 DefaultScope:
-  IncludePaths:
-    - app/models
+  Include:
+    - app/models/*.rb
 
 HasAndBelongsToMany:
-  IncludePaths:
-    - app/models
+  Include:
+    - app/models/*.rb
 
 ReadAttribute:
-  IncludePaths:
-    - app/models
+  Include:
+    - app/models/*.rb
 
 ScopeArgs:
-  IncludePaths:
-    - app/models
+  Include:
+    - app/models/*.rb
 
 Validation:
-  IncludePaths:
-    - app/models
+  Include:
+    - app/models/*.rb
 

data/lib/rubocop/cli.rb

@@ -52,10 +52,7 @@ module Rubocop
     private
 
     def act_on_options(args)
-      if @options[:show_cops]
-        print_available_cops
-        exit(0)
-      end
+      handle_exiting_options
 
       ConfigLoader.debug = @options[:debug]
       ConfigLoader.auto_gen_config = @options[:auto_gen_config]
@@ -63,10 +60,15 @@ module Rubocop
       @config_store.options_config = @options[:config] if @options[:config]
 
       Rainbow.enabled = false unless @options[:color]
+    end
+
+    def handle_exiting_options
+      return unless Options::EXITING_OPTIONS.any? { |o| @options.key? o }
 
       puts Rubocop::Version.version(false) if @options[:version]
       puts Rubocop::Version.version(true) if @options[:verbose_version]
-      exit(0) if @options[:version] || @options[:verbose_version]
+      print_available_cops if @options[:show_cops]
+      exit(0)
     end
 
     def print_available_cops

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

@@ -23,6 +23,8 @@ module Rubocop
         LITERALS = [:str, :dstr, :int, :float, :array,
                     :hash, :regexp, :nil, :true, :false]
 
+        BASIC_LITERALS = LITERALS - [:dstr, :array, :hash]
+
         def on_if(node)
           check_for_literal(node)
         end
@@ -45,8 +47,9 @@ module Rubocop
 
         def on_case(node)
           cond, *whens, _else = *node
+
           if cond
-            handle_node(cond)
+            check_case_cond(cond)
           else
             whens.each do |when_node|
               check_for_literal(when_node)
@@ -85,6 +88,18 @@ module Rubocop
           LITERALS.include?(node.type)
         end
 
+        def basic_literal?(node)
+          if node && node.type == :array
+            primitive_array?(node)
+          else
+            BASIC_LITERALS.include?(node.type)
+          end
+        end
+
+        def primitive_array?(node)
+          node.children.all? { |n| basic_literal?(n) }
+        end
+
         def check_node(node)
           return unless node
 
@@ -110,6 +125,13 @@ module Rubocop
             check_node(node)
           end
         end
+
+        def check_case_cond(node)
+          return if node.type == :array && !primitive_array?(node)
+          return if node.type == :dstr
+
+          handle_node(node)
+        end
       end
     end
   end

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

@@ -51,16 +51,40 @@ module Rubocop
           left_brace = hash_node.loc.begin
           return if first_pair.loc.expression.line == left_brace.line
 
+          if separator_style?(first_pair)
+            check_based_on_longest_key(hash_node.children, left_brace,
+                                       left_parenthesis)
+          else
+            check_first_pair(first_pair, left_brace, left_parenthesis, 0)
+          end
+        end
+
+        def separator_style?(first_pair)
+          separator = first_pair.loc.operator
+          key = "Enforced#{separator.is?(':') ? 'Colon' : 'HashRocket'}Style"
+          config.for_cop('AlignHash')[key] == 'separator'
+        end
+
+        def check_based_on_longest_key(pairs, left_brace, left_parenthesis)
+          key_lengths = pairs.map do |pair|
+            pair.children.first.loc.expression.length
+          end
+          check_first_pair(pairs.first, left_brace, left_parenthesis,
+                           key_lengths.max - key_lengths.first)
+        end
+
+        def check_first_pair(first_pair, left_brace, left_parenthesis, offset)
           column = first_pair.loc.expression.column
           @column_delta =
-            expected_column(left_brace, left_parenthesis) - column
+            expected_column(left_brace, left_parenthesis, offset) - column
 
           if @column_delta == 0
             correct_style_detected
           else
             add_offense(first_pair, :expression,
                         message(base_description(left_parenthesis))) do
-              if column == unexpected_column(left_brace, left_parenthesis)
+              if column == unexpected_column(left_brace, left_parenthesis,
+                                             offset)
                 opposite_style_detected
               else
                 unrecognized_style_detected
@@ -70,7 +94,7 @@ module Rubocop
         end
 
         # Returns the expected, or correct indentation.
-        def expected_column(left_brace, left_parenthesis)
+        def expected_column(left_brace, left_parenthesis, offset)
           base_column =
             if left_parenthesis && style == :special_inside_parentheses
               left_parenthesis.column + 1
@@ -78,7 +102,7 @@ module Rubocop
               left_brace.source_line =~ /\S/
             end
 
-          base_column + IndentationWidth::CORRECT_INDENTATION
+          base_column + IndentationWidth::CORRECT_INDENTATION + offset
         end
 
         # Returns the description of what the correct indentation is based on.
@@ -92,7 +116,7 @@ module Rubocop
 
         # Returns the "unexpected column", which is the column that would be
         # correct if the configuration was changed.
-        def unexpected_column(left_brace, left_parenthesis)
+        def unexpected_column(left_brace, left_parenthesis, offset)
           # Set a crazy value by default, indicating that there's no other
           # configuration that can be chosen to make the used indentation
           # accepted.
@@ -106,7 +130,8 @@ module Rubocop
                                      end
           end
 
-          unexpected_base_column + IndentationWidth::CORRECT_INDENTATION
+          unexpected_base_column + IndentationWidth::CORRECT_INDENTATION +
+            offset
         end
 
         def message(base_description)

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

@@ -37,7 +37,7 @@ module Rubocop
           if int.size >= min_digits
             case int
             when /^\d+$/
-              add_offense(node, :expression) { self.max = int.size }
+              add_offense(node, :expression) { self.max = int.size + 1 }
             when /\d{4}/, /_\d{1,2}_/
               add_offense(node, :expression) do
                 self.config_to_allow_offenses = { 'Enabled' => false }

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

@@ -43,13 +43,7 @@ module Rubocop
           opening_newline = new_line(node.loc.begin, node.children.first)
           closing_newline = new_line(node.loc.end, node.children.last)
 
-          expression, reg_opt =
-              if node.type == :regexp
-                [contents(node.children.first), contents(node.children.last)]
-              else
-                [contents(node), '']
-              end
-
+          expression, reg_opt = *contents(node)
           corrected_source =
             type + opening_delimiter + opening_newline +
             expression +
@@ -91,19 +85,35 @@ module Rubocop
         end
 
         def contents(node)
-          if node.children.empty?
-            ''
-          elsif node.children.first.is_a?(Parser::AST::Node)
-            Parser::Source::Range.new(
-              node.loc.expression.source_buffer,
-              node.children.first.loc.expression.begin_pos,
-              node.children.last.loc.expression.end_pos
-            ).source
+          first_child, *middle, last_child = *node
+          last_child ||= first_child
+          if node.type == :regexp
+            *_, next_to_last_child = *middle
+            next_to_last_child ||= first_child
+            [
+              source(node, first_child, next_to_last_child),
+              last_child.loc.expression.source
+            ]
           else
-            node.children.first.to_s
+            [
+              if first_child.is_a?(Parser::AST::Node)
+                source(node, first_child, last_child)
+              else
+                first_child.to_s
+              end,
+              ''
+            ]
           end
         end
 
+        def source(node, begin_node, end_node)
+          Parser::Source::Range.new(
+            node.loc.expression.source_buffer,
+            begin_node.loc.expression.begin_pos,
+            end_node.loc.expression.end_pos
+          ).source
+        end
+
         def uses_preferred_delimiter?(node, type)
           preferred_delimiters(type)[0] == begin_source(node)[-1]
         end

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

@@ -61,7 +61,11 @@ module Rubocop
             end
           end
 
-          cfg['MaxSlashes'] = value
+          if value >= 0
+            cfg['MaxSlashes'] = value
+          else
+            self.config_to_allow_offenses = { 'Enabled' => false }
+          end
         end
 
         def error_message(word)

data/lib/rubocop/options.rb

@@ -6,6 +6,7 @@ module Rubocop
   # This class handles command line options.
   class Options
     DEFAULT_FORMATTER = 'progress'
+    EXITING_OPTIONS = [:version, :verbose_version, :show_cops]
 
     def initialize
       @options = {}
@@ -34,6 +35,10 @@ module Rubocop
         add_boolean_flags(opts)
       end.parse!(args)
 
+      if (incompat = @options.keys & EXITING_OPTIONS).size > 1
+        fail ArgumentError, "Incompatible cli options: #{incompat.inspect}"
+      end
+
       [@options, args]
     end
 

data/lib/rubocop/version.rb

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

data/relnotes/{0.19.0.md → v0.19.0.md}

@@ -68,3 +68,27 @@ Below is the list of all the gory details. Enjoy!
 * [#862](https://github.com/bbatsov/rubocop/issues/862): Fix a bug where single line `rubocop:disable` comments with indentations were treated as multiline cop disabling comments. ([@yujinakayama][])
 * Fix a bug where `rubocop:disable` comments with a cop name including `all` (e.g. `MethodCallParentheses`) were disabling all cops. ([@yujinakayama][])
 * Fix a bug where string and regexp literals including `# rubocop:disable` were confused with real comments. ([@yujinakayama][])
+
+[@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

data/relnotes/v0.19.1.md

@@ -0,0 +1,16 @@
+RuboCop 0.19.1 is a bugfix-only release. Below is a list of the bugs we've fixed since 0.19.0:
+
+### Bugs fixed
+
+* [#884](https://github.com/bbatsov/rubocop/issues/884): Fix --auto-gen-config for `NumericLiterals` so MinDigits is correct. ([@tmorris-fiksu][])
+* [#879](https://github.com/bbatsov/rubocop/issues/879): Fix --auto-gen-config for `RegexpLiteral` so we don't generate illegal values for `MaxSlashes`. ([@jonas054][])
+* Fix the name of the `Include` param in the default config of the Rails cops. ([@bbatsov][])
+* [#878](https://github.com/bbatsov/rubocop/pull/878): Blacklist `Rakefile`, `Gemfile` and `Capfile` by default in the `FileName` cop. ([@bbatsov][])
+* [#875](https://github.com/bbatsov/rubocop/issues/875): Handle `separator` style hashes in `IndentHash`. ([@jonas054][])
+* Fix a bug where multiple cli options that result in exit can be specified at once (e.g. `-vV`, `-v --show-cops`). ([@jkogara][])
+* [#889](https://github.com/bbatsov/rubocop/issues/889): Fix a false positive for `LiteralInCondition` when the condition is non-primitive array. ([@bbatsov][])
+
+[@bbatsov]: https://github.com/bbatsov
+[@jonas054]: https://github.com/jonas054
+[@jkogara]: https://github.com/jkogara
+[@tmorris-fiksu]: https://github.com/tmorris-fiksu

data/rubocop-todo.yml

@@ -8,7 +8,7 @@
 # Offense count: 6
 # Configuration parameters: CountComments.
 ClassLength:
-  Max: 125
+  Max: 130
 
 # Offense count: 16
 CyclomaticComplexity:

data/spec/rubocop/cli_spec.rb

@@ -321,6 +321,30 @@ describe Rubocop::CLI, :isolated_environment do
                   ''].join("\n"))
       end
 
+      it 'can correct IndentHash offenses with separator style' do
+        create_file('example.rb',
+                    ['# encoding: utf-8',
+                     'CONVERSION_CORRESPONDENCE = {',
+                     '              match_for_should: :match,',
+                     '          match_for_should_not: :match_when_negated,',
+                     '    failure_message_for_should: :failure_message,',
+                     'failure_message_for_should_not: :failure_message_when',
+                     '}'])
+        create_file('.rubocop.yml',
+                    ['AlignHash:',
+                     '  EnforcedColonStyle: separator'])
+        expect(cli.run(%w(--auto-correct))).to eq(1)
+        expect(IO.read('example.rb'))
+          .to eq(['# encoding: utf-8',
+                  'CONVERSION_CORRESPONDENCE = {',
+                  '                match_for_should: :match,',
+                  '            match_for_should_not: :match_when_negated,',
+                  '      failure_message_for_should: :failure_message,',
+                  '  failure_message_for_should_not: :failure_message_when',
+                  '}',
+                  ''].join("\n"))
+      end
+
       it 'should not hang SpaceAfterPunctuation and SpaceInsideParens' do
         create_file('example.rb',
                     ['# encoding: utf-8',
@@ -1086,11 +1110,19 @@ describe Rubocop::CLI, :isolated_environment do
       create_file('dir1/app/models/example1.rb', ['# encoding: utf-8',
                                                   'read_attribute(:test)'])
       create_file('dir1/.rubocop.yml', ['AllCops:',
-                                        '  RunRailsCops: true'])
+                                        '  RunRailsCops: true',
+                                        '',
+                                        'ReadAttribute:',
+                                        '  Include:',
+                                        '    - dir1/app/models/*.rb'])
       create_file('dir2/app/models/example2.rb', ['# encoding: utf-8',
                                                   'read_attribute(:test)'])
       create_file('dir2/.rubocop.yml', ['AllCops:',
-                                        '  RunRailsCops: false'])
+                                        '  RunRailsCops: false',
+                                        '',
+                                        'ReadAttribute:',
+                                        '  Include:',
+                                        '    - dir2/app/models/*.rb'])
       expect(cli.run(%w(--format simple dir1 dir2))).to eq(1)
       expect($stdout.string)
         .to eq(['== dir1/app/models/example1.rb ==',

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

@@ -115,4 +115,40 @@ describe Rubocop::Cop::Lint::LiteralInCondition do
       expect(cop.offenses).to be_empty
     end
   end
+
+  it 'accepts array literal in case, if it has non-literal elements' do
+    inspect_source(cop,
+                   ['case [1, 2, x]',
+                    'when [1, 2, 5] then top',
+                    'end'
+                   ])
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts array literal in case, if it has non-literal elements' do
+    inspect_source(cop,
+                   ['case [1, 2, [x, 1]]',
+                    'when [1, 2, 5] then top',
+                    'end'
+                   ])
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'registers an offense for case with a primitive array condition' do
+    inspect_source(cop,
+                   ['case [1, 2, [3, 4]]',
+                    'when [1, 2, 5] then top',
+                    'end'
+                   ])
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'accepts dstr literal in case' do
+    inspect_source(cop,
+                   ['case "#{x}"',
+                    'when [1, 2, 5] then top',
+                    'end'
+                   ])
+    expect(cop.offenses).to be_empty
+  end
 end

data/spec/rubocop/cop/rails/action_filter_spec.rb

@@ -10,28 +10,28 @@ describe Rubocop::Cop::Rails::ActionFilter, :config do
 
     described_class::FILTER_METHODS.each do |method|
       it "registers an offense for #{method}" do
-        inspect_source(cop,
-                       ["#{method} :name"])
+        inspect_source_file(cop,
+                            ["#{method} :name"])
         expect(cop.offenses.size).to eq(1)
       end
 
       it "registers an offense for #{method} with block" do
-        inspect_source(cop,
-                       ["#{method} { |controller| something }"])
+        inspect_source_file(cop,
+                            ["#{method} { |controller| something }"])
         expect(cop.offenses.size).to eq(1)
       end
     end
 
     described_class::ACTION_METHODS.each do |method|
       it "accepts #{method}" do
-        inspect_source(cop,
-                       ["#{method} :something"])
+        inspect_source_file(cop,
+                            ["#{method} :something"])
         expect(cop.offenses).to be_empty
       end
     end
 
     it 'auto-corrects to preferred method' do
-      new_source = autocorrect_source(cop, 'before_filter :test')
+      new_source = autocorrect_source_file(cop, 'before_filter :test')
       expect(new_source).to eq('before_action :test')
     end
   end
@@ -41,28 +41,28 @@ describe Rubocop::Cop::Rails::ActionFilter, :config do
 
     described_class::ACTION_METHODS.each do |method|
       it "registers an offense for #{method}" do
-        inspect_source(cop,
-                       ["#{method} :name"])
+        inspect_source_file(cop,
+                            ["#{method} :name"])
         expect(cop.offenses.size).to eq(1)
       end
 
       it "registers an offense for #{method} with block" do
-        inspect_source(cop,
-                       ["#{method} { |controller| something }"])
+        inspect_source_file(cop,
+                            ["#{method} { |controller| something }"])
         expect(cop.offenses.size).to eq(1)
       end
     end
 
     described_class::FILTER_METHODS.each do |method|
       it "accepts #{method}" do
-        inspect_source(cop,
-                       ["#{method} :something"])
+        inspect_source_file(cop,
+                            ["#{method} :something"])
         expect(cop.offenses).to be_empty
       end
     end
 
     it 'auto-corrects to preferred method' do
-      new_source = autocorrect_source(cop, 'before_action :test')
+      new_source = autocorrect_source_file(cop, 'before_action :test')
       expect(new_source).to eq('before_filter :test')
     end
   end

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

@@ -2,10 +2,82 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::IndentHash, :config do
+describe Rubocop::Cop::Style::IndentHash do
   subject(:cop) { described_class.new(config) }
+  let(:config) do
+    supported_styles = {
+      'SupportedStyles' => %w(special_inside_parentheses consistent)
+    }
+    Rubocop::Config.new('AlignHash' => align_hash_config,
+                        'IndentHash' => cop_config.merge(supported_styles))
+  end
+  let(:align_hash_config) do
+    {
+      'Enabled' => true,
+      'EnforcedColonStyle' => 'key',
+      'EnforcedHashRocketStyle' => 'key'
+    }
+  end
   let(:cop_config) { { 'EnforcedStyle' => 'special_inside_parentheses' } }
 
+  context 'when the AlignHash style is separator for :' do
+    let(:align_hash_config) do
+      {
+        'Enabled' => true,
+        'EnforcedColonStyle' => 'separator',
+        'EnforcedHashRocketStyle' => 'key'
+      }
+    end
+
+    it 'accepts correctly indented first pair' do
+      inspect_source(cop,
+                     ['a << {',
+                      '    a: 1,',
+                      '  aaa: 222',
+                      '}'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for incorrectly indented first pair with :' do
+      inspect_source(cop,
+                     ['a << {',
+                      '       a: 1,',
+                      '     aaa: 222',
+                      '}'])
+      expect(cop.highlights).to eq(['a: 1'])
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
+    end
+  end
+
+  context 'when the AlignHash style is separator for =>' do
+    let(:align_hash_config) do
+      {
+        'Enabled' => true,
+        'EnforcedColonStyle' => 'key',
+        'EnforcedHashRocketStyle' => 'separator'
+      }
+    end
+
+    it 'accepts correctly indented first pair' do
+      inspect_source(cop,
+                     ['a << {',
+                      "    'a' => 1,",
+                      "  'aaa' => 222",
+                      '}'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for incorrectly indented first pair with =>' do
+      inspect_source(cop,
+                     ['a << {',
+                      "   'a' => 1,",
+                      " 'aaa' => 222",
+                      '}'])
+      expect(cop.highlights).to eq(["'a' => 1"])
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
+    end
+  end
+
   context 'when hash is operand' do
     it 'accepts correctly indented first pair' do
       inspect_source(cop,

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

@@ -6,12 +6,20 @@ describe Rubocop::Cop::Style::NumericLiterals, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'MinDigits' => 5 } }
 
-  it 'registers an offense for a long integer without underscores' do
-    inspect_source(cop, ['a = 123456'])
+  it 'registers an offense for a long undelimited integer' do
+    inspect_source(cop, ['a = 12345'])
     expect(cop.offenses.size).to eq(1)
     expect(cop.config_to_allow_offenses).to eq('MinDigits' => 6)
   end
 
+  it 'registers an offense for a float with a long undelimited integer part' do
+    pending 'Though the offense message implies that floats are checked, ' \
+            'currently the cop only detects integers.'
+    inspect_source(cop, ['a = 123456.789'])
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.config_to_allow_offenses).to eq('MinDigits' => 7)
+  end
+
   it 'registers an offense for an integer with misplaced underscore' do
     inspect_source(cop, ['a = 123_456_78_90_00'])
     expect(cop.offenses.size).to eq(1)

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

@@ -236,6 +236,18 @@ describe Rubocop::Cop::Style::PercentLiteralDelimiters, :config do
       expect(new_source).to eq('%r[.*]')
     end
 
+    it 'fixes a string with interpolation' do
+      original_source = '%Q|#{with_interpolation}|'
+      new_source = autocorrect_source(cop, original_source)
+      expect(new_source).to eq('%Q[#{with_interpolation}]')
+    end
+
+    it 'fixes a regular expression with interpolation' do
+      original_source = '%r|#{with_interpolation}|'
+      new_source = autocorrect_source(cop, original_source)
+      expect(new_source).to eq('%r[#{with_interpolation}]')
+    end
+
     it 'fixes a regular expression with option' do
       original_source = '%r(.*)i'
       new_source = autocorrect_source(cop, original_source)

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

@@ -35,7 +35,7 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
       expect(cop.messages)
         .to eq(['Use %r only for regular expressions matching more ' \
                 "than 0 '/' characters."])
-      expect(cop.config_to_allow_offenses).to eq('MaxSlashes' => -1)
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
     it 'accepts %r regexp with one slash' do
@@ -92,7 +92,7 @@ describe Rubocop::Cop::Style::RegexpLiteral, :config do
       expect(cop.messages)
         .to eq(['Use %r only for regular expressions matching more ' \
                 "than 1 '/' character."] * 2)
-      expect(cop.config_to_allow_offenses).to eq('MaxSlashes' => -1)
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
     it 'accepts %r regexp with two or more slashes' do

data/spec/rubocop/cop/team_spec.rb

@@ -39,7 +39,7 @@ describe Rubocop::Cop::Team do
   describe '#inspect_file', :isolated_environment do
     include FileHelper
 
-    let(:file_path) { 'example.rb' }
+    let(:file_path) { '/tmp/example.rb' }
     let(:offenses) { team.inspect_file(file_path) }
 
     before do

data/spec/rubocop/options_spec.rb

@@ -99,6 +99,33 @@ Usage: rubocop [options] [file1, file2, ...]
       end
     end
 
+    describe 'incompatible cli options' do
+      it 'fails with argument correct error' do
+        msg = 'Incompatible cli options: [:version, :verbose_version]'
+        expect { options.parse %w(-vV) }
+          .to raise_error(ArgumentError, msg)
+      end
+
+      it 'fails with argument correct error' do
+        msg = 'Incompatible cli options: [:version, :show_cops]'
+        expect { options.parse %w(-v --show-cops) }
+          .to raise_error(ArgumentError, msg)
+      end
+
+      it 'fails with argument correct error' do
+        msg = 'Incompatible cli options: [:verbose_version, :show_cops]'
+        expect { options.parse %w(-V --show-cops) }
+          .to raise_error(ArgumentError, msg)
+      end
+
+      it 'fails with argument correct error' do
+        msg = ['Incompatible cli options: [:version, :verbose_version,',
+               ' :show_cops]'].join
+        expect { options.parse %w(-vV --show-cops) }
+          .to raise_error(ArgumentError, msg)
+      end
+    end
+
     describe '--only' do
       it 'exits with error if an incorrect cop name is passed' do
         expect { options.parse(%w(--only 123)) }

data/spec/spec_helper.rb

@@ -60,12 +60,20 @@ module ExitCodeMatchers
 end
 
 RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
   broken_filter = lambda do |v|
     v.is_a?(Symbol) ? RUBY_ENGINE == v.to_s : v
   end
   config.filter_run_excluding ruby: ->(v) { !RUBY_VERSION.start_with?(v.to_s) }
   config.filter_run_excluding broken: broken_filter
-  config.treat_symbols_as_metadata_keys_with_true_values = true
 
   config.expect_with :rspec do |c|
     c.syntax = :expect # disables `should`
@@ -102,9 +110,13 @@ def parse_source(source, file = nil)
   end
 end
 
-def autocorrect_source(cop, source)
+def autocorrect_source_file(cop, source)
+  Tempfile.open('tmp') { |f| autocorrect_source(cop, source, f) }
+end
+
+def autocorrect_source(cop, source, file = nil)
   cop.instance_variable_get(:@options)[:auto_correct] = true
-  processed_source = parse_source(source)
+  processed_source = parse_source(source, file)
   _investigate(cop, processed_source)
 
   corrector =

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Bozhidar Batsov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -410,7 +410,8 @@ files:
 - lib/rubocop/target_finder.rb
 - lib/rubocop/token.rb
 - lib/rubocop/version.rb
-- relnotes/0.19.0.md
+- relnotes/v0.19.0.md
+- relnotes/v0.19.1.md
 - rubocop-todo.yml
 - rubocop.gemspec
 - spec/.rubocop.yml