tailor 1.2.1 → 1.3.0

data/spec/functional/naming/camel_case_methods_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
@@ -14,7 +14,7 @@ CAMEL_CASE_METHODS['one_caps_camel_case_method_trailing_comment'] =
 end}
 
 
-describe "Detection of camel case methods" do
+describe 'Detection of camel case methods' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -36,19 +36,19 @@ describe "Detection of camel case methods" do
     style
   end
 
-  context "standard camel case method" do
+  context 'standard camel case method' do
     let(:file_name) { 'one_caps_camel_case_method' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "allow_camel_case_methods" }
+    specify { critic.problems[file_name].first[:type].should == 'allow_camel_case_methods' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 4 }
     specify { critic.problems[file_name].first[:level].should be :error }
   end
 
-  context "standard camel case method, trailing comment" do
+  context 'standard camel case method, trailing comment' do
     let(:file_name) { 'one_caps_camel_case_method_trailing_comment' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "allow_camel_case_methods" }
+    specify { critic.problems[file_name].first[:type].should == 'allow_camel_case_methods' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 4 }
     specify { critic.problems[file_name].first[:level].should be :error }

data/spec/functional/naming/screaming_snake_case_classes_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
@@ -23,7 +23,7 @@ end}
 
 
 
-describe "Detection of camel case methods" do
+describe 'Detection of camel case methods' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -45,37 +45,37 @@ describe "Detection of camel case methods" do
     style
   end
 
-  context "standard screaming snake case class" do
+  context 'standard screaming snake case class' do
     let(:file_name) { 'one_screaming_snake_case_class' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "allow_screaming_snake_case_classes" }
+    specify { critic.problems[file_name].first[:type].should == 'allow_screaming_snake_case_classes' }
     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 "standard screaming snake case module" do
+  context 'standard screaming snake case module' do
     let(:file_name) { 'one_screaming_snake_case_module' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "allow_screaming_snake_case_classes" }
+    specify { critic.problems[file_name].first[:type].should == 'allow_screaming_snake_case_classes' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 7 }
     specify { critic.problems[file_name].first[:level].should be :error }
   end
 
-  context "double screaming snake case class" do
+  context 'double screaming snake case class' do
     let(:file_name) { 'double_screaming_snake_case_class' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "allow_screaming_snake_case_classes" }
+    specify { critic.problems[file_name].first[:type].should == 'allow_screaming_snake_case_classes' }
     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 "double screaming snake case module" do
+  context 'double screaming snake case module' do
     let(:file_name) { 'double_screaming_snake_case_module' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "allow_screaming_snake_case_classes" }
+    specify { critic.problems[file_name].first[:type].should == 'allow_screaming_snake_case_classes' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 7 }
     specify { critic.problems[file_name].first[:level].should be :error }

data/spec/functional/naming_spec.rb

@@ -1,10 +1,10 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 require_relative '../support/naming_cases'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
 
-describe "Naming problem detection" do
+describe 'Naming problem detection' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -28,7 +28,7 @@ describe "Naming 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

data/spec/functional/vertical_spacing/class_length_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
@@ -24,7 +24,7 @@ CLASS_LENGTH['parent_class_too_long'] =
 end}
 
 
-describe "Detection of class length" do
+describe 'Detection of class length' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -47,19 +47,19 @@ describe "Detection of class length" do
     style
   end
 
-  context "single class" do
+  context 'single class' do
     let(:file_name) { 'class_too_long' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "max_code_lines_in_class" }
+    specify { critic.problems[file_name].first[:type].should == 'max_code_lines_in_class' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 0 }
     specify { critic.problems[file_name].first[:level].should be :error }
   end
 
-  context "class in a class" do
+  context 'class in a class' do
     let(:file_name) { 'parent_class_too_long' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "max_code_lines_in_class" }
+    specify { critic.problems[file_name].first[:type].should == 'max_code_lines_in_class' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 0 }
     specify { critic.problems[file_name].first[:level].should be :error }

data/spec/functional/vertical_spacing/method_length_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
@@ -18,7 +18,7 @@ METHOD_LENGTH['parent_method_too_long'] =
 end}
 
 
-describe "Detection of method length" do
+describe 'Detection of method length' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -41,19 +41,19 @@ describe "Detection of method length" do
     style
   end
 
-  context "single class too long" do
+  context 'single class too long' do
     let(:file_name) { 'method_too_long' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "max_code_lines_in_method" }
+    specify { critic.problems[file_name].first[:type].should == 'max_code_lines_in_method' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 0 }
     specify { critic.problems[file_name].first[:level].should be :error }
   end
 
-  context "method in a method" do
+  context 'method in a method' do
     let(:file_name) { 'method_too_long' }
     specify { critic.problems[file_name].size.should be 1 }
-    specify { critic.problems[file_name].first[:type].should == "max_code_lines_in_method" }
+    specify { critic.problems[file_name].first[:type].should == 'max_code_lines_in_method' }
     specify { critic.problems[file_name].first[:line].should be 1 }
     specify { critic.problems[file_name].first[:column].should be 0 }
     specify { critic.problems[file_name].first[:level].should be :error }

data/spec/functional/vertical_spacing_spec.rb

@@ -1,10 +1,10 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 require_relative '../support/vertical_spacing_cases'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
 
-describe "Vertical Space problem detection" do
+describe 'Vertical Space problem detection' do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
@@ -28,7 +28,7 @@ describe "Vertical 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

data/spec/support/conditional_spacing_cases.rb

@@ -0,0 +1,37 @@
+CONDITIONAL_SPACING = {}
+
+CONDITIONAL_SPACING['no_space_after_if'] =
+  %q{if(foo)
+end}
+
+CONDITIONAL_SPACING['space_after_if'] =
+  %q{if (foo)
+end}
+
+CONDITIONAL_SPACING['no_parens'] =
+  %q{if foo
+end}
+
+CONDITIONAL_SPACING['nested_parens'] =
+  %q{if(foo(bar))
+end}
+
+CONDITIONAL_SPACING['no_space_after_unless'] =
+  %q{unless(foo)
+end}
+
+CONDITIONAL_SPACING['space_after_unless'] =
+  %q{unless (foo)
+end}
+
+CONDITIONAL_SPACING['no_space_after_case'] =
+  %q{puts case(true)
+when true then 'a'
+when false then 'b'
+end}
+
+CONDITIONAL_SPACING['space_after_case'] =
+  %q{puts case (true)
+when true then 'a'
+when false then 'b'
+end}

data/spec/support/good_indentation_cases.rb

@@ -375,7 +375,7 @@ end}
 
 INDENT_OK['for_with_retry_loop'] =
   %Q{for i in 1..5
-  retry if  i > 2
+  retry if i > 2
   puts "Value of local variable is \#{i}"
 end}
 

data/spec/unit/tailor/cli/options_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require 'tailor/cli/options'
+
+module OptionHelpers
+  def cli_option(name)
+    "--#{name.to_s.gsub('_', '-')}"
+  end
+  def option_value(name, value)
+    options = Tailor::CLI::Options.parse!([cli_option(name), value])
+    options.style[name]
+  end
+end
+
+describe Tailor::CLI::Options do
+  include OptionHelpers
+  describe '#parse!' do
+    [
+      :indentation_spaces,
+      :max_code_lines_in_class,
+      :max_code_lines_in_method,
+      :max_line_length,
+      :spaces_after_comma,
+      :spaces_after_lbrace,
+      :spaces_after_lbracket,
+      :spaces_after_lparen,
+      :spaces_before_comma,
+      :spaces_before_lbrace,
+      :spaces_before_rbrace,
+      :spaces_before_rbracket,
+      :spaces_before_rparen,
+      :spaces_in_empty_braces,
+      :trailing_newlines
+    ].each do |o|
+        it 'parses a valid numeric argument correct' do
+          expect(option_value(o, '1')).to eq 1
+        end
+        it 'marks the ruler as off if the option is specified as "off"' do
+          expect(option_value(o, 'off')).to eq :off
+        end
+        it 'marks a ruler as off if the option is specified as "false"' do
+          expect(option_value(o, 'false')).to eq :off
+        end
+        it 'raises if the argument is otherwise not an integer' do
+          expect do
+            option_value(o, 'not-an-integer')
+          end.to raise_error(OptionParser::InvalidArgument)
+        end
+      end
+  end
+end

data/spec/unit/tailor/cli_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/cli'
 
 
@@ -25,7 +25,7 @@ describe Tailor::CLI do
 
   describe '::run' do
     it "creates an instance of Tailor::CLI and calls that object's #execute!" do
-      cli = double "Tailor::CLI"
+      cli = double 'Tailor::CLI'
       cli.should_receive(:execute!)
       Tailor::CLI.should_receive(:new).and_return cli
       Tailor::CLI.run([])
@@ -33,7 +33,7 @@ describe Tailor::CLI do
   end
 
   describe '#initialize' do
-    let(:args) { ['last'] }
+    let(:args) { %w[last] }
 
     it 'uses Options to parse the args' do
       Tailor::Configuration.stub(:new).and_return config

data/spec/unit/tailor/composite_observable_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 require 'tailor/composite_observable'
 
 
@@ -9,31 +9,31 @@ end
 describe Tailor::CompositeObservable do
   subject { Tester.new }
 
-  describe ".define_observer" do
+  describe '.define_observer' do
     context "observer = 'pants'" do
       before { Tailor::CompositeObservable.define_observer 'pants' }
 
-      context "observer responds to #pants_update" do
+      context 'observer responds to #pants_update' do
         it "defines an instance method 'add_pants_observer' that takes 1 arg" do
-          observer = double "Observer", respond_to?: true
+          observer = double 'Observer', respond_to?: true
           subject.add_pants_observer(observer)
         end
       end
 
-      context "observer does not respond to #pants_update" do
+      context 'observer does not respond to #pants_update' do
         it "defines an instance method 'add_pants_observer' that takes 1 arg" do
-          observer = double "Observer", respond_to?: false
+          observer = double 'Observer', respond_to?: false
           expect { subject.add_pants_observer(observer) }.
             to raise_error NoMethodError
         end
       end
 
-      it "defines an instance method #notify_pants_observers" do
+      it 'defines an instance method #notify_pants_observers' do
         expect { subject.notify_pants_observers }.
           to_not raise_error
       end
 
-      it "defines an instance method #pants_changed" do
+      it 'defines an instance method #pants_changed' do
         expect { subject.pants_changed }.to_not raise_error
       end
     end

data/spec/unit/tailor/configuration/file_set_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../../spec_helper'
+require 'spec_helper'
 require 'tailor/configuration/file_set'
 
 
@@ -18,7 +18,7 @@ describe Tailor::Configuration::FileSet do
       end
 
       context 'the file does not exist' do
-        it "returns an empty Array" do
+        it 'returns an empty Array' do
           subject.instance_eval { build_file_list('test.rb') }.should == []
         end
       end

data/spec/unit/tailor/configuration/style_spec.rb

@@ -1,150 +1,150 @@
-require_relative '../../../spec_helper'
+require 'spec_helper'
 require 'tailor/configuration/style'
 
 
 describe Tailor::Configuration::Style do
-  describe ".define_property" do
-    it "defines an instance method that takes 2 params" do
+  describe '.define_property' do
+    it 'defines an instance method that takes 2 params' do
       Tailor::Configuration::Style.define_property(:test_method)
       subject.test_method(1, 2)
     end
 
-    it "allows access to the values via #to_hash" do
+    it 'allows access to the values via #to_hash' do
       Tailor::Configuration::Style.define_property(:test_method)
       subject.test_method(1, level: :pants)
       subject.to_hash.should include test_method: [1, { level: :pants }]
     end
   end
 
-  describe "#initialize" do
-    describe "sets up default values" do
-      describe "allow_camel_case_methods" do
+  describe '#initialize' do
+    describe 'sets up default values' do
+      describe 'allow_camel_case_methods' do
         specify do
           subject.instance_variable_get(:@allow_camel_case_methods).should == [
             false, { level: :error }]
         end
       end
 
-      describe "allow_hard_tabs" do
+      describe 'allow_hard_tabs' do
         specify do
           subject.instance_variable_get(:@allow_hard_tabs).should == [
             false, { level: :error }]
         end
       end
 
-      describe "allow_screaming_snake_case_classes" do
+      describe 'allow_screaming_snake_case_classes' do
         specify do
           subject.instance_variable_get(:@allow_screaming_snake_case_classes).
             should == [false, { level: :error }]
         end
       end
 
-      describe "allow_trailing_line_spaces" do
+      describe 'allow_trailing_line_spaces' do
         specify do
           subject.instance_variable_get(:@allow_trailing_line_spaces).
             should == [false, { level: :error }]
         end
       end
 
-      describe "indentation_spaces" do
+      describe 'indentation_spaces' do
         specify do
           subject.instance_variable_get(:@indentation_spaces).should == [
             2, { level: :error }]
         end
       end
 
-      describe "max_code_lines_in_class" do
+      describe 'max_code_lines_in_class' do
         specify do
           subject.instance_variable_get(:@max_code_lines_in_class).should == [
             300, { level: :error }]
         end
       end
 
-      describe "max_code_lines_in_method" do
+      describe 'max_code_lines_in_method' do
         specify do
           subject.instance_variable_get(:@max_code_lines_in_method).should == [
             30, { level: :error }]
         end
       end
 
-      describe "max_line_length" do
+      describe 'max_line_length' do
         specify do
           subject.instance_variable_get(:@max_line_length).should == [
             80, { level: :error }]
         end
       end
 
-      describe "spaces_after_comma" do
+      describe 'spaces_after_comma' do
         specify do
           subject.instance_variable_get(:@spaces_after_comma).should == [
             1, { level: :error }]
         end
       end
 
-      describe "spaces_after_lbrace" do
+      describe 'spaces_after_lbrace' do
         specify do
           subject.instance_variable_get(:@spaces_after_lbrace).should == [
             1, { level: :error }]
         end
       end
 
-      describe "spaces_after_lbracket" do
+      describe 'spaces_after_lbracket' do
         specify do
           subject.instance_variable_get(:@spaces_after_lbracket).should == [
             0, { level: :error }]
         end
       end
 
-      describe "spaces_after_lparen" do
+      describe 'spaces_after_lparen' do
         specify do
           subject.instance_variable_get(:@spaces_after_lparen).should == [
             0, { level: :error }]
         end
       end
 
-      describe "spaces_before_comma" do
+      describe 'spaces_before_comma' do
         specify do
           subject.instance_variable_get(:@spaces_before_comma).should == [
             0, { level: :error }]
         end
       end
 
-      describe "spaces_before_lbrace" do
+      describe 'spaces_before_lbrace' do
         specify do
           subject.instance_variable_get(:@spaces_before_lbrace).should == [
             1, { level: :error }]
         end
       end
 
-      describe "spaces_before_rbrace" do
+      describe 'spaces_before_rbrace' do
         specify do
           subject.instance_variable_get(:@spaces_before_rbrace).should == [
             1, { level: :error }]
         end
       end
 
-      describe "spaces_before_rbracket" do
+      describe 'spaces_before_rbracket' do
         specify do
           subject.instance_variable_get(:@spaces_before_rbracket).should == [
             0, { level: :error }]
         end
       end
 
-      describe "spaces_before_rparen" do
+      describe 'spaces_before_rparen' do
         specify do
           subject.instance_variable_get(:@spaces_before_rparen).should == [
             0, { level: :error }]
         end
       end
 
-      describe "spaces_in_empty_braces" do
+      describe 'spaces_in_empty_braces' do
         specify do
           subject.instance_variable_get(:@spaces_in_empty_braces).should == [
             0, { level: :error }]
         end
       end
 
-      describe "trailing_newlines" do
+      describe 'trailing_newlines' do
         specify do
           subject.instance_variable_get(:@trailing_newlines).should == [
             1, { level: :error }]
@@ -153,7 +153,7 @@ describe Tailor::Configuration::Style do
     end
   end
 
-  describe "#to_hash" do
+  describe '#to_hash' do
     let(:default_values) do
       {
         :allow_camel_case_methods => [false, { :level => :error }],
@@ -166,6 +166,7 @@ describe Tailor::Configuration::Style do
         :max_code_lines_in_method => [30, { :level => :error }],
         :max_line_length => [80, { :level => :error }],
         :spaces_after_comma => [1, { :level => :error }],
+        :spaces_after_conditional => [1, { :level=>:error }],
         :spaces_after_lbrace => [1, { :level => :error }],
         :spaces_after_lbracket => [0, { :level => :error }],
         :spaces_after_lparen => [0, { :level => :error }],
@@ -179,17 +180,17 @@ describe Tailor::Configuration::Style do
       }
     end
 
-    it "returns a Hash of all of the attributes and values" do
+    it 'returns a Hash of all of the attributes and values' do
       subject.to_hash.should == default_values
     end
 
-    context "with a user-added property" do
+    context 'with a user-added property' do
       before do
         Tailor::Configuration::Style.define_property(:long_pants)
         subject.long_pants(1, level: :warn)
       end
 
-      it "includes the new property as part of the Hash" do
+      it 'includes the new property as part of the Hash' do
         subject.to_hash.should include long_pants: [1, { level: :warn }]
       end
     end