tailor 1.2.1 → 1.3.0

data/spec/functional/horizontal_spacing/braces_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 

data/spec/functional/horizontal_spacing/brackets_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
@@ -15,7 +15,7 @@ BRACKETS['two_d_array_space_before_rbrackets'] =
   %Q{[[1, 2, 3 ], [ 'a', 'b', 'c'] ]}
 
 
-describe "Detection of spaces around brackets" do
+describe 'Detection of spaces around brackets' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -37,49 +37,49 @@ describe "Detection of spaces around brackets" do
     style
   end
 
-  context "Arrays" do
-    context "empty with space inside" do
+  context 'Arrays' do
+    context 'empty with space inside' do
       let(:file_name) { 'space_in_empty_array' }
       specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_after_lbracket" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lbracket' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 1 }
       specify { critic.problems[file_name].first[:level].should be :error }
     end
 
-    context "space after lbracket" do
+    context 'space after lbracket' do
       let(:file_name) { 'simple_array_space_after_lbracket' }
       specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_after_lbracket" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lbracket' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 1 }
       specify { critic.problems[file_name].first[:level].should be :error }
     end
 
-    context "space before rbracket" do
+    context 'space before rbracket' do
       let(:file_name) { 'simple_array_space_before_rbracket' }
       specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_before_rbracket" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_before_rbracket' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 9 }
       specify { critic.problems[file_name].first[:level].should be :error }
     end
   end
 
-  context "Hash key references" do
-    context "space before rbracket" do
+  context 'Hash key references' do
+    context 'space before rbracket' do
       let(:file_name) { 'hash_key_ref_space_before_rbracket' }
       specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_before_rbracket" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_before_rbracket' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 11 }
       specify { critic.problems[file_name].first[:level].should be :error }
     end
 
-    context "space after lbracket" do
+    context 'space after lbracket' do
       let(:file_name) { 'hash_key_ref_space_after_lbracket' }
       specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_after_lbracket" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lbracket' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 6 }
       specify { critic.problems[file_name].first[:level].should be :error }

data/spec/functional/horizontal_spacing/comma_spacing_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
@@ -17,7 +17,7 @@ COMMA_SPACING['spaces_before_with_trailing_comments'] = %Q{[
 }
 
 
-describe "Spacing around comma detection" do
+describe 'Spacing around comma detection' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -39,28 +39,28 @@ describe "Spacing around comma detection" do
     style
   end
 
-  context "no space after a comma" do
+  context 'no space after a comma' do
     let(:file_name) { 'no_space_after_comma' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "spaces_after_comma" }
+    specify { critic.problems[file_name].first[:type].should == 'spaces_after_comma' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 3 }
     specify { critic.problems[file_name].first[:level].should be :error }
   end
 
-  context "two spaces after a comma" do
+  context 'two spaces after a comma' do
     let(:file_name) { 'two_spaces_after_comma' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "spaces_after_comma" }
+    specify { critic.problems[file_name].first[:type].should == 'spaces_after_comma' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 3 }
     specify { critic.problems[file_name].first[:level].should be :error }
   end
 
-  context "one space before comma" do
+  context 'one space before comma' do
     let(:file_name) { 'one_space_before_comma' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "spaces_before_comma" }
+    specify { critic.problems[file_name].first[:type].should == 'spaces_before_comma' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 2 }
     specify { critic.problems[file_name].first[:level].should be :error }

data/spec/functional/horizontal_spacing/hard_tabs_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
@@ -38,7 +38,7 @@ HARD_TABS['hard_tab_with_2_indented_spaces'] =
   end
 end}
 
-describe "Hard tab detection" do
+describe 'Hard tab detection' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -60,49 +60,49 @@ describe "Hard tab detection" do
     style
   end
 
-  context "1 hard tab" do
+  context '1 hard tab' do
     let(:file_name) { 'hard_tab' }
     specify { critic.problems[file_name].size.should be 2 }
-    specify { critic.problems[file_name].first[:type].should == "allow_hard_tabs"  }
+    specify { critic.problems[file_name].first[:type].should == 'allow_hard_tabs' }
     specify { critic.problems[file_name].first[:line].should be 2 }
     specify { critic.problems[file_name].first[:column].should be 0 }
     specify { critic.problems[file_name].first[:level].should be :error }
-    specify { critic.problems[file_name].last[:type].should == "indentation_spaces"  }
+    specify { critic.problems[file_name].last[:type].should == 'indentation_spaces' }
     specify { critic.problems[file_name].last[:line].should be 2 }
     specify { critic.problems[file_name].last[:column].should be 1 }
     specify { critic.problems[file_name].last[:level].should be :error }
   end
 
-  context "1 hard tab with 2 spaces after it" do
+  context '1 hard tab with 2 spaces after it' do
     let(:file_name) { 'hard_tab_with_spaces' }
     specify { critic.problems[file_name].size.should be 2 }
-    specify { critic.problems[file_name].first[:type].should == "allow_hard_tabs"  }
+    specify { critic.problems[file_name].first[:type].should == 'allow_hard_tabs' }
     specify { critic.problems[file_name].first[:line].should be 3 }
     specify { critic.problems[file_name].first[:column].should be 0 }
     specify { critic.problems[file_name].first[:level].should be :error }
-    specify { critic.problems[file_name].last[:type].should == "indentation_spaces"  }
+    specify { critic.problems[file_name].last[:type].should == 'indentation_spaces' }
     specify { critic.problems[file_name].last[:line].should be 3 }
     specify { critic.problems[file_name].last[:column].should be 3 }
     specify { critic.problems[file_name].last[:level].should be :error }
   end
 
-  context "1 hard tab with 3 spaces after it" do
+  context '1 hard tab with 3 spaces after it' do
     let(:file_name) { 'hard_tab_with_1_indented_space' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "allow_hard_tabs"  }
+    specify { critic.problems[file_name].first[:type].should == 'allow_hard_tabs' }
     specify { critic.problems[file_name].first[:line].should be 3 }
     specify { critic.problems[file_name].first[:column].should be 0 }
     specify { critic.problems[file_name].first[:level].should be :error }
   end
 
-  context "1 hard tab with 4 spaces after it" do
+  context '1 hard tab with 4 spaces after it' do
     let(:file_name) { 'hard_tab_with_2_indented_spaces' }
     specify { critic.problems[file_name].size.should be 2 }
-    specify { critic.problems[file_name].first[:type].should == "allow_hard_tabs"  }
+    specify { critic.problems[file_name].first[:type].should == 'allow_hard_tabs' }
     specify { critic.problems[file_name].first[:line].should be 3 }
     specify { critic.problems[file_name].first[:column].should be 0 }
     specify { critic.problems[file_name].first[:level].should be :error }
-    specify { critic.problems[file_name].last[:type].should == "indentation_spaces"  }
+    specify { critic.problems[file_name].last[:type].should == 'indentation_spaces' }
     specify { critic.problems[file_name].last[:line].should be 3 }
     specify { critic.problems[file_name].last[:column].should be 5 }
     specify { critic.problems[file_name].last[:level].should be :error }

data/spec/functional/horizontal_spacing/long_lines_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
@@ -9,7 +9,7 @@ LONG_LINE['long_line_newline_at_82'] = %Q{'#{'#' * 79}'
 }
 
 
-describe "Long line detection" do
+describe 'Long line detection' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -31,19 +31,19 @@ describe "Long line detection" do
     style
   end
 
-  context "line is 81 chars, no newline" do
+  context 'line is 81 chars, no newline' do
     let(:file_name) { 'long_line_no_newline' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "max_line_length" }
+    specify { critic.problems[file_name].first[:type].should == 'max_line_length' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 81 }
     specify { critic.problems[file_name].first[:level].should be :error }
   end
 
-  context "line is 81 chars, plus a newline" do
+  context 'line is 81 chars, plus a newline' do
     let(:file_name) { 'long_line_newline_at_82' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "max_line_length" }
+    specify { critic.problems[file_name].first[:type].should == 'max_line_length' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 81 }
     specify { critic.problems[file_name].first[:level].should be :error }

data/spec/functional/horizontal_spacing/long_methods_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'tailor/critic'
+require 'tailor/configuration/style'
+
+
+LONG_METHOD_IN_CLASS = {}
+LONG_METHOD_IN_CLASS['ok_with_equals'] = <<-METH
+class Test
+  def method1
+    [1, 2, 3, 4].each do |uuid|
+      next if (@profiles[uuid].to_s.start_with? "SM" || @profiles[uuid] ==
+        :SystemLogger)
+    end
+  end
+
+  def method2
+    puts 'Do not ever get here.'
+  end
+end
+METH
+
+describe 'Long method detection' do
+  before do
+    Tailor::Logger.stub(:log)
+    FakeFS.activate!
+    File.open('long_method.rb', 'w') { |f| f.write contents }
+    subject.check_file(file_name, style.to_hash)
+  end
+
+  subject do
+    Tailor::Critic.new
+  end
+
+  let(:contents) { LONG_METHOD_IN_CLASS[file_name] }
+
+  let(:style) do
+    style = Tailor::Configuration::Style.new
+    style.trailing_newlines 0, level: :off
+    style.indentation_spaces 2, level: :off
+    style.allow_invalid_ruby true, level: :off
+    style.max_code_lines_in_method 3
+
+    style
+  end
+
+  context 'methods are within limits' do
+    context 'method ends with line that ends with ==' do
+      let(:file_name) { 'ok_with_equals' }
+      specify {
+        pending 'https://github.com/turboladen/tailor/issues/112'
+
+        subject.problems[file_name].size.should be 1 }
+    end
+  end
+end

data/spec/functional/horizontal_spacing/parens_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
@@ -17,7 +17,7 @@ PARENS['multi_line_method_call_space_after_lparen_trailing_comment'] =
   %Q{thing( one,
   two)}
 
-describe "Detection of spaces around brackets" do
+describe 'Detection of spaces around brackets' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -39,61 +39,61 @@ describe "Detection of spaces around brackets" do
     style
   end
 
-  context "methods" do
-    context "space after lparen" do
+  context 'methods' do
+    context 'space after lparen' do
       let(:file_name) { 'simple_method_call_space_after_lparen' }
       specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_after_lparen" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lparen' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 6 }
       specify { critic.problems[file_name].first[:level].should be :error }
     end
 
-    context "space before rparen" do
+    context 'space before rparen' do
       let(:file_name) { 'simple_method_call_space_before_rparen' }
       specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_before_rparen" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_before_rparen' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 15 }
       specify { critic.problems[file_name].first[:level].should be :error }
     end
 
-    context "space after lparen, trailing comment" do
+    context 'space after lparen, trailing comment' do
       let(:file_name) { 'method_call_space_after_lparen_trailing_comment' }
       specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_after_lparen" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lparen' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 6 }
       specify { critic.problems[file_name].first[:level].should be :error }
     end
 
-    context "space after lparen, before rparen, trailing comment" do
+    context 'space after lparen, before rparen, trailing comment' do
       let(:file_name) { 'method_call_space_after_lparen_before_rparen_trailing_comment' }
       specify { critic.problems[file_name].size.should be 2 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_after_lparen" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lparen' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 6 }
       specify { critic.problems[file_name].first[:level].should be :error }
-      specify { critic.problems[file_name].last[:type].should == "spaces_before_rparen" }
+      specify { critic.problems[file_name].last[:type].should == 'spaces_before_rparen' }
       specify { critic.problems[file_name].last[:line].should be 1 }
       specify { critic.problems[file_name].last[:column].should be 16 }
       specify { critic.problems[file_name].last[:level].should be :error }
     end
   end
 
-  context "multi-line method calls" do
-    context "space after lparen" do
+  context 'multi-line method calls' do
+    context 'space after lparen' do
       let(:file_name) { 'multi_line_method_call_space_after_lparen' }
       specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_after_lparen" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lparen' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 6 }
       specify { critic.problems[file_name].first[:level].should be :error }
     end
-    context "space after lparen, trailing comment" do
+    context 'space after lparen, trailing comment' do
       let(:file_name) { 'multi_line_method_call_space_after_lparen_trailing_comment' }
       specify { critic.problems[file_name].size.should be 1 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_after_lparen" }
+      specify { critic.problems[file_name].first[:type].should == 'spaces_after_lparen' }
       specify { critic.problems[file_name].first[:line].should be 1 }
       specify { critic.problems[file_name].first[:column].should be 6 }
       specify { critic.problems[file_name].first[:level].should be :error }

data/spec/functional/horizontal_spacing/trailing_whitespace_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require_relative '../../support/horizontal_spacing_cases'
 require 'tailor/critic'
 require 'tailor/configuration/style'
@@ -15,7 +15,7 @@ TRAILING_WHITESPACE['trailing_spaces_on_def'] = %Q{def thing
   puts 'something'
 end}
 
-describe "Trailing whitespace detection" do
+describe 'Trailing whitespace detection' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -37,28 +37,28 @@ describe "Trailing whitespace detection" do
     style
   end
 
-  context "line is empty spaces" do
+  context 'line is empty spaces' do
     let(:file_name) { 'empty_line_with_spaces' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "allow_trailing_line_spaces" }
+    specify { critic.problems[file_name].first[:type].should == 'allow_trailing_line_spaces' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 2 }
     specify { critic.problems[file_name].first[:level].should be :error }
   end
 
-  context "method contains an empty line with spaces" do
+  context 'method contains an empty line with spaces' do
     let(:file_name) { 'empty_line_with_spaces_in_method' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "allow_trailing_line_spaces" }
+    specify { critic.problems[file_name].first[:type].should == 'allow_trailing_line_spaces' }
     specify { critic.problems[file_name].first[:line].should be 2 }
     specify { critic.problems[file_name].first[:column].should be 2 }
     specify { critic.problems[file_name].first[:level].should be :error }
   end
 
-  context "def line ends with spaces" do
+  context 'def line ends with spaces' do
     let(:file_name) { 'trailing_spaces_on_def' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "allow_trailing_line_spaces" }
+    specify { critic.problems[file_name].first[:type].should == 'allow_trailing_line_spaces' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 11 }
     specify { critic.problems[file_name].first[:level].should be :error }

data/spec/functional/horizontal_spacing_spec.rb

@@ -1,9 +1,9 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 require_relative '../support/horizontal_spacing_cases'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
-describe "Horizontal Space problem detection" do
+describe 'Horizontal Space problem detection' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -27,13 +27,13 @@ describe "Horizontal Space problem detection" do
       File.open(file_name, 'w') { |f| f.write contents }
     end
 
-    it "should be OK" do
+    it 'should be OK' do
       critic.check_file(file_name, style.to_hash)
       critic.problems.should == { file_name =>  [] }
     end
   end
 
-  context "line ends with a backslash" do
+  context 'line ends with a backslash' do
     let(:file_name) { 'line_split_by_backslash' }
 
     before do
@@ -41,7 +41,7 @@ describe "Horizontal Space problem detection" do
       File.open(file_name, 'w') { |f| f.write contents }
     end
 
-    context "no problems" do
+    context 'no problems' do
       let(:contents) do
         %Q{execute 'myscript' do
   command \\
@@ -50,13 +50,13 @@ describe "Horizontal Space problem detection" do
 end}
       end
 
-      it "is OK" do
+      it 'is OK' do
         critic.check_file(file_name, style.to_hash)
         critic.problems.should == { file_name => [] }
       end
     end
-    
-    context "line after backslash is too long" do
+
+    context 'line after backslash is too long' do
       let(:contents) do
         %Q{execute 'myscript' do
   command \\
@@ -65,15 +65,15 @@ end}
 end}
       end
 
-      it "is OK" do
+      it 'is OK' do
         critic.check_file(file_name, style.to_hash)
         critic.problems.should == {
           file_name => [
             {
-              :type => "max_line_length",
+              :type => 'max_line_length',
               :line => 3,
               :column => 81,
-              :message => "Line is 81 chars long, but should be 80.",
+              :message => 'Line is 81 chars long, but should be 80.',
               :level=>:error
             }
           ]