rubocop 0.4.4 → 0.4.5

data/CONTRIBUTING.md

@@ -1,9 +1,15 @@
-# Contributing to Rubocop
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+# Contributing to RuboCop
+
+* Check out the latest master to make sure the feature hasn't been
+  implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't
+  requested it and/or contributed it.
 * Fork the project.
 * Start a feature/bugfix branch.
 * Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* Make sure to add tests for it. This is important so I don't break it
+  in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If
+  you want to have your own version, or is otherwise necessary, that
+  is fine, but please isolate to its own commit so I can cherry-pick
+  around it.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.2.2)
+    diff-lcs (1.2.3)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -20,13 +20,13 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.13.1)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     term-ansicolor (1.1.4)
-    yard (0.8.5.2)
+    yard (0.8.6)
 
 PLATFORMS
   ruby

data/README.md

@@ -76,6 +76,14 @@ analyzer a daunting task.
 RuboCop currently supports MRI 1.9 and MRI 2.0. Support for JRuby and
 Rubinius is not planned at this point.
 
+## Editor integration
+
+### Emacs
+
+[rubocop.el](https://github.com/bbatsov/rubocop-emacs) is a simple
+Emacs interface for RuboCop. It allows you to run RuboCop inside Emacs
+and quickly jump between problems in your code.
+
 ## Copyright
 
 Copyright (c) 2012-2013 Bozhidar Batsov. See [LICENSE.txt](LICENSE.txt) for

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/rubocop/cli.rb

@@ -36,15 +36,11 @@ module Rubocop
         end
       end.parse!(args)
 
+      cops = Cop::Cop.all
+      show_cops_on_duty(cops) if $options[:debug]
       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|
@@ -62,15 +58,18 @@ module Rubocop
           total_offences += syntax_cop.offences.count
         else
           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
-            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?
+            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
           end
         end
 

data/lib/rubocop/cop/syntax.rb

@@ -10,8 +10,11 @@ module Rubocop
           Open3.capture3('ruby -wc', stdin_data: source.join("\n"))
 
         stderr.each_line do |line|
-          line_no, severity, message = process_line(line)
-          add_offence(severity, line_no, message)
+          # discard lines that are not containing relevant info
+          if line =~ /.+:(\d+): (.+)/
+            line_no, severity, message = process_line(line)
+            add_offence(severity, line_no, message)
+          end
         end
       end
 

data/rubocop.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rubocop"
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bozhidar Batsov"]
-  s.date = "2013-04-14"
+  s.date = "2013-04-15"
   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"]

data/spec/rubocop/cli_spec.rb

@@ -208,6 +208,32 @@ module Rubocop
         end
       end
 
+      it 'can have different config files in different directories' do
+        %w(src lib).each do |dir|
+          FileUtils.mkdir_p "example/#{dir}"
+          File.open("example/#{dir}/example1.rb", 'w') do |f|
+            f.puts '# encoding: utf-8'
+            f.puts '#' * 90
+          end
+        end
+        File.open('example/src/.rubocop.yml', 'w') do |f|
+          f.puts('LineLength:',
+                 '  Enabled: true',
+                 '  Max: 100')
+        end
+        begin
+          expect(cli.run(['example'])).to eq(1)
+          expect($stdout.string.uncolored).to eq(
+            ['== example/lib/example1.rb ==',
+             'C:  2: Line is too long. [90/79]',
+             '',
+             '2 files inspected, 1 offences detected',
+             ''].join("\n"))
+        ensure
+          FileUtils.rm_rf 'example'
+        end
+      end
+
       it 'finds no violations when checking the rubocop source code' do
         cli.run
         expect($stdout.string.uncolored).to match(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -256,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2433240001762549702
+      hash: -80957332524471411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: