rubocop 0.18.1 → 0.19.0

data/lib/rubocop/options.rb

@@ -45,10 +45,11 @@ module Rubocop
                    '  [p]rogress (default)',
                    '  [s]imple',
                    '  [c]lang',
+                   '  [fu]ubar',
                    '  [e]macs',
                    '  [j]son',
-                   '  [f]iles',
-                   '  [o]ffences',
+                   '  [fi]les',
+                   '  [o]ffenses',
                    '  custom formatter class name']
 
     def add_formatting_options(opts, args)
@@ -88,10 +89,10 @@ module Rubocop
       option(opts, '-d', '--debug', 'Display debug info.')
       option(opts,
              '-D', '--display-cop-names',
-             'Display cop names in offence messages.')
+             'Display cop names in offense messages.')
       option(opts, '-R', '--rails', 'Run extra Rails cops.')
       option(opts, '-l', '--lint', 'Run only lint cops.')
-      option(opts, '-a', '--auto-correct', 'Auto-correct offences.')
+      option(opts, '-a', '--auto-correct', 'Auto-correct offenses.')
 
       @options[:color] = true
       opts.on('-n', '--no-color', 'Disable color output.') do
@@ -124,7 +125,7 @@ module Rubocop
       rejected = args.reject! { |a| %w(-s --silent).include?(a) }
       if rejected
         warn '-s/--silent options is dropped. ' \
-          '`emacs` and `files` formatters no longer display summary.'
+             '`emacs` and `files` formatters no longer display summary.'
       end
     end
 
@@ -156,8 +157,8 @@ module Rubocop
 
     def validate_auto_gen_config_option(args)
       if args.any?
-        fail ArgumentError,
-             '--auto-gen-config can not be combined with any other arguments.'
+        warn '--auto-gen-config can not be combined with any other arguments.'
+        exit(1)
       end
     end
   end

data/lib/rubocop/processed_source.rb

@@ -5,8 +5,8 @@ module Rubocop
   # and other information such as disabled lines for cops.
   # It also provides a convenient way to access source lines.
   class ProcessedSource
-    attr_reader :buffer, :ast, :comments, :tokens, :diagnostics
-    attr_accessor :disabled_lines_for_cops
+    attr_reader :buffer, :ast, :comments, :tokens, :diagnostics,
+                :comment_config
 
     def initialize(buffer, ast, comments, tokens, diagnostics)
       @buffer = buffer
@@ -14,6 +14,7 @@ module Rubocop
       @comments = comments
       @tokens = tokens
       @diagnostics = diagnostics
+      @comment_config = CommentConfig.new(self)
     end
 
     def lines

data/lib/rubocop/source_parser.rb

@@ -4,25 +4,13 @@ module Rubocop
   # SourceParser provides a way to parse Ruby source with Parser gem
   # and also parses comment directives which disable arbitrary cops.
   module SourceParser
-    COMMENT_DIRECTIVE_REGEXP = Regexp.new(
-      '^.*?(\S)?.*# rubocop : ((?:dis|en)able)\b ((?:\w+,? )+)'
-        .gsub(' ', '\s*')
-    )
-
     module_function
 
-    def parse(string, name = '(string)')
-      processed_source = parse_with_parser(string, name)
-      processed_source.disabled_lines_for_cops =
-        cop_disabled_lines_in(processed_source.lines)
-      processed_source
-    end
-
     def parse_file(path)
       parse(File.read(path), path)
     end
 
-    def parse_with_parser(string, name)
+    def parse(string, name = '(string)')
       source_buffer = Parser::Source::Buffer.new(name, 1)
       source_buffer.source = string
 
@@ -55,51 +43,5 @@ module Rubocop
 
       parser
     end
-
-    def cop_disabled_lines_in(source_lines)
-      disabled_lines_for_cops = {}
-      current_disabled_cops = {}
-
-      source_lines.each_with_index do |line, index|
-        line_number = index + 1
-
-        each_mentioned_cop(line) do |cop_name, disabled, single_line|
-          if single_line
-            next unless disabled
-            disabled_lines_for_cops[cop_name] ||= []
-            disabled_lines_for_cops[cop_name] << line_number
-          else
-            current_disabled_cops[cop_name] = disabled
-          end
-        end
-
-        current_disabled_cops.each do |cop_name, disabled|
-          next unless disabled
-          disabled_lines_for_cops[cop_name] ||= []
-          disabled_lines_for_cops[cop_name] << line_number
-        end
-      end
-
-      disabled_lines_for_cops
-    end
-
-    def each_mentioned_cop(line)
-      match = line.match(COMMENT_DIRECTIVE_REGEXP)
-
-      return unless match
-
-      non_whitespace_before_comment, switch, cops_string = match.captures
-
-      if cops_string.include?('all')
-        cop_names = Cop::Cop.all.map(&:cop_name)
-      else
-        cop_names = cops_string.split(/,\s*/)
-      end
-
-      disabled = (switch == 'disable')
-      single_line = !non_whitespace_before_comment.nil?
-
-      cop_names.each { |cop_name| yield cop_name, disabled, single_line }
-    end
   end
 end

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module Rubocop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.18.1'
+    STRING = '0.19.0'
 
     MSG = '%s (using Parser %s, running on %s %s %s)'
 
@@ -11,8 +11,8 @@ module Rubocop
 
     def version(debug = false)
       if debug
-        sprintf(MSG, STRING, Parser::VERSION,
-                RUBY_ENGINE, RUBY_VERSION, RUBY_PLATFORM)
+        format(MSG, STRING, Parser::VERSION,
+               RUBY_ENGINE, RUBY_VERSION, RUBY_PLATFORM)
       else
         STRING
       end

data/relnotes/0.19.0.md

@@ -0,0 +1,70 @@
+This is the biggest RuboCop release we've done in a while. The highlights include
+about a dozen new cops, more cop configuration options, improved auto-correct and so many bugfixes.
+
+You'll might note that we changed the use of `offence` with `offense`. This was done to keep the spelling
+in our code consistent. Hopefully this won't cause anyone problems, but we're obliged to mention it as
+the `Offence` class itself got renamed.
+
+Below is the list of all the gory details. Enjoy!
+
+## RuboCop 0.19.0
+
+### New features
+
+* New cop `FileName` makes sure that source files have snake_case names. ([@bbatsov][])
+* New cop `DeprecatedClassMethods` checks for deprecated class methods. ([@bbatsov][])
+* New cop `StringConversionInInterpolation` checks for redundant `Object#to_s` in string interpolation. ([@bbatsov][])
+* New cop `LiteralInInterpolation` checks for interpolated string literals. ([@bbatsov][])
+* New cop `SelfAssignment` checks for places where the self-assignment shorthand should have been used. ([@bbatsov][])
+* New cop `DoubleNegation` checks for uses of `!!`. ([@bbatsov][])
+* New cop `PercentLiteralDelimiters` enforces consistent usage of `%`-literal delimiters. ([@hannestyden][])
+* New Rails cop `ActionFilter` enforces the use of `_filter` or `_action` action filter methods. ([@bbatsov][])
+* New Rails cop `ScopeArgs` makes sure you invoke the `scope` method properly. ([@bbatsov][])
+* Add `with_fixed_indentation` style to `AlignParameters` cop. ([@hannestyden][])
+* Add `IgnoreLastArgumentHash` option to `AlignHash` cop. ([@hannestyden][])
+* [#743](https://github.com/bbatsov/rubocop/issues/743): `SingleLineMethods` cop does auto-correction. ([@jonas054][])
+* [#743](https://github.com/bbatsov/rubocop/issues/743): `Semicolon` cop does auto-correction. ([@jonas054][])
+* [#743](https://github.com/bbatsov/rubocop/issues/743): `EmptyLineBetweenDefs` cop does auto-correction. ([@jonas054][])
+* [#743](https://github.com/bbatsov/rubocop/issues/743): `IndentationWidth` cop does auto-correction. ([@jonas054][])
+* [#743](https://github.com/bbatsov/rubocop/issues/743): `IndentationConsistency` cop does auto-correction. ([@jonas054][])
+* [#809](https://github.com/bbatsov/rubocop/issues/809): New formatter `fuubar` displays a progress bar and shows details of offenses as soon as they are detected. ([@yujinakayama][])
+* [#797](https://github.com/bbatsov/rubocop/issues/797): New cop `IndentHash` checks the indentation of the first key in multi-line hash literals. ([@jonas054][])
+* [#797](https://github.com/bbatsov/rubocop/issues/797): New cop `IndentArray` checks the indentation of the first element in multi-line array literals. ([@jonas054][])
+* [#806](https://github.com/bbatsov/rubocop/issues/806): Now excludes files in `vendor/**` by default. ([@jeremyolliver][])
+* [#795](https://github.com/bbatsov/rubocop/issues/795): `IfUnlessModifier` and `WhileUntilModifier` supports `MaxLineLength`, which is independent of `LineLength` parameter `Max`. ([@agrimm][])
+* [#868](https://github.com/bbatsov/rubocop/issues/868): New cop `ClassAndModuleChildren` checks the style of children definitions at classes and modules: nested / compact. ([@geniou][])
+
+### Changes
+
+* [#793](https://github.com/bbatsov/rubocop/issues/793): Add printing total count when `rubocop --format offences`. ([@ma2gedev][])
+* Remove `Ignore` param from the Rails `Output` cop. The standard `Exclude/Include` should be used instead. ([@bbatsov][])
+* Renamed `FavorSprintf` to `FormatString` and made it configurable. ([@bbatsov][])
+* Renamed `Offence` to `Offense`. ([@bbatsov][])
+* Use `offense` in all messages instead of `offence`. ([@bbatsov][])
+* For indentation of `if`/`unless`/`while`/`until` bodies when the result is assigned to a variable, instead of supporting two styles simultaneously, `IndentationWidth` now supports one style of indentation at a time, specified by `EndAlignment`/`AlignWith`. ([@jonas054][])
+* Renamed `Style` param of `DotPosition` cop to `EnforcedStyle`. ([@bbatsov][])
+* Add `length` value to locations of offense in JSON formatter. ([@yujinakayama][])
+* `SpaceAroundBlockBraces` cop replaced by `SpaceBeforeBlockBraces` and `SpaceInsideBlockBraces`. ([@jonas054][])
+* `SpaceAroundEqualsInParameterDefault` cop is now configurable with the `EnforcedStyle` option. ([@jonas054][])
+
+### Bugs fixed
+
+* [#790](https://github.com/bbatsov/rubocop/issues/790): Fix auto-correction interference problem between `MethodDefParentheses` and other cops. ([@jonas054][])
+* [#794](https://github.com/bbatsov/rubocop/issues/794): Fix handling of modifier keywords with required parentheses in `ParenthesesAroundCondition`. ([@bbatsov][])
+* [#804](https://github.com/bbatsov/rubocop/issues/804): Fix a false positive with operator assignments in a loop (including `begin..rescue..end` with `retry`) in `UselessAssignment`. ([@yujinakayama][])
+* [#815](https://github.com/bbatsov/rubocop/issues/815): Fix a false positive for heredocs with blank lines in them in `EmptyLines`. ([@bbatsov][])
+* Auto-correction is now more robust and less likely to die because of `RangeError` or "clobbering". ([@jonas054][])
+* Offenses always reported in order of position in file, also during `--auto-correct` runs. ([@jonas054][])
+* Fix problem with `[Corrected]` tag sometimes missing in output from `--auto-correct` runs. ([@jonas054][])
+* Fix message from `EndAlignment` cop when `AlignWith` is `keyword`. ([@jonas054][])
+* Handle `case` conditions in `LiteralInCondition`. ([@bbatsov][])
+* [#822](https://github.com/bbatsov/rubocop/issues/822): Fix a false positive in `DotPosition` when enforced style is set to `trailing`. ([@bbatsov][])
+* Handle properly dynamic strings in `LineEndConcatenation`. ([@bbatsov][])
+* [#832](https://github.com/bbatsov/rubocop/issues/832): Fix auto-correction interference problem between `BracesAroundHashParameters` and `SpaceInsideHashLiteralBraces`. ([@jonas054][])
+* Fix bug in auto-correction of alignment so that only space can be removed. ([@jonas054][])
+* Fix bug in `IndentationWidth` auto-correction so it doesn't correct things that `IndentationConsistency` should correct. ([@jonas054][])
+* [#847](https://github.com/bbatsov/rubocop/issues/847): Fix bug in `RegexpLiteral` concerning `--auto-gen-config`. ([@jonas054][])
+* [#848](https://github.com/bbatsov/rubocop/issues/848): Fix bug in `--show-cops` that made it print the default configuration rather than the current configuration. ([@jonas054][])
+* [#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][])

data/rubocop-todo.yml

@@ -1,20 +1,20 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-01-15 12:15:45 +0100 using RuboCop version 0.16.0.
+# on 2014-03-01 12:00:46 +1100 using RuboCop version 0.18.1.
 # The point is for the user to remove these configuration records
-# one by one as the offences are removed from the code base.
+# one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offence count: 6
+# Offense count: 6
 # Configuration parameters: CountComments.
 ClassLength:
-  Max: 124
+  Max: 125
 
-# Offence count: 14
+# Offense count: 16
 CyclomaticComplexity:
   Max: 10
 
-# Offence count: 97
+# Offense count: 105
 # Configuration parameters: CountComments.
 MethodLength:
   Max: 20

data/rubocop.gemspec

@@ -27,9 +27,10 @@ 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.1.3')
+  s.add_runtime_dependency('parser', '~> 2.1.7')
   s.add_runtime_dependency('powerpack', '~> 0.0.6')
   s.add_runtime_dependency('json', '>= 1.7.7', '< 2')
+  s.add_runtime_dependency('ruby-progressbar', '~> 1.4')
   s.add_development_dependency('rake', '~> 10.1')
   s.add_development_dependency('rspec', '~> 2.14')
   s.add_development_dependency('yard', '~> 0.8')

data/spec/rubocop/cli_spec.rb

@@ -3,6 +3,7 @@
 require 'fileutils'
 require 'tmpdir'
 require 'spec_helper'
+require 'timeout'
 
 describe Rubocop::CLI, :isolated_environment do
   include FileHelper
@@ -48,6 +49,122 @@ describe Rubocop::CLI, :isolated_environment do
                   'end'].join("\n") + "\n")
       end
 
+      it 'can handle spaces when removing braces' do
+        create_file('example.rb',
+                    ['# encoding: utf-8',
+                     "assert_post_status_code 400, 's', {:type => 'bad'}"])
+        expect(cli.run(%w(--auto-correct --format emacs))).to eq(1)
+        expect(IO.read('example.rb'))
+          .to eq(['# encoding: utf-8',
+                  "assert_post_status_code 400, 's', type: 'bad'",
+                  ''].join("\n"))
+        e = abs('example.rb')
+        expect($stdout.string)
+          .to eq(["#{e}:2:35: C: [Corrected] Redundant curly braces around " \
+                  "a hash parameter.",
+                  "#{e}:2:35: C: [Corrected] Use the new Ruby 1.9 hash " \
+                  "syntax.",
+                  # TODO: Don't report that a problem is corrected when it
+                  # actually went away due to another correction.
+                  "#{e}:2:35: C: [Corrected] Space inside { missing.",
+                  # TODO: Don't report duplicates (HashSyntax in this case).
+                  "#{e}:2:36: C: [Corrected] Use the new Ruby 1.9 hash " \
+                  "syntax.",
+                  "#{e}:2:50: C: [Corrected] Space inside } missing.",
+                  ''].join("\n"))
+      end
+
+      # A case where two cops, EmptyLinesAroundBody and EmptyLines, try to
+      # remove the same line in autocorrect.
+      it 'can correct two empty lines at end of class body' do
+        create_file('example.rb', ['class Test',
+                                   '  def f',
+                                   '  end',
+                                   '',
+                                   '',
+                                   'end'])
+        expect(cli.run(['--auto-correct'])).to eq(1)
+        expect($stderr.string).to eq('')
+        expect(IO.read('example.rb')).to eq(['class Test',
+                                             '  def f',
+                                             '  end',
+                                             'end'].join("\n") + "\n")
+      end
+
+      # A case where WordArray's correction can be clobbered by
+      # AccessModifierIndentation's correction.
+      it 'can correct indentation and another thing' do
+        create_file('example.rb', ['# encoding: utf-8',
+                                   'class Dsl',
+                                   'private',
+                                   '  A = ["git", "path"]',
+                                   'end'])
+        expect(cli.run(%w(--auto-correct --format emacs))).to eq(1)
+        expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
+                                             'class Dsl',
+                                             '  private',
+                                             '  A = %w(git path)',
+                                             'end'].join("\n") + "\n")
+        e = abs('example.rb')
+        expect($stdout.string)
+          .to eq(["#{e}:2:1: C: Missing top-level class documentation " \
+                  'comment.',
+                  "#{e}:3:1: C: [Corrected] Indent access modifiers like " \
+                  'private.',
+                  "#{e}:3:1: C: Keep a blank line before and after private.",
+                  # An offense that moves around during auto-correction will
+                  # appear to be duplicated:
+                  "#{e}:3:3: C: Keep a blank line before and after private.",
+                  "#{e}:4:7: C: [Corrected] Use %w or %W for array of words.",
+                  "#{e}:4:8: C: [Corrected] Prefer single-quoted strings " \
+                  "when you don't need string interpolation or special " \
+                  'symbols.',
+                  # Another instance of the same offense reported twice:
+                  "#{e}:4:15: C: [Corrected] Prefer single-quoted strings " \
+                  "when you don't need string interpolation or special " \
+                  'symbols.',
+                  ''].join("\n"))
+      end
+
+      # A case where the same cop could try to correct an offense twice in one
+      # place.
+      it 'can correct empty line inside special form of nested modules' do
+        create_file('example.rb', ['module A module B',
+                                   '',
+                                   'end end'])
+        expect(cli.run(['--auto-correct'])).to eq(1)
+        expect(IO.read('example.rb')).to eq(['module A module B',
+                                             'end end'].join("\n") + "\n")
+      end
+
+      it 'can correct single line methods' do
+        create_file('example.rb', ['# encoding: utf-8',
+                                   'def func1; do_something end # comment',
+                                   'def func2() do_1; do_2; end'])
+        expect(cli.run(%w(--auto-correct --format offenses))).to eq(1)
+        expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
+                                             '# comment',
+                                             'def func1',
+                                             '  do_something',
+                                             'end',
+                                             '',
+                                             'def func2',
+                                             '  do_1',
+                                             '  do_2',
+                                             'end',
+                                             ''].join("\n"))
+        expect($stdout.string).to eq(['',
+                                      '6   TrailingWhitespace',
+                                      '4   Semicolon',
+                                      '2   SingleLineMethods',
+                                      '1   DefWithParentheses',
+                                      '1   EmptyLineBetweenDefs',
+                                      '--',
+                                      '14  Total',
+                                      '',
+                                      ''].join("\n"))
+      end
+
       # In this example, the auto-correction (changing "raise" to "fail")
       # creates a new problem (alignment of parameters), which is also
       # corrected automatically.
@@ -66,7 +183,7 @@ describe Rubocop::CLI, :isolated_environment do
           .to eq(['Inspecting 1 file',
                   'C',
                   '',
-                  'Offences:',
+                  'Offenses:',
                   '',
                   'example.rb:2:1: C: [Corrected] Use `fail` instead of ' \
                   '`raise` to signal exceptions.',
@@ -77,7 +194,7 @@ describe Rubocop::CLI, :isolated_environment do
                   "      'Method should be overridden in child classes'",
                   '      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^',
                   '',
-                  '1 file inspected, 2 offences detected, 2 offences ' \
+                  '1 file inspected, 2 offenses detected, 2 offenses ' \
                   'corrected',
                   ''].join("\n"))
       end
@@ -106,17 +223,116 @@ describe Rubocop::CLI, :isolated_environment do
           .to eq(['Inspecting 1 file',
                   'C',
                   '',
-                  'Offences:',
+                  'Offenses:',
                   '',
-                  'example.rb:4:1: C: [Corrected] Trailing whitespace ' \
-                  'detected.',
                   'example.rb:4:1: C: [Corrected] Extra empty line detected ' \
                   'at body beginning.',
+                  'example.rb:4:1: C: [Corrected] Trailing whitespace ' \
+                  'detected.',
                   '',
-                  '1 file inspected, 2 offences detected, 2 offences ' \
+                  '1 file inspected, 2 offenses detected, 2 offenses ' \
                   'corrected',
                   ''].join("\n"))
       end
+
+      it 'can correct MethodDefParentheses and other offense' do
+        create_file('example.rb',
+                    ['# encoding: utf-8',
+                     'def primes limit',
+                     '  1.upto(limit).find_all { |i| is_prime[i] }',
+                     'end'])
+        expect(cli.run(%w(-D --auto-correct))).to eq(1)
+        expect($stderr.string).to eq('')
+        expect(IO.read('example.rb'))
+          .to eq(['# encoding: utf-8',
+                  'def primes(limit)',
+                  '  1.upto(limit).select { |i| is_prime[i] }',
+                  'end'].join("\n") + "\n")
+        expect($stdout.string)
+          .to eq(['Inspecting 1 file',
+                  'C',
+                  '',
+                  'Offenses:',
+                  '',
+                  'example.rb:2:12: C: [Corrected] MethodDefParentheses: ' \
+                  'Use def with parentheses when there are parameters.',
+                  'def primes limit',
+                  '           ^^^^^',
+                  'example.rb:3:17: C: [Corrected] CollectionMethods: ' \
+                  'Prefer select over find_all.',
+                  '  1.upto(limit).find_all { |i| is_prime[i] }',
+                  '                ^^^^^^^^',
+                  '',
+                  '1 file inspected, 2 offenses detected, 2 offenses ' \
+                  'corrected',
+                  ''].join("\n"))
+      end
+
+      it 'can correct HashSyntax and SpaceAroundOperators offenses' do
+        create_file('example.rb',
+                    ['# encoding: utf-8',
+                     '{ :b=>1 }'])
+        expect(cli.run(%w(-D --auto-correct --format emacs))).to eq(1)
+        expect($stderr.string).to eq('')
+        expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
+                                             '{ b: 1 }',
+                                             ''].join("\n"))
+        expect($stdout.string)
+          .to eq(["#{abs('example.rb')}:2:3: C: [Corrected] HashSyntax: Use " \
+                  "the new Ruby 1.9 hash syntax.",
+                  "#{abs('example.rb')}:2:5: C: [Corrected] " \
+                  "SpaceAroundOperators: Surrounding space missing for " \
+                  "operator '=>'.",
+                  ''].join("\n"))
+      end
+
+      it 'can correct TrailingBlankLines and TrailingWhitespace offenses' do
+        create_file('example.rb',
+                    ['# encoding: utf-8',
+                     '',
+                     '  ',
+                     '',
+                     ''])
+        expect(cli.run(%w(--auto-correct --format emacs))).to eq(1)
+        expect($stderr.string).to eq('')
+        expect(IO.read('example.rb')).to eq("# encoding: utf-8\n")
+        expect($stdout.string)
+          .to eq(["#{abs('example.rb')}:2:1: C: [Corrected] 3 trailing " \
+                  "blank lines detected.",
+                  "#{abs('example.rb')}:3:1: C: [Corrected] Trailing " \
+                  "whitespace detected.",
+                  ''].join("\n"))
+      end
+
+      it 'can correct MethodCallParentheses and EmptyLiteral offenses' do
+        create_file('example.rb',
+                    ['# encoding: utf-8',
+                     'Hash.new()'])
+        expect(cli.run(%w(--auto-correct --format emacs))).to eq(1)
+        expect($stderr.string).to eq('')
+        expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
+                                             '{}',
+                                             ''].join("\n"))
+        expect($stdout.string)
+          .to eq(["#{abs('example.rb')}:2:1: C: [Corrected] Use hash " \
+                  "literal {} instead of Hash.new.",
+                  "#{abs('example.rb')}:2:9: C: [Corrected] Do not use " \
+                  "parentheses for method calls with no arguments.",
+                  ''].join("\n"))
+      end
+
+      it 'should not hang SpaceAfterPunctuation and SpaceInsideParens' do
+        create_file('example.rb',
+                    ['# encoding: utf-8',
+                     'some_method(a, )'])
+        Timeout.timeout(10) do
+          expect(cli.run(%w(--auto-correct))).to eq(1)
+        end
+        expect($stderr.string).to eq('')
+        expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
+                                             'some_method(a,)',
+                                             ''].join("\n"))
+      end
     end
 
     describe '--auto-gen-config' do
@@ -136,9 +352,9 @@ describe Rubocop::CLI, :isolated_environment do
         expect(IO.read('rubocop-todo.yml'))
           .to eq(todo_contents.join("\n") + "\n")
         create_file('.rubocop.yml', ['inherit_from: rubocop-todo.yml'])
-        expect(cli.run(['--auto-gen-config'])).to eq(1)
+        expect { cli.run(['--auto-gen-config']) }.to exit_with_code(1)
         expect($stderr.string).to eq('Remove rubocop-todo.yml from the ' \
-                                     'current configuration before ' +
+                                     'current configuration before ' \
                                      "generating it again.\n")
       end
 
@@ -148,7 +364,8 @@ describe Rubocop::CLI, :isolated_environment do
                                     '#' * 85,
                                     'y ',
                                     'puts x'])
-        expect(cli.run(['--auto-gen-config', 'example1.rb'])).to eq(1)
+        expect { cli.run(['--auto-gen-config', 'example1.rb']) }
+          .to exit_with_code(1)
         expect($stderr.string)
           .to eq('--auto-gen-config can not be combined with any other ' \
                  "arguments.\n")
@@ -168,8 +385,7 @@ describe Rubocop::CLI, :isolated_environment do
         expect(cli.run(['--auto-gen-config'])).to eq(1)
         expect($stderr.string).to eq('')
         expect($stdout.string)
-          .to include([
-                       'Created rubocop-todo.yml.',
+          .to include(['Created rubocop-todo.yml.',
                        'Run rubocop with --config rubocop-todo.yml, or',
                        'add inherit_from: rubocop-todo.yml in a ' \
                        '.rubocop.yml file.',
@@ -178,34 +394,35 @@ describe Rubocop::CLI, :isolated_environment do
           ['# This configuration was generated by `rubocop --auto-gen-config`',
            /# on .* using RuboCop version .*/,
            '# The point is for the user to remove these configuration records',
-           '# one by one as the offences are removed from the code base.',
+           '# one by one as the offenses are removed from the code base.',
            '# Note that changes in the inspected code, or installation of new',
            '# versions of RuboCop, may require this file to be generated ' \
            'again.',
            '',
-           '# Offence count: 1',
+           '# Offense count: 1',
            '# Configuration parameters: AllowedVariables.',
            'GlobalVars:',
            '  Enabled: false',
            '',
-           '# Offence count: 1',
+           '# Offense count: 1',
+           '# Cop supports --auto-correct.',
            'IndentationConsistency:',
            '  Enabled: false',
            '',
-           '# Offence count: 2',
+           '# Offense count: 2',
            'LineLength:',
            '  Max: 90',
            '',
-           '# Offence count: 1',
+           '# Offense count: 1',
            '# Cop supports --auto-correct.',
            'SpaceAroundOperators:',
            '  Enabled: false',
            '',
-           '# Offence count: 1',
+           '# Offense count: 1',
            'Tab:',
            '  Enabled: false',
            '',
-           '# Offence count: 2',
+           '# Offense count: 2',
            '# Cop supports --auto-correct.',
            'TrailingWhitespace:',
            '  Enabled: false']
@@ -218,6 +435,41 @@ describe Rubocop::CLI, :isolated_environment do
           end
         end
       end
+
+      it 'generates a todo list that removes the reports' do
+        create_file('example.rb', ['# encoding: utf-8',
+                                   'y.gsub!(%r{abc/xyz}, "#{x}")'])
+        expect(cli.run(%w(--format emacs))).to eq(1)
+        expect($stdout.string)
+          .to eq(["#{abs('example.rb')}:2:9: C: Use %r only for regular " \
+                  "expressions matching more than 1 '/' character.",
+                  ''].join("\n"))
+        expect(cli.run(['--auto-gen-config'])).to eq(1)
+        expected =
+          ['# This configuration was generated by `rubocop --auto-gen-config`',
+           /# on .* using RuboCop version .*/,
+           '# The point is for the user to remove these configuration records',
+           '# one by one as the offenses are removed from the code base.',
+           '# Note that changes in the inspected code, or installation of new',
+           '# versions of RuboCop, may require this file to be generated ' \
+           'again.',
+           '',
+           '# Offense count: 1',
+           'RegexpLiteral:',
+           '  MaxSlashes: 0']
+        actual = IO.read('rubocop-todo.yml').split($RS)
+        expected.each_with_index do |line, ix|
+          if line.is_a?(String)
+            expect(actual[ix]).to eq(line)
+          else
+            expect(actual[ix]).to match(line)
+          end
+        end
+        $stdout = StringIO.new
+        result = cli.run(%w(--config rubocop-todo.yml --format emacs))
+        expect($stdout.string).to eq('')
+        expect(result).to eq(0)
+      end
     end
 
     describe '--only' do
@@ -233,10 +485,10 @@ describe Rubocop::CLI, :isolated_environment do
         expect($stdout.string)
           .to eq(['== example.rb ==',
                   'C:  1:  1: Favor modifier if usage when you ' \
-                  'have a single-line body. Another good alternative is ' +
+                  'have a single-line body. Another good alternative is ' \
                   'the usage of control flow &&/||.',
                   '',
-                  '1 file inspected, 1 offence detected',
+                  '1 file inspected, 1 offense detected',
                   ''].join("\n"))
       end
     end
@@ -254,7 +506,7 @@ describe Rubocop::CLI, :isolated_environment do
           .to eq(['== example.rb ==',
                   'W:  1:  4: Literal 0 appeared in a condition.',
                   '',
-                  '1 file inspected, 1 offence detected',
+                  '1 file inspected, 1 offense detected',
                   ''].join("\n"))
       end
     end
@@ -265,7 +517,7 @@ describe Rubocop::CLI, :isolated_environment do
         expect(cli.run(['--debug', 'example1.rb'])).to eq(1)
         home = File.dirname(File.dirname(File.dirname(__FILE__)))
         expect($stdout.string.lines.grep(/configuration/).map(&:chomp))
-          .to eq(["For #{abs('')}:" +
+          .to eq(["For #{abs('')}:" \
                   " configuration from #{home}/config/default.yml",
                   "Inheriting configuration from #{home}/config/enabled.yml",
                   "Inheriting configuration from #{home}/config/disabled.yml"
@@ -323,6 +575,8 @@ describe Rubocop::CLI, :isolated_environment do
       let(:stdout) { $stdout.string }
 
       before do
+        create_file('.rubocop.yml', ['LineLength:',
+                                     '  Max: 110'])
         expect { cli.run ['--show-cops'] + cop_list }.to exit_with_code(0)
       end
 
@@ -415,10 +669,8 @@ describe Rubocop::CLI, :isolated_environment do
       let(:target_file) { 'example.rb' }
 
       before do
-        create_file(target_file, [
-                                  '# encoding: utf-8',
-                                  '#' * 90
-                                 ])
+        create_file(target_file, ['# encoding: utf-8',
+                                  '#' * 90])
       end
 
       describe 'builtin formatters' do
@@ -426,10 +678,8 @@ describe Rubocop::CLI, :isolated_environment do
           it 'outputs with simple format' do
             cli.run(['--format', 'simple', 'example.rb'])
             expect($stdout.string)
-              .to include([
-                           "== #{target_file} ==",
-                           'C:  2: 80: Line is too long. [90/79]'
-                          ].join("\n"))
+              .to include(["== #{target_file} ==",
+                           'C:  2: 80: Line is too long. [90/79]'].join("\n"))
           end
         end
 
@@ -476,7 +726,7 @@ describe Rubocop::CLI, :isolated_environment do
                       'example2.rb:3:1: C: Inconsistent indentation ' \
                       'detected.',
                       'def a',
-                      '',
+                      '^^^^^',
                       'example2.rb:4:1: C: Use 2 (not 3) spaces for ' \
                       'indentation.',
                       '   puts',
@@ -485,7 +735,7 @@ describe Rubocop::CLI, :isolated_environment do
                       'def badName',
                       '    ^^^^^^^',
                       'example3.rb:3:3: C: Favor modifier if usage ' \
-                      'when you have a single-line body. Another good ' +
+                      'when you have a single-line body. Another good ' \
                       'alternative is the usage of control flow &&/||.',
                       '  if something',
                       '  ^^',
@@ -494,7 +744,7 @@ describe Rubocop::CLI, :isolated_environment do
                       '    end',
                       '    ^^^',
                       '',
-                      '3 files inspected, 10 offences detected',
+                      '3 files inspected, 10 offenses detected',
                       ''].join("\n"))
           end
         end
@@ -511,12 +761,12 @@ describe Rubocop::CLI, :isolated_environment do
             expect(cli.run(['--format', 'emacs', 'example1.rb',
                             'example2.rb'])).to eq(1)
             expected_output =
-              ["#{abs('example1.rb')}:2:2: C: Surrounding space missing" +
+              ["#{abs('example1.rb')}:2:2: C: Surrounding space missing" \
                " for operator '='.",
                "#{abs('example1.rb')}:2:5: C: Trailing whitespace detected.",
                "#{abs('example1.rb')}:3:2: C: Trailing whitespace detected.",
                "#{abs('example2.rb')}:2:1: C: Tab detected.",
-               "#{abs('example2.rb')}:3:1: C: Inconsistent indentation " +
+               "#{abs('example2.rb')}:3:1: C: Inconsistent indentation " \
                'detected.',
                ''].join("\n")
             expect($stdout.string).to eq(expected_output)
@@ -538,7 +788,7 @@ describe Rubocop::CLI, :isolated_environment do
 
         context 'when a class name is specified' do
           it 'uses the class as a formatter' do
-            module ::MyTool
+            module MyTool
               class RubocopFormatter < Rubocop::Formatter::BaseFormatter
                 def started(all_files)
                   output.puts "started: #{all_files.join(',')}"
@@ -548,7 +798,7 @@ describe Rubocop::CLI, :isolated_environment do
                   output.puts "file_started: #{file}"
                 end
 
-                def file_finished(file, offences)
+                def file_finished(file, offenses)
                   output.puts "file_finished: #{file}"
                 end
 
@@ -559,13 +809,11 @@ describe Rubocop::CLI, :isolated_environment do
             end
 
             cli.run(['--format', 'MyTool::RubocopFormatter', 'example.rb'])
-            expect($stdout.string).to eq([
-                                          "started: #{target_file}",
+            expect($stdout.string).to eq(["started: #{target_file}",
                                           "file_started: #{target_file}",
                                           "file_finished: #{target_file}",
                                           "finished: #{target_file}",
-                                          ''
-                                         ].join("\n"))
+                                          ''].join("\n"))
           end
         end
 
@@ -581,12 +829,10 @@ describe Rubocop::CLI, :isolated_environment do
       it 'can be used multiple times' do
         cli.run(['--format', 'simple', '--format', 'emacs', 'example.rb'])
         expect($stdout.string)
-          .to include([
-                       "== #{target_file} ==",
+          .to include(["== #{target_file} ==",
                        'C:  2: 80: Line is too long. [90/79]',
-                       "#{abs(target_file)}:2:80: C: Line is too long. " +
-                       '[90/79]'
-                      ].join("\n"))
+                       "#{abs(target_file)}:2:80: C: Line is too long. " \
+                       '[90/79]'].join("\n"))
       end
     end
 
@@ -594,10 +840,8 @@ describe Rubocop::CLI, :isolated_environment do
       let(:target_file) { 'example.rb' }
 
       before do
-        create_file(target_file, [
-                                  '# encoding: utf-8',
-                                  '#' * 90
-                                 ])
+        create_file(target_file, ['# encoding: utf-8',
+                                  '#' * 90])
       end
 
       it 'redirects output to the specified file' do
@@ -606,19 +850,15 @@ describe Rubocop::CLI, :isolated_environment do
       end
 
       it 'is applied to the previously specified formatter' do
-        cli.run([
-                 '--format', 'simple',
+        cli.run(['--format', 'simple',
                  '--format', 'emacs', '--out', 'emacs_output.txt',
-                 target_file
-                ])
+                 target_file])
 
-        expect($stdout.string).to eq([
-                                      "== #{target_file} ==",
+        expect($stdout.string).to eq(["== #{target_file} ==",
                                       'C:  2: 80: Line is too long. [90/79]',
                                       '',
-                                      '1 file inspected, 1 offence detected',
-                                      ''
-                                     ].join("\n"))
+                                      '1 file inspected, 1 offense detected',
+                                      ''].join("\n"))
 
         expect(File.read('emacs_output.txt'))
           .to eq("#{abs(target_file)}:2:80: C: Line is too long. [90/79]\n")
@@ -685,67 +925,57 @@ describe Rubocop::CLI, :isolated_environment do
   end
 
   it 'checks a given correct file and returns 0' do
-    create_file('example.rb', [
-                               '# encoding: utf-8',
+    create_file('example.rb', ['# encoding: utf-8',
                                'x = 0',
-                               'puts x'
-                              ])
+                               'puts x'])
     expect(cli.run(['--format', 'simple', 'example.rb'])).to eq(0)
     expect($stdout.string)
-      .to eq("\n1 file inspected, no offences detected\n")
+      .to eq("\n1 file inspected, no offenses detected\n")
   end
 
   it 'checks a given file with faults and returns 1' do
-    create_file('example.rb', [
-                               '# encoding: utf-8',
+    create_file('example.rb', ['# encoding: utf-8',
                                'x = 0 ',
-                               'puts x'
-                              ])
+                               'puts x'])
     expect(cli.run(['--format', 'simple', 'example.rb'])).to eq(1)
     expect($stdout.string)
       .to eq ['== example.rb ==',
               'C:  2:  6: Trailing whitespace detected.',
               '',
-              '1 file inspected, 1 offence detected',
+              '1 file inspected, 1 offense detected',
               ''].join("\n")
   end
 
-  it 'registers an offence for a syntax error' do
-    create_file('example.rb', [
-                               '# encoding: utf-8',
+  it 'registers an offense for a syntax error' do
+    create_file('example.rb', ['# encoding: utf-8',
                                'class Test',
-                               'en'
-                              ])
+                               'en'])
     expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(1)
     expect($stdout.string)
-      .to eq(["#{abs('example.rb')}:4:1: E: unexpected " +
+      .to eq(["#{abs('example.rb')}:4:1: E: unexpected " \
               'token $end',
               ''].join("\n"))
   end
 
-  it 'registers an offence for Parser warnings' do
-    create_file('example.rb', [
-                               '# encoding: utf-8',
+  it 'registers an offense for Parser warnings' do
+    create_file('example.rb', ['# encoding: utf-8',
                                'puts *test',
-                               'if a then b else c end'
-                              ])
+                               'if a then b else c end'])
     expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(1)
     expect($stdout.string)
-      .to eq(["#{abs('example.rb')}:2:6: W: " +
-              'Ambiguous splat operator. Parenthesize the method arguments ' +
-              "if it's surely a splat operator, or add a whitespace to the " +
+      .to eq(["#{abs('example.rb')}:2:6: W: " \
+              'Ambiguous splat operator. Parenthesize the method arguments ' \
+              "if it's surely a splat operator, or add a whitespace to the " \
               'right of the * if it should be a multiplication.',
-              "#{abs('example.rb')}:3:1: C: " +
-              'Favor the ternary operator (?:) over if/then/else/end ' +
+              "#{abs('example.rb')}:3:1: C: " \
+              'Favor the ternary operator (?:) over if/then/else/end ' \
               'constructs.',
               ''].join("\n"))
   end
 
   it 'can process a file with an invalid UTF-8 byte sequence' do
-    create_file('example.rb', [
-                               '# encoding: utf-8',
-                               "# #{'f9'.hex.chr}#{'29'.hex.chr}"
-                              ])
+    create_file('example.rb', ['# encoding: utf-8',
+                               "# #{'f9'.hex.chr}#{'29'.hex.chr}"])
     expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(1)
     expect($stdout.string)
       .to eq(["#{abs('example.rb')}:1:1: F: Invalid byte sequence in utf-8.",
@@ -768,11 +998,11 @@ describe Rubocop::CLI, :isolated_environment do
                    'end'])
       expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(1)
       # all cops were disabled, then 2 were enabled again, so we
-      # should get 2 offences reported.
+      # should get 2 offenses reported.
       expect($stdout.string)
         .to eq(["#{abs('example.rb')}:8:80: C: Line is too long. [95/79]",
-                "#{abs('example.rb')}:10:5: C: Prefer single-quoted " +
-                "strings when you don't need string interpolation or " +
+                "#{abs('example.rb')}:10:5: C: Prefer single-quoted " \
+                "strings when you don't need string interpolation or " \
                 'special symbols.',
                 ''].join("\n"))
     end
@@ -780,7 +1010,7 @@ describe Rubocop::CLI, :isolated_environment do
     it 'can disable selected cops in a code section' do
       create_file('example.rb',
                   ['# encoding: utf-8',
-                   '# rubocop:disable LineLength,NumericLiterals,' +
+                   '# rubocop:disable LineLength,NumericLiterals,' \
                    'StringLiterals',
                    '#' * 90,
                    'x(123456)',
@@ -793,18 +1023,17 @@ describe Rubocop::CLI, :isolated_environment do
                    'end'])
       expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(1)
       # 3 cops were disabled, then 2 were enabled again, so we
-      # should get 2 offences reported.
+      # should get 2 offenses reported.
       expect($stdout.string)
         .to eq(["#{abs('example.rb')}:8:80: C: Line is too long. [95/79]",
-                "#{abs('example.rb')}:10:5: C: Prefer single-quoted " +
-                "strings when you don't need string interpolation or " +
+                "#{abs('example.rb')}:10:5: C: Prefer single-quoted " \
+                "strings when you don't need string interpolation or " \
                 'special symbols.',
                 ''].join("\n"))
     end
 
     it 'can disable all cops on a single line' do
-      create_file('example.rb', [
-                                 '# encoding: utf-8',
+      create_file('example.rb', ['# encoding: utf-8',
                                  'y("123", 123456) # rubocop:disable all'
                                 ])
       expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(0)
@@ -813,9 +1042,8 @@ describe Rubocop::CLI, :isolated_environment do
 
     it 'can disable selected cops on a single line' do
       create_file('example.rb',
-                  [
-                   '# encoding: utf-8',
-                   '#' * 90 + ' # rubocop:disable LineLength',
+                  ['# encoding: utf-8',
+                   'a' * 90 + ' # rubocop:disable LineLength',
                    '#' * 95,
                    'y("123") # rubocop:disable LineLength,StringLiterals'
                   ])
@@ -828,15 +1056,14 @@ describe Rubocop::CLI, :isolated_environment do
   end
 
   it 'finds a file with no .rb extension but has a shebang line' do
-    create_file('example', [
-                            '#!/usr/bin/env ruby',
+    create_file('example', ['#!/usr/bin/env ruby',
                             '# encoding: utf-8',
                             'x = 0',
                             'puts x'
                            ])
     expect(cli.run(%w(--format simple))).to eq(0)
     expect($stdout.string)
-      .to eq(['', '1 file inspected, no offences detected', ''].join("\n"))
+      .to eq(['', '1 file inspected, no offenses detected', ''].join("\n"))
   end
 
   describe 'enabling/disabling rails cops' do
@@ -857,34 +1084,28 @@ describe Rubocop::CLI, :isolated_environment do
 
     it 'with configation option true in one dir runs rails cops there' do
       create_file('dir1/app/models/example1.rb', ['# encoding: utf-8',
-                                                 'read_attribute(:test)'])
-      create_file('dir1/.rubocop.yml', [
-                                        'AllCops:',
-                                        '  RunRailsCops: true',
-                                       ])
+                                                  'read_attribute(:test)'])
+      create_file('dir1/.rubocop.yml', ['AllCops:',
+                                        '  RunRailsCops: true'])
       create_file('dir2/app/models/example2.rb', ['# encoding: utf-8',
                                                   'read_attribute(:test)'])
-      create_file('dir2/.rubocop.yml', [
-                                        'AllCops:',
-                                        '  RunRailsCops: false',
-                                       ])
-      expect(cli.run(['--format', 'simple', 'dir1', 'dir2'])).to eq(1)
+      create_file('dir2/.rubocop.yml', ['AllCops:',
+                                        '  RunRailsCops: false'])
+      expect(cli.run(%w(--format simple dir1 dir2))).to eq(1)
       expect($stdout.string)
         .to eq(['== dir1/app/models/example1.rb ==',
-                'C:  2:  1: Prefer self[:attribute] over read_attribute' +
+                'C:  2:  1: Prefer self[:attribute] over read_attribute' \
                 '(:attribute).',
                 '',
-                '2 files inspected, 1 offence detected',
+                '2 files inspected, 1 offense detected',
                 ''].join("\n"))
     end
 
     it 'with configation option false but -R given runs rails cops' do
       create_file('app/models/example1.rb', ['# encoding: utf-8',
                                              'read_attribute(:test)'])
-      create_file('.rubocop.yml', [
-                                   'AllCops:',
-                                   '  RunRailsCops: false',
-                                  ])
+      create_file('.rubocop.yml', ['AllCops:',
+                                   '  RunRailsCops: false'])
       expect(cli.run(['--format', 'simple', '-R', 'app/models/example1.rb']))
         .to eq(1)
       expect($stdout.string).to include('Prefer self[:attribute]')
@@ -893,34 +1114,24 @@ describe Rubocop::CLI, :isolated_environment do
 
   describe 'cops can exclude files based on config' do
     it 'ignores excluded files' do
-      create_file('example.rb', [
-                                 '# encoding: utf-8',
-                                 'x = 0'
-                                ])
-      create_file('regexp.rb', [
-                                '# encoding: utf-8',
-                                'x = 0'
-                               ])
-      create_file('exclude_glob.rb', [
-                                      '#!/usr/bin/env ruby',
+      create_file('example.rb', ['# encoding: utf-8',
+                                 'x = 0'])
+      create_file('regexp.rb', ['# encoding: utf-8',
+                                'x = 0'])
+      create_file('exclude_glob.rb', ['#!/usr/bin/env ruby',
                                       '# encoding: utf-8',
-                                      'x = 0'
-                                     ])
-      create_file('dir/thing.rb', [
-                                   '# encoding: utf-8',
-                                   'x = 0'
-                                  ])
-      create_file('.rubocop.yml', [
-                                   'UselessAssignment:',
+                                      'x = 0'])
+      create_file('dir/thing.rb', ['# encoding: utf-8',
+                                   'x = 0'])
+      create_file('.rubocop.yml', ['UselessAssignment:',
                                    '  Exclude:',
                                    '    - example.rb',
                                    '    - !ruby/regexp /regexp.rb\z/',
                                    '    - "exclude_*"',
-                                   '    - "dir/*"'
-                                  ])
+                                   '    - "dir/*"'])
       expect(cli.run(%w(--format simple))).to eq(0)
       expect($stdout.string)
-        .to eq(['', '4 files inspected, no offences detected',
+        .to eq(['', '4 files inspected, no offenses detected',
                 ''].join("\n"))
     end
 
@@ -928,47 +1139,40 @@ describe Rubocop::CLI, :isolated_environment do
 
   describe 'configuration from file' do
     it 'finds included files' do
-      create_file('example', [
-                              '# encoding: utf-8',
+      create_file('example', ['# encoding: utf-8',
                               'x = 0',
                               'puts x'
                              ])
-      create_file('regexp', [
-                             '# encoding: utf-8',
+      create_file('regexp', ['# encoding: utf-8',
                              'x = 0',
                              'puts x'
                             ])
-      create_file('.rubocop.yml', [
-                                   'AllCops:',
+      create_file('.rubocop.yml', ['AllCops:',
                                    '  Includes:',
                                    '    - example',
                                    '    - !ruby/regexp /regexp$/'
                                   ])
       expect(cli.run(%w(--format simple))).to eq(0)
       expect($stdout.string)
-        .to eq(['', '2 files inspected, no offences detected',
+        .to eq(['', '2 files inspected, no offenses detected',
                 ''].join("\n"))
     end
 
     it 'ignores excluded files' do
-      create_file('example.rb', [
-                                 '# encoding: utf-8',
+      create_file('example.rb', ['# encoding: utf-8',
                                  'x = 0',
                                  'puts x'
                                 ])
-      create_file('regexp.rb', [
-                                '# encoding: utf-8',
+      create_file('regexp.rb', ['# encoding: utf-8',
                                 'x = 0',
                                 'puts x'
                                ])
-      create_file('exclude_glob.rb', [
-                                      '#!/usr/bin/env ruby',
+      create_file('exclude_glob.rb', ['#!/usr/bin/env ruby',
                                       '# encoding: utf-8',
                                       'x = 0',
                                       'puts x'
                                      ])
-      create_file('.rubocop.yml', [
-                                   'AllCops:',
+      create_file('.rubocop.yml', ['AllCops:',
                                    '  Excludes:',
                                    '    - example.rb',
                                    '    - !ruby/regexp /regexp.rb$/',
@@ -976,7 +1180,7 @@ describe Rubocop::CLI, :isolated_environment do
                                   ])
       expect(cli.run(%w(--format simple))).to eq(0)
       expect($stdout.string)
-        .to eq(['', '0 files inspected, no offences detected',
+        .to eq(['', '0 files inspected, no offenses detected',
                 ''].join("\n"))
     end
 
@@ -984,49 +1188,43 @@ describe Rubocop::CLI, :isolated_environment do
     # File.stub(:open).and_call_original causes SystemStackError.
     it 'does not read files in excluded list', broken: :rbx do
       %w(rb.rb non-rb.ext without-ext).each do |filename|
-        create_file("example/ignored/#{filename}", [
-                                                    '# encoding: utf-8',
+        create_file("example/ignored/#{filename}", ['# encoding: utf-8',
                                                     '#' * 90
                                                    ])
       end
 
-      create_file('example/.rubocop.yml', [
-                                           'AllCops:',
+      create_file('example/.rubocop.yml', ['AllCops:',
                                            '  Excludes:',
-                                           '    - ignored/**',
-                                          ])
-      expect(File).not_to receive(:open).with(%r(/ignored/))
+                                           '    - ignored/**'])
+      expect(File).not_to receive(:open).with(%r{/ignored/})
       allow(File).to receive(:open).and_call_original
       expect(cli.run(%w(--format simple example))).to eq(0)
       expect($stdout.string)
-        .to eq(['', '0 files inspected, no offences detected',
+        .to eq(['', '0 files inspected, no offenses detected',
                 ''].join("\n"))
     end
 
     it 'can be configured with option to disable a certain error' do
       create_file('example1.rb', 'puts 0 ')
-      create_file('rubocop.yml', [
-                                  'Encoding:',
+      create_file('rubocop.yml', ['Encoding:',
                                   '  Enabled: false',
                                   '',
                                   'CaseIndentation:',
-                                  '  Enabled: false'
-                                 ])
+                                  '  Enabled: false'])
       expect(cli.run(['--format', 'simple',
                       '-c', 'rubocop.yml', 'example1.rb'])).to eq(1)
       expect($stdout.string)
         .to eq(['== example1.rb ==',
                 'C:  1:  7: Trailing whitespace detected.',
                 '',
-                '1 file inspected, 1 offence detected',
+                '1 file inspected, 1 offense detected',
                 ''].join("\n"))
     end
 
-    it 'can disable parser-derived offences with warning severity' do
+    it 'can disable parser-derived offenses with warning severity' do
       # `-' interpreted as argument prefix
       create_file('example.rb', 'puts -1')
-      create_file('.rubocop.yml', [
-                                   'Encoding:',
+      create_file('.rubocop.yml', ['Encoding:',
                                    '  Enabled: false',
                                    '',
                                    'AmbiguousOperator:',
@@ -1035,10 +1233,9 @@ describe Rubocop::CLI, :isolated_environment do
       expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(0)
     end
 
-    it 'cannot disable Syntax offences with fatal/error severity' do
+    it 'cannot disable Syntax offenses with fatal/error severity' do
       create_file('example.rb', 'class Test')
-      create_file('.rubocop.yml', [
-                                   'Encoding:',
+      create_file('.rubocop.yml', ['Encoding:',
                                    '  Enabled: false',
                                    '',
                                    'Syntax:',
@@ -1064,7 +1261,7 @@ describe Rubocop::CLI, :isolated_environment do
         .to eq(['== example1.rb ==',
                 'C:  2:  5: Prefer select over find_all.',
                 '',
-                '1 file inspected, 1 offence detected',
+                '1 file inspected, 1 offense detected',
                 ''].join("\n"))
     end
 
@@ -1072,8 +1269,7 @@ describe Rubocop::CLI, :isolated_environment do
       create_file('example1.rb', ['if a',
                                   '  b',
                                   'end'])
-      create_file('rubocop.yml', [
-                                  'Encoding:',
+      create_file('rubocop.yml', ['Encoding:',
                                   '  Enabled: false',
                                   '',
                                   'LineLength:',
@@ -1083,19 +1279,18 @@ describe Rubocop::CLI, :isolated_environment do
                         '-c', 'rubocop.yml', 'example1.rb'])
       expect($stdout.string)
         .to eq(['== example1.rb ==',
-                'C:  1:  1: Favor modifier if usage when you have ' +
-                'a single-line body. Another good alternative is the ' +
+                'C:  1:  1: Favor modifier if usage when you have ' \
+                'a single-line body. Another good alternative is the ' \
                 'usage of control flow &&/||.',
                 '',
-                '1 file inspected, 1 offence detected',
+                '1 file inspected, 1 offense detected',
                 ''].join("\n"))
       expect(result).to eq(1)
     end
 
     it 'can be configured with project config to disable a certain error' do
       create_file('example_src/example1.rb', 'puts 0 ')
-      create_file('example_src/.rubocop.yml', [
-                                               'Encoding:',
+      create_file('example_src/.rubocop.yml', ['Encoding:',
                                                '  Enabled: false',
                                                '',
                                                'CaseIndentation:',
@@ -1107,35 +1302,31 @@ describe Rubocop::CLI, :isolated_environment do
         .to eq(['== example_src/example1.rb ==',
                 'C:  1:  7: Trailing whitespace detected.',
                 '',
-                '1 file inspected, 1 offence detected',
+                '1 file inspected, 1 offense detected',
                 ''].join("\n"))
     end
 
     it 'can use an alternative max line length from a config file' do
-      create_file('example_src/example1.rb', [
-                                              '# encoding: utf-8',
+      create_file('example_src/example1.rb', ['# encoding: utf-8',
                                               '#' * 90
                                              ])
-      create_file('example_src/.rubocop.yml', [
-                                               'LineLength:',
+      create_file('example_src/.rubocop.yml', ['LineLength:',
                                                '  Enabled: true',
                                                '  Max: 100'
                                               ])
       expect(cli.run(['--format', 'simple',
                       'example_src/example1.rb'])).to eq(0)
       expect($stdout.string)
-        .to eq(['', '1 file inspected, no offences detected', ''].join("\n"))
+        .to eq(['', '1 file inspected, no offenses detected', ''].join("\n"))
     end
 
     it 'can have different config files in different directories' do
       %w(src lib).each do |dir|
-        create_file("example/#{dir}/example1.rb", [
-                                                   '# encoding: utf-8',
+        create_file("example/#{dir}/example1.rb", ['# encoding: utf-8',
                                                    '#' * 90
                                                   ])
       end
-      create_file('example/src/.rubocop.yml', [
-                                               'LineLength:',
+      create_file('example/src/.rubocop.yml', ['LineLength:',
                                                '  Enabled: true',
                                                '  Max: 100'
                                               ])
@@ -1144,53 +1335,47 @@ describe Rubocop::CLI, :isolated_environment do
                                    ['== example/lib/example1.rb ==',
                                     'C:  2: 80: Line is too long. [90/79]',
                                     '',
-                                    '2 files inspected, 1 offence detected',
+                                    '2 files inspected, 1 offense detected',
                                     ''].join("\n"))
     end
 
     it 'prefers a config file in ancestor directory to another in home' do
-      create_file('example_src/example1.rb', [
-                                              '# encoding: utf-8',
+      create_file('example_src/example1.rb', ['# encoding: utf-8',
                                               '#' * 90
                                              ])
-      create_file('example_src/.rubocop.yml', [
-                                               'LineLength:',
+      create_file('example_src/.rubocop.yml', ['LineLength:',
                                                '  Enabled: true',
                                                '  Max: 100'
                                               ])
-      create_file("#{Dir.home}/.rubocop.yml", [
-                                               'LineLength:',
+      create_file("#{Dir.home}/.rubocop.yml", ['LineLength:',
                                                '  Enabled: true',
                                                '  Max: 80'
                                               ])
       expect(cli.run(['--format', 'simple',
                       'example_src/example1.rb'])).to eq(0)
       expect($stdout.string)
-        .to eq(['', '1 file inspected, no offences detected', ''].join("\n"))
+        .to eq(['', '1 file inspected, no offenses detected', ''].join("\n"))
     end
 
     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',
+        create_file("example/#{dir}/example1.rb", ['# encoding: utf-8',
                                                    '#' * 90
                                                   ])
       end
 
-      create_file('example/.rubocop.yml', [
-                                           'AllCops:',
+      create_file('example/.rubocop.yml', ['AllCops:',
                                            '  Excludes:',
                                            '    - src/**',
                                            '    - etc/**',
-                                           '    - tmp/spec/**'
-                                          ])
+                                           '    - tmp/spec/**'])
 
       expect(cli.run(%w(--format simple example))).to eq(1)
       expect($stdout.string).to eq(
                                    ['== example/tmp/test/example1.rb ==',
                                     'C:  2: 80: Line is too long. [90/79]',
                                     '',
-                                    '1 file inspected, 1 offence detected',
+                                    '1 file inspected, 1 offense detected',
                                     ''].join("\n"))
     end
 
@@ -1211,7 +1396,7 @@ describe Rubocop::CLI, :isolated_environment do
 
       cli.run(%w(--format simple))
       expect($stdout.string)
-        .to eq(['', '0 files inspected, no offences detected',
+        .to eq(['', '0 files inspected, no offenses detected',
                 ''].join("\n"))
     end
 
@@ -1236,7 +1421,7 @@ describe Rubocop::CLI, :isolated_environment do
       cli.run(%w(--format simple))
       expect($stderr.string).to eq('')
       expect($stdout.string)
-        .to eq(['', '0 files inspected, no offences detected',
+        .to eq(['', '0 files inspected, no offenses detected',
                 ''].join("\n"))
     end
 
@@ -1263,21 +1448,17 @@ describe Rubocop::CLI, :isolated_environment do
 
       cli.run(%w(--format simple))
       expect($stdout.string)
-        .to eq(['', '0 files inspected, no offences detected',
+        .to eq(['', '0 files inspected, no offenses detected',
                 ''].join("\n"))
     end
 
     it 'prints a warning for an unrecognized cop name in .rubocop.yml' do
-      create_file('example/example1.rb', [
-                                          '# encoding: utf-8',
-                                          '#' * 90
-                                         ])
+      create_file('example/example1.rb', ['# encoding: utf-8',
+                                          '#' * 90])
 
-      create_file('example/.rubocop.yml', [
-                                           'LyneLenth:',
+      create_file('example/.rubocop.yml', ['LyneLenth:',
                                            '  Enabled: true',
-                                           '  Max: 100'
-                                          ])
+                                           '  Max: 100'])
 
       expect(cli.run(%w(--format simple example))).to eq(1)
       expect($stderr.string)
@@ -1288,16 +1469,12 @@ describe Rubocop::CLI, :isolated_environment do
     end
 
     it 'prints a warning for an unrecognized configuration parameter' do
-      create_file('example/example1.rb', [
-                                          '# encoding: utf-8',
-                                          '#' * 90
-                                         ])
+      create_file('example/example1.rb', ['# encoding: utf-8',
+                                          '#' * 90])
 
-      create_file('example/.rubocop.yml', [
-                                           'LineLength:',
+      create_file('example/.rubocop.yml', ['LineLength:',
                                            '  Enabled: true',
-                                           '  Min: 10'
-                                          ])
+                                           '  Min: 10'])
 
       expect(cli.run(%w(--format simple example))).to eq(1)
       expect($stderr.string)
@@ -1307,78 +1484,64 @@ describe Rubocop::CLI, :isolated_environment do
                 ''].join("\n"))
     end
 
-    it 'works when a configuration file passed by -c specifies Excludes with regexp' do
-      create_file('example/example1.rb', [
-                                          '# encoding: utf-8',
-                                          '#' * 90
-                                         ])
+    it 'works when a configuration file passed by -c specifies Excludes ' \
+       'with regexp' do
+      create_file('example/example1.rb', ['# encoding: utf-8',
+                                          '#' * 90])
 
-      create_file('rubocop.yml', [
-                                           'AllCops:',
-                                           '  Excludes:',
-                                           '    - !ruby/regexp /example1\.rb$/'
-                                          ])
+      create_file('rubocop.yml', ['AllCops:',
+                                  '  Excludes:',
+                                  '    - !ruby/regexp /example1\.rb$/'])
 
       cli.run(%w(--format simple -c rubocop.yml))
       expect($stdout.string)
-        .to eq(['', '0 files inspected, no offences detected',
+        .to eq(['', '0 files inspected, no offenses detected',
                 ''].join("\n"))
     end
 
-    it 'works when a configuration file passed by -c specifies Excludes with strings' do
-      create_file('example/example1.rb', [
-                                          '# encoding: utf-8',
-                                          '#' * 90
-                                         ])
+    it 'works when a configuration file passed by -c specifies Excludes ' \
+       'with strings' do
+      create_file('example/example1.rb', ['# encoding: utf-8',
+                                          '#' * 90])
 
-      create_file('rubocop.yml', [
-                                  'AllCops:',
+      create_file('rubocop.yml', ['AllCops:',
                                   '  Excludes:',
-                                  '    - example/**'
-                                 ])
+                                  '    - example/**'])
 
       cli.run(%w(--format simple -c rubocop.yml))
       expect($stdout.string)
-        .to eq(['', '0 files inspected, no offences detected',
+        .to eq(['', '0 files inspected, no offenses detected',
                 ''].join("\n"))
     end
 
     it 'works when a configuration file specifies a Severity' do
-      create_file('example/example1.rb', [
-                                          '# encoding: utf-8',
-                                          '#' * 90
-                                         ])
+      create_file('example/example1.rb', ['# encoding: utf-8',
+                                          '#' * 90])
 
-      create_file('rubocop.yml', [
-                                  'LineLength:',
-                                  '  Severity: error',
-                                 ])
+      create_file('rubocop.yml', ['LineLength:',
+                                  '  Severity: error'])
 
       cli.run(%w(--format simple -c rubocop.yml))
       expect($stdout.string)
         .to eq(['== example/example1.rb ==',
                 'E:  2: 80: Line is too long. [90/79]',
                 '',
-                '1 file inspected, 1 offence detected',
+                '1 file inspected, 1 offense detected',
                 ''].join("\n"))
       expect($stderr.string).to eq('')
     end
 
     it 'fails when a configuration file specifies an invalid Severity' do
-      create_file('example/example1.rb', [
-                                          '# encoding: utf-8',
-                                          '#' * 90
-                                         ])
+      create_file('example/example1.rb', ['# encoding: utf-8',
+                                          '#' * 90])
 
-      create_file('rubocop.yml', [
-                                  'LineLength:',
-                                  '  Severity: superbad',
-                                 ])
+      create_file('rubocop.yml', ['LineLength:',
+                                  '  Severity: superbad'])
 
       cli.run(%w(--format simple -c rubocop.yml))
       expect($stderr.string)
-        .to eq("Warning: Invalid severity 'superbad'. " +
-               'Valid severities are refactor, convention, ' +
+        .to eq("Warning: Invalid severity 'superbad'. " \
+               'Valid severities are refactor, convention, ' \
                "warning, error, fatal.\n")
     end
   end