rubocop 0.3.2 → 0.4.0

data/.rubocop.yml

@@ -121,3 +121,9 @@ MethodAndVariableSnakeCase:
 
 ClassAndModuleCamelCase:
   Enabled: true
+
+Syntax:
+  Enabled: true
+
+CollectionMethods:
+  Enabled: true

data/README.md

@@ -1,19 +1,23 @@
 [![Gem Version](https://badge.fury.io/rb/rubocop.png)](http://badge.fury.io/rb/rubocop)
 [![Build Status](https://travis-ci.org/bbatsov/rubocop.png?branch=master)](https://travis-ci.org/bbatsov/rubocop)
 
-# rubocop
+# RuboCop
 
-Ruby code style checker based on the [Ruby Style Guide](https://github.com/bbatsov/ruby-style-guide).
+**RuboCop** is a Ruby code style checker based on the
+[Ruby Style Guide](https://github.com/bbatsov/ruby-style-guide).
 
 ## Installation
 
+**RuboCop**'s installation is pretty standard:
+
 ```bash
 $ gem install rubocop
 ```
 
 ## Basic Usage
 
-Running `rubocop` with no arguments will check all Ruby source files in the current folder:
+Running `rubocop` with no arguments will check all Ruby source files
+in the current folder:
 
 ```bash
 $ rubocop
@@ -31,14 +35,22 @@ For more details check the available command-line options:
 $ rubocop -h
 ```
 
+Command flag       | Description
+-------------------|------------------------------------------------------------
+`-v/--version`     | Displays the current version and exits
+`-d/--debug`       | Displays some extra debug output
+`-e/--emacs`       | Output the results in Emacs format
+`-c/--config`      | Run with specified config file
+`-s/-silent`       | Suppress the final summary
+
 ## Configuration
 
-The behavior of `rubocop` can be controlled via the
+The behavior of RuboCop can be controlled via the
 [.rubocop.yml](https://github.com/bbatsov/rubocop/blob/master/.rubocop.yml)
 configuration file. The file can be placed either in your home folder
 or in some project folder.
 
-`rubocop` will start looking for the configuration file in the directory
+RuboCop will start looking for the configuration file in the directory
 it was started in and continue its way up to the home folder.
 
 The file has the following format:
@@ -61,7 +73,7 @@ Unfortunately every major Ruby implementation has its own code
 analysis tooling, which makes the development of a portable code
 analyzer a daunting task.
 
-`rubocop` currently supports MRI 1.9 and MRI 2.0. Support for JRuby and
+RuboCop currently supports MRI 1.9 and MRI 2.0. Support for JRuby and
 Rubinius is not planned at this point.
 
 ## Copyright

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/bin/rubocop

@@ -12,5 +12,5 @@ time = Benchmark.realtime do
   result = cli.run
 end
 
-puts "Finished in #{time} seconds" if $options[:verbose]
+puts "Finished in #{time} seconds" if $options[:debug]
 exit result

data/lib/rubocop.rb

@@ -11,6 +11,7 @@ require 'rubocop/cop/offence'
 require 'rubocop/cop/cop'
 require 'rubocop/cop/encoding'
 require 'rubocop/cop/line_length'
+require 'rubocop/cop/syntax'
 require 'rubocop/cop/tab'
 require 'rubocop/cop/trailing_whitespace'
 require 'rubocop/cop/indentation'
@@ -36,9 +37,11 @@ require 'rubocop/cop/new_lambda_literal'
 require 'rubocop/cop/parentheses_around_condition'
 require 'rubocop/cop/method_and_variable_snake_case'
 require 'rubocop/cop/class_and_module_camel_case'
+require 'rubocop/cop/collection_methods'
 
 require 'rubocop/report/report'
 require 'rubocop/report/plain_text'
 require 'rubocop/report/emacs_style'
 
 require 'rubocop/cli'
+require 'rubocop/version'

data/lib/rubocop/cli.rb

@@ -18,8 +18,8 @@ module Rubocop
       OptionParser.new do |opts|
         opts.banner = 'Usage: rubocop [options] [file1, file2, ...]'
 
-        opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
-          $options[:verbose] = v
+        opts.on('-d', '--[no-]debug', 'Display debug info') do |d|
+          $options[:debug] = d
         end
         opts.on('-e', '--emacs', 'Emacs style output') do
           $options[:mode] = :emacs_style
@@ -30,13 +30,21 @@ module Rubocop
         opts.on('-s', '--silent', 'Silence summary') do |s|
           $options[:silent] = s
         end
+        opts.on('-v', '--version', 'Display version') do
+          puts Rubocop::VERSION
+          exit(0)
+        end
       end.parse!(args)
 
-      cops = Cop::Cop.all
-      show_cops_on_duty(cops) if $options[:verbose]
       total_offences = 0
       @configs = {}
 
+      target_files = target_files(args)
+      config = $options[:config] || config_from_dotfile(target_files[0])
+
+      cops = cops_on_duty(config)
+      show_cops_on_duty(cops) if $options[:debug]
+
       target_files(args).each do |file|
         report = Report.create(file, $options[:mode])
         source = File.readlines(file).map do |line|
@@ -45,18 +53,15 @@ module Rubocop
         end
 
         tokens, sexp, correlations = CLI.rip_source(source)
-        config = $options[:config] || config_from_dotfile(File.dirname(file))
 
         cops.each do |cop_klass|
           cop_config = config[cop_klass.name.split('::').last] if config
-          if cop_config.nil? || cop_config['Enabled']
-            cop_klass.config = cop_config
-            cop = cop_klass.new
-            cop.correlations = correlations
-            cop.inspect(file, source, tokens, sexp)
-            total_offences += cop.offences.count
-            report << cop if cop.has_report?
-          end
+          cop_klass.config = cop_config
+          cop = cop_klass.new
+          cop.correlations = correlations
+          cop.inspect(file, source, tokens, sexp)
+          total_offences += cop.offences.count
+          report << cop if cop.has_report?
         end
 
         report.display unless report.empty?
@@ -92,6 +97,7 @@ module Rubocop
     # directory where the inspected file is. If no .rubocop.yml is
     # found there, the user's home directory is checked.
     def config_from_dotfile(target_file_dir)
+      return unless target_file_dir
       # @configs is a cache that maps directories to
       # configurations. We search for .rubocop.yml only if we haven't
       # already found it for the given directory.
@@ -111,10 +117,21 @@ module Rubocop
       @configs[target_file_dir]
     end
 
+    def cops_on_duty(config)
+      cops_on_duty = []
+
+      Cop::Cop.all.each do |cop_klass|
+        cop_config = config[cop_klass.name.split('::').last] if config
+        cops_on_duty << cop_klass if cop_config.nil? || cop_config['Enabled']
+      end
+
+      cops_on_duty
+    end
+
     def show_cops_on_duty(cops)
-      puts 'Reporting for duty:'
-      cops.each { |c| puts c }
-      puts '*******************'
+      puts '== Reporting for duty =='
+      cops.each { |c| puts ' * '.yellow + c.to_s.green }
+      puts '========================'
     end
 
     # Generate a list of target files by expanding globing patterns

data/lib/rubocop/cop/collection_methods.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+module Rubocop
+  module Cop
+    class CollectionMethods < Cop
+      PREFERRED_METHODS = {
+        'collect' => 'map',
+        'inject' => 'reduce',
+        'detect' => 'find',
+        'find_all' => 'select',
+      }
+
+      def inspect(file, source, tokens, sexp)
+        each(:call, sexp) do |s|
+          s.drop(2).each_slice(2) do |m|
+            method_name = m[1][1]
+            if PREFERRED_METHODS[method_name]
+              add_offence(
+                :convention,
+                m[1][2].lineno,
+                "Prefer #{PREFERRED_METHODS[method_name]} over #{method_name}."
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/cop.rb

@@ -89,7 +89,7 @@ module Rubocop
 
       def all_positions(sexp)
         return [sexp[2]] if sexp[0] =~ /^@/
-        sexp.grep(Array).inject([]) { |memo, s| memo + all_positions(s) }
+        sexp.grep(Array).reduce([]) { |memo, s| memo + all_positions(s) }
       end
     end
   end

data/lib/rubocop/cop/def_parentheses.rb

@@ -3,7 +3,10 @@
 module Rubocop
   module Cop
     module DefParentheses
-      EMPTY_PARAMS = [:params, nil, nil, nil, nil, nil]
+      EMPTY_PARAMS = [:params, nil, nil, nil,
+        nil, nil, nil, nil] if RUBY_VERSION >= '2.0.0'
+      EMPTY_PARAMS = [:params, nil, nil, nil,
+        nil, nil] if RUBY_VERSION < '2.0.0'
 
       def inspect(file, source, tokens, sexp)
         each(:def, sexp) { |def_sexp| check(tokens, def_sexp) }

data/lib/rubocop/cop/encoding.rb

@@ -6,10 +6,12 @@ module Rubocop
       ERROR_MESSAGE = 'Missing encoding comment.'
 
       def inspect(file, source, tokens, sexp)
-        expected_line = 0
-        expected_line += 1 if source[expected_line] =~ /^#!/
-        unless source[expected_line] =~ /#.*coding: (UTF|utf)-8/
-          add_offence(:convention, 1, ERROR_MESSAGE)
+        unless RUBY_VERSION >= '2.0.0'
+          expected_line = 0
+          expected_line += 1 if source[expected_line] =~ /^#!/
+          unless source[expected_line] =~ /#.*coding: (UTF|utf)-8/
+            add_offence(:convention, 1, ERROR_MESSAGE)
+          end
         end
       end
     end

data/lib/rubocop/cop/favor_modifier.rb

@@ -28,13 +28,13 @@ module Rubocop
           # The start ix is the index of the leftmost token on the
           # line of the if/unless, i.e. the index of if/unless itself,
           # or of the indentation space.
-          start_ix = if_ix.downto(0).find do |ix|
-            ix == 0 || tokens[ix - 1].text =~ /\n/
+          start_ix = if_ix.downto(0).find do |block_ix|
+            block_ix == 0 || tokens[block_ix - 1].text =~ /\n/
           end
           # The stop index is the index of the token just before
           # 'end', not counting whitespace tokens.
-          stop_ix = (end_ix - 1).downto(0).find do |ix|
-            tokens[ix].text !~ /\s/
+          stop_ix = (end_ix - 1).downto(0).find do |block_ix|
+            tokens[block_ix].text !~ /\s/
           end
           if length(tokens, start_ix, stop_ix) <= LineLength.max
             add_offence(:convention, token_positions[if_ix].lineno,
@@ -44,7 +44,7 @@ module Rubocop
       end
 
       def length(tokens, start_ix, stop_ix)
-        (start_ix..stop_ix).inject(0) do |acc, ix|
+        (start_ix..stop_ix).reduce(0) do |acc, ix|
           acc + if ix > start_ix && tokens[ix - 1].text =~ /\n/
                   0
                 else

data/lib/rubocop/cop/indentation.rb

@@ -17,7 +17,7 @@ module Rubocop
       end
 
       def find_keywords(tokens, keyword)
-        indexes = tokens.each_index.find_all do |ix|
+        indexes = tokens.each_index.select do |ix|
           keyword?(tokens, ix, keyword)
         end
         tokens.values_at(*indexes)

data/lib/rubocop/cop/syntax.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require 'open3'
+
+module Rubocop
+  module Cop
+    class Syntax < Cop
+      def inspect(file, source, tokens, sexp)
+        _, stderr, _ =
+          Open3.capture3('ruby -wc', stdin_data: source.join("\n"))
+
+        stderr.each_line do |line|
+          line_no, warning = line.match(/.+:(\d+): warning: (.+)/).captures
+          add_offence(:warning, line_no.to_i, warning.capitalize) if line_no
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Rubocop
-  VERSION = '0.0.1'
+  VERSION = '0.3.2'
 end

data/rubocop.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rubocop"
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bozhidar Batsov"]
-  s.date = "2013-04-06"
+  s.date = "2013-04-11"
   s.description = "Automatic Ruby code style checking tool. Aims to enforce the community-driven Ruby Style Guide."
   s.email = "bozhidar@batsov.com"
   s.executables = ["rubocop"]
@@ -30,15 +30,13 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/rubocop",
-    "features/rubocop.feature",
-    "features/step_definitions/rubocop_steps.rb",
-    "features/support/env.rb",
     "lib/rubocop.rb",
     "lib/rubocop/cli.rb",
     "lib/rubocop/cop/align_parameters.rb",
     "lib/rubocop/cop/ampersands_pipes_vs_and_or.rb",
     "lib/rubocop/cop/blocks.rb",
     "lib/rubocop/cop/class_and_module_camel_case.rb",
+    "lib/rubocop/cop/collection_methods.rb",
     "lib/rubocop/cop/cop.rb",
     "lib/rubocop/cop/def_parentheses.rb",
     "lib/rubocop/cop/empty_lines.rb",
@@ -60,6 +58,7 @@ Gem::Specification.new do |s|
     "lib/rubocop/cop/space_after_comma_etc.rb",
     "lib/rubocop/cop/string_literals.rb",
     "lib/rubocop/cop/surrounding_space.rb",
+    "lib/rubocop/cop/syntax.rb",
     "lib/rubocop/cop/tab.rb",
     "lib/rubocop/cop/ternary_operator.rb",
     "lib/rubocop/cop/trailing_whitespace.rb",
@@ -74,6 +73,7 @@ Gem::Specification.new do |s|
     "spec/rubocop/cops/align_parameters_spec.rb",
     "spec/rubocop/cops/ampersands_pipes_vs_and_or_spec.rb",
     "spec/rubocop/cops/class_and_module_camel_case_spec.rb",
+    "spec/rubocop/cops/collection_methods_spec.rb",
     "spec/rubocop/cops/cop_spec.rb",
     "spec/rubocop/cops/def_with_parentheses_spec.rb",
     "spec/rubocop/cops/def_without_parentheses_spec.rb",
@@ -107,6 +107,7 @@ Gem::Specification.new do |s|
     "spec/rubocop/cops/space_inside_brackets_spec.rb",
     "spec/rubocop/cops/space_inside_parens_spec.rb",
     "spec/rubocop/cops/string_literals_spec.rb",
+    "spec/rubocop/cops/syntax_spec.rb",
     "spec/rubocop/cops/tab_spec.rb",
     "spec/rubocop/cops/ternary_operator_spec.rb",
     "spec/rubocop/cops/trailing_whitespace_spec.rb",

data/spec/rubocop/cli_spec.rb

@@ -10,25 +10,33 @@ module Rubocop
       after(:each) { $stdout = STDOUT }
 
       it 'exits cleanly when -h is used' do
-        -> { cli.run ['-h'] }.should exit_with_code(0)
-        -> { cli.run ['--help'] }.should exit_with_code(0)
+        expect { cli.run ['-h'] }.to exit_with_code(0)
+        expect { cli.run ['--help'] }.to exit_with_code(0)
         message = ['Usage: rubocop [options] [file1, file2, ...]',
-                   '    -v, --[no-]verbose               Run verbosely',
+                   '    -d, --[no-]debug                 Display debug info',
                    '    -e, --emacs                      Emacs style output',
                    '    -c, --config FILE                Configuration file',
-                   '    -s, --silent                     Silence summary']
-        $stdout.string.should == (message * 2).join("\n") + "\n"
+                   '    -s, --silent                     Silence summary',
+                   '    -v, --version                    Display version']
+        expect($stdout.string).to eq((message * 2).join("\n") + "\n")
+      end
+
+      it 'exits cleanly when -v is used' do
+        expect { cli.run ['-v'] }.to exit_with_code(0)
+        expect { cli.run ['--version'] }.to exit_with_code(0)
+        expect($stdout.string).to eq((Rubocop::VERSION + "\n") * 2)
       end
 
       it 'checks a given correct file and returns 0' do
         File.open('example.rb', 'w') do |f|
           f.puts '# encoding: utf-8'
           f.puts 'x = 0'
+          f.puts 'puts x'
         end
         begin
-          cli.run(['example.rb']).should == 0
-          $stdout.string.uncolored.should ==
-            "\n1 files inspected, 0 offences detected\n"
+          expect(cli.run(['example.rb'])).to eq(0)
+          expect($stdout.string.uncolored)
+            .to eq("\n1 files inspected, 0 offences detected\n")
         ensure
           File.delete 'example.rb'
         end
@@ -38,26 +46,28 @@ module Rubocop
         File.open('example.rb', 'w') do |f|
           f.puts '# encoding: utf-8'
           f.puts 'x = 0 '
+          f.puts 'puts x'
         end
         begin
-          cli.run(['example.rb']).should == 1
-          $stdout.string.uncolored.should ==
-            ['== example.rb ==',
-             'C:  2: Trailing whitespace detected.',
-             '',
-             '1 files inspected, 1 offences detected',
-             ''].join("\n")
+          expect(cli.run(['example.rb'])).to eq(1)
+          expect($stdout.string.uncolored)
+            .to eq ['== example.rb ==',
+                    'C:  2: Trailing whitespace detected.',
+                    '',
+                    '1 files inspected, 1 offences detected',
+                    ''].join("\n")
         ensure
           File.delete 'example.rb'
         end
       end
 
-      it 'can report in emacs style' do
-        File.open('example1.rb', 'w') { |f| f.puts 'x= 0 ', 'y ' }
-        File.open('example2.rb', 'w') { |f| f.puts "\tx = 0" }
+      it 'can report in emacs style', ruby: 1.9 do
+        File.open('example1.rb', 'w') { |f| f.puts 'x= 0 ', 'y ', 'puts x' }
+        File.open('example2.rb', 'w') { |f| f.puts "\tx = 0", 'puts x' }
         begin
-          cli.run(['--emacs', 'example1.rb', 'example2.rb']).should == 1
-          $stdout.string.uncolored.should ==
+          expect(cli.run(['--emacs', 'example1.rb', 'example2.rb'])).to eq(1)
+          expect($stdout.string.uncolored)
+            .to eq(
             ['example1.rb:1: C: Missing encoding comment.',
              'example1.rb:1: C: Trailing whitespace detected.',
              "example1.rb:1: C: Surrounding space missing for operator '='.",
@@ -66,27 +76,65 @@ module Rubocop
              'example2.rb:1: C: Tab detected.',
              '',
              '2 files inspected, 6 offences detected',
-             ''].join("\n")
+             ''].join("\n"))
+        ensure
+          File.delete 'example1.rb'
+          File.delete 'example2.rb'
+        end
+      end
+
+      it 'can report in emacs style', ruby: 2.0 do
+        File.open('example1.rb', 'w') { |f| f.puts 'x= 0 ', 'y ', 'puts x' }
+        File.open('example2.rb', 'w') { |f| f.puts "\tx = 0", 'puts x' }
+        begin
+          expect(cli.run(['--emacs', 'example1.rb', 'example2.rb'])).to eq(1)
+          expect($stdout.string.uncolored)
+            .to eq(
+            ['example1.rb:1: C: Trailing whitespace detected.',
+             "example1.rb:1: C: Surrounding space missing for operator '='.",
+             'example1.rb:2: C: Trailing whitespace detected.',
+             'example2.rb:1: C: Tab detected.',
+             '',
+             '2 files inspected, 4 offences detected',
+             ''].join("\n"))
         ensure
           File.delete 'example1.rb'
           File.delete 'example2.rb'
         end
       end
 
-      it 'ommits summary when --silent passed' do
-        File.open('example1.rb', 'w') { |f| f.puts 'x = 0 ' }
-        File.open('example2.rb', 'w') { |f| f.puts "\tx = 0" }
+      it 'ommits summary when --silent passed', ruby: 1.9 do
+        File.open('example1.rb', 'w') { |f| f.puts 'puts 0 ' }
+        File.open('example2.rb', 'w') { |f| f.puts "\tputs 0" }
         begin
-          cli.run(['--emacs',
-                   '--silent',
-                   'example1.rb',
-                   'example2.rb']).should == 1
-          $stdout.string.should ==
+          expect(cli.run(['--emacs',
+                          '--silent',
+                          'example1.rb',
+                          'example2.rb'])).to eq(1)
+          expect($stdout.string).to eq(
             ['example1.rb:1: C: Missing encoding comment.',
              'example1.rb:1: C: Trailing whitespace detected.',
              'example2.rb:1: C: Missing encoding comment.',
              'example2.rb:1: C: Tab detected.',
-             ''].join("\n")
+             ''].join("\n"))
+        ensure
+          File.delete 'example1.rb'
+          File.delete 'example2.rb'
+        end
+      end
+
+      it 'ommits summary when --silent passed', ruby: 2.0 do
+        File.open('example1.rb', 'w') { |f| f.puts 'puts 0 ' }
+        File.open('example2.rb', 'w') { |f| f.puts "\tputs 0" }
+        begin
+          expect(cli.run(['--emacs',
+                          '--silent',
+                          'example1.rb',
+                          'example2.rb'])).to eq(1)
+          expect($stdout.string).to eq(
+            ['example1.rb:1: C: Trailing whitespace detected.',
+             'example2.rb:1: C: Tab detected.',
+             ''].join("\n"))
         ensure
           File.delete 'example1.rb'
           File.delete 'example2.rb'
@@ -94,7 +142,7 @@ module Rubocop
       end
 
       it 'can be configured with option to disable a certain error' do
-        File.open('example1.rb', 'w') { |f| f.puts 'x = 0 ' }
+        File.open('example1.rb', 'w') { |f| f.puts 'puts 0 ' }
         File.open('rubocop.yml', 'w') do |f|
           f.puts('Encoding:',
                  '  Enabled: false',
@@ -103,14 +151,13 @@ module Rubocop
                  '  Enabled: false')
         end
         begin
-          return_code = cli.run(['-c', 'rubocop.yml', 'example1.rb'])
-          $stdout.string.uncolored.should ==
+          expect(cli.run(['-c', 'rubocop.yml', 'example1.rb'])).to eq(1)
+          expect($stdout.string.uncolored).to eq(
             ['== example1.rb ==',
              'C:  1: Trailing whitespace detected.',
              '',
              '1 files inspected, 1 offences detected',
-             ''].join("\n")
-          return_code.should == 1
+             ''].join("\n"))
         ensure
           File.delete 'example1.rb'
           File.delete 'rubocop.yml'
@@ -119,7 +166,7 @@ module Rubocop
 
       it 'can be configured with project config to disable a certain error' do
         FileUtils.mkdir 'example_src'
-        File.open('example_src/example1.rb', 'w') { |f| f.puts 'x = 0 ' }
+        File.open('example_src/example1.rb', 'w') { |f| f.puts 'puts 0 ' }
         File.open('example_src/.rubocop.yml', 'w') do |f|
           f.puts('Encoding:',
                  '  Enabled: false',
@@ -128,14 +175,13 @@ module Rubocop
                  '  Enabled: false')
         end
         begin
-          return_code = cli.run(['example_src/example1.rb'])
-          $stdout.string.uncolored.should ==
+          expect(cli.run(['example_src/example1.rb'])).to eq(1)
+          expect($stdout.string.uncolored).to eq(
             ['== example_src/example1.rb ==',
              'C:  1: Trailing whitespace detected.',
              '',
              '1 files inspected, 1 offences detected',
-             ''].join("\n")
-          return_code.should == 1
+             ''].join("\n"))
         ensure
           FileUtils.rm_rf 'example_src'
         end
@@ -143,21 +189,20 @@ module Rubocop
 
       it 'can use an alternative max line length from a config file' do
         FileUtils.mkdir 'example_src'
-        File.open('example_src/example1.rb', 'w') { |f| f.puts '#' * 90 }
+        File.open('example_src/example1.rb', 'w') do |f|
+          f.puts '# encoding: utf-8'
+          f.puts '#' * 90
+        end
         File.open('example_src/.rubocop.yml', 'w') do |f|
           f.puts('LineLength:',
                  '  Enabled: true',
                  '  Max: 100')
         end
         begin
-          return_code = cli.run(['example_src/example1.rb'])
-          $stdout.string.uncolored.should ==
-            ['== example_src/example1.rb ==',
-             'C:  1: Missing encoding comment.',
-             '',
-             '1 files inspected, 1 offences detected',
-             ''].join("\n")
-          return_code.should == 1
+          expect(cli.run(['example_src/example1.rb'])).to eq(0)
+          expect($stdout.string.uncolored).to eq(
+            ['', '1 files inspected, 0 offences detected',
+             ''].join("\n"))
         ensure
           FileUtils.rm_rf 'example_src'
         end
@@ -165,8 +210,9 @@ module Rubocop
 
       it 'finds no violations when checking the rubocop source code' do
         cli.run
-        $stdout.string.uncolored.should =~
+        expect($stdout.string.uncolored).to match(
           /files inspected, 0 offences detected\n/
+        )
       end
 
       it 'can process a file with an invalide UTF-8 byte sequence' do
@@ -175,7 +221,7 @@ module Rubocop
           f.puts "# \xf9\x29"
         end
         begin
-          cli.run(['--emacs', 'example.rb']).should == 0
+          expect(cli.run(['--emacs', 'example.rb'])).to eq(0)
         ensure
           File.delete 'example.rb'
         end
@@ -185,7 +231,7 @@ module Rubocop
         cop_names = Cop::Cop.all.map do |cop_class|
           cop_class.name.split('::').last
         end
-        YAML.load_file('.rubocop.yml').keys.sort.should == cop_names.sort
+        expect(YAML.load_file('.rubocop.yml').keys.sort).to eq(cop_names.sort)
       end
     end
   end