rubocop 0.22.0 → 0.23.0

data/spec/rubocop/formatter/offense_count_formatter_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'stringio'
 require 'tempfile'
 
-module Rubocop
+module RuboCop
   module Formatter
     describe OffenseCountFormatter do
       subject(:formatter) { described_class.new(output) }

data/spec/rubocop/formatter/progress_formatter_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'stringio'
 
-module Rubocop
+module RuboCop
   describe Formatter::ProgressFormatter do
     subject(:formatter) { described_class.new(output) }
     let(:output) { StringIO.new }

data/spec/rubocop/formatter/simple_text_formatter_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'stringio'
 require 'tempfile'
 
-module Rubocop
+module RuboCop
   module Formatter
     describe SimpleTextFormatter do
       subject(:formatter) { described_class.new(output) }

data/spec/rubocop/options_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Options, :isolated_environment do
+describe RuboCop::Options, :isolated_environment do
   include FileHelper
 
   subject(:options) { described_class.new }
@@ -31,7 +31,7 @@ describe Rubocop::Options, :isolated_environment do
       it 'shows help text' do
         begin
           options.parse(['--help'])
-        rescue SystemExit # rubocop:disable HandleExceptions
+        rescue SystemExit # rubocop:disable Lint/HandleExceptions
         end
 
         expected_help = <<-END
@@ -84,7 +84,7 @@ Usage: rubocop [options] [file1, file2, ...]
       it 'lists all builtin formatters' do
         begin
           options.parse(['--help'])
-        rescue SystemExit # rubocop:disable HandleExceptions
+        rescue SystemExit # rubocop:disable Lint/HandleExceptions
         end
 
         option_sections = $stdout.string.lines.slice_before(/^\s*-/)
@@ -100,7 +100,7 @@ Usage: rubocop [options] [file1, file2, ...]
         end.sort
 
         expected_formatter_keys =
-          Rubocop::Formatter::FormatterSet::BUILTIN_FORMATTERS_FOR_KEYS
+          RuboCop::Formatter::FormatterSet::BUILTIN_FORMATTERS_FOR_KEYS
           .keys.sort
 
         expect(formatter_keys).to eq(expected_formatter_keys)
@@ -158,7 +158,7 @@ Usage: rubocop [options] [file1, file2, ...]
     end
   end
 
-  unless Rubocop::Version::STRING.start_with?('0')
+  unless RuboCop::Version::STRING.start_with?('0')
     describe '-e/--emacs option' do
       it 'is dropped in RuboCop 1.0.0' do
         # This spec can be removed once the option is dropped.

data/spec/rubocop/path_util_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::PathUtil do
+describe RuboCop::PathUtil do
   describe '#relative_path' do
     it 'builds paths relative to PWD by default as a stop-gap' do
       relative = File.join(Dir.pwd, 'relative')

data/spec/rubocop/processed_source_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::ProcessedSource do
+describe RuboCop::ProcessedSource do
   subject(:processed_source) do
     described_class.new(
       buffer,

data/spec/rubocop/source_parser_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::SourceParser, :isolated_environment do
+describe RuboCop::SourceParser, :isolated_environment do
   include FileHelper
 
   describe '.parse_file' do
@@ -29,7 +29,7 @@ describe Rubocop::SourceParser, :isolated_environment do
     end
 
     it 'returns ProcessedSource' do
-      expect(processed_source).to be_a(Rubocop::ProcessedSource)
+      expect(processed_source).to be_a(RuboCop::ProcessedSource)
     end
 
     describe 'the returned processed source' do
@@ -45,7 +45,7 @@ describe Rubocop::SourceParser, :isolated_environment do
 
       it 'has an array of tokens' do
         expect(processed_source.tokens).to be_a(Array)
-        expect(processed_source.tokens.first).to be_a(Rubocop::Token)
+        expect(processed_source.tokens.first).to be_a(RuboCop::Token)
       end
 
       it 'has a source buffer' do

data/spec/rubocop/target_finder_spec.rb

@@ -2,13 +2,13 @@
 
 require 'spec_helper'
 
-describe Rubocop::TargetFinder, :isolated_environment do
+describe RuboCop::TargetFinder, :isolated_environment do
   include FileHelper
 
   subject(:target_finder) do
     described_class.new(config_store, options)
   end
-  let(:config_store) { Rubocop::ConfigStore.new }
+  let(:config_store) { RuboCop::ConfigStore.new }
   let(:options) { { force_exclusion: force_exclusion, debug: debug } }
   let(:force_exclusion) { false }
   let(:debug) { false }

data/spec/rubocop/token_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Token do
+describe RuboCop::Token do
   describe '.from_parser_token' do
     subject(:token) { described_class.from_parser_token(parser_token) }
     let(:parser_token) { [type, [text, range]] }

data/spec/spec_helper.rb

@@ -91,7 +91,7 @@ def inspect_source_file(cop, source)
 end
 
 def inspect_source(cop, source, file = nil)
-  Rubocop::Formatter::DisabledConfigFormatter.config_to_allow_offenses = {}
+  RuboCop::Formatter::DisabledConfigFormatter.config_to_allow_offenses = {}
   processed_source = parse_source(source, file)
   fail 'Error parsing example code' unless processed_source.valid_syntax?
   _investigate(cop, processed_source)
@@ -100,13 +100,13 @@ end
 def parse_source(source, file = nil)
   source = source.join($RS) if source.is_a?(Array)
   if file.is_a? String
-    Rubocop::SourceParser.parse(source, file)
+    RuboCop::SourceParser.parse(source, file)
   elsif file
     file.write(source)
     file.rewind
-    Rubocop::SourceParser.parse(source, file.path)
+    RuboCop::SourceParser.parse(source, file.path)
   else
-    Rubocop::SourceParser.parse(source)
+    RuboCop::SourceParser.parse(source)
   end
 end
 
@@ -120,23 +120,23 @@ def autocorrect_source(cop, source, file = nil)
   _investigate(cop, processed_source)
 
   corrector =
-    Rubocop::Cop::Corrector.new(processed_source.buffer, cop.corrections)
+    RuboCop::Cop::Corrector.new(processed_source.buffer, cop.corrections)
   corrector.rewrite
 end
 
 def _investigate(cop, processed_source)
-  forces = Rubocop::Cop::Force.all.each_with_object([]) do |klass, instances|
+  forces = RuboCop::Cop::Force.all.each_with_object([]) do |klass, instances|
     next unless cop.join_force?(klass)
     instances << klass.new([cop])
   end
 
   commissioner =
-    Rubocop::Cop::Commissioner.new([cop], forces, raise_error: true)
+    RuboCop::Cop::Commissioner.new([cop], forces, raise_error: true)
   commissioner.investigate(processed_source)
   commissioner
 end
 
-module Rubocop
+module RuboCop
   module Cop
     class Cop
       def messages

data/spec/support/isolated_environment.rb

@@ -13,7 +13,7 @@ shared_context 'isolated environment', :isolated_environment do
       tmpdir = File.realpath(tmpdir)
 
       # Make upwards search for .rubocop.yml files stop at this directory.
-      Rubocop::ConfigLoader.root_level = tmpdir
+      RuboCop::ConfigLoader.root_level = tmpdir
 
       begin
         virtual_home = File.expand_path(File.join(tmpdir, 'home'))

data/spec/support/mri_syntax_checker.rb

@@ -33,7 +33,7 @@ module MRISyntaxChecker
     begin_pos = source_lines[0...(line_number - 1)].reduce(0) do |a, e|
       a + e.length + "\n".length
     end
-    Rubocop::Cop::Offense.new(severity,
+    RuboCop::Cop::Offense.new(severity,
                               Parser::Source::Range.new(source_buffer,
                                                         begin_pos,
                                                         begin_pos + 1),

data/spec/support/offenses_matcher.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+RSpec::Matchers.define :find_offenses_in do |code|
+  match do |cop|
+    inspect_source(cop, [code])
+    includes_highlight(cop) &&
+      includes_message(cop) &&
+      cop.offenses.any?
+  end
+
+  chain :with_highlight do |highlight|
+    @highlight = highlight
+  end
+
+  chain :with_message do |message|
+    @message = message
+  end
+
+  def includes_highlight(cop)
+    return true unless @highlight
+
+    cop.highlights.include?(@highlight)
+  end
+
+  def includes_message(cop)
+    return true unless @message
+
+    cop.offenses.map(&:message).include?(@message)
+  end
+end

data/spec/support/shared_context.rb

@@ -4,7 +4,7 @@
 shared_context 'config', :config do
   let(:config) do
     # Module#<
-    unless described_class < Rubocop::Cop::Cop
+    unless described_class < RuboCop::Cop::Cop
       fail '`config` must be used in `describe SomeCopClass do .. end`'
     end
 
@@ -13,8 +13,8 @@ shared_context 'config', :config do
     cop_name = described_class.cop_name
     hash = {
       cop_name =>
-      Rubocop::ConfigLoader.default_configuration[cop_name].merge(cop_config)
+      RuboCop::ConfigLoader.default_configuration[cop_name].merge(cop_config)
     }
-    Rubocop::Config.new(hash, "#{Dir.pwd}/.rubocop.yml")
+    RuboCop::Config.new(hash, "#{Dir.pwd}/.rubocop.yml")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Bozhidar Batsov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -326,6 +326,7 @@ files:
 - lib/rubocop/cop/style/indent_hash.rb
 - lib/rubocop/cop/style/indentation_consistency.rb
 - lib/rubocop/cop/style/indentation_width.rb
+- lib/rubocop/cop/style/inline_comment.rb
 - lib/rubocop/cop/style/lambda.rb
 - lib/rubocop/cop/style/lambda_call.rb
 - lib/rubocop/cop/style/leading_comment_space.rb
@@ -438,6 +439,7 @@ files:
 - relnotes/v0.20.1.md
 - relnotes/v0.21.0.md
 - relnotes/v0.22.0.md
+- relnotes/v0.23.0.md
 - rubocop.gemspec
 - spec/.rubocop.yml
 - spec/isolated_environment_spec.rb
@@ -555,6 +557,7 @@ files:
 - spec/rubocop/cop/style/indent_hash_spec.rb
 - spec/rubocop/cop/style/indentation_consistency_spec.rb
 - spec/rubocop/cop/style/indentation_width_spec.rb
+- spec/rubocop/cop/style/inline_comment_spec.rb
 - spec/rubocop/cop/style/lambda_call_spec.rb
 - spec/rubocop/cop/style/lambda_spec.rb
 - spec/rubocop/cop/style/leading_comment_space_spec.rb
@@ -663,6 +666,7 @@ files:
 - spec/support/file_helper.rb
 - spec/support/isolated_environment.rb
 - spec/support/mri_syntax_checker.rb
+- spec/support/offenses_matcher.rb
 - spec/support/shared_context.rb
 - spec/support/shared_examples.rb
 - spec/support/statement_modifier_helper.rb
@@ -807,6 +811,7 @@ test_files:
 - spec/rubocop/cop/style/indent_hash_spec.rb
 - spec/rubocop/cop/style/indentation_consistency_spec.rb
 - spec/rubocop/cop/style/indentation_width_spec.rb
+- spec/rubocop/cop/style/inline_comment_spec.rb
 - spec/rubocop/cop/style/lambda_call_spec.rb
 - spec/rubocop/cop/style/lambda_spec.rb
 - spec/rubocop/cop/style/leading_comment_space_spec.rb
@@ -915,6 +920,7 @@ test_files:
 - spec/support/file_helper.rb
 - spec/support/isolated_environment.rb
 - spec/support/mri_syntax_checker.rb
+- spec/support/offenses_matcher.rb
 - spec/support/shared_context.rb
 - spec/support/shared_examples.rb
 - spec/support/statement_modifier_helper.rb