rubocop 0.2.1 → 0.3.0

data/spec/rubocop/cops/single_line_blocks_spec.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    describe SingleLineBlocks do
+      let (:blocks) { SingleLineBlocks.new }
+
+      it 'registers an offence for a single line block with do-end' do
+        inspect_source(blocks, '', ['each do |x| end'])
+        blocks.offences.map(&:message).should ==
+          ['Prefer {...} over do...end for single-line blocks.']
+      end
+
+      it 'accepts a single line block with braces' do
+        inspect_source(blocks, '', ['each { |x| }'])
+        blocks.offences.map(&:message).should == []
+      end
+    end
+  end
+end

data/spec/rubocop/cops/{space_after_comma_etc_spec.rb → space_after_colon_spec.rb}

@@ -4,14 +4,8 @@ require 'spec_helper'
 
 module Rubocop
   module Cop
-    describe SpaceAfterCommaEtc do
-      let (:space) { SpaceAfterCommaEtc.new }
-
-      it 'registers an offence for block argument commas' do
-        inspect_source(space, 'file.rb', ['each { |s,t| }'])
-        space.offences.map(&:message).should ==
-          ['Space missing after comma.']
-      end
+    describe SpaceAfterColon do
+      let (:space) { SpaceAfterColon.new }
 
       it 'registers an offence for colon without space after it' do
         inspect_source(space, 'file.rb', ['x = w ? {a:3}:4'])
@@ -19,12 +13,6 @@ module Rubocop
           ['Space missing after colon.'] * 2
       end
 
-      it 'registers an offence for semicolon without space after it' do
-        inspect_source(space, 'file.rb', ['x = 1;y = 2'])
-        space.offences.map(&:message).should ==
-          ['Space missing after semicolon.']
-      end
-
       it 'allows the colons in symbols' do
         inspect_source(space, 'file.rb', ['x = :a'])
         space.offences.map(&:message).should == []

data/spec/rubocop/cops/space_after_comma_spec.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    describe SpaceAfterComma do
+      let (:space) { SpaceAfterComma.new }
+
+      it 'registers an offence for block argument commas' do
+        inspect_source(space, 'file.rb', ['each { |s,t| }'])
+        space.offences.map(&:message).should ==
+          ['Space missing after comma.']
+      end
+    end
+  end
+end

data/spec/rubocop/cops/space_after_semicolon_spec.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    describe SpaceAfterSemicolon do
+      let (:space) { SpaceAfterSemicolon.new }
+
+      it 'registers an offence for semicolon without space after it' do
+        inspect_source(space, 'file.rb', ['x = 1;y = 2'])
+        space.offences.map(&:message).should ==
+          ['Space missing after semicolon.']
+      end
+    end
+  end
+end

data/spec/rubocop/cops/space_around_braces_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    describe SpaceAroundBraces do
+      let (:space) { SpaceAroundBraces.new }
+
+      it 'registers an offence for left brace without spaces' do
+        inspect_source(space, 'file.rb', ['each{ puts }'])
+        space.offences.map(&:message).should ==
+          ["Surrounding space missing for '{'."]
+      end
+
+      it 'registers an offence for right brace without inner space' do
+        inspect_source(space, 'file.rb', ['each { puts}'])
+        space.offences.map(&:message).should ==
+          ["Space missing to the left of '}'."]
+      end
+
+      it 'accepts an empty hash literal with no space inside' do
+        inspect_source(space, 'file.rb',
+                       ['view_hash.each do |view_key|',
+                        'end',
+                        '@views = {}',
+                        ''])
+        space.offences.map(&:message).should == []
+      end
+    end
+  end
+end

data/spec/rubocop/cops/{surrounding_space_spec.rb → space_around_operators_spec.rb}

@@ -4,14 +4,13 @@ require 'spec_helper'
 
 module Rubocop
   module Cop
-    describe SurroundingSpace do
-      let (:space) { SurroundingSpace.new }
+    describe SpaceAroundOperators do
+      let (:space) { SpaceAroundOperators.new }
 
       it 'registers an offence for assignment without space on both sides' do
         inspect_source(space, 'file.rb', ['x=0', 'y= 0', 'z =0'])
-        space.offences.size.should == 3
-        space.offences.first.message.should ==
-          "Surrounding space missing for operator '='."
+        space.offences.map(&:message).should ==
+          ["Surrounding space missing for operator '='."] * 3
       end
 
       it 'registers an offence for binary operators that could be unary' do
@@ -22,63 +21,12 @@ module Rubocop
            "Surrounding space missing for operator '+'."]
       end
 
-      it 'registers an offence for left brace without spaces' do
-        inspect_source(space, 'file.rb', ['each{ puts }'])
-        space.offences.map(&:message).should ==
-          ["Surrounding space missing for '{'."]
-      end
-
-      it 'registers an offence for right brace without inner space' do
-        inspect_source(space, 'file.rb', ['each { puts}'])
-        space.offences.map(&:message).should ==
-          ["Space missing to the left of '}'."]
-      end
-
-      it 'accepts an empty hash literal with no space inside' do
-        inspect_source(space, 'file.rb',
-                       ['view_hash.each do |view_key|',
-                        'end',
-                        '@views = {}',
-                        ''])
-        space.offences.map(&:message).should == []
-      end
-
       it 'registers an offence for arguments to a method' do
         inspect_source(space, 'file.rb', ['puts 1+2'])
         space.offences.map(&:message).should ==
           ["Surrounding space missing for operator '+'."]
       end
 
-      it 'registers an offence for an array literal with spaces inside' do
-        inspect_source(space, 'file.rb', ['a = [1, 2 ]',
-                                         'b = [ 1, 2]'])
-        space.offences.map(&:message).should ==
-          ['Space inside square brackets detected.',
-           'Space inside square brackets detected.']
-      end
-
-      it 'accepts space inside square brackets if on its own row' do
-        inspect_source(space, 'file.rb', ['a = [',
-                                         '     1, 2',
-                                         '    ]'])
-        space.offences.map(&:message).should == []
-      end
-
-      it 'registers an offence for spaces inside parens' do
-        inspect_source(space, 'file.rb', ['f( 3)',
-                                         'g(3 )'])
-        space.offences.map(&:message).should ==
-          ['Space inside parentheses detected.',
-           'Space inside parentheses detected.']
-      end
-
-      it 'accepts parentheses in block parameter list' do
-        inspect_source(space, 'file.rb',
-                       ['list.inject(Tms.new) { |sum, (label, item)|',
-                        '}'])
-        space.offences.map(&:message).should == []
-      end
-
       it 'accepts operator symbols' do
         inspect_source(space, 'file.rb', ['func(:-)'])
         space.offences.map(&:message).should == []
@@ -130,12 +78,6 @@ module Rubocop
         space.offences.map(&:message).should == []
       end
 
-      it 'accepts square brackets as method name' do
-        inspect_source(space, 'file.rb', ['def Vector.[](*array)',
-                                         'end'])
-        space.offences.map(&:message).should == []
-      end
-
       it 'accepts def of operator' do
         inspect_source(space, 'file.rb', ['def +(other); end'])
         space.offences.map(&:message).should == []
@@ -175,17 +117,6 @@ module Rubocop
                                          'x = +2'])
         space.offences.map(&:message).should == []
       end
-
-      it 'accepts square brackets called with method call syntax' do
-        inspect_source(space, 'file.rb', ['subject.[](0)'])
-        space.offences.map(&:message).should == []
-      end
-
-      it 'only reports a single space once' do
-        inspect_source(space, 'file.rb', ['[ ]'])
-        space.offences.map(&:message).should ==
-          ['Space inside square brackets detected.']
-      end
     end
   end
 end

data/spec/rubocop/cops/space_inside_brackets_spec.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    describe SpaceInsideBrackets do
+      let (:space) { SpaceInsideBrackets.new }
+
+      it 'registers an offence for an array literal with spaces inside' do
+        inspect_source(space, 'file.rb', ['a = [1, 2 ]',
+                                         'b = [ 1, 2]'])
+        space.offences.map(&:message).should ==
+          ['Space inside square brackets detected.',
+           'Space inside square brackets detected.']
+      end
+
+      it 'accepts space inside square brackets if on its own row' do
+        inspect_source(space, 'file.rb', ['a = [',
+                                         '     1, 2',
+                                         '    ]'])
+        space.offences.map(&:message).should == []
+      end
+
+      it 'accepts square brackets as method name' do
+        inspect_source(space, 'file.rb', ['def Vector.[](*array)',
+                                         'end'])
+        space.offences.map(&:message).should == []
+      end
+
+      it 'accepts square brackets called with method call syntax' do
+        inspect_source(space, 'file.rb', ['subject.[](0)'])
+        space.offences.map(&:message).should == []
+      end
+
+      it 'only reports a single space once' do
+        inspect_source(space, 'file.rb', ['[ ]'])
+        space.offences.map(&:message).should ==
+          ['Space inside square brackets detected.']
+      end
+    end
+  end
+end

data/spec/rubocop/cops/space_inside_parens_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    describe SpaceInsideParens do
+      let (:space) { SpaceInsideParens.new }
+
+      it 'registers an offence for spaces inside parens' do
+        inspect_source(space, 'file.rb', ['f( 3)',
+                                         'g(3 )'])
+        space.offences.map(&:message).should ==
+          ['Space inside parentheses detected.',
+           'Space inside parentheses detected.']
+      end
+
+      it 'accepts parentheses in block parameter list' do
+        inspect_source(space, 'file.rb',
+                       ['list.inject(Tms.new) { |sum, (label, item)|',
+                        '}'])
+        space.offences.map(&:message).should == []
+      end
+
+    end
+  end
+end

data/spec/rubocop/cops/ternary_operator_spec.rb

@@ -4,20 +4,40 @@ require 'spec_helper'
 
 module Rubocop
   module Cop
-    describe TernaryOperator do
-      let (:num) { TernaryOperator.new }
+    describe MultilineTernaryOperator do
+      let (:op) { MultilineTernaryOperator.new }
 
       it 'registers an offence for a multiline ternary operator expression' do
-        inspect_source(num, 'file.rb', ['a = cond ?',
+        inspect_source(op, 'file.rb', ['a = cond ?',
                                         '  b : c'])
-        num.offences.map(&:message).should ==
+        op.offences.map(&:message).should ==
           ['Avoid multi-line ?: (the ternary operator); use if/unless ' +
            'instead.']
       end
 
       it 'accepts a single line ternary operator expression' do
-        inspect_source(num, 'file.rb', ['a = cond ? b : c'])
-        num.offences.map(&:message).should == []
+        inspect_source(op, 'file.rb', ['a = cond ? b : c'])
+        op.offences.map(&:message).should == []
+      end
+    end
+
+    describe NestedTernaryOperator do
+      let (:op) { NestedTernaryOperator.new }
+
+      it 'registers an offence for a nested ternary operator expression' do
+        inspect_source(op, 'file.rb', ['a ? (b ? b1 : b2) : a2'])
+        op.offences.map(&:message).should ==
+          ['Ternary operators must not be nested. Prefer if/else constructs ' +
+           'instead.']
+      end
+
+      it 'accepts a non-nested ternary operator within an if' do
+        inspect_source(op, 'file.rb', ['a = if x',
+                                       '  cond ? b : c',
+                                       'else',
+                                       '  d',
+                                       'end'])
+        op.offences.map(&:message).should == []
       end
     end
   end

data/spec/rubocop/cops/unless_else_spec.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    describe UnlessElse do
+      let (:ue) { UnlessElse.new }
+
+      it 'registers an offence for an unless with else' do
+        inspect_source(ue, 'file.rb', ['unless x',
+                                       '  a = 1',
+                                       'else',
+                                       '  a = 0',
+                                       'end'])
+        ue.offences.map(&:message).should ==
+          ['Never use unless with else. Rewrite these with the ' +
+           'positive case first.']
+      end
+
+      it 'accepts an unless without else' do
+        inspect_source(ue, 'file.rb', ['unless x',
+                                       '  a = 1',
+                                       'end'])
+        ue.offences.map(&:message).should == []
+      end
+    end
+  end
+end

data/spec/rubocop/cops/when_then_spec.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Rubocop
+  module Cop
+    describe WhenThen do
+      let (:wt) { WhenThen.new }
+
+      it 'registers an offence for when x;' do
+        inspect_source(wt, 'file.rb', ['case a',
+                                       'when b; c',
+                                       'end'])
+        wt.offences.map(&:message).should ==
+          ['Never use "when x;". Use "when x then" instead.']
+      end
+
+      it 'accepts when x then' do
+        inspect_source(wt, 'file.rb', ['case a',
+                                       'when b then c',
+                                       'end'])
+        wt.offences.map(&:message).should == []
+      end
+
+      it 'accepts ; separating statements in the body of when' do
+        inspect_source(wt, 'file.rb', ['case a',
+                                       'when b then c; d',
+                                       'end',
+                                       '',
+                                       'case e',
+                                       'when f',
+                                       '  g; h',
+                                       'end'])
+        wt.offences.map(&:message).should == []
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
 # encoding: utf-8
 
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -120,6 +120,7 @@ files:
 - .document
 - .rbenv-version
 - .rspec
+- .rubocop.yml
 - .rvmrc
 - .travis.yml
 - CONTRIBUTING.md
@@ -136,6 +137,7 @@ files:
 - 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/cop.rb
 - lib/rubocop/cop/def_parentheses.rb
@@ -156,6 +158,8 @@ files:
 - lib/rubocop/cop/tab.rb
 - lib/rubocop/cop/ternary_operator.rb
 - lib/rubocop/cop/trailing_whitespace.rb
+- lib/rubocop/cop/unless_else.rb
+- lib/rubocop/cop/when_then.rb
 - lib/rubocop/report/emacs_style.rb
 - lib/rubocop/report/plain_text.rb
 - lib/rubocop/report/report.rb
@@ -163,25 +167,38 @@ files:
 - rubocop.gemspec
 - spec/rubocop/cli_spec.rb
 - spec/rubocop/cops/align_parameters_spec.rb
-- spec/rubocop/cops/blocks_spec.rb
+- spec/rubocop/cops/ampersands_pipes_vs_and_or_spec.rb
 - spec/rubocop/cops/cop_spec.rb
-- spec/rubocop/cops/def_parentheses_spec.rb
+- spec/rubocop/cops/def_with_parentheses_spec.rb
+- spec/rubocop/cops/def_without_parentheses_spec.rb
 - spec/rubocop/cops/empty_lines_spec.rb
+- spec/rubocop/cops/encoding_spec.rb
 - spec/rubocop/cops/end_of_line_spec.rb
 - spec/rubocop/cops/grammar_spec.rb
 - spec/rubocop/cops/hash_syntax_spec.rb
-- spec/rubocop/cops/if_then_else_spec.rb
+- spec/rubocop/cops/if_with_semicolon_spec.rb
 - spec/rubocop/cops/indentation_spec.rb
 - spec/rubocop/cops/line_length_spec.rb
+- spec/rubocop/cops/multiline_blocks_spec.rb
+- spec/rubocop/cops/multiline_if_then_spec.rb
 - spec/rubocop/cops/numeric_literals_spec.rb
 - spec/rubocop/cops/offence_spec.rb
+- spec/rubocop/cops/one_line_conditional_spec.rb
 - spec/rubocop/cops/parameter_lists_spec.rb
-- spec/rubocop/cops/space_after_comma_etc_spec.rb
+- spec/rubocop/cops/single_line_blocks_spec.rb
+- spec/rubocop/cops/space_after_colon_spec.rb
+- spec/rubocop/cops/space_after_comma_spec.rb
+- spec/rubocop/cops/space_after_semicolon_spec.rb
+- spec/rubocop/cops/space_around_braces_spec.rb
+- spec/rubocop/cops/space_around_operators_spec.rb
+- 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/surrounding_space_spec.rb
 - spec/rubocop/cops/tab_spec.rb
 - spec/rubocop/cops/ternary_operator_spec.rb
 - spec/rubocop/cops/trailing_whitespace_spec.rb
+- spec/rubocop/cops/unless_else_spec.rb
+- spec/rubocop/cops/when_then_spec.rb
 - spec/rubocop/reports/emacs_style_spec.rb
 - spec/rubocop/reports/report_spec.rb
 - spec/spec_helper.rb
@@ -200,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3978981872359853745
+      hash: 1293678541270492107
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: