rubocop 0.13.1 → 0.14.0

data/spec/rubocop/token_spec.rb

@@ -2,26 +2,24 @@
 
 require 'spec_helper'
 
-module Rubocop
-  describe Token do
-    describe '.from_parser_token' do
-      subject(:token) { Token.from_parser_token(parser_token) }
-      let(:parser_token) { [type, [text, range]] }
-      let(:type) { :kDEF } # rubocop:disable SymbolName
-      let(:text) { 'def' }
-      let(:range) { double('range') }
+describe Rubocop::Token do
+  describe '.from_parser_token' do
+    subject(:token) { described_class.from_parser_token(parser_token) }
+    let(:parser_token) { [type, [text, range]] }
+    let(:type) { :kDEF } # rubocop:disable SymbolName
+    let(:text) { 'def' }
+    let(:range) { double('range') }
 
-      it "sets parser token's type to rubocop token's type" do
-        expect(token.type).to eq(type)
-      end
+    it "sets parser token's type to rubocop token's type" do
+      expect(token.type).to eq(type)
+    end
 
-      it "sets parser token's text to rubocop token's text" do
-        expect(token.text).to eq(text)
-      end
+    it "sets parser token's text to rubocop token's text" do
+      expect(token.text).to eq(text)
+    end
 
-      it "sets parser token's range to rubocop token's pos" do
-        expect(token.pos).to eq(range)
-      end
+    it "sets parser token's range to rubocop token's pos" do
+      expect(token.pos).to eq(range)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Bozhidar Batsov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre6
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre6
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: powerpack
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +149,6 @@ files:
 - config/disabled.yml
 - config/enabled.yml
 - lib/rubocop.rb
-- lib/rubocop/backports/bsearch.rb
 - lib/rubocop/cli.rb
 - lib/rubocop/config.rb
 - lib/rubocop/config_store.rb
@@ -158,6 +157,7 @@ files:
 - lib/rubocop/cop/corrector.rb
 - lib/rubocop/cop/lint/assignment_in_condition.rb
 - lib/rubocop/cop/lint/block_alignment.rb
+- lib/rubocop/cop/lint/debugger.rb
 - lib/rubocop/cop/lint/empty_ensure.rb
 - lib/rubocop/cop/lint/end_alignment.rb
 - lib/rubocop/cop/lint/end_in_method.rb
@@ -169,6 +169,7 @@ files:
 - lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb
 - lib/rubocop/cop/lint/rescue_exception.rb
 - lib/rubocop/cop/lint/shadowing_outer_local_variable.rb
+- lib/rubocop/cop/lint/syntax.rb
 - lib/rubocop/cop/lint/unreachable_code.rb
 - lib/rubocop/cop/lint/useless_assignment.rb
 - lib/rubocop/cop/lint/useless_comparison.rb
@@ -196,11 +197,13 @@ files:
 - lib/rubocop/cop/style/case_indentation.rb
 - lib/rubocop/cop/style/character_literal.rb
 - lib/rubocop/cop/style/class_and_module_camel_case.rb
+- lib/rubocop/cop/style/class_length.rb
 - lib/rubocop/cop/style/class_methods.rb
 - lib/rubocop/cop/style/class_vars.rb
 - lib/rubocop/cop/style/collection_methods.rb
 - lib/rubocop/cop/style/colon_method_call.rb
 - lib/rubocop/cop/style/comment_annotation.rb
+- lib/rubocop/cop/style/configurable_naming.rb
 - lib/rubocop/cop/style/constant_name.rb
 - lib/rubocop/cop/style/def_parentheses.rb
 - lib/rubocop/cop/style/documentation.rb
@@ -228,9 +231,10 @@ files:
 - lib/rubocop/cop/style/lambda_call.rb
 - lib/rubocop/cop/style/leading_comment_space.rb
 - lib/rubocop/cop/style/line_length.rb
-- lib/rubocop/cop/style/method_and_variable_snake_case.rb
 - lib/rubocop/cop/style/method_call_parentheses.rb
+- lib/rubocop/cop/style/method_called_on_do_end_block.rb
 - lib/rubocop/cop/style/method_length.rb
+- lib/rubocop/cop/style/method_name.rb
 - lib/rubocop/cop/style/module_function.rb
 - lib/rubocop/cop/style/multiline_block_chain.rb
 - lib/rubocop/cop/style/multiline_if_then.rb
@@ -243,8 +247,10 @@ files:
 - lib/rubocop/cop/style/parentheses_around_condition.rb
 - lib/rubocop/cop/style/perl_backrefs.rb
 - lib/rubocop/cop/style/proc.rb
+- lib/rubocop/cop/style/raise_args.rb
 - lib/rubocop/cop/style/reduce_arguments.rb
 - lib/rubocop/cop/style/redundant_begin.rb
+- lib/rubocop/cop/style/redundant_exception.rb
 - lib/rubocop/cop/style/redundant_return.rb
 - lib/rubocop/cop/style/redundant_self.rb
 - lib/rubocop/cop/style/regexp_literal.rb
@@ -269,6 +275,7 @@ files:
 - lib/rubocop/cop/style/trivial_accessors.rb
 - lib/rubocop/cop/style/unless_else.rb
 - lib/rubocop/cop/style/variable_interpolation.rb
+- lib/rubocop/cop/style/variable_name.rb
 - lib/rubocop/cop/style/when_then.rb
 - lib/rubocop/cop/style/while_until_do.rb
 - lib/rubocop/cop/style/word_array.rb
@@ -291,6 +298,7 @@ files:
 - lib/rubocop/formatter/offence_count_formatter.rb
 - lib/rubocop/formatter/progress_formatter.rb
 - lib/rubocop/formatter/simple_text_formatter.rb
+- lib/rubocop/options.rb
 - lib/rubocop/processed_source.rb
 - lib/rubocop/rake_task.rb
 - lib/rubocop/source_parser.rb
@@ -308,6 +316,7 @@ files:
 - spec/rubocop/cop/corrector_spec.rb
 - spec/rubocop/cop/lint/assignment_in_condition_spec.rb
 - spec/rubocop/cop/lint/block_alignment_spec.rb
+- spec/rubocop/cop/lint/debugger_spec.rb
 - spec/rubocop/cop/lint/empty_ensure_spec.rb
 - spec/rubocop/cop/lint/end_alignment_spec.rb
 - spec/rubocop/cop/lint/end_in_method_spec.rb
@@ -319,6 +328,7 @@ files:
 - spec/rubocop/cop/lint/parentheses_as_grouped_expression_spec.rb
 - spec/rubocop/cop/lint/rescue_exception_spec.rb
 - spec/rubocop/cop/lint/shadowing_outer_local_variable_spec.rb
+- spec/rubocop/cop/lint/syntax_spec.rb
 - spec/rubocop/cop/lint/unreachable_code_spec.rb
 - spec/rubocop/cop/lint/useless_assignment_spec.rb
 - spec/rubocop/cop/lint/useless_comparison_spec.rb
@@ -345,6 +355,7 @@ files:
 - spec/rubocop/cop/style/case_indentation_spec.rb
 - spec/rubocop/cop/style/character_literal_spec.rb
 - spec/rubocop/cop/style/class_and_module_camel_case_spec.rb
+- spec/rubocop/cop/style/class_length_spec.rb
 - spec/rubocop/cop/style/class_methods_spec.rb
 - spec/rubocop/cop/style/class_vars_spec.rb
 - spec/rubocop/cop/style/collection_methods_spec.rb
@@ -378,9 +389,10 @@ files:
 - spec/rubocop/cop/style/lambda_spec.rb
 - spec/rubocop/cop/style/leading_comment_space_spec.rb
 - spec/rubocop/cop/style/line_length_spec.rb
-- spec/rubocop/cop/style/method_and_variable_snake_case_spec.rb
 - spec/rubocop/cop/style/method_call_parentheses_spec.rb
+- spec/rubocop/cop/style/method_called_on_do_end_block_spec.rb
 - spec/rubocop/cop/style/method_length_spec.rb
+- spec/rubocop/cop/style/method_name_spec.rb
 - spec/rubocop/cop/style/module_function_spec.rb
 - spec/rubocop/cop/style/multiline_block_chain_spec.rb
 - spec/rubocop/cop/style/multiline_if_then_spec.rb
@@ -393,8 +405,10 @@ files:
 - spec/rubocop/cop/style/parentheses_around_condition_spec.rb
 - spec/rubocop/cop/style/perl_backrefs_spec.rb
 - spec/rubocop/cop/style/proc_spec.rb
+- spec/rubocop/cop/style/raise_args_spec.rb
 - spec/rubocop/cop/style/reduce_arguments_spec.rb
 - spec/rubocop/cop/style/redundant_begin_spec.rb
+- spec/rubocop/cop/style/redundant_exception_spec.rb
 - spec/rubocop/cop/style/redundant_return_spec.rb
 - spec/rubocop/cop/style/redundant_self_spec.rb
 - spec/rubocop/cop/style/regexp_literal_spec.rb
@@ -425,6 +439,7 @@ files:
 - spec/rubocop/cop/style/trivial_accessors_spec.rb
 - spec/rubocop/cop/style/unless_else_spec.rb
 - spec/rubocop/cop/style/variable_interpolation_spec.rb
+- spec/rubocop/cop/style/variable_name_spec.rb
 - spec/rubocop/cop/style/when_then_spec.rb
 - spec/rubocop/cop/style/while_until_do_spec.rb
 - spec/rubocop/cop/style/word_array_spec.rb
@@ -445,6 +460,7 @@ files:
 - spec/rubocop/formatter/offence_count_formatter_spec.rb
 - spec/rubocop/formatter/progress_formatter_spec.rb
 - spec/rubocop/formatter/simple_text_formatter_spec.rb
+- spec/rubocop/options_spec.rb
 - spec/rubocop/processed_source_spec.rb
 - spec/rubocop/source_parser_spec.rb
 - spec/rubocop/target_finder_spec.rb
@@ -491,6 +507,7 @@ test_files:
 - spec/rubocop/cop/corrector_spec.rb
 - spec/rubocop/cop/lint/assignment_in_condition_spec.rb
 - spec/rubocop/cop/lint/block_alignment_spec.rb
+- spec/rubocop/cop/lint/debugger_spec.rb
 - spec/rubocop/cop/lint/empty_ensure_spec.rb
 - spec/rubocop/cop/lint/end_alignment_spec.rb
 - spec/rubocop/cop/lint/end_in_method_spec.rb
@@ -502,6 +519,7 @@ test_files:
 - spec/rubocop/cop/lint/parentheses_as_grouped_expression_spec.rb
 - spec/rubocop/cop/lint/rescue_exception_spec.rb
 - spec/rubocop/cop/lint/shadowing_outer_local_variable_spec.rb
+- spec/rubocop/cop/lint/syntax_spec.rb
 - spec/rubocop/cop/lint/unreachable_code_spec.rb
 - spec/rubocop/cop/lint/useless_assignment_spec.rb
 - spec/rubocop/cop/lint/useless_comparison_spec.rb
@@ -528,6 +546,7 @@ test_files:
 - spec/rubocop/cop/style/case_indentation_spec.rb
 - spec/rubocop/cop/style/character_literal_spec.rb
 - spec/rubocop/cop/style/class_and_module_camel_case_spec.rb
+- spec/rubocop/cop/style/class_length_spec.rb
 - spec/rubocop/cop/style/class_methods_spec.rb
 - spec/rubocop/cop/style/class_vars_spec.rb
 - spec/rubocop/cop/style/collection_methods_spec.rb
@@ -561,9 +580,10 @@ test_files:
 - spec/rubocop/cop/style/lambda_spec.rb
 - spec/rubocop/cop/style/leading_comment_space_spec.rb
 - spec/rubocop/cop/style/line_length_spec.rb
-- spec/rubocop/cop/style/method_and_variable_snake_case_spec.rb
 - spec/rubocop/cop/style/method_call_parentheses_spec.rb
+- spec/rubocop/cop/style/method_called_on_do_end_block_spec.rb
 - spec/rubocop/cop/style/method_length_spec.rb
+- spec/rubocop/cop/style/method_name_spec.rb
 - spec/rubocop/cop/style/module_function_spec.rb
 - spec/rubocop/cop/style/multiline_block_chain_spec.rb
 - spec/rubocop/cop/style/multiline_if_then_spec.rb
@@ -576,8 +596,10 @@ test_files:
 - spec/rubocop/cop/style/parentheses_around_condition_spec.rb
 - spec/rubocop/cop/style/perl_backrefs_spec.rb
 - spec/rubocop/cop/style/proc_spec.rb
+- spec/rubocop/cop/style/raise_args_spec.rb
 - spec/rubocop/cop/style/reduce_arguments_spec.rb
 - spec/rubocop/cop/style/redundant_begin_spec.rb
+- spec/rubocop/cop/style/redundant_exception_spec.rb
 - spec/rubocop/cop/style/redundant_return_spec.rb
 - spec/rubocop/cop/style/redundant_self_spec.rb
 - spec/rubocop/cop/style/regexp_literal_spec.rb
@@ -608,6 +630,7 @@ test_files:
 - spec/rubocop/cop/style/trivial_accessors_spec.rb
 - spec/rubocop/cop/style/unless_else_spec.rb
 - spec/rubocop/cop/style/variable_interpolation_spec.rb
+- spec/rubocop/cop/style/variable_name_spec.rb
 - spec/rubocop/cop/style/when_then_spec.rb
 - spec/rubocop/cop/style/while_until_do_spec.rb
 - spec/rubocop/cop/style/word_array_spec.rb
@@ -628,6 +651,7 @@ test_files:
 - spec/rubocop/formatter/offence_count_formatter_spec.rb
 - spec/rubocop/formatter/progress_formatter_spec.rb
 - spec/rubocop/formatter/simple_text_formatter_spec.rb
+- spec/rubocop/options_spec.rb
 - spec/rubocop/processed_source_spec.rb
 - spec/rubocop/source_parser_spec.rb
 - spec/rubocop/target_finder_spec.rb

data/lib/rubocop/backports/bsearch.rb

@@ -1,39 +0,0 @@
-# encoding: utf-8
-
-# rubocop:disable LineLength
-# rubocop:disable BlockNesting
-
-unless Array.method_defined? :bsearch
-  # Backport of Array#bsearch from Ruby 2.0.
-  # Needed to boost Parser's performance under Ruby 1.9.
-  class Array
-    def bsearch
-      return to_enum(__method__) unless block_given?
-      from = 0
-      to   = size - 1
-      satisfied = nil
-      while from <= to
-        midpoint = (from + to).div(2)
-        result = yield(cur = self[midpoint])
-        case result
-        when Numeric
-          return cur if result == 0
-          result = result < 0
-        when true
-          satisfied = cur
-        when nil, false
-          # nothing to do
-        else
-          fail TypeError, "wrong argument type #{result.class} (must be numeric, true, false or nil)"
-        end
-
-        if result
-          to = midpoint - 1
-        else
-          from = midpoint + 1
-        end
-      end
-      satisfied
-    end
-  end
-end

data/lib/rubocop/cop/style/method_and_variable_snake_case.rb

@@ -1,77 +0,0 @@
-# encoding: utf-8
-
-module Rubocop
-  module Cop
-    module Style
-      # This cop makes sure that all methods and variables use
-      # snake_case for their names. Some special arrangements have to be
-      # made for operator methods.
-      class MethodAndVariableSnakeCase < Cop
-        MSG = 'Use snake_case for methods and variables.'
-        SNAKE_CASE = /^@?[\da-z_]+[!?=]?$/
-
-        def investigate(processed_source)
-          ast = processed_source.ast
-          return unless ast
-          on_node([:def, :defs, :lvasgn, :ivasgn, :send], ast) do |n|
-            range = case n.type
-                    when :def             then name_of_instance_method(n)
-                    when :defs            then name_of_singleton_method(n)
-                    when :lvasgn, :ivasgn then name_of_variable(n)
-                    when :send            then name_of_setter(n)
-                    end
-
-            next unless range
-            name = range.source.to_sym
-            next if name =~ SNAKE_CASE || OPERATOR_METHODS.include?(name)
-
-            convention(n, range)
-          end
-        end
-
-        def name_of_instance_method(def_node)
-          expr = def_node.loc.expression
-          match = /^def(\s+)([\w]+[!?=]?\b)/.match(expr.source)
-          return unless match
-          space, method_name = match.captures
-          begin_pos = expr.begin_pos + 'def'.length + space.length
-          Parser::Source::Range.new(expr.source_buffer, begin_pos,
-                                    begin_pos + method_name.length)
-        end
-
-        def name_of_singleton_method(defs_node)
-          scope, method_name, _args, _body = *defs_node
-          after_dot(defs_node, method_name.length,
-                    "def\s+" + Regexp.escape(scope.loc.expression.source))
-        end
-
-        def name_of_variable(vasgn_node)
-          expr = vasgn_node.loc.expression
-          name = vasgn_node.children.first
-          Parser::Source::Range.new(expr.source_buffer, expr.begin_pos,
-                                    expr.begin_pos + name.length)
-        end
-
-        def name_of_setter(send_node)
-          receiver, method_name = *send_node
-          return unless receiver && receiver.type == :self
-          return unless method_name.to_s.end_with?('=')
-          after_dot(send_node, method_name.length - '='.length,
-                    Regexp.escape(receiver.loc.expression.source))
-        end
-
-        # Returns a range containing the method name after the given regexp and
-        # a dot.
-        def after_dot(node, method_name_length, regexp)
-          expr = node.loc.expression
-          match = /\A#{regexp}\s*\.\s*/.match(expr.source)
-          return unless match
-          offset = match[0].length
-          begin_pos = expr.begin_pos + offset
-          Parser::Source::Range.new(expr.source_buffer, begin_pos,
-                                    begin_pos + method_name_length)
-        end
-      end
-    end
-  end
-end

data/spec/rubocop/cop/style/method_and_variable_snake_case_spec.rb

@@ -1,102 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-module Rubocop
-  module Cop
-    module Style
-      describe MethodAndVariableSnakeCase do
-        subject(:cop) { described_class.new }
-
-        it 'registers an offence for camel case in instance method name' do
-          inspect_source(cop, ['def myMethod',
-                               '  # ...',
-                               'end'])
-          expect(cop.offences).to have(1).item
-          expect(cop.highlights).to eq(['myMethod'])
-        end
-
-        it 'registers an offence for camel case in singleton method name' do
-          inspect_source(cop, ['def self.myMethod',
-                               '  # ...',
-                               'end'])
-          expect(cop.offences).to have(1).item
-          expect(cop.highlights).to eq(['myMethod'])
-        end
-
-        it 'registers an offence for camel case in local variable name' do
-          inspect_source(cop, 'myLocal = 1')
-          expect(cop.offences).to have(1).item
-          expect(cop.highlights).to eq(['myLocal'])
-        end
-
-        it 'registers an offence for camel case in instance variable name' do
-          inspect_source(cop, '@myAttribute = 3')
-          expect(cop.offences).to have(1).item
-          expect(cop.highlights).to eq(['@myAttribute'])
-        end
-
-        it 'registers an offence for camel case in setter name' do
-          inspect_source(cop, 'self.mySetter = 2')
-          expect(cop.offences).to have(1).item
-          expect(cop.highlights).to eq(['mySetter'])
-        end
-
-        it 'registers an offence for capitalized camel case' do
-          inspect_source(cop, ['def MyMethod',
-                               'end'])
-          expect(cop.offences).to have(1).item
-          expect(cop.highlights).to eq(['MyMethod'])
-        end
-
-        it 'accepts snake case in names' do
-          inspect_source(cop, ['def my_method',
-                               '  my_local_html = 1',
-                               '  self.my_setter = 2',
-                               '  @my_attribute = 3',
-                               'end'])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'registers an offence for mixed snake case and camel case' do
-          inspect_source(cop, ['def visit_Arel_Nodes_SelectStatement',
-                               'end'])
-          expect(cop.offences).to have(1).item
-          expect(cop.highlights).to eq(['visit_Arel_Nodes_SelectStatement'])
-        end
-
-        it 'accepts screaming snake case globals' do
-          inspect_source(cop, '$MY_GLOBAL = 0')
-          expect(cop.offences).to be_empty
-        end
-
-        it 'accepts screaming snake case constants' do
-          inspect_source(cop, 'MY_CONSTANT = 0')
-          expect(cop.offences).to be_empty
-        end
-
-        it 'accepts assigning to camel case constant' do
-          inspect_source(cop, 'Paren = Struct.new :left, :right, :kind')
-          expect(cop.offences).to be_empty
-        end
-
-        it 'accepts one line methods' do
-          inspect_source(cop, "def body; '' end")
-          expect(cop.offences).to be_empty
-        end
-
-        it 'accepts operator definitions' do
-          inspect_source(cop, ['def +(other)',
-                               '  # ...',
-                               'end'])
-          expect(cop.offences).to be_empty
-        end
-
-        it 'accepts assignment with indexing of self' do
-          inspect_source(cop, 'self[:a] = b')
-          expect(cop.offences).to be_empty
-        end
-      end
-    end
-  end
-end