rubocop 0.6.0 → 0.6.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 59160d74a2b79a8d6402bca657745ea9aadaf27c
+  data.tar.gz: 074abc5e163cfff8ad8c3f11fc61bbf309be6515
+SHA512:
+  metadata.gz: 84391e7848783db7aeaf55918c3ef7c93819f7329a1d22cbaf1cc072d62b02494d1e9a87b71d0fa79f620cf3368be3f96b314d69f5f6633962714be57126c58a
+  data.tar.gz: aedd8920e0a1ab20d364c149283f9954c4f15b33054de3e53edfd3364817a1af23c852167256fd1e3c95f38da49398c63a780b270581df077cff12026f3b892e

data/.rubocop.yml

@@ -232,8 +232,12 @@ EnsureReturn:
 HandleExceptions:
   Enabled: true
 
-# Use only ascii symbols in identifiers and comments.
-AsciiIdentifiersAndComments:
+# Use only ascii symbols in identifiers.
+AsciiIdentifiers:
+  Enabled: true
+
+# Use only ascii symbols in comments.
+AsciiComments:
   Enabled: true
 
 # Avoid rescuing the Exception class.

data/CHANGELOG.md

@@ -6,6 +6,28 @@
 
 ### Bugs fixed
 
+## 0.6.1 (04/28/2013)
+
+### New features
+
+* Split AsciiIdentifiersAndComments cop in two separate cops
+
+### Bugs fixed
+
+* [#90](https://github.com/bbatsov/rubocop/issues/90) Two cops crash when scanning code using super
+* [#93](https://github.com/bbatsov/rubocop/issues/93) Issue with whitespace?': undefined method
+* [#97](https://github.com/bbatsov/rubocop/issues/97) Build fails
+* [#100](https://github.com/bbatsov/rubocop/issues/100) OpMethod cop doesn't work if method arg is not in braces
+* SymbolSnakeCase now tracks Ruby 1.9 hash labels as well as regular symbols
+
+### Misc
+
+* [#88](https://github.com/bbatsov/rubocop/issues/88) Abort gracefully when interrupted with Ctrl-C
+* No longer crashes on bugs within cops. Now problematic checks are skipped and a message is displayed.
+* Replaced Term::ANSIColor with Rainbow.
+* Add an option to disable colors in the output.
+* Cop names are now displayed alongside messages when `-d/--debug` is passed.
+
 ## 0.6.0 (04/23/2013)
 
 ### New features

data/Gemfile

@@ -1,3 +1,7 @@
 source 'http://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'coveralls', require: false
+end

data/README.md

@@ -1,5 +1,6 @@
 [![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)
+[![Coverage Status](https://coveralls.io/repos/bbatsov/rubocop/badge.png?branch=master)](https://coveralls.io/r/bbatsov/rubocop)
 
 # RuboCop
 
@@ -114,11 +115,24 @@ and quickly jump between problems in your code.
 [flycheck](https://github.com/lunaryorn/flycheck) > 0.9 also supports
 RuboCop and uses it by default when available.
 
+### Vim
+
+The [vim-rubocop](https://github.com/ngmy/vim-rubocop) plugin runs
+RuboCop and displays the results in Vim.
+
 ### Other Editors
 
 Here's one great opportunity to contribute to RuboCop - implement
 RuboCop integration for your favorite editor.
 
+## Guard integration
+
+If you're fond of [Guard](https://github.com/guard/guard) you might
+like
+[guard-rubocop](https://github.com/yujinakayama/guard-rubocop). It
+allows you to automatically check Ruby code style with RuboCop when
+files are modified.
+
 ## Contributors
 
 Here's a [list](https://github.com/bbatsov/rubocop/contributors) of

data/lib/rubocop.rb

@@ -1,11 +1,7 @@
 # encoding: utf-8
 
 require 'ripper'
-require 'term/ansicolor'
-
-class String
-  include Term::ANSIColor
-end
+require 'rainbow'
 
 require 'rubocop/cop/offence'
 require 'rubocop/cop/cop'
@@ -53,7 +49,8 @@ require 'rubocop/cop/brace_after_percent'
 require 'rubocop/cop/ensure_return'
 require 'rubocop/cop/handle_exceptions'
 require 'rubocop/cop/rescue_exception'
-require 'rubocop/cop/ascii_identifiers_and_comments'
+require 'rubocop/cop/ascii_identifiers'
+require 'rubocop/cop/ascii_comments'
 require 'rubocop/cop/hash_literal'
 require 'rubocop/cop/array_literal'
 require 'rubocop/cop/method_length'

data/lib/rubocop/cli.rb

@@ -8,40 +8,32 @@ module Rubocop
   # The CLI is a class responsible of handling all the command line interface
   # logic.
   class CLI
+    # If set true while running,
+    # RuboCop will abort processing and exit gracefully.
+    attr_accessor :wants_to_quit
+    alias_method :wants_to_quit?, :wants_to_quit
+
     # Entry point for the application logic. Here we
     # do the command line arguments processing and inspect
     # the target files
     # @return [Fixnum] UNIX exit code
     def run(args = ARGV)
+      trap_interrupt
+
       $options = { mode: :default }
 
-      OptionParser.new do |opts|
-        opts.banner = 'Usage: rubocop [options] [file1, file2, ...]'
-
-        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
-        end
-        opts.on('-c FILE', '--config FILE', 'Configuration file') do |f|
-          $options[:config] = YAML.load_file(f)
-        end
-        opts.on('-s', '--silent', 'Silence summary') do |s|
-          $options[:silent] = s
-        end
-        opts.on('-v', '--version', 'Display version') do
-          puts Rubocop::Version::STRING
-          exit(0)
-        end
-      end.parse!(args)
+      parse_options(args)
 
       cops = Cop::Cop.all
       show_cops_on_duty(cops) if $options[:debug]
+      processed_file_count = 0
       total_offences = 0
+      errors_count = 0
       @configs = {}
 
       target_files(args).each do |file|
+        break if wants_to_quit?
+
         puts "Scanning #{file}" if $options[:debug]
 
         report = Report.create(file, $options[:mode])
@@ -71,24 +63,68 @@ module Rubocop
               cop = cop_klass.new
               cop.correlations = correlations
               cop.disabled_lines = disabled_lines[cop_name]
-              cop.inspect(file, source, tokens, sexp)
+              begin
+                cop.inspect(file, source, tokens, sexp)
+              rescue => e
+                errors_count += 1
+                warn "An error occurred while #{cop.name} cop" +
+                  " was inspecting #{file}."
+                warn 'To see the complete backtrace run rubocop -d.'
+                puts e.backtrace if $options[:debug]
+              end
               total_offences += cop.offences.count
               report << cop if cop.has_report?
             end
           end
         end
 
+        processed_file_count += 1
         report.display unless report.empty?
       end
 
       unless $options[:silent]
-        display_summary(target_files(args).count, total_offences)
+        display_summary(processed_file_count, total_offences, errors_count)
       end
 
-      return total_offences == 0 ? 0 : 1
+      (total_offences == 0) && !wants_to_quit ? 0 : 1
+    end
+
+    def parse_options(args)
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: rubocop [options] [file1, file2, ...]'
+
+        opts.on('-d', '--debug', 'Display debug info') do |d|
+          $options[:debug] = d
+        end
+        opts.on('-e', '--emacs', 'Emacs style output') do
+          $options[:mode] = :emacs_style
+        end
+        opts.on('-c FILE', '--config FILE', 'Configuration file') do |f|
+          $options[:config] = YAML.load_file(f)
+        end
+        opts.on('-s', '--silent', 'Silence summary') do |s|
+          $options[:silent] = s
+        end
+        opts.on('-n', '--no-color', 'Disable color output') do |s|
+          Sickill::Rainbow.enabled = false
+        end
+        opts.on('-v', '--version', 'Display version') do
+          puts Rubocop::Version::STRING
+          exit(0)
+        end
+      end.parse!(args)
     end
 
-    def display_summary(num_files, total_offences)
+    def trap_interrupt
+      Signal.trap('INT') do
+        exit!(1) if wants_to_quit?
+        self.wants_to_quit = true
+        STDERR.puts
+        STDERR.puts 'Exiting... Interrupt again to exit immediately.'
+      end
+    end
+
+    def display_summary(num_files, total_offences, errors_count)
       print "\n#{num_files} file#{num_files > 1 ? 's' : ''} inspected, "
       offences_string = if total_offences.zero?
                           'no offences'
@@ -98,7 +134,14 @@ module Rubocop
                           "#{total_offences} offences"
                         end
       puts "#{offences_string} detected"
-        .send(total_offences.zero? ? :green : :red)
+        .color(total_offences.zero? ? :green : :red)
+
+      if errors_count > 0
+        plural = errors_count > 1 ? 's' : ''
+        puts "\n#{errors_count} error#{plural} occurred.".color(:red)
+        puts 'Errors are usually caused by RuboCop bugs.'
+        puts 'Please, report your problems to RuboCop\'s issue tracker.'
+      end
     end
 
     def disabled_lines_in(source)
@@ -188,7 +231,9 @@ module Rubocop
 
     def show_cops_on_duty(cops)
       puts '== Reporting for duty =='
-      cops.each { |c| puts ' * '.yellow + c.to_s.green }
+      cops.each do |c|
+        puts ' * '.color(:yellow) + c.to_s.color(:green)
+      end
       puts '========================'
     end
 

data/lib/rubocop/cop/array_literal.rb

@@ -9,8 +9,8 @@ module Rubocop
         each(:method_add_arg, sexp) do |s|
           potential_class = s[1][1][1]
 
-          if potential_class[1] == 'Array' && s[1][3][1] == 'new' &&
-              s[2] == [:arg_paren, nil]
+          if potential_class && potential_class[1] == 'Array' &&
+              s[1][3][1] == 'new' && s[2] == [:arg_paren, nil]
             add_offence(:convention,
                         potential_class[2].lineno,
                         ERROR_MESSAGE)

data/lib/rubocop/cop/{ascii_identifiers_and_comments.rb → ascii_comments.rb}

@@ -2,12 +2,12 @@
 
 module Rubocop
   module Cop
-    class AsciiIdentifiersAndComments < Cop
-      ERROR_MESSAGE = 'Use only ascii symbols in identifiers and comments.'
+    class AsciiComments < Cop
+      ERROR_MESSAGE = 'Use only ascii symbols in comments.'
 
       def inspect(file, source, tokens, sexp)
         tokens.each do |t|
-          if [:on_ident, :on_comment].include?(t.type) &&
+          if t.type == :on_comment &&
               t.text =~ /[^\x00-\x7f]/
             add_offence(:convention, t.pos.lineno, ERROR_MESSAGE)
           end

data/lib/rubocop/cop/ascii_identifiers.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module Rubocop
+  module Cop
+    class AsciiIdentifiers < Cop
+      ERROR_MESSAGE = 'Use only ascii symbols in identifiers.'
+
+      def inspect(file, source, tokens, sexp)
+        tokens.each do |t|
+          if t.type == :on_ident &&
+              t.text =~ /[^\x00-\x7f]/
+            add_offence(:convention, t.pos.lineno, ERROR_MESSAGE)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/cop.rb

@@ -56,10 +56,15 @@ module Rubocop
 
       def add_offence(severity, line_number, message)
         unless @disabled_lines && @disabled_lines.include?(line_number)
+          message = $options[:debug] ? "#{name}: #{message}" : message
           @offences << Offence.new(severity, line_number, message)
         end
       end
 
+      def name
+        self.class.to_s.split('::')[-1]
+      end
+
       private
 
       def each_parent_of(sym, sexp)

data/lib/rubocop/cop/hash_literal.rb

@@ -9,8 +9,8 @@ module Rubocop
         each(:method_add_arg, sexp) do |s|
           potential_class = s[1][1][1]
 
-          if potential_class[1] == 'Hash' && s[1][3][1] == 'new' &&
-              s[2] == [:arg_paren, nil]
+          if potential_class && potential_class[1] == 'Hash' &&
+              s[1][3][1] == 'new' && s[2] == [:arg_paren, nil]
             add_offence(:convention,
                         potential_class[2].lineno,
                         ERROR_MESSAGE)

data/lib/rubocop/cop/op_method.rb

@@ -8,7 +8,12 @@ module Rubocop
       def inspect(file, source, tokens, sexp)
         each(:def, sexp) do |s|
           if s[1][0] == :@op && !%w([] []= <<).include?(s[1][1])
-            param = s[2][1][1][0]
+            if s[2][0] == :paren
+              # param is surrounded by braces
+              param = s[2][1][1][0]
+            else
+              param = s[2][1][0]
+            end
 
             unless param[1] == 'other'
               add_offence(:convention,

data/lib/rubocop/cop/space_after_comma_etc.rb

@@ -6,11 +6,10 @@ module Rubocop
       ERROR_MESSAGE = 'Space missing after %s.'
 
       def inspect(file, source, tokens, sexp)
-        tokens.each_index do |ix|
-          t = tokens[ix]
-          if kind(t) && !whitespace?(tokens[ix + 1])
-            add_offence(:convention, t.pos.lineno,
-                        sprintf(ERROR_MESSAGE, kind(t)))
+        tokens.each_cons(2) do |t1, t2|
+          if kind(t1) && !whitespace?(t2)
+            add_offence(:convention, t1.pos.lineno,
+                        sprintf(ERROR_MESSAGE, kind(t1)))
           end
         end
       end

data/lib/rubocop/cop/symbol_snake_case.rb

@@ -6,6 +6,13 @@ module Rubocop
       ERROR_MESSAGE = 'Use snake_case for symbols.'
       SNAKE_CASE = /^@?[\da-z_]+[!?=]?$/
       def inspect(file, source, tokens, sexp)
+        check_for_symbols(sexp)
+        check_for_hash_labels(sexp)
+      end
+
+      private
+
+      def check_for_symbols(sexp)
         each(:symbol_literal, sexp) do |s|
           symbol_type = s[1][1][0]
 
@@ -22,6 +29,19 @@ module Rubocop
           end
         end
       end
+
+      def check_for_hash_labels(sexp)
+        each(:@label, sexp) do |s|
+          label_ident = s[1].chop
+
+          unless label_ident =~ SNAKE_CASE
+            line_no = s[2].lineno
+            add_offence(:convention,
+                        line_no,
+                        ERROR_MESSAGE)
+          end
+        end
+      end
     end
   end
 end

data/lib/rubocop/report/plain_text.rb

@@ -6,7 +6,7 @@ module Rubocop
     class PlainText < Report
       # Generates a string representation of the report
       def generate
-        report = "== #{filename} ==\n".yellow
+        report = "== #{filename} ==\n".color(:yellow)
         report << entries.join("\n")
       end
 

data/lib/rubocop/version.rb

@@ -2,6 +2,6 @@
 
 module Rubocop
   module Version
-    STRING = '0.6.0'
+    STRING = '0.6.1'
   end
 end

data/rubocop.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.8.23'
   s.summary = 'Automatic Ruby code style checking tool.'
 
-  s.add_runtime_dependency(%q<term-ansicolor>, '~> 1.1')
+  s.add_runtime_dependency(%q<rainbow>, '>= 1.1.4')
   s.add_development_dependency(%q<rake>, '~> 10.0')
   s.add_development_dependency(%q<rspec>, '~> 2.13')
   s.add_development_dependency(%q<yard>, '~> 0.8')

data/spec/rubocop/cli_spec.rb

@@ -15,10 +15,11 @@ module Rubocop
         expect { cli.run ['-h'] }.to exit_with_code(0)
         expect { cli.run ['--help'] }.to exit_with_code(0)
         message = ['Usage: rubocop [options] [file1, file2, ...]',
-                   '    -d, --[no-]debug                 Display debug info',
+                   '    -d, --debug                      Display debug info',
                    '    -e, --emacs                      Emacs style output',
                    '    -c, --config FILE                Configuration file',
                    '    -s, --silent                     Silence summary',
+                   '    -n, --no-color                   Disable color output',
                    '    -v, --version                    Display version']
         expect($stdout.string).to eq((message * 2).join("\n") + "\n")
       end
@@ -29,6 +30,74 @@ module Rubocop
         expect($stdout.string).to eq((Rubocop::Version::STRING + "\n") * 2)
       end
 
+      describe '#wants_to_quit?' do
+        it 'is initially false' do
+          expect(cli.wants_to_quit?).to be_false
+        end
+      end
+
+      context 'when interrupted with Ctrl-C' do
+        def execute_rubocop
+          project_root = File.expand_path('../..', File.dirname(__FILE__))
+          rubocop_command = File.join(project_root, 'bin', 'rubocop')
+
+          _, stdout, stderr, thread = Open3.popen3(rubocop_command, '--debug')
+
+          unless IO.select([stdout], nil, nil, 10)
+            fail 'rubocop took too long to start running'
+          end
+
+          yield stdout, stderr, thread.pid
+
+          thread.value.exitstatus
+        ensure
+          thread.terminate
+        end
+
+        def wait_for_output(output)
+          IO.select([output], nil, nil, 10)
+        end
+
+        it 'exits with status 1' do
+          exit_status = execute_rubocop do |stdout, stderr, pid|
+            Process.kill('INT', pid)
+          end
+          expect(exit_status).to eq(1)
+        end
+
+        it 'exits gracefully without dumping backtraces' do
+          execute_rubocop do |stdout, stderr, pid|
+            Process.kill('INT', pid)
+            wait_for_output(stderr)
+            expect(stderr.read).not_to match(/from .+:\d+:in /)
+          end
+        end
+
+        context 'with Ctrl-C once' do
+          it 'reports summary' do
+            execute_rubocop do |stdout, stderr, pid|
+              Process.kill('INT', pid)
+              wait_for_output(stdout)
+              output = stdout.read
+              expect(output).to match(/files? inspected/)
+            end
+          end
+        end
+
+        context 'with Ctrl-C twice' do
+          it 'exits immediately without reporting summary' do
+            execute_rubocop do |stdout, stderr, pid|
+              Process.kill('INT', pid)
+              wait_for_output(stderr) # Wait for "Exiting...".
+              Process.kill('INT', pid)
+              wait_for_output(stdout)
+              output = stdout.read
+              expect(output).not_to match(/files? inspected/)
+            end
+          end
+        end
+      end
+
       it 'checks a given correct file and returns 0' do
         File.open('example.rb', 'w') do |f|
           f.puts '# encoding: utf-8'
@@ -37,7 +106,7 @@ module Rubocop
         end
         begin
           expect(cli.run(['example.rb'])).to eq(0)
-          expect($stdout.string.uncolored)
+          expect($stdout.string)
             .to eq("\n1 file inspected, no offences detected\n")
         ensure
           File.delete 'example.rb'
@@ -52,7 +121,7 @@ module Rubocop
         end
         begin
           expect(cli.run(['example.rb'])).to eq(1)
-          expect($stdout.string.uncolored)
+          expect($stdout.string)
             .to eq ['== example.rb ==',
                     'C:  2: Trailing whitespace detected.',
                     '',
@@ -68,7 +137,7 @@ module Rubocop
         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)
+          expect($stdout.string)
             .to eq(
             ['example1.rb:1: C: Missing utf-8 encoding comment.',
              'example1.rb:1: C: Trailing whitespace detected.',
@@ -90,7 +159,7 @@ module Rubocop
         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)
+          expect($stdout.string)
             .to eq(
             ['example1.rb:1: C: Trailing whitespace detected.',
              "example1.rb:1: C: Surrounding space missing for operator '='.",
@@ -143,6 +212,21 @@ module Rubocop
         end
       end
 
+      it 'shows cop names when --debug is passed', ruby: 2.0 do
+        File.open('example1.rb', 'w') { |f| f.puts "\tputs 0" }
+        begin
+          expect(cli.run(['--emacs',
+                          '--silent',
+                          '--debug',
+                          'example1.rb'])).to eq(1)
+          expect($stdout.string.lines[-1]).to eq(
+            ['example1.rb:1: C: Tab: Tab detected.',
+             ''].join("\n"))
+        ensure
+          File.delete 'example1.rb'
+        end
+      end
+
       it 'can be configured with option to disable a certain error' do
         File.open('example1.rb', 'w') { |f| f.puts 'puts 0 ' }
         File.open('rubocop.yml', 'w') do |f|
@@ -154,7 +238,7 @@ module Rubocop
         end
         begin
           expect(cli.run(['-c', 'rubocop.yml', 'example1.rb'])).to eq(1)
-          expect($stdout.string.uncolored).to eq(
+          expect($stdout.string).to eq(
             ['== example1.rb ==',
              'C:  1: Trailing whitespace detected.',
              '',
@@ -178,7 +262,7 @@ module Rubocop
         end
         begin
           expect(cli.run(['example_src/example1.rb'])).to eq(1)
-          expect($stdout.string.uncolored).to eq(
+          expect($stdout.string).to eq(
             ['== example_src/example1.rb ==',
              'C:  1: Trailing whitespace detected.',
              '',
@@ -202,7 +286,7 @@ module Rubocop
         end
         begin
           expect(cli.run(['example_src/example1.rb'])).to eq(0)
-          expect($stdout.string.uncolored).to eq(
+          expect($stdout.string).to eq(
             ['', '1 file inspected, no offences detected',
              ''].join("\n"))
         ensure
@@ -225,7 +309,7 @@ module Rubocop
         end
         begin
           expect(cli.run(['example'])).to eq(1)
-          expect($stdout.string.uncolored).to eq(
+          expect($stdout.string).to eq(
             ['== example/lib/example1.rb ==',
              'C:  2: Line is too long. [90/79]',
              '',
@@ -257,7 +341,7 @@ module Rubocop
           end
           begin
             expect(cli.run(['example_src/example1.rb'])).to eq(0)
-            expect($stdout.string.uncolored).to eq(
+            expect($stdout.string).to eq(
               ['', '1 file inspected, no offences detected',
                ''].join("\n"))
           ensure
@@ -271,7 +355,7 @@ module Rubocop
         # Need to pass an empty array explicitly
         # so that the CLI does not refer arguments of `rspec`
         cli.run([])
-        expect($stdout.string.uncolored).to match(
+        expect($stdout.string).to match(
           /files inspected, no offences detected\n/
         )
       end
@@ -285,7 +369,7 @@ module Rubocop
         begin
           expect(cli.run(['--emacs', 'example.rb'])).to eq(1)
           unexpected_part = RUBY_VERSION >= '2.0' ? 'end-of-input' : '$end'
-          expect($stdout.string.uncolored).to eq(
+          expect($stdout.string).to eq(
             ["example.rb:3: E: Syntax error, unexpected #{unexpected_part}, " +
              'expecting keyword_end',
              '',
@@ -333,7 +417,7 @@ module Rubocop
           expect(cli.run(['--emacs', 'example.rb'])).to eq(1)
           # all cops were disabled, then 2 were enabled again, so we
           # should get 2 offences reported.
-          expect($stdout.string.uncolored).to eq(
+          expect($stdout.string).to eq(
             ['example.rb:8: C: Line is too long. [95/79]',
              "example.rb:10: C: Prefer single-quoted strings when you don't " +
              'need string interpolation or special symbols.',
@@ -363,7 +447,7 @@ module Rubocop
           expect(cli.run(['--emacs', 'example.rb'])).to eq(1)
           # 3 cops were disabled, then 2 were enabled again, so we
           # should get 2 offences reported.
-          expect($stdout.string.uncolored).to eq(
+          expect($stdout.string).to eq(
             ['example.rb:8: C: Line is too long. [95/79]',
              "example.rb:10: C: Prefer single-quoted strings when you don't " +
              'need string interpolation or special symbols.',
@@ -382,7 +466,7 @@ module Rubocop
         end
         begin
           expect(cli.run(['--emacs', 'example.rb'])).to eq(0)
-          expect($stdout.string.uncolored).to eq(
+          expect($stdout.string).to eq(
             ['',
              '1 file inspected, no offences detected',
              ''].join("\n"))
@@ -400,7 +484,7 @@ module Rubocop
         end
         begin
           expect(cli.run(['--emacs', 'example.rb'])).to eq(1)
-          expect($stdout.string.uncolored).to eq(
+          expect($stdout.string).to eq(
             ['example.rb:3: C: Line is too long. [95/79]',
              '',
              '1 file inspected, 1 offence detected',
@@ -423,7 +507,7 @@ module Rubocop
             # Need to pass an empty array explicitly
             # so that the CLI does not refer arguments of `rspec`
             expect(cli.run([])).to eq(0)
-            expect($stdout.string.uncolored).to eq(
+            expect($stdout.string).to eq(
               ['', '1 file inspected, no offences detected',
                ''].join("\n"))
           end
@@ -431,6 +515,28 @@ module Rubocop
           FileUtils::rm_rf 'test'
         end
       end
+
+      describe '#display_summary' do
+        it 'handles pluralization correctly' do
+          cli.display_summary(1, 0, 0)
+          expect($stdout.string).to eq(
+            "\n1 file inspected, no offences detected\n")
+          $stdout = StringIO.new
+          cli.display_summary(1, 1, 0)
+          expect($stdout.string).to eq(
+            "\n1 file inspected, 1 offence detected\n")
+          $stdout = StringIO.new
+          cli.display_summary(2, 2, 0)
+          expect($stdout.string).to eq(
+            "\n2 files inspected, 2 offences detected\n")
+        end
+
+        it 'displays an error message when errors are present' do
+          cli.display_summary(1, 1, 1)
+          expect($stdout.string.lines.to_a[-3])
+            .to eq("1 error occurred.\n")
+        end
+      end
     end
   end
 end

data/spec/rubocop/cops/array_literal_spec.rb

@@ -24,6 +24,16 @@ module Rubocop
                        ['test = Array.new(3)'])
         expect(a.offences).to be_empty
       end
+
+      it 'does not crash when a method is called on super' do
+        inspect_source(a,
+                       'file.rb',
+                       ['class Derived < Base',
+                        '  def func',
+                        '    super.slice(1..2)',
+                        '  end',
+                        'end'])
+      end
     end
   end
 end

data/spec/rubocop/cops/ascii_comments_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    describe AsciiComments do
+      let(:ascii) { AsciiComments.new }
+
+      it 'registers an offence for a comment with non-ascii chars' do
+        inspect_source(ascii,
+                       'file.rb',
+                       ['# 这是什么？'])
+        expect(ascii.offences.size).to eq(1)
+        expect(ascii.offences.map(&:message))
+          .to eq([AsciiComments::ERROR_MESSAGE])
+      end
+
+      it 'accepts comments with only ascii chars' do
+        inspect_source(ascii,
+                       'file.rb',
+                       ['# AZaz1@$%~,;*_`|'])
+        expect(ascii.offences).to be_empty
+      end
+    end
+  end
+end

data/spec/rubocop/cops/ascii_identifiers_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    describe AsciiIdentifiers do
+      let(:ascii) { AsciiIdentifiers.new }
+
+      it 'registers an offence for a variable name with non-ascii chars' do
+        inspect_source(ascii,
+                       'file.rb',
+                       ['älg = 1'])
+        expect(ascii.offences.size).to eq(1)
+        expect(ascii.offences.map(&:message))
+          .to eq([AsciiIdentifiers::ERROR_MESSAGE])
+      end
+
+      it 'accepts identifiers with only ascii chars' do
+        inspect_source(ascii,
+                       'file.rb',
+                       ['x.empty?'])
+        expect(ascii.offences).to be_empty
+      end
+    end
+  end
+end

data/spec/rubocop/cops/hash_literal_spec.rb

@@ -24,6 +24,16 @@ module Rubocop
                        ['test = Hash.new(3)'])
         expect(a.offences).to be_empty
       end
+
+      it 'does not crash when a method is called on super' do
+        inspect_source(a,
+                       'file.rb',
+                       ['class Derived < Base',
+                        '  def func',
+                        '    super.slice(1..2)',
+                        '  end',
+                        'end'])
+      end
     end
   end
 end

data/spec/rubocop/cops/op_method_spec.rb

@@ -18,6 +18,17 @@ module Rubocop
           .to eq([sprintf(OpMethod::ERROR_MESSAGE, '+')])
       end
 
+      it 'works properly even if the argument is not surrounded with braces' do
+        inspect_source(om,
+                       'file.rb',
+                       ['def + another',
+                        '  another',
+                        'end'])
+        expect(om.offences.size).to eq(1)
+        expect(om.offences.map(&:message))
+          .to eq([sprintf(OpMethod::ERROR_MESSAGE, '+')])
+      end
+
       it 'does not register an offence for arg named other' do
         inspect_source(om,
                        'file.rb',

data/spec/rubocop/cops/space_after_semicolon_spec.rb

@@ -12,6 +12,11 @@ module Rubocop
         expect(space.offences.map(&:message)).to eq(
           ['Space missing after semicolon.'])
       end
+
+      it 'does not crash if semicolon is the last character of the file' do
+        inspect_source(space, 'file.rb', ['x = 1;'])
+        expect(space.offences.map(&:message)).to be_empty
+      end
     end
   end
 end

data/spec/rubocop/cops/symbol_snake_case_spec.rb

@@ -14,12 +14,25 @@ module Rubocop
           ['Use snake_case for symbols.'])
       end
 
+      it 'registers an offence for symbol used as hash label' do
+        inspect_source(snake_case, 'file.rb',
+                       ['{ ONE: 1, TWO: 2 }'])
+        expect(snake_case.offences.map(&:message)).to eq(
+          ['Use snake_case for symbols.'] * 2)
+      end
+
       it 'accepts snake case in names' do
         inspect_source(snake_case, 'file.rb',
                        ['test = :good_idea'])
         expect(snake_case.offences).to be_empty
       end
 
+      it 'accepts snake case in hash label names' do
+        inspect_source(snake_case, 'file.rb',
+                       ['{ one: 1, one_more_3: 2 }'])
+        expect(snake_case.offences).to be_empty
+      end
+
       it 'accepts snake case with a prefix @ in names' do
         inspect_source(snake_case, 'file.rb',
                        ['test = :@good_idea'])

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+require 'coveralls'
+Coveralls.wear!
+
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start
@@ -11,6 +14,9 @@ require 'rspec'
 require 'rubocop'
 require 'rubocop/cli'
 
+# disable colors in specs
+Sickill::Rainbow.enabled = false
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.6.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -12,25 +11,22 @@ cert_chain: []
 date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +121,8 @@ files:
 - lib/rubocop/cop/align_parameters.rb
 - lib/rubocop/cop/ampersands_pipes_vs_and_or.rb
 - lib/rubocop/cop/array_literal.rb
-- lib/rubocop/cop/ascii_identifiers_and_comments.rb
+- lib/rubocop/cop/ascii_comments.rb
+- lib/rubocop/cop/ascii_identifiers.rb
 - lib/rubocop/cop/avoid_class_vars.rb
 - lib/rubocop/cop/avoid_for.rb
 - lib/rubocop/cop/avoid_perl_backrefs.rb
@@ -195,7 +183,8 @@ files:
 - spec/rubocop/cops/align_parameters_spec.rb
 - spec/rubocop/cops/ampersands_pipes_vs_and_or_spec.rb
 - spec/rubocop/cops/array_literal_spec.rb
-- spec/rubocop/cops/ascii_identifiers_and_comments_spec.rb
+- spec/rubocop/cops/ascii_comments_spec.rb
+- spec/rubocop/cops/ascii_identifiers_spec.rb
 - spec/rubocop/cops/avoid_class_vars_spec.rb
 - spec/rubocop/cops/avoid_for_spec.rb
 - spec/rubocop/cops/avoid_perl_backrefs_spec.rb
@@ -263,30 +252,26 @@ files:
 homepage: http://github.com/bbatsov/rubocop
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4221530219562804900
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automatic Ruby code style checking tool.
 test_files:
 - spec/rubocop/cli_spec.rb
@@ -294,7 +279,8 @@ test_files:
 - spec/rubocop/cops/align_parameters_spec.rb
 - spec/rubocop/cops/ampersands_pipes_vs_and_or_spec.rb
 - spec/rubocop/cops/array_literal_spec.rb
-- spec/rubocop/cops/ascii_identifiers_and_comments_spec.rb
+- spec/rubocop/cops/ascii_comments_spec.rb
+- spec/rubocop/cops/ascii_identifiers_spec.rb
 - spec/rubocop/cops/avoid_class_vars_spec.rb
 - spec/rubocop/cops/avoid_for_spec.rb
 - spec/rubocop/cops/avoid_perl_backrefs_spec.rb

data/spec/rubocop/cops/ascii_identifiers_and_comments_spec.rb

@@ -1,38 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-module Rubocop
-  module Cop
-    describe AsciiIdentifiersAndComments do
-      let(:ascii) { AsciiIdentifiersAndComments.new }
-
-      it 'registers an offence for a variable name with non-ascii chars' do
-        inspect_source(ascii,
-                       'file.rb',
-                       ['älg = 1'])
-        expect(ascii.offences.size).to eq(1)
-        expect(ascii.offences.map(&:message))
-          .to eq([AsciiIdentifiersAndComments::ERROR_MESSAGE])
-      end
-
-      it 'registers an offence for a comment with non-ascii chars' do
-        inspect_source(ascii,
-                       'file.rb',
-                       ['# 这是什么？'])
-        expect(ascii.offences.size).to eq(1)
-        expect(ascii.offences.map(&:message))
-          .to eq([AsciiIdentifiersAndComments::ERROR_MESSAGE])
-      end
-
-      it 'accepts comments and identifiers with only ascii chars' do
-        inspect_source(ascii,
-                       'file.rb',
-                       ['# AZaz1@$%~,;*_`|',
-                        'x.empty?'])
-        expect(ascii.offences.size).to eq(0)
-        expect(ascii.offences.map(&:message)).to be_empty
-      end
-    end
-  end
-end