tailor 1.1.5 → 1.2.0

data/spec/functional/indentation_spacing_spec.rb

@@ -3,6 +3,7 @@ require_relative '../support/good_indentation_cases'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
+
 describe "Indentation spacing problem detection" do
   before do
     Tailor::Logger.stub(:log)
@@ -25,18 +26,18 @@ describe "Indentation spacing problem detection" do
 
   INDENT_OK.each do |file_name, contents|
     before do
-      FileUtils.touch file_name.to_s
-      File.open(file_name.to_s, 'w') { |f| f.write contents }
+      FileUtils.touch file_name
+      File.open(file_name, 'w') { |f| f.write contents }
     end
 
     it "should be OK" do
-      critic.check_file(file_name.to_s, style.to_hash)
-      critic.problems.should == { file_name.to_s =>  [] }
+      critic.check_file(file_name, style.to_hash)
+      critic.problems.should == { file_name =>  [] }
     end
   end
 
   context "case statement with indented whens" do
-    let(:file_name) { :case_whens_in }
+    let(:file_name) { 'case_whens_in' }
 
     let(:contents) do
       %Q{def my_method
@@ -55,7 +56,7 @@ end}
   end
 
   context "method with rparen on following line" do
-    let(:file_name) { :method_closing_lonely_paren }
+    let(:file_name) { 'method_closing_lonely_paren' }
 
     let(:contents) do
       %Q{def your_thing(one
@@ -69,7 +70,7 @@ end}
   end
 
   context "lonely rparen and do on the same line" do
-    let(:file_name) { :rparen_and_do_same_line }
+    let(:file_name) { 'rparen_and_do_same_line' }
 
     let(:contents) do
       %Q{opt.on('-c', '--config-file FILE',

data/spec/functional/naming/camel_case_methods_spec.rb

@@ -5,11 +5,11 @@ require 'tailor/configuration/style'
 
 CAMEL_CASE_METHODS = {}
 
-CAMEL_CASE_METHODS[:one_caps_camel_case_method] =
+CAMEL_CASE_METHODS['one_caps_camel_case_method'] =
   %Q{def thingOne
 end}
 
-CAMEL_CASE_METHODS[:one_caps_camel_case_method_trailing_comment] =
+CAMEL_CASE_METHODS['one_caps_camel_case_method_trailing_comment'] =
   %Q{def thingOne   # comment
 end}
 
@@ -18,8 +18,8 @@ describe "Detection of camel case methods" do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
-    File.open(file_name.to_s, 'w') { |f| f.write contents }
-    critic.check_file(file_name.to_s, style.to_hash)
+    File.open(file_name, 'w') { |f| f.write contents }
+    critic.check_file(file_name, style.to_hash)
   end
 
   let(:critic) do
@@ -37,20 +37,20 @@ describe "Detection of camel case methods" do
   end
 
   context "standard camel case method" do
-    let(:file_name) { :one_caps_camel_case_method }
-    specify { critic.problems[file_name.to_s].size.should be 1 }
-    specify { critic.problems[file_name.to_s].first[:type].should == "allow_camel_case_methods" }
-    specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-    specify { critic.problems[file_name.to_s].first[:column].should be 4 }
-    specify { critic.problems[file_name.to_s].first[:level].should be :error }
+    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[: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
-    let(:file_name) { :one_caps_camel_case_method_trailing_comment }
-    specify { critic.problems[file_name.to_s].size.should be 1 }
-    specify { critic.problems[file_name.to_s].first[:type].should == "allow_camel_case_methods" }
-    specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-    specify { critic.problems[file_name.to_s].first[:column].should be 4 }
-    specify { critic.problems[file_name.to_s].first[:level].should be :error }
+    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[: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
 end

data/spec/functional/naming/screaming_snake_case_classes_spec.rb

@@ -5,19 +5,19 @@ require 'tailor/configuration/style'
 
 SCREAMING_SNAKE_CASE_CLASSES = {}
 
-SCREAMING_SNAKE_CASE_CLASSES[:one_screaming_snake_case_class] =
+SCREAMING_SNAKE_CASE_CLASSES['one_screaming_snake_case_class'] =
   %Q{class Thing_One
 end}
 
-SCREAMING_SNAKE_CASE_CLASSES[:one_screaming_snake_case_module] =
+SCREAMING_SNAKE_CASE_CLASSES['one_screaming_snake_case_module'] =
   %Q{module Thing_One
 end}
 
-SCREAMING_SNAKE_CASE_CLASSES[:double_screaming_snake_case_class] =
+SCREAMING_SNAKE_CASE_CLASSES['double_screaming_snake_case_class'] =
   %Q{class Thing_One_Again
 end}
 
-SCREAMING_SNAKE_CASE_CLASSES[:double_screaming_snake_case_module] =
+SCREAMING_SNAKE_CASE_CLASSES['double_screaming_snake_case_module'] =
   %Q{module Thing_One_Again
 end}
 
@@ -27,8 +27,8 @@ describe "Detection of camel case methods" do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
-    File.open(file_name.to_s, 'w') { |f| f.write contents }
-    critic.check_file(file_name.to_s, style.to_hash)
+    File.open(file_name, 'w') { |f| f.write contents }
+    critic.check_file(file_name, style.to_hash)
   end
 
   let(:critic) do
@@ -46,38 +46,38 @@ describe "Detection of camel case methods" do
   end
 
   context "standard screaming snake case class" do
-    let(:file_name) { :one_screaming_snake_case_class }
-    specify { critic.problems[file_name.to_s].size.should be 1 }
-    specify { critic.problems[file_name.to_s].first[:type].should == "allow_screaming_snake_case_classes" }
-    specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-    specify { critic.problems[file_name.to_s].first[:column].should be 6 }
-    specify { critic.problems[file_name.to_s].first[:level].should be :error }
+    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[: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
-    let(:file_name) { :one_screaming_snake_case_module }
-    specify { critic.problems[file_name.to_s].size.should be 1 }
-    specify { critic.problems[file_name.to_s].first[:type].should == "allow_screaming_snake_case_classes" }
-    specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-    specify { critic.problems[file_name.to_s].first[:column].should be 7 }
-    specify { critic.problems[file_name.to_s].first[:level].should be :error }
+    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[: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
-    let(:file_name) { :double_screaming_snake_case_class }
-    specify { critic.problems[file_name.to_s].size.should be 1 }
-    specify { critic.problems[file_name.to_s].first[:type].should == "allow_screaming_snake_case_classes" }
-    specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-    specify { critic.problems[file_name.to_s].first[:column].should be 6 }
-    specify { critic.problems[file_name.to_s].first[:level].should be :error }
+    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[: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
-    let(:file_name) { :double_screaming_snake_case_module }
-    specify { critic.problems[file_name.to_s].size.should be 1 }
-    specify { critic.problems[file_name.to_s].first[:type].should == "allow_screaming_snake_case_classes" }
-    specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-    specify { critic.problems[file_name.to_s].first[:column].should be 7 }
-    specify { critic.problems[file_name.to_s].first[:level].should be :error }
+    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[: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
 end

data/spec/functional/naming_spec.rb

@@ -3,6 +3,7 @@ require_relative '../support/naming_cases'
 require 'tailor/critic'
 require 'tailor/configuration/style'
 
+
 describe "Naming problem detection" do
   before do
     Tailor::Logger.stub(:log)
@@ -23,13 +24,13 @@ describe "Naming problem detection" do
 
   NAMING_OK.each do |file_name, contents|
     before do
-      FileUtils.touch file_name.to_s
-      File.open(file_name.to_s, 'w') { |f| f.write contents }
+      FileUtils.touch file_name
+      File.open(file_name, 'w') { |f| f.write contents }
     end
 
     it "should be OK" do
-      critic.check_file(file_name.to_s, style.to_hash)
-      critic.problems.should == { file_name.to_s =>  [] }
+      critic.check_file(file_name, style.to_hash)
+      critic.problems.should == { file_name =>  [] }
     end
   end
 end

data/spec/functional/rake_task_spec.rb

@@ -1,5 +1,5 @@
-require "spec_helper"
-require "tailor/rake_task"
+require 'spec_helper'
+require 'tailor/rake_task'
 
 
 describe Tailor::RakeTask do
@@ -13,14 +13,14 @@ describe Tailor::RakeTask do
   end
 
   describe 'rake tailor' do
-    context "with problematic files" do
+    context 'with problematic files' do
       subject do
         Tailor::RakeTask.new do |t|
           t.config_file = File.expand_path 'spec/support/rake_task_config_problems.rb'
         end
       end
 
-      it "finds problems" do
+      it 'finds problems' do
         subject
 
         expect {
@@ -29,14 +29,14 @@ describe Tailor::RakeTask do
       end
     end
 
-    context "with OK files" do
+    context 'with OK files' do
       subject do
         Tailor::RakeTask.new do |t|
           t.config_file = File.expand_path 'spec/support/rake_task_config_no_problems.rb'
         end
       end
 
-      it "doesn't find problems" do
+      it 'does not find problems' do
         subject
 
         expect {
@@ -46,7 +46,7 @@ describe Tailor::RakeTask do
     end
   end
 
-  context "using a custom task name" do
+  context 'using a custom task name' do
     subject do
       Tailor::RakeTask.new(task_name) do |t|
         t.config_file = File.expand_path 'spec/support/rake_task_config_problems.rb'
@@ -55,7 +55,7 @@ describe Tailor::RakeTask do
 
     let(:task_name) { 'my_neat_task' }
 
-    it "runs the task" do
+    it 'runs the task' do
       subject
 
       expect {
@@ -64,7 +64,7 @@ describe Tailor::RakeTask do
     end
   end
 
-  context "overriding tailor opts within the task" do
+  context 'overriding tailor opts within the task' do
     subject do
       Tailor::RakeTask.new do |t|
         t.config_file = File.expand_path 'spec/support/rake_task_config_problems.rb'
@@ -72,7 +72,7 @@ describe Tailor::RakeTask do
       end
     end
 
-    it "uses the options from the rake task" do
+    it 'uses the options from the rake task' do
       subject
 
       expect {
@@ -80,4 +80,50 @@ describe Tailor::RakeTask do
       }.to_not raise_error
     end
   end
+
+  context 'adding file sets within the task' do
+    let(:test_dir) do
+      File.expand_path(File.dirname(__FILE__) + '/../dir')
+    end
+
+    before do
+      require 'fileutils'
+
+      unless File.exists?(test_dir)
+        FileUtils.mkdir(test_dir)
+      end
+
+      File.directory?(test_dir).should be_true
+
+      File.open(test_dir + '/test.rb', 'w') do |f|
+        f.write <<-CONTENTS
+puts 'I no have end quote
+        CONTENTS
+      end
+
+      File.exists?(test_dir + '/test.rb').should be_true
+    end
+
+    after do
+      FileUtils.rm_rf test_dir
+    end
+
+    subject do
+      Tailor::RakeTask.new do |t|
+        t.config_file = File.expand_path 'spec/support/rake_task_config_problems.rb'
+
+        t.file_set('dir/**/*.rb', 'dir') do |style|
+          style.max_line_length 1, level: :error
+        end
+      end
+    end
+
+    it 'uses the options from the rake task' do
+      subject
+
+      expect {
+        rake['tailor'].invoke
+      }.to raise_error
+    end
+  end
 end

data/spec/functional/vertical_spacing/class_length_spec.rb

@@ -4,7 +4,7 @@ require 'tailor/configuration/style'
 
 
 CLASS_LENGTH = {}
-CLASS_LENGTH[:class_too_long] =
+CLASS_LENGTH['class_too_long'] =
   %Q{class Party
   include Clowns
   include Pizza
@@ -14,7 +14,7 @@ CLASS_LENGTH[:class_too_long] =
   end
 end}
 
-CLASS_LENGTH[:parent_class_too_long] =
+CLASS_LENGTH['parent_class_too_long'] =
   %Q{class Party
 
   class Pizza
@@ -28,8 +28,8 @@ describe "Detection of class length" do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
-    File.open(file_name.to_s, 'w') { |f| f.write contents }
-    critic.check_file(file_name.to_s, style.to_hash)
+    File.open(file_name, 'w') { |f| f.write contents }
+    critic.check_file(file_name, style.to_hash)
   end
 
   let(:critic) do
@@ -48,20 +48,20 @@ describe "Detection of class length" do
   end
 
   context "single class" do
-    let(:file_name) { :class_too_long }
-    specify { critic.problems[file_name.to_s].size.should be 1 }
-    specify { critic.problems[file_name.to_s].first[:type].should == "max_code_lines_in_class" }
-    specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-    specify { critic.problems[file_name.to_s].first[:column].should be 0 }
-    specify { critic.problems[file_name.to_s].first[:level].should be :error }
+    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[: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
-    let(:file_name) { :parent_class_too_long }
-    specify { critic.problems[file_name.to_s].size.should be 1 }
-    specify { critic.problems[file_name.to_s].first[:type].should == "max_code_lines_in_class" }
-    specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-    specify { critic.problems[file_name.to_s].first[:column].should be 0 }
-    specify { critic.problems[file_name.to_s].first[:level].should be :error }
+    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[: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
 end

data/spec/functional/vertical_spacing/method_length_spec.rb

@@ -4,13 +4,13 @@ require 'tailor/configuration/style'
 
 
 METHOD_LENGTH = {}
-METHOD_LENGTH[:method_too_long] =
+METHOD_LENGTH['method_too_long'] =
   %Q{def thing
   puts
   puts
 end}
 
-METHOD_LENGTH[:parent_method_too_long] =
+METHOD_LENGTH['parent_method_too_long'] =
   %Q{def thing
   puts
   def inner_thing; print '1'; end
@@ -22,8 +22,8 @@ describe "Detection of method length" do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
-    File.open(file_name.to_s, 'w') { |f| f.write contents }
-    critic.check_file(file_name.to_s, style.to_hash)
+    File.open(file_name, 'w') { |f| f.write contents }
+    critic.check_file(file_name, style.to_hash)
   end
 
   let(:critic) do
@@ -42,20 +42,20 @@ describe "Detection of method length" do
   end
 
   context "single class too long" do
-    let(:file_name) { :method_too_long }
-    specify { critic.problems[file_name.to_s].size.should be 1 }
-    specify { critic.problems[file_name.to_s].first[:type].should == "max_code_lines_in_method" }
-    specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-    specify { critic.problems[file_name.to_s].first[:column].should be 0 }
-    specify { critic.problems[file_name.to_s].first[:level].should be :error }
+    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[: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
-    let(:file_name) { :method_too_long }
-    specify { critic.problems[file_name.to_s].size.should be 1 }
-    specify { critic.problems[file_name.to_s].first[:type].should == "max_code_lines_in_method" }
-    specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-    specify { critic.problems[file_name.to_s].first[:column].should be 0 }
-    specify { critic.problems[file_name.to_s].first[:level].should be :error }
+    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[: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
 end